mirror of
https://github.com/moby/moby.git
synced 2025-07-27 20:02:03 +03:00
Fix network inspect for default networks.
- Keep old fields in NetworkSetting to respect the deprecation policy. Signed-off-by: David Calavera <david.calavera@gmail.com>
This commit is contained in:
@ -13,6 +13,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/docker/docker/api/types"
|
||||
"github.com/docker/docker/api/types/versions/v1p20"
|
||||
"github.com/docker/docker/pkg/integration/checker"
|
||||
"github.com/docker/libnetwork/driverapi"
|
||||
remoteapi "github.com/docker/libnetwork/drivers/remote/api"
|
||||
@ -641,3 +642,31 @@ func (s *DockerNetworkSuite) TestDockerNetworkMacInspect(c *check.C) {
|
||||
c.Assert(err, checker.IsNil)
|
||||
c.Assert(mac, checker.Equals, "a0:b1:c2:d3:e4:f5")
|
||||
}
|
||||
|
||||
func (s *DockerSuite) TestInspectApiMultipeNetworks(c *check.C) {
|
||||
dockerCmd(c, "network", "create", "mybridge1")
|
||||
dockerCmd(c, "network", "create", "mybridge2")
|
||||
out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
|
||||
id := strings.TrimSpace(out)
|
||||
c.Assert(waitRun(id), check.IsNil)
|
||||
|
||||
dockerCmd(c, "network", "connect", "mybridge1", id)
|
||||
dockerCmd(c, "network", "connect", "mybridge2", id)
|
||||
|
||||
body := getInspectBody(c, "v1.20", id)
|
||||
var inspect120 v1p20.ContainerJSON
|
||||
err := json.Unmarshal(body, &inspect120)
|
||||
c.Assert(err, checker.IsNil)
|
||||
|
||||
versionedIP := inspect120.NetworkSettings.IPAddress
|
||||
|
||||
body = getInspectBody(c, "v1.21", id)
|
||||
var inspect121 types.ContainerJSON
|
||||
err = json.Unmarshal(body, &inspect121)
|
||||
c.Assert(err, checker.IsNil)
|
||||
c.Assert(inspect121.NetworkSettings.Networks, checker.HasLen, 3)
|
||||
|
||||
bridge := inspect121.NetworkSettings.Networks["bridge"]
|
||||
c.Assert(bridge.IPAddress, checker.Equals, versionedIP)
|
||||
c.Assert(bridge.IPAddress, checker.Equals, inspect121.NetworkSettings.IPAddress)
|
||||
}
|
||||
|
Reference in New Issue
Block a user