deleted file mode 100644

@@ -1,340 +0,0 @@

-// +build !windows

-

-package main

-

-import (

-	"strings"

-	"time"

-

-	"github.com/docker/docker/integration-cli/checker"

-	"github.com/docker/docker/integration-cli/cli"

-	"github.com/docker/docker/pkg/parsers/kernel"

-	"github.com/go-check/check"

-	"github.com/gotestyourself/gotestyourself/icmd"

-)

-

-// ensure Kernel version is >= v3.9 for macvlan support

-func macvlanKernelSupport() bool {

-	return checkKernelMajorVersionGreaterOrEqualThen(3, 9)

-}

-

-// ensure Kernel version is >= v4.2 for ipvlan support

-func ipvlanKernelSupport() bool {

-	return checkKernelMajorVersionGreaterOrEqualThen(4, 2)

-}

-

-func checkKernelMajorVersionGreaterOrEqualThen(kernelVersion int, majorVersion int) bool {

-	kv, err := kernel.GetKernelVersion()

-	if err != nil {

-		return false

-	}

-	if kv.Kernel < kernelVersion || (kv.Kernel == kernelVersion && kv.Major < majorVersion) {

-		return false

-	}

-	return true

-}

-

-func (s *DockerNetworkSuite) TestDockerNetworkIpvlanPersistance(c *check.C) {

-	// verify the driver automatically provisions the 802.1q link (di-dummy0.70)

-	testRequires(c, DaemonIsLinux, ipvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon, SameHostDaemon)

-	// master dummy interface 'di' notation represent 'docker ipvlan'

-	master := "di-dummy0"

-	// simulate the master link the vlan tagged subinterface parent link will use

-	createMasterDummy(c, master)

-	// cleanup the master interface that also collects the slave dev

-	defer deleteInterface(c, master)

-	// create a network specifying the desired sub-interface name

-	dockerCmd(c, "network", "create", "--driver=ipvlan", "-o", "parent=di-dummy0.70", "di-persist")

-	assertNwIsAvailable(c, "di-persist")

-	// Restart docker daemon to test the config has persisted to disk

-	s.d.Restart(c)

-	// verify network is recreated from persistence

-	assertNwIsAvailable(c, "di-persist")

-}

-

-func (s *DockerNetworkSuite) TestDockerNetworkIpvlanSubIntCreate(c *check.C) {

-	// verify the driver automatically provisions the 802.1q link (di-dummy0.50)

-	testRequires(c, DaemonIsLinux, ipvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon, SameHostDaemon)

-	// master dummy interface 'dm' abbreviation represents 'docker ipvlan'

-	master := "di-dummy0"

-	// simulate the master link the vlan tagged subinterface parent link will use

-	createMasterDummy(c, master)

-	// cleanup the master interface which also collects the slave dev

-	defer deleteInterface(c, master)

-	// create a network specifying the desired sub-interface name

-	dockerCmd(c, "network", "create", "--driver=ipvlan", "-o", "parent=di-dummy0.60", "di-subinterface")

-	assertNwIsAvailable(c, "di-subinterface")

-}

-

-func (s *DockerNetworkSuite) TestDockerNetworkIpvlanOverlapParent(c *check.C) {

-	// verify the same parent interface cannot be used if already in use by an existing network

-	testRequires(c, DaemonIsLinux, ipvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon, SameHostDaemon)

-	// master dummy interface 'dm' abbreviation represents 'docker ipvlan'

-	master := "di-dummy0"

-	createMasterDummy(c, master)

-	// cleanup the master interface which also collects the slave dev

-	defer deleteInterface(c, master)

-	createVlanInterface(c, master, "di-dummy0.30", "30")

-	// create a network using an existing parent interface

-	dockerCmd(c, "network", "create", "--driver=ipvlan", "-o", "parent=di-dummy0.30", "di-subinterface")

-	assertNwIsAvailable(c, "di-subinterface")

-	// attempt to create another network using the same parent iface that should fail

-	out, _, err := dockerCmdWithError("network", "create", "--driver=ipvlan", "-o", "parent=di-dummy0.30", "di-parent-net-overlap")

-	// verify that the overlap returns an error

-	c.Assert(err, check.NotNil, check.Commentf(out))

-}

-

