Merge pull request #3620 from jcaamano/ic-l2-ip-allocator

Enable interconnect for localnet topology

go-controller/hack/test-go.sh

@@ -59,7 +59,7 @@ function testrun {
         echo "Increasing timeout to 20m for package ${pkg}"
         args="${args} -test.timeout=20m"
     fi
-    if grep -q -r "ginkgo" ."${path}"; then
+    if grep -q "ginkgo" ."${path}"/*_test.go; then
 	    prefix=$(echo "${path}" | cut -c 2- | sed 's,/,_,g')
         ginkgoargs="-ginkgo.v ${ginkgo_focus} -ginkgo.reportFile ${TEST_REPORT_DIR}/junit-${prefix}.xml"
     fi

go-controller/pkg/ovn/ipallocator/allocator/bitmap.go → go-controller/pkg/allocator/bitmap/bitmap.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package allocator
+package bitmap
 
 import (
 	"errors"

go-controller/pkg/ovn/ipallocator/allocator/bitmap_test.go → go-controller/pkg/allocator/bitmap/bitmap_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package allocator
+package bitmap
 
 import (
 	"testing"

go-controller/pkg/ovn/ipallocator/allocator/interfaces.go → go-controller/pkg/allocator/bitmap/interfaces.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package allocator
+package bitmap
 
 // Interface manages the allocation of items out of a range. Interface
 // should be threadsafe.

go-controller/pkg/ovn/ipallocator/allocator/utils.go → go-controller/pkg/allocator/bitmap/utils.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package allocator
+package bitmap
 
 import "math/big"
 

go-controller/pkg/ovn/ipallocator/allocator/utils_test.go → go-controller/pkg/allocator/bitmap/utils_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package allocator
+package bitmap
 
 import (
 	"math/big"

go-controller/pkg/ovn/ipallocator/allocator.go → go-controller/pkg/allocator/ip/allocator.go

@@ -14,15 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package ipallocator
+package ip
 
 import (
 	"errors"
 	"fmt"
 	"math/big"
 	"net"
 
-	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/ipallocator/allocator"
+	allocator "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/allocator/bitmap"
 	utilnet "k8s.io/utils/net"
 )
 
@@ -35,13 +35,19 @@ type Interface interface {
 	ForEach(func(net.IP))
 	CIDR() net.IPNet
 	Has(ip net.IP) bool
+	Reserved(ip net.IP) bool
 }
 
 var (
 	ErrFull      = errors.New("range is full")
 	ErrAllocated = errors.New("provided IP is already allocated")
 )
 
+// IsErrAllocated returns true if err is of type ErrAllocated
+func IsErrAllocated(err error) bool {
+	return errors.Is(err, ErrAllocated)
+}
+
 type ErrNotInRange struct {
 	ValidRange string
 }
@@ -199,6 +205,17 @@ func (r *Range) Has(ip net.IP) bool {
 	return r.alloc.Has(offset)
 }
 
+// Reserved returns true if the provided IP can't be allocated. This is *only*
+// true for the network and broadcast addresses.
+func (r *Range) Reserved(ip net.IP) bool {
+	if !r.net.Contains(ip) {
+		return false
+	}
+
+	offset := calculateIPOffset(r.base, ip)
+	return offset == -1 || offset == r.max
+}
+
 // contains returns true and the offset if the ip is in the range, and false
 // and nil otherwise. The first and last addresses of the CIDR are omitted.
 func (r *Range) contains(ip net.IP) (bool, int) {

go-controller/pkg/ovn/ipallocator/allocator_test.go → go-controller/pkg/allocator/ip/allocator_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package ipallocator
+package ip
 
 import (
 	"net"
@@ -258,3 +258,30 @@ func TestForEach(t *testing.T) {
 		}
 	}
 }
+
+func TestReserved(t *testing.T) {
+	_, cidr, err := net.ParseCIDR("192.168.1.0/24")
+	if err != nil {
+		t.Fatal(err)
+	}
+	r, err := NewCIDRRange(cidr)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !r.Reserved(net.ParseIP("192.168.1.0")) {
+		t.Errorf("should be a reserved address: %s", "192.168.1.0")
+	}
+
+	if !r.Reserved(net.ParseIP("192.168.1.255")) {
+		t.Errorf("should be a reserved address: %s", "192.168.1.255")
+	}
+
+	if r.Reserved(net.ParseIP("192.168.1.1")) {
+		t.Errorf("should not be a reserved address: %s", "192.168.1.1")
+	}
+
+	if r.Reserved(net.ParseIP("192.168.1.254")) {
+		t.Errorf("should not be a reserved address: %s", "192.168.1.254")
+	}
+}