Skip to content

Swagger/API update "standalone" API fields#40340

Merged
thaJeztah merged 4 commits intomoby:masterfrom
thaJeztah:swagger_remove_classic_swarm_node
Jan 23, 2020
Merged

Swagger/API update "standalone" API fields#40340
thaJeztah merged 4 commits intomoby:masterfrom
thaJeztah:swagger_remove_classic_swarm_node

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Jan 3, 2020

closes #39821
replaces #39821

Update docs/descriptions of fields that are only used by the Swarm standalone API (https://github.com/docker/swarm), and omit the SystemStatus field if it's not set.

@thaJeztah thaJeztah mentioned this pull request Jan 3, 2020
Closed
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jan 3, 2020

Interesting; this docker-py test looks to be flaky;


[2020-01-03T11:58:55.181Z] =================================== FAILURES ===================================
[2020-01-03T11:58:55.181Z] ____________________ ImageCollectionTest.test_pull_multiple ____________________
[2020-01-03T11:58:55.181Z] tests/integration/models_images_test.py:90: in test_pull_multiple
[2020-01-03T11:58:55.181Z]     assert len(images) == 1
[2020-01-03T11:58:55.181Z] E   AssertionError: assert 2 == 1
[2020-01-03T11:58:55.181Z] E    +  where 2 = len([<Image: 'hello-world:linux'>, <Image: 'hello-world:latest'>])
[2020-01-03T11:58:55.181Z] ------- generated xml file: /src/bundles/test-docker-py/junit-report.xml -------

@thaJeztah thaJeztah mentioned this pull request Jan 3, 2020
Merged
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jan 3, 2020

opened docker/docker-py#2485 to fix the test upstream, and #40343 to temporarily skip the test

@thaJeztah
swagger: remove classic swarm "Node" field
234d5a7 
This field is not part of the Docker API and only used
for classic (standalone) swarm.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
TestContainerInspectNode: document test as being for classic swarm
b5c22f4 
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
api/types: document classic swarm "Node" field
78c8692 
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
API: omit classic swarm "SystemStatus" field if empty
8311d6b 
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the swagger_remove_classic_swarm_node branch from 574ed84 to 8311d6b Compare January 6, 2020 11:25
cpuguy83
cpuguy83 approved these changes Jan 9, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@SamWhited
Copy link
Copy Markdown
Contributor

SamWhited commented Jan 23, 2020

LGTM

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jan 23, 2020

let's merge (I'll probably cherry-pick the docs changes)

@thaJeztah thaJeztah merged commit ac058c1 into moby:master Jan 23, 2020
@thaJeztah thaJeztah deleted the swagger_remove_classic_swarm_node branch January 23, 2020 19:45
@thaJeztah thaJeztah mentioned this pull request Feb 12, 2020
Merged
@thaJeztah thaJeztah added this to the 20.03.0 milestone Apr 2, 2020
@thaJeztah thaJeztah mentioned this pull request Jun 26, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cpuguy83 cpuguy83 cpuguy83 approved these changes

Assignees

No one assigned

Labels

area/api API area/docs impact/api impact/changelog impact/deprecation status/3-docs-review

Projects

None yet

Milestone

20.10.0

Development

Successfully merging this pull request may close these issues.

3 participants

@thaJeztah @SamWhited @cpuguy83