clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-19 04:07:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test to verify --mac-address doesn't get applied to new endpoint

Browse Source 
created on network connect.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
(cherry picked from commit 451b79d69102ad95f1b91a52bb4b17c240f41e56)
This commit is contained in:
Lei Jitang
2015-11-10 17:47:32 +08:00
committed by Tibor Vass
parent 9a1d077d9c
commit 5d417ee6e8
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/container_unix.go
+1 -1
View File
@@ -973,7 +973,7 @@ func (container *Container) getNetworkSandbox() libnetwork.Sandbox {
return sb
}
// ConnectToNetwork connects a container to a netork
// ConnectToNetwork connects a container to a network
func (container *Container) ConnectToNetwork(idOrName string) error {
if !container.Running {
return derr.ErrorCodeNotRunning.WithArgs(container.ID)
integration-cli/docker_cli_network_unix_test.go
+14
View File
@@ -768,3 +768,17 @@ func (s *DockerNetworkSuite) TestDockerNetworkConnectWithPortMapping(c *check.C)
c.Assert(waitRun("c1"), check.IsNil)
dockerCmd(c, "network", "connect", "test1", "c1")
}
func (s *DockerNetworkSuite) TestDockerNetworkConnectWithMac(c *check.C) {
macAddress := "02:42:ac:11:00:02"
dockerCmd(c, "network", "create", "mynetwork")
dockerCmd(c, "run", "--name=test", "-d", "--mac-address", macAddress, "busybox", "top")
c.Assert(waitRun("test"), check.IsNil)
mac1, err := inspectField("test", "NetworkSettings.Networks.bridge.MacAddress")
c.Assert(err, checker.IsNil)
c.Assert(strings.TrimSpace(mac1), checker.Equals, macAddress)
dockerCmd(c, "network", "connect", "mynetwork", "test")
mac2, err := inspectField("test", "NetworkSettings.Networks.mynetwork.MacAddress")
c.Assert(err, checker.IsNil)
c.Assert(strings.TrimSpace(mac2), checker.Not(checker.Equals), strings.TrimSpace(mac1))
}