beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update tests w/ new libnetwork contraints

Browse source 
The TestDockerNetworkIPAMMultipleNetworks test allocates several
networks simultaneously with overlapping IP addresses.  Libnetwork now
forbids this.  Adjust the test case to use distinct IP ranges for the
networks it creates.

Signed-off-by: Chris Telfer <ctelfer@docker.com>
This commit is contained in:
Chris Telfer 2018-06-29 15:15:52 -04:00
parent f155f828a2
commit efb7909bef
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
integration-cli/docker_cli_network_unix_test.go
View file

@ -610,17 +610,17 @@ func (s *DockerNetworkSuite) TestDockerNetworkIPAMMultipleNetworks(c *check.C) {
// test network with multiple subnets // test network with multiple subnets
// bridge network doesn't support multiple subnets. hence, use a dummy driver that supports // bridge network doesn't support multiple subnets. hence, use a dummy driver that supports
dockerCmd(c, "network", "create", "-d", dummyNetworkDriver, "--subnet=192.168.0.0/16", "--subnet=192.170.0.0/16", "test6") dockerCmd(c, "network", "create", "-d", dummyNetworkDriver, "--subnet=192.170.0.0/16", "--subnet=192.171.0.0/16", "test6")
assertNwIsAvailable(c, "test6") assertNwIsAvailable(c, "test6")
// test network with multiple subnets with valid ipam combinations // test network with multiple subnets with valid ipam combinations
// also check same subnet across networks when the driver supports it. // also check same subnet across networks when the driver supports it.
dockerCmd(c, "network", "create", "-d", dummyNetworkDriver, dockerCmd(c, "network", "create", "-d", dummyNetworkDriver,
"--subnet=192.168.0.0/16", "--subnet=192.170.0.0/16", "--subnet=192.172.0.0/16", "--subnet=192.173.0.0/16",
"--gateway=192.168.0.100", "--gateway=192.170.0.100", "--gateway=192.172.0.100", "--gateway=192.173.0.100",
"--ip-range=192.168.1.0/24", "--ip-range=192.172.1.0/24",
"--aux-address", "a=192.168.1.5", "--aux-address", "b=192.168.1.6", "--aux-address", "a=192.172.1.5", "--aux-address", "b=192.172.1.6",
"--aux-address", "c=192.170.1.5", "--aux-address", "d=192.170.1.6", "--aux-address", "c=192.173.1.5", "--aux-address", "d=192.173.1.6",
"test7") "test7")
assertNwIsAvailable(c, "test7") assertNwIsAvailable(c, "test7")