Skip to content

Commit dfb0065

Browse files
aidanhsaidanhs
committed
Expose bridge IPv6 setting to docker network inspect
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
1 parent 73ee139 commit dfb0065

File tree

8 files changed

+27
-9
lines changed

8 files changed

+27
-9
lines changed

‎api/client/network.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ func (cli *DockerCli) CmdNetworkCreate(args ...string) error {
5050
cmd.Var(flIpamOpt, []string{"-ipam-opt"}, "set IPAM driver specific options")
5151

5252
flInternal := cmd.Bool([]string{"-internal"}, false, "restricts external access to the network")
53+
flIPv6 := cmd.Bool([]string{"-ipv6"}, false, "enables IPv6 on the network")
5354

5455
cmd.Require(flag.Exact, 1)
5556
err := cmd.ParseFlags(args, true)
@@ -77,6 +78,7 @@ func (cli *DockerCli) CmdNetworkCreate(args ...string) error {
7778
Options: flOpts.GetAll(),
7879
CheckDuplicate: true,
7980
Internal: *flInternal,
81+
EnableIPv6: *flIPv6,
8082
}
8183

8284
resp, err := cli.client.NetworkCreate(nc)

‎api/server/router/network/backend.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ type Backend interface {
1414
GetNetworkByName(idName string) (libnetwork.Network, error)
1515
GetNetworksByID(partialID string) []libnetwork.Network
1616
GetAllNetworks() []libnetwork.Network
17-
CreateNetwork(name, driver string, ipam network.IPAM, options map[string]string, internal bool) (libnetwork.Network, error)
17+
CreateNetwork(name, driver string, ipam network.IPAM, options map[string]string, internal bool, enableIPv6 bool) (libnetwork.Network, error)
1818
ConnectContainerToNetwork(containerName, networkName string, endpointConfig *network.EndpointSettings) error
1919
DisconnectContainerFromNetwork(containerName string, network libnetwork.Network, force bool) error
2020
DeleteNetwork(name string) error

‎api/server/router/network/network_routes.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func (n *networkRouter) postNetworkCreate(ctx context.Context, w http.ResponseWr
9191
warning = fmt.Sprintf("Network with name %s (id : %s) already exists", nw.Name(), nw.ID())
9292
}
9393

94-
nw, err = n.backend.CreateNetwork(create.Name, create.Driver, create.IPAM, create.Options, create.Internal)
94+
nw, err = n.backend.CreateNetwork(create.Name, create.Driver, create.IPAM, create.Options, create.Internal, create.EnableIPv6)
9595
if err != nil {
9696
return err
9797
}
@@ -160,6 +160,8 @@ func buildNetworkResource(nw libnetwork.Network) *types.NetworkResource {
160160
r.ID = nw.ID()
161161
r.Scope = nw.Info().Scope()
162162
r.Driver = nw.Type()
163+
r.EnableIPv6 = nw.Info().IPv6Enabled()
164+
r.Internal = nw.Info().Internal()
163165
r.Options = nw.Info().DriverOptions()
164166
r.Containers = make(map[string]types.EndpointResource)
165167
buildIpamResources(r, nw)

‎daemon/daemon_unix.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -694,10 +694,8 @@ func initBridgeDriver(controller libnetwork.NetworkController, config *Config) e
694694
}
695695
// Initialize default network on "bridge" with the same name
696696
_, err = controller.NewNetwork("bridge", "bridge",
697-
libnetwork.NetworkOptionGeneric(options.Generic{
698-
netlabel.GenericData: netOption,
699-
netlabel.EnableIPv6: config.bridgeConfig.EnableIPv6,
700-
}),
697+
libnetwork.NetworkOptionEnableIPv6(config.bridgeConfig.EnableIPv6),
698+
libnetwork.NetworkOptionDriverOpts(netOption),
701699
libnetwork.NetworkOptionIpam("default", "", v4Conf, v6Conf, nil),
702700
libnetwork.NetworkOptionDeferIPv6Alloc(deferIPv6Alloc))
703701
if err != nil {

‎daemon/network.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (daemon *Daemon) GetAllNetworks() []libnetwork.Network {
9090
}
9191

9292
// CreateNetwork creates a network with the given name, driver and other optional parameters
93-
func (daemon *Daemon) CreateNetwork(name, driver string, ipam network.IPAM, options map[string]string, internal bool) (libnetwork.Network, error) {
93+
func (daemon *Daemon) CreateNetwork(name, driver string, ipam network.IPAM, netOption map[string]string, internal bool, enableIPv6 bool) (libnetwork.Network, error) {
9494
c := daemon.netController
9595
if driver == "" {
9696
driver = c.Config().Daemon.DefaultDriver
@@ -104,7 +104,8 @@ func (daemon *Daemon) CreateNetwork(name, driver string, ipam network.IPAM, opti
104104
}
105105

106106
nwOptions = append(nwOptions, libnetwork.NetworkOptionIpam(ipam.Driver, "", v4Conf, v6Conf, ipam.Options))
107-
nwOptions = append(nwOptions, libnetwork.NetworkOptionDriverOpts(options))
107+
nwOptions = append(nwOptions, libnetwork.NetworkOptionEnableIPv6(enableIPv6))
108+
nwOptions = append(nwOptions, libnetwork.NetworkOptionDriverOpts(netOption))
108109
if internal {
109110
nwOptions = append(nwOptions, libnetwork.NetworkOptionInternalNetwork())
110111
}

‎integration-cli/docker_api_network_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ func (s *DockerSuite) TestApiNetworkInspect(c *check.C) {
8484
nr = getNetworkResource(c, nr.ID)
8585
c.Assert(nr.Driver, checker.Equals, "bridge")
8686
c.Assert(nr.Scope, checker.Equals, "local")
87+
c.Assert(nr.Internal, checker.Equals, false)
88+
c.Assert(nr.EnableIPv6, checker.Equals, false)
8789
c.Assert(nr.IPAM.Driver, checker.Equals, "default")
8890
c.Assert(len(nr.Containers), checker.Equals, 1)
8991
c.Assert(nr.Containers[containerID], checker.NotNil)

‎integration-cli/docker_cli_network_unix_test.go‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,18 +574,24 @@ func (s *DockerNetworkSuite) TestDockerNetworkInspectDefault(c *check.C) {
574574
nr := getNetworkResource(c, "none")
575575
c.Assert(nr.Driver, checker.Equals, "null")
576576
c.Assert(nr.Scope, checker.Equals, "local")
577+
c.Assert(nr.Internal, checker.Equals, false)
578+
c.Assert(nr.EnableIPv6, checker.Equals, false)
577579
c.Assert(nr.IPAM.Driver, checker.Equals, "default")
578580
c.Assert(len(nr.IPAM.Config), checker.Equals, 0)
579581

580582
nr = getNetworkResource(c, "host")
581583
c.Assert(nr.Driver, checker.Equals, "host")
582584
c.Assert(nr.Scope, checker.Equals, "local")
585+
c.Assert(nr.Internal, checker.Equals, false)
586+
c.Assert(nr.EnableIPv6, checker.Equals, false)
583587
c.Assert(nr.IPAM.Driver, checker.Equals, "default")
584588
c.Assert(len(nr.IPAM.Config), checker.Equals, 0)
585589

586590
nr = getNetworkResource(c, "bridge")
587591
c.Assert(nr.Driver, checker.Equals, "bridge")
588592
c.Assert(nr.Scope, checker.Equals, "local")
593+
c.Assert(nr.Internal, checker.Equals, false)
594+
c.Assert(nr.EnableIPv6, checker.Equals, false)
589595
c.Assert(nr.IPAM.Driver, checker.Equals, "default")
590596
c.Assert(len(nr.IPAM.Config), checker.Equals, 1)
591597
c.Assert(nr.IPAM.Config[0].Subnet, checker.NotNil)
@@ -600,6 +606,8 @@ func (s *DockerNetworkSuite) TestDockerNetworkInspectCustomUnspecified(c *check.
600606
nr := getNetworkResource(c, "test01")
601607
c.Assert(nr.Driver, checker.Equals, "bridge")
602608
c.Assert(nr.Scope, checker.Equals, "local")
609+
c.Assert(nr.Internal, checker.Equals, false)
610+
c.Assert(nr.EnableIPv6, checker.Equals, false)
603611
c.Assert(nr.IPAM.Driver, checker.Equals, "default")
604612
c.Assert(len(nr.IPAM.Config), checker.Equals, 1)
605613
c.Assert(nr.IPAM.Config[0].Subnet, checker.NotNil)
@@ -610,12 +618,14 @@ func (s *DockerNetworkSuite) TestDockerNetworkInspectCustomUnspecified(c *check.
610618
}
611619

612620
func (s *DockerNetworkSuite) TestDockerNetworkInspectCustomSpecified(c *check.C) {
613-
dockerCmd(c, "network", "create", "--driver=bridge", "--subnet=172.28.0.0/16", "--ip-range=172.28.5.0/24", "--gateway=172.28.5.254", "br0")
621+
dockerCmd(c, "network", "create", "--driver=bridge", "--ipv6", "--subnet=172.28.0.0/16", "--ip-range=172.28.5.0/24", "--gateway=172.28.5.254", "br0")
614622
assertNwIsAvailable(c, "br0")
615623

616624
nr := getNetworkResource(c, "br0")
617625
c.Assert(nr.Driver, checker.Equals, "bridge")
618626
c.Assert(nr.Scope, checker.Equals, "local")
627+
c.Assert(nr.Internal, checker.Equals, false)
628+
c.Assert(nr.EnableIPv6, checker.Equals, true)
619629
c.Assert(nr.IPAM.Driver, checker.Equals, "default")
620630
c.Assert(len(nr.IPAM.Config), checker.Equals, 1)
621631
c.Assert(nr.IPAM.Config[0].Subnet, checker.Equals, "172.28.0.0/16")

‎integration-cli/docker_cli_port_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,9 @@ func (s *DockerSuite) TestPortExposeHostBinding(c *check.C) {
297297
func (s *DockerSuite) TestPortBindingOnSandbox(c *check.C) {
298298
testRequires(c, DaemonIsLinux, NotUserNamespace)
299299
dockerCmd(c, "network", "create", "--internal", "-d", "bridge", "internal-net")
300+
nr := getNetworkResource(c, "internal-net")
301+
c.Assert(nr.Internal, checker.Equals, true)
302+
300303
dockerCmd(c, "run", "--net", "internal-net", "-d", "--name", "c1",
301304
"-p", "8080:8080", "busybox", "nc", "-l", "-p", "8080")
302305
c.Assert(waitRun("c1"), check.IsNil)

0 commit comments

Comments
 (0)