Support IPv6 for Subnet/SubnetSet

Signed-off-by: Yanjun Zhou <yanjun.zhou@broadcom.com>

Author: yanjunz97

build/yaml/crd/vpc/crd.nsx.vmware.com_subnets.yaml

@@ -167,6 +167,7 @@ spec:
                     - DHCPServer
                     - DHCPRelay
                     - DHCPDeactivated
+                    - DHCPServerStateless
                     type: string
                 type: object
                 x-kubernetes-validations:

build/yaml/crd/vpc/crd.nsx.vmware.com_subnetsets.yaml

@@ -116,6 +116,7 @@ spec:
                     - DHCPServer
                     - DHCPRelay
                     - DHCPDeactivated
+                    - DHCPServerStateless
                     type: string
                 type: object
                 x-kubernetes-validations:

docs/ref/apis/vpc.md

@@ -207,6 +207,7 @@ _Appears in:_
 | `DHCPDeactivated` |  |
 | `DHCPServer` |  |
 | `DHCPRelay` |  |
+| `DHCPServerStateless` |  |
 
 
 #### DHCPv6ServerAdditionalConfig
@@ -908,7 +909,7 @@ _Appears in:_
 
 | Field | Description | Default | Validation |
 | --- | --- | --- | --- |
-| `mode` _[DHCPConfigMode](#dhcpconfigmode)_ | DHCP Mode. DHCPDeactivated will be used if it is not defined. |  | Enum: [DHCPServer DHCPRelay DHCPDeactivated] <br /> |
+| `mode` _[DHCPConfigMode](#dhcpconfigmode)_ | DHCP Mode. DHCPDeactivated will be used if it is not defined. |  | Enum: [DHCPServer DHCPRelay DHCPDeactivated DHCPServerStateless] <br /> |
 | `dhcpServerAdditionalConfig` _[DHCPServerAdditionalConfig](#dhcpserveradditionalconfig)_ | Additional DHCP server config for a VPC Subnet. |  |  |
 
 
@@ -1236,7 +1237,7 @@ _Appears in:_
 
 | Field | Description | Default | Validation |
 | --- | --- | --- | --- |
-| `vpc` _string_ | NSX path of the VPC the Namespace is associated with.<br />If vpc is set, only defaultSubnetSize takes effect, other fields are ignored. |  |  |
+| `vpc` _string_ | NSX path of the VPC the Namespace is associated with.<br />If vpc is set, only defaultSubnetSize and defaultIPv6PrefixLength take effect, other fields are ignored. |  |  |
 | `subnets` _[SharedSubnet](#sharedsubnet) array_ | Shared Subnets the Namespace is associated with. |  |  |
 | `nsxProject` _string_ | NSX Project the Namespace is associated with. |  |  |
 | `vpcConnectivityProfile` _string_ | VPCConnectivityProfile Path. This profile has configuration related to creating VPC transit gateway attachment. |  |  |

pkg/apis/vpc/v1alpha1/subnet_types.go

@@ -14,21 +14,22 @@ type ConnectivityState string
 type IPAddressType string
 
 const (
-	AccessModePublic              string            = "Public"
-	AccessModePrivate             string            = "Private"
-	AccessModeProject             string            = "PrivateTGW"
-	AccessModeL2Only              string            = "L2Only"
-	DHCPConfigModeDeactivated     string            = "DHCPDeactivated"
-	DHCPConfigModeServer          string            = "DHCPServer"
-	DHCPConfigModeRelay           string            = "DHCPRelay"
-	DHCPv6ConfigModeDeactivated   DHCPv6ConfigMode  = "DHCPDeactivated"
-	DHCPv6ConfigModeServer        DHCPv6ConfigMode  = "DHCPServer"
-	DHCPv6ConfigModeRelay         DHCPv6ConfigMode  = "DHCPRelay"
-	ConnectivityStateConnected    ConnectivityState = "Connected"
-	ConnectivityStateDisconnected ConnectivityState = "Disconnected"
-	IPAddressTypeIPv4             IPAddressType     = "IPv4"
-	IPAddressTypeIPv6             IPAddressType     = "IPv6"
-	IPAddressTypeIPv4IPv6         IPAddressType     = "IPv4IPv6"
+	AccessModePublic                string            = "Public"
+	AccessModePrivate               string            = "Private"
+	AccessModeProject               string            = "PrivateTGW"
+	AccessModeL2Only                string            = "L2Only"
+	DHCPConfigModeDeactivated       string            = "DHCPDeactivated"
+	DHCPConfigModeServer            string            = "DHCPServer"
+	DHCPConfigModeRelay             string            = "DHCPRelay"
+	DHCPv6ConfigModeDeactivated     DHCPv6ConfigMode  = "DHCPDeactivated"
+	DHCPv6ConfigModeServer          DHCPv6ConfigMode  = "DHCPServer"
+	DHCPv6ConfigModeRelay           DHCPv6ConfigMode  = "DHCPRelay"
+	DHCPv6ConfigModeServerStateless DHCPv6ConfigMode  = "DHCPServerStateless"
+	ConnectivityStateConnected      ConnectivityState = "Connected"
+	ConnectivityStateDisconnected   ConnectivityState = "Disconnected"
+	IPAddressTypeIPv4               IPAddressType     = "IPv4"
+	IPAddressTypeIPv6               IPAddressType     = "IPv6"
+	IPAddressTypeIPv4IPv6           IPAddressType     = "IPv4IPv6"
 )
 
 // SubnetSpec defines the desired state of Subnet.
@@ -162,7 +163,7 @@ type DHCPServerAdditionalConfig struct {
 // +kubebuilder:validation:XValidation:rule="(!has(self.mode)|| self.mode=='DHCPDeactivated' || self.mode=='DHCPRelay' ) && (!has(self.dhcpServerAdditionalConfig) || !has(self.dhcpServerAdditionalConfig.reservedIPRanges) || size(self.dhcpServerAdditionalConfig.reservedIPRanges)==0) || has(self.mode) && self.mode=='DHCPServer'", message="DHCPServerAdditionalConfig must be cleared when Subnet has DHCP relay enabled or DHCP is deactivated."
 type SubnetDHCPConfig struct {
 	// DHCP Mode. DHCPDeactivated will be used if it is not defined.
-	// +kubebuilder:validation:Enum=DHCPServer;DHCPRelay;DHCPDeactivated
+	// +kubebuilder:validation:Enum=DHCPServer;DHCPRelay;DHCPDeactivated;DHCPServerStateless
 	Mode DHCPConfigMode `json:"mode,omitempty"`
 	// Additional DHCP server config for a VPC Subnet.
 	DHCPServerAdditionalConfig DHCPServerAdditionalConfig `json:"dhcpServerAdditionalConfig,omitempty"`

pkg/controllers/common/utils.go

@@ -25,6 +25,13 @@ import (
 	"github.com/vmware-tanzu/nsx-operator/pkg/util"
 )
 
+const (
+	// NSX API IP Address Types
+	NSXIPAddressTypeIPv4     = "IPV4"
+	NSXIPAddressTypeIPv6     = "IPV6"
+	NSXIPAddressTypeIPv4IPv6 = "IPV4_IPV6"
+)
+
 var (
 	log                     = logger.Log
 	SubnetSetLocks          sync.Map
@@ -616,3 +623,66 @@ func PodIsDeleted(pod *v1.Pod) bool {
 	return pod.Status.Phase == v1.PodSucceeded ||
 		pod.Status.Phase == v1.PodFailed
 }
+
+// ConvertCRIPAddressTypeToNSX converts CR IPAddressType to NSX API format
+// v1alpha1 format: IPv4, IPv6, IPv4IPv6
+// NSX format: IPV4, IPV6, IPV4_IPV6
+func ConvertCRIPAddressTypeToNSX(crType v1alpha1.IPAddressType) string {
+	switch crType {
+	case v1alpha1.IPAddressTypeIPv4:
+		return NSXIPAddressTypeIPv4
+	case v1alpha1.IPAddressTypeIPv6:
+		return NSXIPAddressTypeIPv6
+	case v1alpha1.IPAddressTypeIPv4IPv6:
+		return NSXIPAddressTypeIPv4IPv6
+	default:
+		log.Warn("Unknown IP address type, defaulting to IPv4", "unknownType", string(crType))
+		return NSXIPAddressTypeIPv4
+	}
+}
+
+// ConvertNSXIPAddressTypeToCR converts NSX API IPAddressType to CR format
+// NSX format: IPV4, IPV6, IPV4_IPV6
+// v1alpha1 format: IPV4, IPV6, IPV4IPV6
+func ConvertNSXIPAddressTypeToCR(nsxType string) v1alpha1.IPAddressType {
+	switch nsxType {
+	case NSXIPAddressTypeIPv4:
+		return v1alpha1.IPAddressTypeIPv4
+	case NSXIPAddressTypeIPv6:
+		return v1alpha1.IPAddressTypeIPv6
+	case NSXIPAddressTypeIPv4IPv6:
+		return v1alpha1.IPAddressTypeIPv4IPv6
+	default:
+		return v1alpha1.IPAddressTypeIPv4
+	}
+}
+
+// IntersectIPAddressTypes computes the intersection of multiple IP address types
+// Returns the most restrictive common type, or error if no intersection
+// Example:
+// intersection of [IPv4IPv6, IPv6] should equal IPv6
+// intersection of [IPv4IPv6, IPv4] should equal IPv4
+func IntersectIPAddressTypes(types []v1alpha1.IPAddressType) (v1alpha1.IPAddressType, error) {
+	if len(types) == 0 {
+		return "", fmt.Errorf("no IP address types provided")
+	}
+
+	result := types[0]
+
+	for _, t := range types[1:] {
+		if result == t {
+			continue
+		}
+
+		if result == v1alpha1.IPAddressTypeIPv4IPv6 {
+			result = t // Dual-stack intersects to the more specific type
+		} else if t == v1alpha1.IPAddressTypeIPv4IPv6 {
+			// Dual-stack with single-stack: keep single-stack (more restrictive)
+			continue
+		} else if result != t {
+			return "", fmt.Errorf("no intersection between IP address types %s and %s", result, t)
+		}
+	}
+
+	return result, nil
+}

pkg/controllers/common/utils_test.go

@@ -1174,3 +1174,191 @@ func TestPodIsDeleted(t *testing.T) {
 		})
 	}
 }
+
+func TestConvertCRIPAddressTypeToNSX(t *testing.T) {
+	tests := []struct {
+		name     string
+		crType   v1alpha1.IPAddressType
+		expected string
+	}{
+		{
+			name:     "IPv4 conversion",
+			crType:   v1alpha1.IPAddressTypeIPv4,
+			expected: "IPV4",
+		},
+		{
+			name:     "IPv6 conversion",
+			crType:   v1alpha1.IPAddressTypeIPv6,
+			expected: "IPV6",
+		},
+		{
+			name:     "IPv4IPv6 conversion",
+			crType:   v1alpha1.IPAddressTypeIPv4IPv6,
+			expected: "IPV4_IPV6",
+		},
+		{
+			name:     "empty type defaults to IPv4",
+			crType:   v1alpha1.IPAddressType(""),
+			expected: "IPV4",
+		},
+		{
+			name:     "unknown type defaults to IPv4",
+			crType:   v1alpha1.IPAddressType("Unknown"),
+			expected: "IPV4",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := ConvertCRIPAddressTypeToNSX(tt.crType)
+			assert.Equal(t, tt.expected, result)
+		})
+	}
+}
+
+func TestConvertNSXIPAddressTypeToCR(t *testing.T) {
+	tests := []struct {
+		name     string
+		nsxType  string
+		expected v1alpha1.IPAddressType
+	}{
+		{
+			name:     "IPV4 conversion",
+			nsxType:  "IPV4",
+			expected: v1alpha1.IPAddressTypeIPv4,
+		},
+		{
+			name:     "IPV6 conversion",
+			nsxType:  "IPV6",
+			expected: v1alpha1.IPAddressTypeIPv6,
+		},
+		{
+			name:     "IPV4_IPV6 conversion",
+			nsxType:  "IPV4_IPV6",
+			expected: v1alpha1.IPAddressTypeIPv4IPv6,
+		},
+		{
+			name:     "empty type defaults to IPv4",
+			nsxType:  "",
+			expected: v1alpha1.IPAddressTypeIPv4,
+		},
+		{
+			name:     "unknown type defaults to IPv4",
+			nsxType:  "UNKNOWN",
+			expected: v1alpha1.IPAddressTypeIPv4,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := ConvertNSXIPAddressTypeToCR(tt.nsxType)
+			assert.Equal(t, tt.expected, result)
+		})
+	}
+}
+
+func TestIntersectIPAddressTypes(t *testing.T) {
+	tests := []struct {
+		name        string
+		types       []v1alpha1.IPAddressType
+		expected    v1alpha1.IPAddressType
+		expectedErr bool
+		errMsg      string
+	}{
+		{
+			name:        "single IPv4 type",
+			types:       []v1alpha1.IPAddressType{v1alpha1.IPAddressTypeIPv4},
+			expected:    v1alpha1.IPAddressTypeIPv4,
+			expectedErr: false,
+		},
+		{
+			name:        "single IPv6 type",
+			types:       []v1alpha1.IPAddressType{v1alpha1.IPAddressTypeIPv6},
+			expected:    v1alpha1.IPAddressTypeIPv6,
+			expectedErr: false,
+		},
+		{
+			name:        "dual stack IPv4IPv6",
+			types:       []v1alpha1.IPAddressType{v1alpha1.IPAddressTypeIPv4IPv6},
+			expected:    v1alpha1.IPAddressTypeIPv4IPv6,
+			expectedErr: false,
+		},
+		{
+			name:        "IPv4IPv6 with IPv4 returns IPv4",
+			types:       []v1alpha1.IPAddressType{v1alpha1.IPAddressTypeIPv4IPv6, v1alpha1.IPAddressTypeIPv4},
+			expected:    v1alpha1.IPAddressTypeIPv4,
+			expectedErr: false,
+		},
+		{
+			name:        "IPv4IPv6 with IPv6 returns IPv6",
+			types:       []v1alpha1.IPAddressType{v1alpha1.IPAddressTypeIPv4IPv6, v1alpha1.IPAddressTypeIPv6},
+			expected:    v1alpha1.IPAddressTypeIPv6,
+			expectedErr: false,
+		},
+		{
+			name:        "IPv4 with IPv4 same type",
+			types:       []v1alpha1.IPAddressType{v1alpha1.IPAddressTypeIPv4, v1alpha1.IPAddressTypeIPv4},
+			expected:    v1alpha1.IPAddressTypeIPv4,
+			expectedErr: false,
+		},
+		{
+			name:        "IPv6 with IPv6 same type",
+			types:       []v1alpha1.IPAddressType{v1alpha1.IPAddressTypeIPv6, v1alpha1.IPAddressTypeIPv6},
+			expected:    v1alpha1.IPAddressTypeIPv6,
+			expectedErr: false,
+		},
+		{
+			name:        "IPv4 with IPv6 no intersection",
+			types:       []v1alpha1.IPAddressType{v1alpha1.IPAddressTypeIPv4, v1alpha1.IPAddressTypeIPv6},
+			expected:    "",
+			expectedErr: true,
+			errMsg:      "no intersection",
+		},
+		{
+			name:        "IPv4 with IPv6 with IPv4IPv6 returns IPv4",
+			types:       []v1alpha1.IPAddressType{v1alpha1.IPAddressTypeIPv4, v1alpha1.IPAddressTypeIPv6, v1alpha1.IPAddressTypeIPv4IPv6},
+			expected:    "",
+			expectedErr: true,
+			errMsg:      "no intersection",
+		},
+		{
+			name:        "empty slice",
+			types:       []v1alpha1.IPAddressType{},
+			expected:    "",
+			expectedErr: true,
+			errMsg:      "no IP address types provided",
+		},
+		{
+			name:        "IPv4 with IPv4IPv6 returns IPv4",
+			types:       []v1alpha1.IPAddressType{v1alpha1.IPAddressTypeIPv4, v1alpha1.IPAddressTypeIPv4IPv6},
+			expected:    v1alpha1.IPAddressTypeIPv4,
+			expectedErr: false,
+		},
+		{
+			name:        "IPv6 with IPv4IPv6 returns IPv6",
+			types:       []v1alpha1.IPAddressType{v1alpha1.IPAddressTypeIPv6, v1alpha1.IPAddressTypeIPv4IPv6},
+			expected:    v1alpha1.IPAddressTypeIPv6,
+			expectedErr: false,
+		},
+		{
+			name:        "IPv4IPv6 with IPv4 with IPv6 no intersection",
+			types:       []v1alpha1.IPAddressType{v1alpha1.IPAddressTypeIPv4IPv6, v1alpha1.IPAddressTypeIPv4, v1alpha1.IPAddressTypeIPv6},
+			expected:    "",
+			expectedErr: true,
+			errMsg:      "no intersection",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result, err := IntersectIPAddressTypes(tt.types)
+			if tt.expectedErr {
+				assert.Error(t, err)
+				assert.Contains(t, err.Error(), tt.errMsg)
+			} else {
+				assert.NoError(t, err)
+				assert.Equal(t, tt.expected, result)
+			}
+		})
+	}
+}