mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-07-14 15:41:16 +03:00
Code Activity

Merge pull request #17218 from vdemeester/17023-network-multiple-inspect

Browse Source 
Add support for multiple network in inspect
This commit is contained in:
Sebastiaan van Stijn
2015-10-21 11:09:02 -07:00
parent 6a7c38a57d 7af9f988ac
commit 9f031f70ce
2 changed files with 55 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
integration-cli/docker_cli_network_unix_test.go
View File

@ -210,10 +210,10 @@ func isNwPresent(c *check.C, name string) bool {
func getNwResource(c *check.C, name string) *types.NetworkResource {
out, _ := dockerCmd(c, "network", "inspect", name)
nr := types.NetworkResource{}
nr := []types.NetworkResource{}
err := json.Unmarshal([]byte(out), &nr)
c.Assert(err, check.IsNil)
return &nr
return &nr[0]
}
func (s *DockerNetworkSuite) TestDockerNetworkLsDefault(c *check.C) {
@ -236,6 +236,30 @@ func (s *DockerSuite) TestDockerNetworkDeleteNotExists(c *check.C) {
c.Assert(err, checker.NotNil, check.Commentf("%v", out))
}
func (s *DockerSuite) TestDockerInspectMultipleNetwork(c *check.C) {
out, _ := dockerCmd(c, "network", "inspect", "host", "none")
networkResources := []types.NetworkResource{}
err := json.Unmarshal([]byte(out), &networkResources)
c.Assert(err, check.IsNil)
c.Assert(networkResources, checker.HasLen, 2)
// Should print an error, return an exitCode 1 *but* should print the host network
out, exitCode, err := dockerCmdWithError("network", "inspect", "host", "nonexistent")
c.Assert(err, checker.NotNil)
c.Assert(exitCode, checker.Equals, 1)
c.Assert(out, checker.Contains, "Error: No such network: nonexistent")
networkResources = []types.NetworkResource{}
inspectOut := strings.SplitN(out, "\n", 2)[1]
err = json.Unmarshal([]byte(inspectOut), &networkResources)
c.Assert(networkResources, checker.HasLen, 1)
// Should print an error and return an exitCode, nothing else
out, exitCode, err = dockerCmdWithError("network", "inspect", "nonexistent")
c.Assert(err, checker.NotNil)
c.Assert(exitCode, checker.Equals, 1)
c.Assert(out, checker.Contains, "Error: No such network: nonexistent")
}
func (s *DockerNetworkSuite) TestDockerNetworkConnectDisconnect(c *check.C) {
dockerCmd(c, "network", "create", "test")
assertNwIsAvailable(c, "test")