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

Merge pull request #625 from aboch/acf

Browse source 
Relax restriction on IpamConfig
This commit is contained in:
Madhu Venugopal 2015-10-09 20:04:15 -07:00
commit f8891e4f4a
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnetwork/libnetwork_internal_test.go
View file

@ -238,7 +238,7 @@ func compareIpamConfList(listA, listB []*IpamConf) bool {
a = listA[i]
b = listB[i]
if a.PreferredPool != b.PreferredPool ||
a.SubPool != b.SubPool || a.IsV6 != b.IsV6 ||
a.SubPool != b.SubPool ||
!compareStringMaps(a.Options, b.Options) ||
a.Gateway != b.Gateway || !compareStringMaps(a.AuxAddresses, b.AuxAddresses) {
return false

6
libnetwork/network.go
View file

@ -76,8 +76,6 @@ type IpamConf struct {
SubPool string
// Input options for IPAM Driver (optional)
Options map[string]string
// IPv6 flag, Needed when no preferred pool is specified
IsV6 bool
// Preferred Network Gateway address (optional)
Gateway string
// Auxiliary addresses for network driver. Must be within the master pool.
@ -889,7 +887,7 @@ func (n *network) ipamAllocateVersion(ipVer int, ipam ipamapi.Ipam) error {
return types.InternalErrorf("incorrect ip version passed to ipam allocate: %d", ipVer)
}
if *cfgList == nil {
if len(*cfgList) == 0 {
if ipVer == 6 {
return nil
}
@ -907,7 +905,7 @@ func (n *network) ipamAllocateVersion(ipVer int, ipam ipamapi.Ipam) error {
d := &IpamInfo{}
(*infoList)[i] = d
d.PoolID, d.Pool, d.Meta, err = ipam.RequestPool(n.addrSpace, cfg.PreferredPool, cfg.SubPool, cfg.Options, cfg.IsV6)
d.PoolID, d.Pool, d.Meta, err = ipam.RequestPool(n.addrSpace, cfg.PreferredPool, cfg.SubPool, cfg.Options, ipVer == 6)
if err != nil {
return err
}