From 40d1455b2e73689d0c2fb6fd0dde30deebd55650 Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Thu, 30 Jul 2015 17:29:02 -0700 Subject: [PATCH] Add test code to cover issue #14859 Signed-off-by: Alessandro Boch Upstream-commit: 4964ab08218f3b40f5c3a6bf19fe74f7fb39562a Component: engine --- .../engine/integration-cli/docker_cli_daemon_test.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/components/engine/integration-cli/docker_cli_daemon_test.go b/components/engine/integration-cli/docker_cli_daemon_test.go index 8c3b08a441..60db3c8d30 100644 --- a/components/engine/integration-cli/docker_cli_daemon_test.go +++ b/components/engine/integration-cli/docker_cli_daemon_test.go @@ -780,6 +780,18 @@ func (s *DockerDaemonSuite) TestDaemonDefaultGatewayIPv4Explicit(c *check.C) { deleteInterface(c, defaultNetworkBridge) } +func (s *DockerDaemonSuite) TestDaemonDefaultGatewayIPv4ExplicitOutsideContainerSubnet(c *check.C) { + defaultNetworkBridge := "docker0" + deleteInterface(c, defaultNetworkBridge) + + // Program a custom default gateway outside of the container subnet, daemon should accept it and start + err := s.d.StartWithBusybox("--bip", "172.16.0.10/16", "--fixed-cidr", "172.16.1.0/24", "--default-gateway", "172.16.0.254") + c.Assert(err, check.IsNil) + + deleteInterface(c, defaultNetworkBridge) + s.d.Restart() +} + func (s *DockerDaemonSuite) TestDaemonIP(c *check.C) { d := s.d