kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Bring up DockerNetworkSuite

Browse source 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
This commit is contained in:
Christopher Crone 2017-09-12 17:18:36 +02:00
parent 6936ce3b65
commit 42d812df0a
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hack/test/e2e-run.sh
View file

@ -12,4 +12,4 @@ cd /tests/integration/container
echo "Run integration-cli DockerSuite tests" echo "Run integration-cli DockerSuite tests"
cd /tests/integration-cli cd /tests/integration-cli
./test.main -test.v -check.v -check.f DockerSuite ./test.main -test.v -check.v -check.f "DockerSuite|DockerNetworkSuite"

16
integration-cli/docker_cli_network_unix_test.go
View file

@ -353,6 +353,8 @@ func (s *DockerNetworkSuite) TestDockerNetworkRmPredefined(c *check.C) {
} }
func (s *DockerNetworkSuite) TestDockerNetworkLsFilter(c *check.C) { func (s *DockerNetworkSuite) TestDockerNetworkLsFilter(c *check.C) {
// E2E: Test assumes clean network environment.
testRequires(c, NotE2E)
testNet := "testnet1" testNet := "testnet1"
testLabel := "foo" testLabel := "foo"
testValue := "bar" testValue := "bar"
@ -626,6 +628,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkConnectDisconnect(c *check.C) {
} }
func (s *DockerNetworkSuite) TestDockerNetworkIPAMMultipleNetworks(c *check.C) { func (s *DockerNetworkSuite) TestDockerNetworkIPAMMultipleNetworks(c *check.C) {
testRequires(c, SameHostDaemon)
// test0 bridge network // test0 bridge network
dockerCmd(c, "network", "create", "--subnet=192.168.0.0/16", "test1") dockerCmd(c, "network", "create", "--subnet=192.168.0.0/16", "test1")
assertNwIsAvailable(c, "test1") assertNwIsAvailable(c, "test1")
@ -666,6 +669,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkIPAMMultipleNetworks(c *check.C) {
} }
func (s *DockerNetworkSuite) TestDockerNetworkCustomIPAM(c *check.C) { func (s *DockerNetworkSuite) TestDockerNetworkCustomIPAM(c *check.C) {
testRequires(c, SameHostDaemon)
// Create a bridge network using custom ipam driver // Create a bridge network using custom ipam driver
dockerCmd(c, "network", "create", "--ipam-driver", dummyIPAMDriver, "br0") dockerCmd(c, "network", "create", "--ipam-driver", dummyIPAMDriver, "br0")
assertNwIsAvailable(c, "br0") assertNwIsAvailable(c, "br0")
@ -681,6 +685,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkCustomIPAM(c *check.C) {
} }
func (s *DockerNetworkSuite) TestDockerNetworkIPAMOptions(c *check.C) { func (s *DockerNetworkSuite) TestDockerNetworkIPAMOptions(c *check.C) {
testRequires(c, SameHostDaemon)
// Create a bridge network using custom ipam driver and options // Create a bridge network using custom ipam driver and options
dockerCmd(c, "network", "create", "--ipam-driver", dummyIPAMDriver, "--ipam-opt", "opt1=drv1", "--ipam-opt", "opt2=drv2", "br0") dockerCmd(c, "network", "create", "--ipam-driver", dummyIPAMDriver, "--ipam-opt", "opt1=drv1", "--ipam-opt", "opt2=drv2", "br0")
assertNwIsAvailable(c, "br0") assertNwIsAvailable(c, "br0")
@ -693,6 +698,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkIPAMOptions(c *check.C) {
} }
func (s *DockerNetworkSuite) TestDockerNetworkNullIPAMDriver(c *check.C) { func (s *DockerNetworkSuite) TestDockerNetworkNullIPAMDriver(c *check.C) {
testRequires(c, SameHostDaemon)
// Create a network with null ipam driver // Create a network with null ipam driver
_, _, err := dockerCmdWithError("network", "create", "-d", dummyNetworkDriver, "--ipam-driver", "null", "test000") _, _, err := dockerCmdWithError("network", "create", "-d", dummyNetworkDriver, "--ipam-driver", "null", "test000")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
@ -798,6 +804,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkIPAMInvalidCombinations(c *check.C
} }
func (s *DockerNetworkSuite) TestDockerNetworkDriverOptions(c *check.C) { func (s *DockerNetworkSuite) TestDockerNetworkDriverOptions(c *check.C) {
testRequires(c, SameHostDaemon)
dockerCmd(c, "network", "create", "-d", dummyNetworkDriver, "-o", "opt1=drv1", "-o", "opt2=drv2", "testopt") dockerCmd(c, "network", "create", "-d", dummyNetworkDriver, "-o", "opt1=drv1", "-o", "opt2=drv2", "testopt")
assertNwIsAvailable(c, "testopt") assertNwIsAvailable(c, "testopt")
gopts := remoteDriverNetworkRequest.Options[netlabel.GenericData] gopts := remoteDriverNetworkRequest.Options[netlabel.GenericData]
@ -983,6 +990,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkLinkOnDefaultNetworkOnly(c *check.
} }
func (s *DockerNetworkSuite) TestDockerNetworkOverlayPortMapping(c *check.C) { func (s *DockerNetworkSuite) TestDockerNetworkOverlayPortMapping(c *check.C) {
testRequires(c, SameHostDaemon)
// Verify exposed ports are present in ps output when running a container on // Verify exposed ports are present in ps output when running a container on
// a network managed by a driver which does not provide the default gateway // a network managed by a driver which does not provide the default gateway
// for the container // for the container
@ -1009,7 +1017,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkOverlayPortMapping(c *check.C) {
} }
func (s *DockerNetworkSuite) TestDockerNetworkDriverUngracefulRestart(c *check.C) { func (s *DockerNetworkSuite) TestDockerNetworkDriverUngracefulRestart(c *check.C) {
testRequires(c, DaemonIsLinux, NotUserNamespace) testRequires(c, DaemonIsLinux, NotUserNamespace, SameHostDaemon)
dnd := "dnd" dnd := "dnd"
did := "did" did := "did"
@ -1050,6 +1058,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkDriverUngracefulRestart(c *check.C
} }
func (s *DockerNetworkSuite) TestDockerNetworkMacInspect(c *check.C) { func (s *DockerNetworkSuite) TestDockerNetworkMacInspect(c *check.C) {
testRequires(c, SameHostDaemon)
// Verify endpoint MAC address is correctly populated in container's network settings // Verify endpoint MAC address is correctly populated in container's network settings
nwn := "ov" nwn := "ov"
ctn := "bb" ctn := "bb"
@ -1115,6 +1124,7 @@ func verifyContainerIsConnectedToNetworks(c *check.C, d *daemon.Daemon, cName st
} }
func (s *DockerNetworkSuite) TestDockerNetworkMultipleNetworksGracefulDaemonRestart(c *check.C) { func (s *DockerNetworkSuite) TestDockerNetworkMultipleNetworksGracefulDaemonRestart(c *check.C) {
testRequires(c, SameHostDaemon)
cName := "bb" cName := "bb"
nwList := []string{"nw1", "nw2", "nw3"} nwList := []string{"nw1", "nw2", "nw3"}
@ -1133,6 +1143,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkMultipleNetworksGracefulDaemonRest
} }
func (s *DockerNetworkSuite) TestDockerNetworkMultipleNetworksUngracefulDaemonRestart(c *check.C) { func (s *DockerNetworkSuite) TestDockerNetworkMultipleNetworksUngracefulDaemonRestart(c *check.C) {
testRequires(c, SameHostDaemon)
cName := "cc" cName := "cc"
nwList := []string{"nw1", "nw2", "nw3"} nwList := []string{"nw1", "nw2", "nw3"}
@ -1159,7 +1170,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkRunNetByID(c *check.C) {
} }
func (s *DockerNetworkSuite) TestDockerNetworkHostModeUngracefulDaemonRestart(c *check.C) { func (s *DockerNetworkSuite) TestDockerNetworkHostModeUngracefulDaemonRestart(c *check.C) {
testRequires(c, DaemonIsLinux, NotUserNamespace) testRequires(c, DaemonIsLinux, NotUserNamespace, SameHostDaemon)
s.d.StartWithBusybox(c) s.d.StartWithBusybox(c)
// Run a few containers on host network // Run a few containers on host network
@ -1285,6 +1296,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkRestartWithMultipleNetworks(c *che
} }
func (s *DockerNetworkSuite) TestDockerNetworkConnectDisconnectToStoppedContainer(c *check.C) { func (s *DockerNetworkSuite) TestDockerNetworkConnectDisconnectToStoppedContainer(c *check.C) {
testRequires(c, SameHostDaemon)
dockerCmd(c, "network", "create", "test") dockerCmd(c, "network", "create", "test")
dockerCmd(c, "create", "--name=foo", "busybox", "top") dockerCmd(c, "create", "--name=foo", "busybox", "top")
dockerCmd(c, "network", "connect", "test", "foo") dockerCmd(c, "network", "connect", "test", "foo")