p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

28722: List of containers with networkID filter is not working

Browse Source 
Signed-off-by: dattatrayakumbhar04 <dattatraya.kumbhar@gslab.com>
Upstream-commit: 59b70cdabe3b5f3592e40d241377c6a9f2127dfc
Component: engine
This commit is contained in:
dattatrayakumbhar04
2016-11-22 20:02:46 +00:00
committed by Dattatraya Kumbhar
parent b0235f63ee
commit b3bf6afbcc
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/daemon/list.go
View File

@ -504,7 +504,7 @@ func includeContainerInList(container *container.Container, ctx *listContext) it
if nw.EndpointSettings == nil {
continue
}
if nw.NetworkID == value {
if strings.HasPrefix(nw.NetworkID, value) {
return networkExist
}
}

17
components/engine/integration-cli/docker_cli_ps_test.go
View File

@ -877,6 +877,23 @@ func (s *DockerSuite) TestPsListContainersFilterNetwork(c *check.C) {
containerOut = strings.TrimSpace(string(out))
c.Assert(containerOut, checker.Contains, "onbridgenetwork")
// Filter by partial network ID
partialnwID := string(nwID[0:4])
out, _ = dockerCmd(c, "ps", "--filter", "network="+partialnwID)
containerOut = strings.TrimSpace(string(out))
lines = strings.Split(containerOut, "\n")
// skip header
lines = lines[1:]
// ps output should have only one container
c.Assert(lines, checker.HasLen, 1)
// Making sure onbridgenetwork is on the output
c.Assert(containerOut, checker.Contains, "onbridgenetwork", check.Commentf("Missing the container on network\n"))
}
func (s *DockerSuite) TestPsByOrder(c *check.C) {