fixup! (feat): API side support QandQ Vlan configuration

Author: sven-rosenzweig

api/core/v1alpha1/interface_types.go

@@ -148,7 +148,7 @@ type Switchport struct {
 	// +kubebuilder:validation:Maximum=4094
 	AccessVlan int32 `json:"accessVlan,omitempty"`
 
-	// InnerVlan specifies the VLAN id for QinQ access mode switchports.
+	// InnerVlan specifies the customer VLAN id for QinQ access mode switchports.
 	// +optional
 	// +kubebuilder:validation:Minimum=1
 	// +kubebuilder:validation:Maximum=4094

config/crd/bases/networking.metal.ironcore.dev_interfaces.yaml

@@ -358,8 +358,8 @@ spec:
                     minItems: 1
                     type: array
                   innerVlan:
-                    description: InnerVlan specifies the VLAN id for QinQ access mode
-                      switchports.
+                    description: InnerVlan specifies the customer VLAN id for QinQ
+                      access mode switchports.
                     format: int32
                     maximum: 4094
                     minimum: 1

internal/provider/cisco/iosxr/intf.go

@@ -4,7 +4,6 @@
 package iosxr
 
 import (
-	"errors"
 	"fmt"
 	"regexp"
 	"strconv"
@@ -13,6 +12,11 @@ import (
 	"github.com/ironcore-dev/network-operator/internal/provider/cisco/gnmiext/v2"
 )
 
+var (
+	bundleEtherRE       = regexp.MustCompile(`^Bundle-Ether*`)
+	physicalInterfaceRE = regexp.MustCompile(`(TenGigE|TwentyFiveGigE|FortyGigE|HundredGigE|GigabitEthernet|Te|TF|Fo|Hu)(\d{0,4})(\.(\d+))?$`)
+)
+
 type IFaceSpeed string
 
 const (
@@ -163,9 +167,26 @@ func (phys *PhysIfState) XPath() string {
 	return fmt.Sprintf("Cisco-IOS-XR-ifmgr-oper:interface-properties/data-nodes/data-node[data-node-name=0/RP0/CPU0]/system-view/interfaces/interface[interface-name=%s]", phys.Name)
 }
 
-func ExtractInterfaceSpeedFromName(ifaceName string) (IFaceSpeed, error) {
+func ValidateInterfaceName(name string) error {
+	// Supported Interface name formats:
+	// Physical Interface <PortSpeed><rack><slot><port> e.g TwentyFiveGigE0/0/0/3
+	// SubInterface <PotySpeed><rack><slot><port>.<vlan-id> e.g TwentyFiveGigE0/0/0/3
+	// Bundle Interface/Port Channel Bundle-Ether<BundleID>
+	// Vlans over Bundle Bundle-Ether<BundleID>.<vlan-id>
+
+	beErr := CheckInterfaceNameTypeAggregate(name)
+	physErr := CheckInterfaceNameTypePhysical(name)
+
+	if beErr == nil && physErr != nil {
+		return nil
+	} else if beErr != nil && physErr == nil {
+		return nil
+	}
+	return fmt.Errorf("unsupported interface name format: %s", name)
+}
+
+func ExtractOwnerFromInterfaceName(ifaceName string) (IFaceSpeed, error) {
 	// Owner of bundle interfaces is 'etherbundle'
-	bundleEtherRE := regexp.MustCompile(`^Bundle-Ether*`)
 	if bundleEtherRE.MatchString(ifaceName) {
 		// For Bundle-Ether interfaces
 		return EtherBundle, nil
@@ -194,9 +215,6 @@ func ExtractInterfaceSpeedFromName(ifaceName string) (IFaceSpeed, error) {
 }
 
 func CheckInterfaceNameTypeAggregate(name string) error {
-	if name == "" {
-		return errors.New("interface name must not be empty")
-	}
 	// Matches Bundle-Ether<VLAN>[.<VLAN>] or BE<VLAN>[.<VLAN>]
 	re := regexp.MustCompile(`^(Bundle-Ether|BE)(\d+)(\.(\d+))?$`)
 	matches := re.FindStringSubmatch(name)
@@ -220,6 +238,16 @@ func CheckInterfaceNameTypeAggregate(name string) error {
 	return nil
 }
 
+func CheckInterfaceNameTypePhysical(name string) error {
+	if !physicalInterfaceRE.MatchString(name) {
+		return fmt.Errorf("unsupported physical interface format %s", name)
+	}
+	if _, err := ExtractVlanTagFromName(name); err != nil {
+		return err
+	}
+	return nil
+}
+
 func ExtractVlanTagFromName(name string) (vlanID int32, err error) {
 	// TF0/0/0/3.2021 or Te0/0/0/3.2021 or Hun0/0/0/3.2021
 	res := strings.Split(name, ".")

internal/provider/cisco/iosxr/intf_test.go

@@ -3,6 +3,8 @@
 
 package iosxr
 
+import "testing"
+
 func init() {
 	name := "TwentyFiveGigE0/0/0/14"
 
@@ -51,3 +53,58 @@ func init() {
 		},
 	})
 }
+
+func TestValidateInterfaceName(t *testing.T) {
+	tests := []struct {
+		name      string
+		ifaceName string
+		wantErr   bool
+		errMsg    string
+	}{
+		{
+			name:      "valid TenGigE interface",
+			ifaceName: "TenGigE0001",
+			wantErr:   false,
+		},
+		{
+			name:      "valid TenGigE interface",
+			ifaceName: "TenGigE0001.100",
+			wantErr:   false,
+		},
+		{
+			name:      "missing ",
+			ifaceName: "eth-1-1",
+			wantErr:   true,
+		},
+		{
+			name:      "valid Bundle-Ether interface",
+			ifaceName: "Bundle-Ether1",
+			wantErr:   false,
+		},
+		{
+			name:      "valid Bundle-Ether with VLAN",
+			ifaceName: "Bundle-Ether1.100",
+			wantErr:   false,
+		},
+		{
+			name:      "valid BE interface",
+			ifaceName: "BE1",
+			wantErr:   false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			err := ValidateInterfaceName(tt.ifaceName)
+			if tt.wantErr {
+				if err == nil {
+					t.Errorf("Interface name %s accepted as valid, expected error", tt.ifaceName)
+				}
+			} else {
+				if err != nil {
+					t.Errorf("Interface name %s rejected as invalid, expected valid. Error: %v", tt.ifaceName, err)
+				}
+			}
+		})
+	}
+}

internal/provider/cisco/iosxr/provider.go

@@ -56,6 +56,10 @@ func (p *Provider) EnsureInterface(ctx context.Context, req *provider.EnsureInte
 
 	name := req.Interface.Spec.Name
 
+	if err := ValidateInterfaceName(name); err != nil {
+		return err
+	}
+
 	// Configure different interface types based on the interface name
 	// Interface <PortSpeed><rack><slot><port> e.g TwentyFiveGigE0/0/0/3
 	// SubInterface <PotySpeed><rack><slot><port>.<vlan-id> e.g TwentyFiveGigE0/0/0/3