-func (s *DockerNetworkSuite) TestDockerNetworkIpvlanL2MultiSubnet(c *check.C) {

-	// create a dual stack multi-subnet Ipvlan L2 network and validate connectivity within the subnets, two on each subnet

-	testRequires(c, DaemonIsLinux, IPv6, ipvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)

-	dockerCmd(c, "network", "create", "--driver=ipvlan", "--ipv6", "--subnet=172.28.200.0/24", "--subnet=172.28.202.0/24", "--gateway=172.28.202.254",

-		"--subnet=2001:db8:abc8::/64", "--subnet=2001:db8:abc6::/64", "--gateway=2001:db8:abc6::254", "dualstackl2")

-	// Ensure the network was created

-	assertNwIsAvailable(c, "dualstackl2")

-	// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.200.0/24 and 2001:db8:abc8::/64

-	dockerCmd(c, "run", "-d", "--net=dualstackl2", "--name=first", "--ip", "172.28.200.20", "--ip6", "2001:db8:abc8::20", "busybox:glibc", "top")

-	dockerCmd(c, "run", "-d", "--net=dualstackl2", "--name=second", "--ip", "172.28.200.21", "--ip6", "2001:db8:abc8::21", "busybox:glibc", "top")

-

-	// Inspect and store the v4 address from specified container on the network dualstackl2

-	ip := inspectField(c, "first", "NetworkSettings.Networks.dualstackl2.IPAddress")

-	// Inspect and store the v6 address from specified container on the network dualstackl2

-	ip6 := inspectField(c, "first", "NetworkSettings.Networks.dualstackl2.GlobalIPv6Address")

-

-	// verify ipv4 connectivity to the explicit --ipv address second to first

-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", strings.TrimSpace(ip))

-	c.Assert(err, check.IsNil)

-	// verify ipv6 connectivity to the explicit --ipv6 address second to first

-	_, _, err = dockerCmdWithError("exec", "second", "ping6", "-c", "1", strings.TrimSpace(ip6))

-	c.Assert(err, check.IsNil)

-

-	// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.202.0/24 and 2001:db8:abc6::/64

-	dockerCmd(c, "run", "-d", "--net=dualstackl2", "--name=third", "--ip", "172.28.202.20", "--ip6", "2001:db8:abc6::20", "busybox:glibc", "top")

-	dockerCmd(c, "run", "-d", "--net=dualstackl2", "--name=fourth", "--ip", "172.28.202.21", "--ip6", "2001:db8:abc6::21", "busybox:glibc", "top")

-

-	// Inspect and store the v4 address from specified container on the network dualstackl2

-	ip = inspectField(c, "third", "NetworkSettings.Networks.dualstackl2.IPAddress")

-	// Inspect and store the v6 address from specified container on the network dualstackl2

-	ip6 = inspectField(c, "third", "NetworkSettings.Networks.dualstackl2.GlobalIPv6Address")

-

-	// verify ipv4 connectivity to the explicit --ipv address from third to fourth

-	_, _, err = dockerCmdWithError("exec", "fourth", "ping", "-c", "1", strings.TrimSpace(ip))

-	c.Assert(err, check.IsNil)

-	// verify ipv6 connectivity to the explicit --ipv6 address from third to fourth

-	_, _, err = dockerCmdWithError("exec", "fourth", "ping6", "-c", "1", strings.TrimSpace(ip6))

-	c.Assert(err, check.IsNil)

-

-	// Inspect the v4 gateway to ensure the proper default GW was assigned

-	ip4gw := inspectField(c, "first", "NetworkSettings.Networks.dualstackl2.Gateway")

-	c.Assert(strings.TrimSpace(ip4gw), check.Equals, "172.28.200.1")

-	// Inspect the v6 gateway to ensure the proper default GW was assigned

-	ip6gw := inspectField(c, "first", "NetworkSettings.Networks.dualstackl2.IPv6Gateway")

-	c.Assert(strings.TrimSpace(ip6gw), check.Equals, "2001:db8:abc8::1")

-

-	// Inspect the v4 gateway to ensure the proper explicitly assigned default GW was assigned

-	ip4gw = inspectField(c, "third", "NetworkSettings.Networks.dualstackl2.Gateway")

-	c.Assert(strings.TrimSpace(ip4gw), check.Equals, "172.28.202.254")

-	// Inspect the v6 gateway to ensure the proper explicitly assigned default GW was assigned

-	ip6gw = inspectField(c, "third", "NetworkSettings.Networks.dualstackl2.IPv6Gateway")

-	c.Assert(strings.TrimSpace(ip6gw), check.Equals, "2001:db8:abc6::254")

-}

-

-func (s *DockerNetworkSuite) TestDockerNetworkIpvlanL3MultiSubnet(c *check.C) {

-	// create a dual stack multi-subnet Ipvlan L3 network and validate connectivity between all four containers per L3 mode

-	testRequires(c, DaemonIsLinux, IPv6, ipvlanKernelSupport, NotUserNamespace, NotArm, IPv6, ExperimentalDaemon)

-	dockerCmd(c, "network", "create", "--driver=ipvlan", "--ipv6", "--subnet=172.28.10.0/24", "--subnet=172.28.12.0/24", "--gateway=172.28.12.254",

-		"--subnet=2001:db8:abc9::/64", "--subnet=2001:db8:abc7::/64", "--gateway=2001:db8:abc7::254", "-o", "ipvlan_mode=l3", "dualstackl3")

-	// Ensure the network was created

-	assertNwIsAvailable(c, "dualstackl3")

-

-	// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.10.0/24 and 2001:db8:abc9::/64

-	dockerCmd(c, "run", "-d", "--net=dualstackl3", "--name=first", "--ip", "172.28.10.20", "--ip6", "2001:db8:abc9::20", "busybox:glibc", "top")

-	dockerCmd(c, "run", "-d", "--net=dualstackl3", "--name=second", "--ip", "172.28.10.21", "--ip6", "2001:db8:abc9::21", "busybox:glibc", "top")

-

-	// Inspect and store the v4 address from specified container on the network dualstackl3

-	ip := inspectField(c, "first", "NetworkSettings.Networks.dualstackl3.IPAddress")

-	// Inspect and store the v6 address from specified container on the network dualstackl3

-	ip6 := inspectField(c, "first", "NetworkSettings.Networks.dualstackl3.GlobalIPv6Address")

-

-	// verify ipv4 connectivity to the explicit --ipv address second to first

-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", strings.TrimSpace(ip))

-	c.Assert(err, check.IsNil)

-	// verify ipv6 connectivity to the explicit --ipv6 address second to first

-	_, _, err = dockerCmdWithError("exec", "second", "ping6", "-c", "1", strings.TrimSpace(ip6))

-	c.Assert(err, check.IsNil)

-

-	// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.12.0/24 and 2001:db8:abc7::/64

-	dockerCmd(c, "run", "-d", "--net=dualstackl3", "--name=third", "--ip", "172.28.12.20", "--ip6", "2001:db8:abc7::20", "busybox:glibc", "top")

-	dockerCmd(c, "run", "-d", "--net=dualstackl3", "--name=fourth", "--ip", "172.28.12.21", "--ip6", "2001:db8:abc7::21", "busybox:glibc", "top")

-

-	// Inspect and store the v4 address from specified container on the network dualstackl3

-	ip = inspectField(c, "third", "NetworkSettings.Networks.dualstackl3.IPAddress")

-	// Inspect and store the v6 address from specified container on the network dualstackl3

-	ip6 = inspectField(c, "third", "NetworkSettings.Networks.dualstackl3.GlobalIPv6Address")

-

-	// verify ipv4 connectivity to the explicit --ipv address from third to fourth

-	_, _, err = dockerCmdWithError("exec", "fourth", "ping", "-c", "1", strings.TrimSpace(ip))

-	c.Assert(err, check.IsNil)

-	// verify ipv6 connectivity to the explicit --ipv6 address from third to fourth

-	_, _, err = dockerCmdWithError("exec", "fourth", "ping6", "-c", "1", strings.TrimSpace(ip6))

-	c.Assert(err, check.IsNil)

-

-	// Inspect and store the v4 address from specified container on the network dualstackl3

-	ip = inspectField(c, "second", "NetworkSettings.Networks.dualstackl3.IPAddress")

-	// Inspect and store the v6 address from specified container on the network dualstackl3

-	ip6 = inspectField(c, "second", "NetworkSettings.Networks.dualstackl3.GlobalIPv6Address")

-

-	// Verify connectivity across disparate subnets which is unique to L3 mode only

-	_, _, err = dockerCmdWithError("exec", "third", "ping", "-c", "1", strings.TrimSpace(ip))

-	c.Assert(err, check.IsNil)

-	_, _, err = dockerCmdWithError("exec", "third", "ping6", "-c", "1", strings.TrimSpace(ip6))

-	c.Assert(err, check.IsNil)

-

-	// Inspect the v4 gateway to ensure no next hop is assigned in L3 mode

-	ip4gw := inspectField(c, "first", "NetworkSettings.Networks.dualstackl3.Gateway")

-	c.Assert(strings.TrimSpace(ip4gw), check.Equals, "")

-	// Inspect the v6 gateway to ensure the explicitly specified default GW is ignored per L3 mode enabled

-	ip6gw := inspectField(c, "third", "NetworkSettings.Networks.dualstackl3.IPv6Gateway")

-	c.Assert(strings.TrimSpace(ip6gw), check.Equals, "")

-}

