From cc1b68d5f2cf4f8dc77477632f10fc3b13a27908 Mon Sep 17 00:00:00 2001 From: Chris Telfer Date: Fri, 29 Jun 2018 15:15:52 -0400 Subject: [PATCH] Update tests w/ new libnetwork contraints 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 (cherry picked from commit efb7909befa0fe2236148543a6d50e2563bf386c) Signed-off-by: Sebastiaan van Stijn --- integration-cli/docker_cli_network_unix_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go index 95f7ccfff07b8..a0abb6798a21c 100644 --- a/integration-cli/docker_cli_network_unix_test.go +++ b/integration-cli/docker_cli_network_unix_test.go @@ -610,17 +610,17 @@ func (s *DockerNetworkSuite) TestDockerNetworkIPAMMultipleNetworks(c *check.C) { // test network with multiple subnets // 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") // test network with multiple subnets with valid ipam combinations // also check same subnet across networks when the driver supports it. dockerCmd(c, "network", "create", "-d", dummyNetworkDriver, - "--subnet=192.168.0.0/16", "--subnet=192.170.0.0/16", - "--gateway=192.168.0.100", "--gateway=192.170.0.100", - "--ip-range=192.168.1.0/24", - "--aux-address", "a=192.168.1.5", "--aux-address", "b=192.168.1.6", - "--aux-address", "c=192.170.1.5", "--aux-address", "d=192.170.1.6", + "--subnet=192.172.0.0/16", "--subnet=192.173.0.0/16", + "--gateway=192.172.0.100", "--gateway=192.173.0.100", + "--ip-range=192.172.1.0/24", + "--aux-address", "a=192.172.1.5", "--aux-address", "b=192.172.1.6", + "--aux-address", "c=192.173.1.5", "--aux-address", "d=192.173.1.6", "test7") assertNwIsAvailable(c, "test7")