clearlinux/libnetwork
2
0
Fork 0
mirror of https://github.com/clearlinux/libnetwork.git synced 2026-06-16 02:25:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #593 from mavenugo/ipam-fix

Browse Source 
ipam must honor preferedIP ahead of random allocation from subPool
This commit is contained in:
aboch
2015-10-05 07:42:17 -07:00
parent f8b906b2e8 7f53263551
commit ee15bd4dcd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ipam/allocator.go
+4 -4
View File
@@ -425,16 +425,16 @@ func (a *Allocator) getAddress(nw *net.IPNet, bitmask *bitseq.Handle, prefAddres
}
if ipr == nil && prefAddress == nil {
ordinal, err = bitmask.SetAny()
} else if ipr != nil {
base.IP = ipr.Sub.IP
ordinal, err = bitmask.SetAnyInRange(ipr.Start, ipr.End)
} else {
} else if prefAddress != nil {
hostPart, e := types.GetHostPartIP(prefAddress, base.Mask)
if e != nil {
return nil, fmt.Errorf("failed to allocate preferred address %s: %v", prefAddress.String(), e)
}
ordinal = ipToUint32(types.GetMinimalIP(hostPart))
err = bitmask.Set(ordinal)
} else {
base.IP = ipr.Sub.IP
ordinal, err = bitmask.SetAnyInRange(ipr.Start, ipr.End)
}
if err != nil {
return nil, ipamapi.ErrNoAvailableIPs