-

-func (s *DockerNetworkSuite) TestDockerNetworkIpvlanAddressing(c *check.C) {

-	// Ensure the default gateways, next-hops and default dev devices are properly set

-	testRequires(c, DaemonIsLinux, IPv6, ipvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)

-	dockerCmd(c, "network", "create", "--driver=macvlan", "--ipv6", "--subnet=172.28.130.0/24",

-		"--subnet=2001:db8:abca::/64", "--gateway=2001:db8:abca::254", "-o", "macvlan_mode=bridge", "dualstackbridge")

-	assertNwIsAvailable(c, "dualstackbridge")

-	dockerCmd(c, "run", "-d", "--net=dualstackbridge", "--name=first", "busybox", "top")

-	// Validate macvlan bridge mode defaults gateway sets the default IPAM next-hop inferred from the subnet

-	out, _, err := dockerCmdWithError("exec", "first", "ip", "route")

-	c.Assert(err, check.IsNil)

-	c.Assert(out, checker.Contains, "default via 172.28.130.1 dev eth0")

-	// Validate macvlan bridge mode sets the v6 gateway to the user specified default gateway/next-hop

-	out, _, err = dockerCmdWithError("exec", "first", "ip", "-6", "route")

-	c.Assert(err, check.IsNil)

-	c.Assert(out, checker.Contains, "default via 2001:db8:abca::254 dev eth0")

-

-	// Verify ipvlan l2 mode sets the proper default gateway routes via netlink

-	// for either an explicitly set route by the user or inferred via default IPAM

-	dockerCmd(c, "network", "create", "--driver=ipvlan", "--ipv6", "--subnet=172.28.140.0/24", "--gateway=172.28.140.254",

-		"--subnet=2001:db8:abcb::/64", "-o", "ipvlan_mode=l2", "dualstackl2")

-	assertNwIsAvailable(c, "dualstackl2")

-	dockerCmd(c, "run", "-d", "--net=dualstackl2", "--name=second", "busybox", "top")

-	// Validate ipvlan l2 mode defaults gateway sets the default IPAM next-hop inferred from the subnet

-	out, _, err = dockerCmdWithError("exec", "second", "ip", "route")

-	c.Assert(err, check.IsNil)

-	c.Assert(out, checker.Contains, "default via 172.28.140.254 dev eth0")

-	// Validate ipvlan l2 mode sets the v6 gateway to the user specified default gateway/next-hop

-	out, _, err = dockerCmdWithError("exec", "second", "ip", "-6", "route")

-	c.Assert(err, check.IsNil)

-	c.Assert(out, checker.Contains, "default via 2001:db8:abcb::1 dev eth0")

-

-	// Validate ipvlan l3 mode sets the v4 gateway to dev eth0 and disregards any explicit or inferred next-hops

-	dockerCmd(c, "network", "create", "--driver=ipvlan", "--ipv6", "--subnet=172.28.160.0/24", "--gateway=172.28.160.254",

-		"--subnet=2001:db8:abcd::/64", "--gateway=2001:db8:abcd::254", "-o", "ipvlan_mode=l3", "dualstackl3")

-	assertNwIsAvailable(c, "dualstackl3")

-	dockerCmd(c, "run", "-d", "--net=dualstackl3", "--name=third", "busybox", "top")

-	// Validate ipvlan l3 mode sets the v4 gateway to dev eth0 and disregards any explicit or inferred next-hops

-	out, _, err = dockerCmdWithError("exec", "third", "ip", "route")

-	c.Assert(err, check.IsNil)

-	c.Assert(out, checker.Contains, "default dev eth0")

-	// Validate ipvlan l3 mode sets the v6 gateway to dev eth0 and disregards any explicit or inferred next-hops

-	out, _, err = dockerCmdWithError("exec", "third", "ip", "-6", "route")

-	c.Assert(err, check.IsNil)

-	c.Assert(out, checker.Contains, "default dev eth0")

-}

-

