feat: enhance IP address handling in tests with mixed scenarios and edge cases

Author: zbb88888

pkg/controller/ippool_test.go

@@ -18,9 +18,9 @@ func TestExpandIPPoolAddresses(t *testing.T) {
 	})
 	require.NoError(t, err)
 	require.Equal(t, []string{
-		"10.0.0.1",
+		"10.0.0.1/32",
 		"192.168.1.0/24",
-		"2001:db8::1",
+		"2001:db8::1/128",
 	}, addresses)
 }
 
@@ -70,7 +70,8 @@ func TestExpandIPPoolAddressesEdgeCases(t *testing.T) {
 			"10.0.0.1",
 		})
 		require.NoError(t, err)
-		require.Equal(t, []string{"10.0.0.1/32"}, addresses)
+		require.Len(t, addresses, 1)
+		require.Equal(t, "10.0.0.1/32", addresses[0])
 	})
 
 	t.Run("CIDR normalization", func(t *testing.T) {
@@ -364,6 +365,74 @@ func TestExpandIPPoolAddressesForOVNIntegration(t *testing.T) {
 		require.Error(t, err)
 		require.Contains(t, err.Error(), "mixed IPv4 and IPv6")
 	})
+
+	t.Run("Range expansion with simplification", func(t *testing.T) {
+		// Range that expands to /32 should be simplified
+		addresses, err := util.ExpandIPPoolAddressesForOVN([]string{
+			"10.0.0.1..10.0.0.1", // Single IP range
+		})
+		require.NoError(t, err)
+		require.Len(t, addresses, 1)
+		require.Equal(t, "10.0.0.1", addresses[0])
+		require.NotContains(t, addresses[0], "/32")
+	})
+
+	t.Run("Range with multiple CIDRs - some simplified", func(t *testing.T) {
+		addresses, err := util.ExpandIPPoolAddressesForOVN([]string{
+			"10.0.0.1..10.0.0.5",
+		})
+		require.NoError(t, err)
+		require.NotEmpty(t, addresses)
+		// Should contain simplified /32 and non-simplified /31
+		require.Contains(t, addresses, "10.0.0.1")    // Simplified from /32
+		require.Contains(t, addresses, "10.0.0.2/31") // Not /32, keep as-is
+		require.Contains(t, addresses, "10.0.0.4/31") // Not /32, keep as-is
+	})
+
+	t.Run("Empty input", func(t *testing.T) {
+		addresses, err := util.ExpandIPPoolAddressesForOVN([]string{})
+		require.NoError(t, err)
+		require.Empty(t, addresses)
+	})
+
+	t.Run("Only whitespace entries", func(t *testing.T) {
+		addresses, err := util.ExpandIPPoolAddressesForOVN([]string{"", "  ", "\t"})
+		require.NoError(t, err)
+		require.Empty(t, addresses)
+	})
+
+	t.Run("IPv6 single IP simplified", func(t *testing.T) {
+		addresses, err := util.ExpandIPPoolAddressesForOVN([]string{"2001:db8::1"})
+		require.NoError(t, err)
+		require.Len(t, addresses, 1)
+		require.Equal(t, "2001:db8::1", addresses[0])
+		require.NotContains(t, addresses[0], "/128")
+	})
+
+	t.Run("IPv6 range with /128 simplified", func(t *testing.T) {
+		addresses, err := util.ExpandIPPoolAddressesForOVN([]string{"fd00::1..fd00::1"})
+		require.NoError(t, err)
+		require.Len(t, addresses, 1)
+		require.Equal(t, "fd00::1", addresses[0])
+	})
+
+	t.Run("Duplicate IPs deduplicated and simplified", func(t *testing.T) {
+		addresses, err := util.ExpandIPPoolAddressesForOVN([]string{
+			"10.0.0.1",
+			"10.0.0.1",
+			" 10.0.0.1 ",
+		})
+		require.NoError(t, err)
+		require.Len(t, addresses, 1)
+		require.Equal(t, "10.0.0.1", addresses[0])
+	})
+
+	t.Run("CIDR normalization preserved", func(t *testing.T) {
+		addresses, err := util.ExpandIPPoolAddressesForOVN([]string{"192.168.1.5/24"})
+		require.NoError(t, err)
+		require.Len(t, addresses, 1)
+		require.Equal(t, "192.168.1.0/24", addresses[0])
+	})
 }
 
 func TestExpandIPPoolAddressesGeneralUse(t *testing.T) {

pkg/ipam/ip_range_list_test.go

@@ -1305,9 +1305,13 @@ func TestIPRangeListToCIDRs(t *testing.T) {
 		result, err := rangeList.ToCIDRs()
 		require.NoError(t, err)
 		// Should be merged into 10.0.0.1..10.0.0.10
+		// Which converts to: 10.0.0.1/32, 10.0.0.2/31, 10.0.0.4/30, 10.0.0.8/31, 10.0.0.10/32
 		require.NotEmpty(t, result)
 		require.Contains(t, result, "10.0.0.1/32")
-		require.Contains(t, result, "10.0.0.8/30")
+		require.Contains(t, result, "10.0.0.2/31")
+		require.Contains(t, result, "10.0.0.4/30")
+		require.Contains(t, result, "10.0.0.8/31")
+		require.Contains(t, result, "10.0.0.10/32")
 	})
 
 	t.Run("Multiple separate ranges", func(t *testing.T) {

pkg/util/ippool_test.go

@@ -3,6 +3,7 @@ package util
 import (
 	"math/big"
 	"net"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -257,6 +258,29 @@ func TestExpandIPPoolAddressesMixedAllowed(t *testing.T) {
 		require.NoError(t, err)
 		require.NotEmpty(t, result)
 	})
+
+	t.Run("Complex mixed scenario", func(t *testing.T) {
+		result, err := ExpandIPPoolAddresses([]string{
+			"10.0.0.1",
+			"192.168.0.0/16",
+			"2001:db8::1..2001:db8::10",
+			"fd00::/64",
+		})
+		require.NoError(t, err)
+		require.NotEmpty(t, result)
+		// Should contain both IPv4 and IPv6
+		hasIPv4 := false
+		hasIPv6 := false
+		for _, addr := range result {
+			if strings.Contains(addr, ":") {
+				hasIPv6 = true
+			} else {
+				hasIPv4 = true
+			}
+		}
+		require.True(t, hasIPv4, "Should contain IPv4 addresses")
+		require.True(t, hasIPv6, "Should contain IPv6 addresses")
+	})
 }
 
 func TestCanonicalizeIPPoolEntries(t *testing.T) {
@@ -601,6 +625,26 @@ func TestSimplifyOVNAddress(t *testing.T) {
 		result := simplifyOVNAddress("2001:db8::/127")
 		require.Equal(t, "2001:db8::/127", result)
 	})
+
+	t.Run("Edge case - /30", func(t *testing.T) {
+		result := simplifyOVNAddress("10.0.0.0/30")
+		require.Equal(t, "10.0.0.0/30", result)
+	})
+
+	t.Run("Edge case - /126", func(t *testing.T) {
+		result := simplifyOVNAddress("2001:db8::/126")
+		require.Equal(t, "2001:db8::/126", result)
+	})
+
+	t.Run("Empty string", func(t *testing.T) {
+		result := simplifyOVNAddress("")
+		require.Equal(t, "", result)
+	})
+
+	t.Run("No slash at all", func(t *testing.T) {
+		result := simplifyOVNAddress("10.0.0.1")
+		require.Equal(t, "10.0.0.1", result)
+	})
 }
 
 func TestCompareIP(t *testing.T) {