Changes to cluster/filter, swagger.yaml, version-history.md for filtering on node labels.

anshulpundir · thaJeztah · commit 514ce73391d0 · 2018-08-21T22:17:23.000+02:00
Signed-off-by: Anshul Pundir &lt;anshul.pundir@docker.com&gt;
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/api/swagger.yaml b/api/swagger.yaml
@@ -8609,6 +8609,7 @@ paths:
             - `label=<engine label>`
             - `membership=`(`accepted`|`pending`)`
             - `name=<node name>`
+            - `node.label=<node label>`
             - `role=`(`manager`|`worker`)`
           type: "string"
       tags: ["Node"]
diff --git a/daemon/cluster/filters.go b/daemon/cluster/filters.go
@@ -16,6 +16,7 @@ func newListNodesFilters(filter filters.Args) (*swarmapi.ListNodesRequest_Filter
 		"label":      true,
 		"role":       true,
 		"membership": true,
+		"node.label": true,
 	}
 	if err := filter.Validate(accepted); err != nil {
 		return nil, err
@@ -24,6 +25,7 @@ func newListNodesFilters(filter filters.Args) (*swarmapi.ListNodesRequest_Filter
 		NamePrefixes: filter.Get("name"),
 		IDPrefixes:   filter.Get("id"),
 		Labels:       runconfigopts.ConvertKVStringsToMap(filter.Get("label")),
+		NodeLabels:   runconfigopts.ConvertKVStringsToMap(filter.Get("node.label")),
 	}
 
 	for _, r := range filter.Get("role") {
diff --git a/docs/api/version-history.md b/docs/api/version-history.md
@@ -26,6 +26,10 @@ keywords: "API, Docker, rcli, REST, documentation"
 * `POST /swarm/init` now accepts a `DefaultAddrPool` property to set global scope default address pool
 * `POST /swarm/init` now accepts a `SubnetSize` property to set global scope networks by giving the
   length of the subnet masks for every such network
+* `GET /nodes` now supports a filter type `node.label` filter to filter nodes based
+  on the node.label. The format of the label filter is `node.label=<key>`/`node.label=<key>=<value>`
+  to return those with the specified labels, or `node.label!=<key>`/`node.label!=<key>=<value>`
+  to return those without the specified labels.
 
 ## V1.38 API changes
 

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ func newListNodesFilters(filter filters.Args) (*swarmapi.ListNodesRequest_Filter`
`16`	`16`	`"label": true,`
`17`	`17`	`"role": true,`
`18`	`18`	`"membership": true,`
	`19`	`+ "node.label": true,`
`19`	`20`	`}`
`20`	`21`	`if err := filter.Validate(accepted); err != nil {`
`21`	`22`	`return nil, err`
`@@ -24,6 +25,7 @@ func newListNodesFilters(filter filters.Args) (*swarmapi.ListNodesRequest_Filter`
`24`	`25`	`NamePrefixes: filter.Get("name"),`
`25`	`26`	`IDPrefixes: filter.Get("id"),`
`26`	`27`	`Labels: runconfigopts.ConvertKVStringsToMap(filter.Get("label")),`
	`28`	`+ NodeLabels: runconfigopts.ConvertKVStringsToMap(filter.Get("node.label")),`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`for _, r := range filter.Get("role") {`