-func (s *DockerSuite) TestDockerNetworkIpvlanL2NilParent(c *check.C) {

-	// ipvlan l2 mode - dummy parent interface is provisioned dynamically

-	testRequires(c, DaemonIsLinux, ipvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)

-	dockerCmd(c, "network", "create", "--driver=ipvlan", "di-nil-parent")

-	assertNwIsAvailable(c, "di-nil-parent")

-

-	// start two containers on the same subnet

-	dockerCmd(c, "run", "-d", "--net=di-nil-parent", "--name=first", "busybox:glibc", "top")

-	c.Assert(waitRun("first"), check.IsNil)

-	dockerCmd(c, "run", "-d", "--net=di-nil-parent", "--name=second", "busybox:glibc", "top")

-	c.Assert(waitRun("second"), check.IsNil)

-

-	// intra-network communications should succeed

-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")

-	c.Assert(err, check.IsNil)

-}

-

-func (s *DockerSuite) TestDockerNetworkIpvlanL2InternalMode(c *check.C) {

-	// ipvlan l2 mode --internal containers can communicate inside the network but not externally

-	testRequires(c, DaemonIsLinux, ipvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)

-	cli.DockerCmd(c, "network", "create", "--driver=ipvlan", "--internal", "di-internal")

-	assertNwIsAvailable(c, "di-internal")

-	nr := getNetworkResource(c, "di-internal")

-	c.Assert(nr.Internal, checker.True)

-

-	// start two containers on the same subnet

-	cli.DockerCmd(c, "run", "-d", "--net=di-internal", "--name=first", "busybox:glibc", "top")

-	c.Assert(waitRun("first"), check.IsNil)

-	cli.DockerCmd(c, "run", "-d", "--net=di-internal", "--name=second", "busybox:glibc", "top")

-	c.Assert(waitRun("second"), check.IsNil)

-

-	// access outside of the network should fail

-	result := cli.Docker(cli.Args("exec", "first", "ping", "-c", "1", "-w", "1", "8.8.8.8"), cli.WithTimeout(time.Second))

-	result.Assert(c, icmd.Expected{Timeout: true})

-	// intra-network communications should succeed

-	cli.DockerCmd(c, "exec", "second", "ping", "-c", "1", "first")

-}

-

-func (s *DockerSuite) TestDockerNetworkIpvlanL3NilParent(c *check.C) {

-	// ipvlan l3 mode - dummy parent interface is provisioned dynamically

-	testRequires(c, DaemonIsLinux, ipvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)

-	dockerCmd(c, "network", "create", "--driver=ipvlan", "--subnet=172.28.230.0/24",

-		"--subnet=172.28.220.0/24", "-o", "ipvlan_mode=l3", "di-nil-parent-l3")

-	assertNwIsAvailable(c, "di-nil-parent-l3")

-

-	// start two containers on separate subnets

-	dockerCmd(c, "run", "-d", "--ip=172.28.220.10", "--net=di-nil-parent-l3", "--name=first", "busybox:glibc", "top")

-	c.Assert(waitRun("first"), check.IsNil)

-	dockerCmd(c, "run", "-d", "--ip=172.28.230.10", "--net=di-nil-parent-l3", "--name=second", "busybox:glibc", "top")

-	c.Assert(waitRun("second"), check.IsNil)

-

-	// intra-network communications should succeed

-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")

-	c.Assert(err, check.IsNil)

-}

-

-func (s *DockerSuite) TestDockerNetworkIpvlanL3InternalMode(c *check.C) {

-	// ipvlan l3 mode --internal containers can communicate inside the network but not externally

-	testRequires(c, DaemonIsLinux, ipvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)

-	cli.DockerCmd(c, "network", "create", "--driver=ipvlan", "--subnet=172.28.230.0/24",

-		"--subnet=172.28.220.0/24", "-o", "ipvlan_mode=l3", "--internal", "di-internal-l3")

-	assertNwIsAvailable(c, "di-internal-l3")

-	nr := getNetworkResource(c, "di-internal-l3")

-	c.Assert(nr.Internal, checker.True)

-

-	// start two containers on separate subnets

-	cli.DockerCmd(c, "run", "-d", "--ip=172.28.220.10", "--net=di-internal-l3", "--name=first", "busybox:glibc", "top")

-	c.Assert(waitRun("first"), check.IsNil)

-	cli.DockerCmd(c, "run", "-d", "--ip=172.28.230.10", "--net=di-internal-l3", "--name=second", "busybox:glibc", "top")

-	c.Assert(waitRun("second"), check.IsNil)

-

-	// access outside of the network should fail

-	result := cli.Docker(cli.Args("exec", "first", "ping", "-c", "1", "-w", "1", "8.8.8.8"), cli.WithTimeout(time.Second))

-	result.Assert(c, icmd.Expected{Timeout: true})

-	// intra-network communications should succeed

-	cli.DockerCmd(c, "exec", "second", "ping", "-c", "1", "first")

-}

-

-func createMasterDummy(c *check.C, master string) {

-	// ip link add <dummy_name> type dummy

-	icmd.RunCommand("ip", "link", "add", master, "type", "dummy").Assert(c, icmd.Success)

-	icmd.RunCommand("ip", "link", "set", master, "up").Assert(c, icmd.Success)

-}

-

-func createVlanInterface(c *check.C, master, slave, id string) {

-	// ip link add link <master> name <master>.<VID> type vlan id <VID>

-	icmd.RunCommand("ip", "link", "add", "link", master, "name", slave, "type", "vlan", "id", id).Assert(c, icmd.Success)

-	// ip link set <sub_interface_name> up

-	icmd.RunCommand("ip", "link", "set", slave, "up").Assert(c, icmd.Success)

-}

-

-func linkExists(c *check.C, master string) {

-	// verify the specified link exists, ip link show <link_name>

-	icmd.RunCommand("ip", "link", "show", master).Assert(c, icmd.Success)

-}

