beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Respect auto allocation for --ipv6

Browse source 
Signed-off-by: Alessandro Boch <aboch@docker.com>
This commit is contained in:
Alessandro Boch 2016-11-04 09:14:35 -07:00
parent 1b8698e148
commit 83dd2c193a
3 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libnetwork/api/api_test.go
View file

@ -225,9 +225,7 @@ func TestCreateDeleteNetwork(t *testing.T) {
}
dops := GetOpsMap("abc", "")
nops := map[string]string{
netlabel.EnableIPv6: "true",
}
nops := map[string]string{}
nc := networkCreate{Name: "network_1", NetworkType: bridgeNetType, DriverOpts: dops, NetworkOpts: nops}
goodBody, err := json.Marshal(nc)
if err != nil {
@ -1807,9 +1805,7 @@ func TestEndToEnd(t *testing.T) {
handleRequest := NewHTTPHandler(c)
dops := GetOpsMap("cdef", "1460")
nops := map[string]string{
netlabel.EnableIPv6: "true",
}
nops := map[string]string{}
// Create network
nc := networkCreate{Name: "network-fiftyfive", NetworkType: bridgeNetType, DriverOpts: dops, NetworkOpts: nops}

2
libnetwork/ipam/allocator.go
View file

@ -413,7 +413,7 @@ func (a *Allocator) getPredefinedPool(as string, ipV6 bool) (*net.IPNet, error)
}
}
return nil, types.NotFoundErrorf("could not find an available non-overlapping address pool among the defaults to auto assign to the network")
return nil, types.NotFoundErrorf("could not find an available, non-overlapping IPv%d address pool among the defaults to assign to the network", v)
}
// RequestAddress returns an address from the specified pool ID

3
libnetwork/network.go
View file

@ -1289,9 +1289,6 @@ func (n *network) ipamAllocateVersion(ipVer int, ipam ipamapi.Ipam) error {
}
if len(*cfgList) == 0 {
if ipVer == 6 {
return nil
}
*cfgList = []*IpamConf{{}}
}