Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions plugins/ipam/host-local/backend/allocator/allocator.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,13 +180,24 @@ func (a *IPAllocator) GetIter() (*RangeIter, error) {
// Next returns the next IP, its mask, and its gateway. Returns nil
// if the iterator has been exhausted
func (i *RangeIter) Next() (*net.IPNet, net.IP) {
if i.rangeset == nil || len(*i.rangeset) == 0 {
return nil, nil
}

if i.rangeIdx < 0 || i.rangeIdx >= len(*i.rangeset) {
i.rangeIdx = 0
}

r := (*i.rangeset)[i.rangeIdx]

// If this is the first time iterating and we're not starting in the middle
// of the range, then start at rangeStart, which is inclusive
if i.cur == nil {
i.cur = r.RangeStart
i.startIP = i.cur
if i.cur == nil {
return nil, nil
}
if i.cur.Equal(r.Gateway) {
return i.Next()
}
Expand All @@ -203,6 +214,19 @@ func (i *RangeIter) Next() (*net.IPNet, net.IP) {
i.cur = r.RangeStart
} else {
i.cur = ip.NextIP(i.cur)
if i.cur == nil {
// NextIP returned nil because i.cur was the last address in its family.
// Advance to the next range in the set.
i.rangeIdx++
i.rangeIdx %= len(*i.rangeset)
r = (*i.rangeset)[i.rangeIdx]

i.cur = r.RangeStart
}
}

if i.cur == nil {
return nil, nil
}

if i.startIP == nil {
Expand Down
66 changes: 66 additions & 0 deletions plugins/ipam/host-local/backend/allocator/allocator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,72 @@ var _ = Describe("host-local ip allocator", func() {
Expect(r.nextip()).To(Equal(net.IP{192, 168, 1, 3}))
Expect(r.nextip()).To(BeNil())
})

It("should terminate when NextIP returns nil at the end of the address family", func() {
// IPv4 family boundary
p4 := RangeSet{
Range{
RangeStart: net.IPv4(255, 255, 255, 255).To4(),
Subnet: mustSubnet("255.255.255.252/30"),
},
}
iter4 := RangeIter{
rangeset: &p4,
}
ipNet, _ := iter4.Next()
Expect(ipNet).NotTo(BeNil())
Expect(ipNet.IP).To(Equal(net.IPv4(255, 255, 255, 255).To4()))

ipNet, _ = iter4.Next()
Expect(ipNet).To(BeNil())

// IPv6 family boundary
p6 := RangeSet{
Range{
RangeStart: net.ParseIP("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"),
Subnet: mustSubnet("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fffc/126"),
},
}
iter6 := RangeIter{
rangeset: &p6,
}
ipNet, _ = iter6.Next()
Expect(ipNet).NotTo(BeNil())
Expect(ipNet.IP).To(Equal(net.ParseIP("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")))

ipNet, _ = iter6.Next()
Expect(ipNet).To(BeNil())

// Multi-range: rolls over to next range when reaching family boundary
pMulti := RangeSet{
Range{
RangeStart: net.IPv4(255, 255, 255, 255).To4(),
Subnet: mustSubnet("255.255.255.252/30"),
},
Range{
RangeStart: net.IPv4(10, 0, 0, 1).To4(),
RangeEnd: net.IPv4(10, 0, 0, 2).To4(),
Subnet: mustSubnet("10.0.0.0/24"),
},
}
iterMulti := RangeIter{
rangeset: &pMulti,
}
ipNet, _ = iterMulti.Next()
Expect(ipNet).NotTo(BeNil())
Expect(ipNet.IP).To(Equal(net.IPv4(255, 255, 255, 255).To4()))

ipNet, _ = iterMulti.Next()
Expect(ipNet).NotTo(BeNil())
Expect(ipNet.IP).To(Equal(net.IPv4(10, 0, 0, 1).To4()))

ipNet, _ = iterMulti.Next()
Expect(ipNet).NotTo(BeNil())
Expect(ipNet.IP).To(Equal(net.IPv4(10, 0, 0, 2).To4()))

ipNet, _ = iterMulti.Next()
Expect(ipNet).To(BeNil())
})
})

Context("when has free ip", func() {
Expand Down
Loading