@@ -88,6 +88,9 @@ func WithBind(src, target string) func(*TestContainerConfig) {

 // WithIPv4 sets the specified ip for the specified network of the container

 func WithIPv4(network, ip string) func(*TestContainerConfig) {

 	return func(c *TestContainerConfig) {

+		if c.NetworkingConfig.EndpointsConfig == nil {

+			c.NetworkingConfig.EndpointsConfig = map[string]*networktypes.EndpointSettings{}

+		}

 		if v, ok := c.NetworkingConfig.EndpointsConfig[network]; !ok || v == nil {

 			c.NetworkingConfig.EndpointsConfig[network] = &networktypes.EndpointSettings{}

 		}

@@ -101,6 +104,9 @@ func WithIPv4(network, ip string) func(*TestContainerConfig) {

 // WithIPv6 sets the specified ip6 for the specified network of the container

 func WithIPv6(network, ip string) func(*TestContainerConfig) {

 	return func(c *TestContainerConfig) {

+		if c.NetworkingConfig.EndpointsConfig == nil {

+			c.NetworkingConfig.EndpointsConfig = map[string]*networktypes.EndpointSettings{}

+		}

 		if v, ok := c.NetworkingConfig.EndpointsConfig[network]; !ok || v == nil {

 			c.NetworkingConfig.EndpointsConfig[network] = &networktypes.EndpointSettings{}

 		}

new file mode 100644

@@ -0,0 +1,543 @@

+package network

+

+import (

+	"strings"

+	"testing"

+	"time"

+

+	"github.com/docker/docker/api/types"

+	"github.com/docker/docker/api/types/network"

+	dclient "github.com/docker/docker/client"

+	"github.com/docker/docker/integration-cli/daemon"

+	"github.com/docker/docker/integration/internal/container"

+	"github.com/gotestyourself/gotestyourself/assert"

+	"github.com/gotestyourself/gotestyourself/skip"

+	"golang.org/x/net/context"

+)

+

+func TestDockerNetworkIpvlanPersistance(t *testing.T) {

+	// verify the driver automatically provisions the 802.1q link (di-dummy0.70)

+	skip.If(t, testEnv.DaemonInfo.OSType != "linux")

+	skip.If(t, testEnv.IsRemoteDaemon())

+	skip.If(t, !ipvlanKernelSupport(), "Kernel doesn't support ipvlan")

+

+	d := daemon.New(t, "", "dockerd", daemon.Config{

+		Experimental: true,

+	})

+	d.StartWithBusybox(t)

+	defer d.Stop(t)

+

+	// master dummy interface 'di' notation represent 'docker ipvlan'

+	master := "di-dummy0"

+	createMasterDummy(t, master)

+	defer deleteInterface(t, master)

+

+	client, err := d.NewClient()

+	assert.NilError(t, err)

+

+	// create a network specifying the desired sub-interface name

+	_, err = client.NetworkCreate(context.Background(), "di-persist", types.NetworkCreate{

+		Driver: "ipvlan",

+		Options: map[string]string{

+			"parent": "di-dummy0.70",

+		},

+	})

+	assert.NilError(t, err)

+	assert.Check(t, isNetworkAvailable(client, "di-persist"))

+	// Restart docker daemon to test the config has persisted to disk

+	d.Restart(t)

+	assert.Check(t, isNetworkAvailable(client, "di-persist"))

+}

+

+func TestDockerNetworkIpvlan(t *testing.T) {

+	skip.If(t, testEnv.DaemonInfo.OSType != "linux")

+	skip.If(t, testEnv.IsRemoteDaemon())

+	skip.If(t, !ipvlanKernelSupport(), "Kernel doesn't support ipvlan")

+

+	for _, tc := range []struct {

+		name string

+		test func(dclient.APIClient) func(*testing.T)

+	}{

+		{

+			name: "Subinterface",

+			test: testIpvlanSubinterface,

+		}, {

+			name: "OverlapParent",

+			test: testIpvlanOverlapParent,

+		}, {

+			name: "L2NilParent",

+			test: testIpvlanL2NilParent,

+		}, {

+			name: "L2InternalMode",

+			test: testIpvlanL2InternalMode,

+		}, {

+			name: "L3NilParent",

+			test: testIpvlanL3NilParent,

+		}, {

+			name: "L3InternalMode",

+			test: testIpvlanL3InternalMode,

+		}, {

+			name: "L2MultiSubnet",

+			test: testIpvlanL2MultiSubnet,

+		}, {

+			name: "L3MultiSubnet",

+			test: testIpvlanL3MultiSubnet,

+		}, {

+			name: "Addressing",

+			test: testIpvlanAddressing,

+		},

+	} {

+		d := daemon.New(t, "", "dockerd", daemon.Config{

+			Experimental: true,

+		})

+		d.StartWithBusybox(t)

+

+		client, err := d.NewClient()

+		assert.NilError(t, err)

+

+		t.Run(tc.name, tc.test(client))

+

+		d.Stop(t)

+		// FIXME(vdemeester) clean network

+	}

+}

+

+func testIpvlanSubinterface(client dclient.APIClient) func(*testing.T) {

+	return func(t *testing.T) {

+		master := "di-dummy0"

+		createMasterDummy(t, master)

+		defer deleteInterface(t, master)

+

+		_, err := client.NetworkCreate(context.Background(), "di-subinterface", types.NetworkCreate{

+			Driver: "ipvlan",

+			Options: map[string]string{

+				"parent": "di-dummy0.60",

+			},

+		})

+		assert.NilError(t, err)

+		assert.Check(t, isNetworkAvailable(client, "di-subinterface"))

+

+		// delete the network while preserving the parent link

+		err = client.NetworkRemove(context.Background(), "di-subinterface")

+		assert.NilError(t, err)

+

+		assert.Check(t, isNetworkNotAvailable(client, "di-subinterface"))

+		// verify the network delete did not delete the predefined link

+		linkExists(t, "di-dummy0")

+	}

+}

+

+func testIpvlanOverlapParent(client dclient.APIClient) func(*testing.T) {

+	return func(t *testing.T) {

+		// verify the same parent interface cannot be used if already in use by an existing network

+		master := "di-dummy0"

+		createMasterDummy(t, master)

+		defer deleteInterface(t, master)

+		createVlanInterface(t, master, "di-dummy0.30", "30")

+

+		_, err := client.NetworkCreate(context.Background(), "di-subinterface", types.NetworkCreate{

+			Driver: "ipvlan",

+			Options: map[string]string{

+				"parent": "di-dummy0.30",

+			},

+		})

+		assert.NilError(t, err)

+		assert.Check(t, isNetworkAvailable(client, "di-subinterface"))

+

+		_, err = client.NetworkCreate(context.Background(), "di-subinterface", types.NetworkCreate{

+			Driver: "ipvlan",

+			Options: map[string]string{

+				"parent": "di-dummy0.30",

+			},

+		})

+		// verify that the overlap returns an error

+		assert.Check(t, err != nil)

+	}

+}

+

+func testIpvlanL2NilParent(client dclient.APIClient) func(*testing.T) {

+	return func(t *testing.T) {

+		// ipvlan l2 mode - dummy parent interface is provisioned dynamically

+		_, err := client.NetworkCreate(context.Background(), "di-nil-parent", types.NetworkCreate{

+			Driver: "ipvlan",

+		})

+		assert.NilError(t, err)

+		assert.Check(t, isNetworkAvailable(client, "di-nil-parent"))

+

+		ctx := context.Background()

+		id1 := container.Run(t, ctx, client, container.WithNetworkMode("di-nil-parent"))

+		id2 := container.Run(t, ctx, client, container.WithNetworkMode("di-nil-parent"))

+

+		t.Log(time.Now())

+

+		_, err = container.Exec(ctx, client, id2, []string{"ping", "-c", "1", id1})

+		assert.NilError(t, err)

+		t.Log(time.Now())

+	}

+}

+

+func testIpvlanL2InternalMode(client dclient.APIClient) func(*testing.T) {

+	return func(t *testing.T) {

+		_, err := client.NetworkCreate(context.Background(), "di-internal", types.NetworkCreate{

+			Driver:   "ipvlan",

+			Internal: true,

+		})

+		assert.NilError(t, err)

+		assert.Check(t, isNetworkAvailable(client, "di-internal"))

+

+		ctx := context.Background()

+		id1 := container.Run(t, ctx, client, container.WithNetworkMode("di-internal"))

+		id2 := container.Run(t, ctx, client, container.WithNetworkMode("di-internal"))

+

+		timeoutCtx, cancel := context.WithTimeout(context.Background(), 1*time.Second)

+		defer cancel()

+		_, err = container.Exec(timeoutCtx, client, id1, []string{"ping", "-c", "1", "-w", "1", "8.8.8.8"})

+		// FIXME(vdemeester) check the time of error ?

+		assert.Check(t, err != nil)

+		assert.Check(t, timeoutCtx.Err() == context.DeadlineExceeded)

+

+		_, err = container.Exec(ctx, client, id2, []string{"ping", "-c", "1", id1})

+		assert.NilError(t, err)

+	}

+}

+

+func testIpvlanL3NilParent(client dclient.APIClient) func(*testing.T) {

+	return func(t *testing.T) {

+		_, err := client.NetworkCreate(context.Background(), "di-nil-parent-l3", types.NetworkCreate{

+			Driver: "ipvlan",

+			Options: map[string]string{

+				"ipvlan_mode": "l3",

+			},

+			IPAM: &network.IPAM{

+				Config: []network.IPAMConfig{

+					{

+						Subnet:     "172.28.230.0/24",

+						AuxAddress: map[string]string{},

+					},

+					{

+						Subnet:     "172.28.220.0/24",

+						AuxAddress: map[string]string{},

+					},

+				},

+			},

+		})

+		assert.NilError(t, err)

+		assert.Check(t, isNetworkAvailable(client, "di-nil-parent-l3"))

+

+		ctx := context.Background()

+		id1 := container.Run(t, ctx, client,

+			container.WithNetworkMode("di-nil-parent-l3"),

+			container.WithIPv4("di-nil-parent-l3", "172.28.220.10"),

+		)

+		id2 := container.Run(t, ctx, client,

+			container.WithNetworkMode("di-nil-parent-l3"),

+			container.WithIPv4("di-nil-parent-l3", "172.28.230.10"),

+		)

+

+		_, err = container.Exec(ctx, client, id2, []string{"ping", "-c", "1", id1})

+		assert.NilError(t, err)

+	}

+}

+

+func testIpvlanL3InternalMode(client dclient.APIClient) func(*testing.T) {

+	return func(t *testing.T) {

+		_, err := client.NetworkCreate(context.Background(), "di-internal-l3", types.NetworkCreate{

+			Driver:   "ipvlan",

+			Internal: true,

+			Options: map[string]string{

+				"ipvlan_mode": "l3",

+			},

+			IPAM: &network.IPAM{

+				Config: []network.IPAMConfig{

+					{

+						Subnet:     "172.28.230.0/24",

+						AuxAddress: map[string]string{},

+					},

+					{

+						Subnet:     "172.28.220.0/24",

+						AuxAddress: map[string]string{},

+					},

+				},

+			},

+		})

+		assert.NilError(t, err)

+		assert.Check(t, isNetworkAvailable(client, "di-internal-l3"))

+

+		ctx := context.Background()

+		id1 := container.Run(t, ctx, client,

+			container.WithNetworkMode("di-internal-l3"),

+			container.WithIPv4("di-internal-l3", "172.28.220.10"),

+		)

+		id2 := container.Run(t, ctx, client,

+			container.WithNetworkMode("di-internal-l3"),

+			container.WithIPv4("di-internal-l3", "172.28.230.10"),

+		)

+

+		timeoutCtx, cancel := context.WithTimeout(context.Background(), 1*time.Second)

+		defer cancel()

+		_, err = container.Exec(timeoutCtx, client, id1, []string{"ping", "-c", "1", "-w", "1", "8.8.8.8"})

+		// FIXME(vdemeester) check the time of error ?

+		assert.Check(t, err != nil)

+		assert.Check(t, timeoutCtx.Err() == context.DeadlineExceeded)

+

+		_, err = container.Exec(ctx, client, id2, []string{"ping", "-c", "1", id1})

+		assert.NilError(t, err)

+	}

+}

+

+func testIpvlanL2MultiSubnet(client dclient.APIClient) func(*testing.T) {

+	return func(t *testing.T) {

+		_, err := client.NetworkCreate(context.Background(), "dualstackl2", types.NetworkCreate{

+			Driver:     "ipvlan",

+			EnableIPv6: true,

+			IPAM: &network.IPAM{

+				Config: []network.IPAMConfig{

+					{

+						Subnet:     "172.28.200.0/24",

+						AuxAddress: map[string]string{},

+					},

+					{

+						Subnet:     "172.28.202.0/24",

+						Gateway:    "172.28.202.254",

+						AuxAddress: map[string]string{},

+					},

+					{

+						Subnet:     "2001:db8:abc8::/64",

+						AuxAddress: map[string]string{},

+					},

+					{

+						Subnet:     "2001:db8:abc6::/64",

+						Gateway:    "2001:db8:abc6::254",

+						AuxAddress: map[string]string{},

+					},

+				},

+			},

+		})

+		assert.NilError(t, err)

+		assert.Check(t, isNetworkAvailable(client, "dualstackl2"))

+

+		// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.100.0/24 and 2001:db8:abc2::/64

+		ctx := context.Background()

+		id1 := container.Run(t, ctx, client,

+			container.WithNetworkMode("dualstackl2"),

+			container.WithIPv4("dualstackl2", "172.28.200.20"),

+			container.WithIPv6("dualstackl2", "2001:db8:abc8::20"),

+		)

+		id2 := container.Run(t, ctx, client,

+			container.WithNetworkMode("dualstackl2"),

+			container.WithIPv4("dualstackl2", "172.28.200.21"),

+			container.WithIPv6("dualstackl2", "2001:db8:abc8::21"),

+		)

+		c1, err := client.ContainerInspect(ctx, id1)

+		assert.NilError(t, err)

+

+		// verify ipv4 connectivity to the explicit --ipv address second to first

+		_, err = container.Exec(ctx, client, id2, []string{"ping", "-c", "1", c1.NetworkSettings.Networks["dualstackl2"].IPAddress})

+		assert.NilError(t, err)

+		// verify ipv6 connectivity to the explicit --ipv6 address second to first

+		_, err = container.Exec(ctx, client, id2, []string{"ping6", "-c", "1", c1.NetworkSettings.Networks["dualstackl2"].GlobalIPv6Address})

+		assert.NilError(t, err)

+

+		// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.102.0/24 and 2001:db8:abc4::/64

+		id3 := container.Run(t, ctx, client,

+			container.WithNetworkMode("dualstackl2"),

+			container.WithIPv4("dualstackl2", "172.28.202.20"),

+			container.WithIPv6("dualstackl2", "2001:db8:abc6::20"),

+		)

+		id4 := container.Run(t, ctx, client,

+			container.WithNetworkMode("dualstackl2"),

+			container.WithIPv4("dualstackl2", "172.28.202.21"),

+			container.WithIPv6("dualstackl2", "2001:db8:abc6::21"),

+		)

+		c3, err := client.ContainerInspect(ctx, id3)

+		assert.NilError(t, err)

+

+		// verify ipv4 connectivity to the explicit --ipv address from third to fourth

+		_, err = container.Exec(ctx, client, id4, []string{"ping", "-c", "1", c3.NetworkSettings.Networks["dualstackl2"].IPAddress})

+		assert.NilError(t, err)

+		// verify ipv6 connectivity to the explicit --ipv6 address from third to fourth

+		_, err = container.Exec(ctx, client, id4, []string{"ping6", "-c", "1", c3.NetworkSettings.Networks["dualstackl2"].GlobalIPv6Address})

+		assert.NilError(t, err)

+

+		// Inspect the v4 gateway to ensure the proper default GW was assigned

+		assert.Equal(t, c1.NetworkSettings.Networks["dualstackl2"].Gateway, "172.28.200.1")

+		// Inspect the v6 gateway to ensure the proper default GW was assigned

+		assert.Equal(t, c1.NetworkSettings.Networks["dualstackl2"].IPv6Gateway, "2001:db8:abc8::1")

+		// Inspect the v4 gateway to ensure the proper explicitly assigned default GW was assigned

+		assert.Equal(t, c3.NetworkSettings.Networks["dualstackl2"].Gateway, "172.28.202.254")

+		// Inspect the v6 gateway to ensure the proper explicitly assigned default GW was assigned

+		assert.Equal(t, c3.NetworkSettings.Networks["dualstackl2"].IPv6Gateway, "2001:db8:abc6::254")

+	}

+}

+

+func testIpvlanL3MultiSubnet(client dclient.APIClient) func(*testing.T) {

+	return func(t *testing.T) {

+		_, err := client.NetworkCreate(context.Background(), "dualstackl3", types.NetworkCreate{

+			Driver:     "ipvlan",

+			EnableIPv6: true,

+			Options: map[string]string{

+				"ipvlan_mode": "l3",

+			},

+			IPAM: &network.IPAM{

+				Config: []network.IPAMConfig{

+					{

+						Subnet:     "172.28.10.0/24",

+						AuxAddress: map[string]string{},

+					},

+					{

+						Subnet:     "172.28.12.0/24",

+						Gateway:    "172.28.12.254",

+						AuxAddress: map[string]string{},

+					},

+					{

+						Subnet:     "2001:db8:abc9::/64",

+						AuxAddress: map[string]string{},

+					},

+					{

+						Subnet:     "2001:db8:abc7::/64",

+						Gateway:    "2001:db8:abc7::254",

+						AuxAddress: map[string]string{},

+					},

+				},

+			},

+		})

+		assert.NilError(t, err)

+		assert.Check(t, isNetworkAvailable(client, "dualstackl3"))

+

+		// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.100.0/24 and 2001:db8:abc2::/64

+		ctx := context.Background()

+		id1 := container.Run(t, ctx, client,

+			container.WithNetworkMode("dualstackl3"),

+			container.WithIPv4("dualstackl3", "172.28.10.20"),

+			container.WithIPv6("dualstackl3", "2001:db8:abc9::20"),

+		)

+		id2 := container.Run(t, ctx, client,

+			container.WithNetworkMode("dualstackl3"),

+			container.WithIPv4("dualstackl3", "172.28.10.21"),

+			container.WithIPv6("dualstackl3", "2001:db8:abc9::21"),

+		)

+		c1, err := client.ContainerInspect(ctx, id1)

+		assert.NilError(t, err)

+

+		// verify ipv4 connectivity to the explicit --ipv address second to first

+		_, err = container.Exec(ctx, client, id2, []string{"ping", "-c", "1", c1.NetworkSettings.Networks["dualstackl3"].IPAddress})

+		assert.NilError(t, err)

+		// verify ipv6 connectivity to the explicit --ipv6 address second to first

+		_, err = container.Exec(ctx, client, id2, []string{"ping6", "-c", "1", c1.NetworkSettings.Networks["dualstackl3"].GlobalIPv6Address})

+		assert.NilError(t, err)

+

+		// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.102.0/24 and 2001:db8:abc4::/64

+		id3 := container.Run(t, ctx, client,

+			container.WithNetworkMode("dualstackl3"),

+			container.WithIPv4("dualstackl3", "172.28.12.20"),

+			container.WithIPv6("dualstackl3", "2001:db8:abc7::20"),

+		)

+		id4 := container.Run(t, ctx, client,

+			container.WithNetworkMode("dualstackl3"),

+			container.WithIPv4("dualstackl3", "172.28.12.21"),

+			container.WithIPv6("dualstackl3", "2001:db8:abc7::21"),

+		)

+		c3, err := client.ContainerInspect(ctx, id3)

+		assert.NilError(t, err)

+

+		// verify ipv4 connectivity to the explicit --ipv address from third to fourth

+		_, err = container.Exec(ctx, client, id4, []string{"ping", "-c", "1", c3.NetworkSettings.Networks["dualstackl3"].IPAddress})

+		assert.NilError(t, err)

+		// verify ipv6 connectivity to the explicit --ipv6 address from third to fourth

+		_, err = container.Exec(ctx, client, id4, []string{"ping6", "-c", "1", c3.NetworkSettings.Networks["dualstackl3"].GlobalIPv6Address})

+		assert.NilError(t, err)

+

+		// Inspect the v4 gateway to ensure no next hop is assigned in L3 mode

+		assert.Equal(t, c1.NetworkSettings.Networks["dualstackl3"].Gateway, "")

+		// Inspect the v6 gateway to ensure the explicitly specified default GW is ignored per L3 mode enabled

+		assert.Equal(t, c1.NetworkSettings.Networks["dualstackl3"].IPv6Gateway, "")

+		// Inspect the v4 gateway to ensure no next hop is assigned in L3 mode

+		assert.Equal(t, c3.NetworkSettings.Networks["dualstackl3"].Gateway, "")

+		// Inspect the v6 gateway to ensure the explicitly specified default GW is ignored per L3 mode enabled

+		assert.Equal(t, c3.NetworkSettings.Networks["dualstackl3"].IPv6Gateway, "")

+	}

+}

+

+func testIpvlanAddressing(client dclient.APIClient) func(*testing.T) {

+	return func(t *testing.T) {

+		// Verify ipvlan l2 mode sets the proper default gateway routes via netlink

+		// for either an explicitly set route by the user or inferred via default IPAM

+		_, err := client.NetworkCreate(context.Background(), "dualstackl2", types.NetworkCreate{

+			Driver:     "ipvlan",

+			EnableIPv6: true,

+			Options: map[string]string{

+				"ipvlan_mode": "l2",

+			},

+			IPAM: &network.IPAM{

+				Config: []network.IPAMConfig{

+					{

+						Subnet:     "172.28.140.0/24",

+						Gateway:    "172.28.140.254",

+						AuxAddress: map[string]string{},

+					},

+					{

+						Subnet:     "2001:db8:abcb::/64",

+						AuxAddress: map[string]string{},

+					},

+				},

+			},

+		})

+		assert.NilError(t, err)

+		assert.Check(t, isNetworkAvailable(client, "dualstackl2"))

+

+		ctx := context.Background()

+		id1 := container.Run(t, ctx, client,

+			container.WithNetworkMode("dualstackl2"),

+		)

+		// Validate ipvlan l2 mode defaults gateway sets the default IPAM next-hop inferred from the subnet

+		result, err := container.Exec(ctx, client, id1, []string{"ip", "route"})

+		assert.NilError(t, err)

+		assert.Check(t, strings.Contains(result.Combined(), "default via 172.28.140.254 dev eth0"))

+		// Validate ipvlan l2 mode sets the v6 gateway to the user specified default gateway/next-hop

+		result, err = container.Exec(ctx, client, id1, []string{"ip", "-6", "route"})

+		assert.NilError(t, err)

+		assert.Check(t, strings.Contains(result.Combined(), "default via 2001:db8:abcb::1 dev eth0"))

+

+		// Validate ipvlan l3 mode sets the v4 gateway to dev eth0 and disregards any explicit or inferred next-hops

+		_, err = client.NetworkCreate(context.Background(), "dualstackl3", types.NetworkCreate{

+			Driver:     "ipvlan",

+			EnableIPv6: true,

+			Options: map[string]string{

+				"ipvlan_mode": "l3",

+			},

+			IPAM: &network.IPAM{

+				Config: []network.IPAMConfig{

+					{

+						Subnet:     "172.28.160.0/24",

+						Gateway:    "172.28.160.254",

+						AuxAddress: map[string]string{},

+					},

+					{

+						Subnet:     "2001:db8:abcd::/64",