This repository has been archived by the owner on Mar 21, 2022. It is now read-only.
ISSUE-737: Add ManagerStatus into Node #790
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ssullivan
force-pushed
the
issue-737-add-manager-status-into-node
branch
from
40cd463 to
4f81b74
Compare
ssullivan
force-pushed
the
issue-737-add-manager-status-into-node
branch
2 times, most recently
from
de0b1b6 to
acee2dc
Compare
Codecov Report
@@ Coverage Diff @@
## master #790 +/- ##
============================================
- Coverage 66.51% 66.19% -0.33%
Complexity 725 725
============================================
Files 162 162
Lines 3082 3097 +15
Branches 348 353 +5
============================================
Hits 2050 2050
- Misses 877 892 +15
Partials 155 155 |
ssullivan
force-pushed
the
issue-737-add-manager-status-into-node
branch
9 times, most recently
from
d96036a to
4f64290
Compare
davidxia
reviewed
Jun 25, 2017
| @@ -2850,6 +2849,18 @@ public ListVolumesFilterParam(String name, String value) { | |||
| List<Node> listNodes() throws DockerException, InterruptedException; | |||
|
|
|||
| /** | |||
| * List swarm nodes that match the given criteriag. Only available in Docker API >= 1.24. | |||
| ) | ||
| ); | ||
|
|
||
| final List<Node> nodes = dockerClient.listNodes(Node.find().nodeId("24ifsmvkjbyhk").build()); |
There was a problem hiding this comment.
listNodes() will return the list of one node provided by fixtures/1.28/listNodes.json all the time, regardless of the nodeId used here. So this test only seems to check that listNodes() can take Node.Criteria as a parameter. I would lean towards removing this and the tests below (keep testListNodesWithServerError()) since they don't add much.
There was a problem hiding this comment.
I'll update and remove the tests, thanks for taking a look.
This was referenced Jun 25, 2017
ssullivan
force-pushed
the
issue-737-add-manager-status-into-node
branch
from
4f64290 to
ef9394f
Compare
ISSUE-793: Fix for ManagerStatus when a manager is not a Leader on docker 17.03.1-ce Added a listNodes with Criteria call Switched to using a static import of Fixture Fixed typo in Criteria Removed some unit tests per PR feedback Fixed some checkstyle issues related to import ordering, and some indentation that got introduced after last merge
ssullivan
force-pushed
the
issue-737-add-manager-status-into-node
branch
from
da0fe79 to
c3abb82
Compare
|
I've updated the PR with the requested changes. |
davidxia
approved these changes
Jun 29, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I saw that there was a closed issue #737 that my PR was referenced but my additions didn't add ManagerStatus into node.
This PR adds MangerStatus and NodeStatus into Node which should satisfy #737