[NX-OS] Implement support for RoutedVLAN interfaces on Cisco NX-OS

Author: felix-kaestner

internal/provider/cisco/nxos/intf.go

@@ -25,6 +25,8 @@ var (
 	_ gnmiext.Defaultable  = (*SpanningTree)(nil)
 	_ gnmiext.Configurable = (*PortChannel)(nil)
 	_ gnmiext.Configurable = (*PortChannelOperItems)(nil)
+	_ gnmiext.Configurable = (*SwitchVirtualInterface)(nil)
+	_ gnmiext.Configurable = (*SwitchVirtualInterfaceOperItems)(nil)
 	_ gnmiext.Configurable = (*AddrItem)(nil)
 )
 
@@ -190,6 +192,33 @@ func (p *PortChannelOperItems) XPath() string {
 	return "System/intf-items/aggr-items/AggrIf-list[id=" + p.ID + "]/aggrif-items"
 }
 
+type SwitchVirtualInterface struct {
+	AdminSt       AdminSt2   `json:"adminSt"`
+	Descr         string     `json:"descr"`
+	ID            string     `json:"id"`
+	Medium        SVIMedium  `json:"medium"`
+	MTU           int32      `json:"mtu,omitempty"`
+	RtvrfMbrItems *VrfMember `json:"rtvrfMbr-items,omitempty"`
+	VlanID        int16      `json:"vlanId"`
+}
+
+func (*SwitchVirtualInterface) IsListItem() {}
+
+func (s *SwitchVirtualInterface) XPath() string {
+	return "System/intf-items/svi-items/If-list[id=" + s.ID + "]"
+}
+
+type SwitchVirtualInterfaceOperItems struct {
+	ID     string `json:"-"`
+	OperSt OperSt `json:"operSt"`
+}
+
+func (*SwitchVirtualInterfaceOperItems) IsListItem() {}
+
+func (s *SwitchVirtualInterfaceOperItems) XPath() string {
+	return "System/intf-items/svi-items/If-list[id=" + s.ID + "]"
+}
+
 // AddrItem represents the IP address configuration for an interface.
 // It can hold either IPv4 or IPv6 addresses, determined by the Is6 field.
 type AddrItem struct {
@@ -332,6 +361,13 @@ const (
 	MediumPointToPoint Medium = "p2p"
 )
 
+type SVIMedium string
+
+const (
+	SVIMediumBroadcast    SVIMedium = "bcast"
+	SVIMediumPointToPoint SVIMedium = "p2p"
+)
+
 type SwitchportMode string
 
 const (

internal/provider/cisco/nxos/provider.go

@@ -614,6 +614,29 @@ func (p *Provider) EnsureInterface(ctx context.Context, req *provider.InterfaceR
 
 		conf = append(conf, pc)
 
+	case v1alpha1.InterfaceTypeRoutedVLAN:
+		f := new(Feature)
+		f.Name = "ifvlan"
+		f.AdminSt = AdminStEnabled
+		conf = append(conf, f)
+
+		svi := new(SwitchVirtualInterface)
+		svi.ID = name
+		svi.Descr = req.Interface.Spec.Description
+		svi.AdminSt = AdminStDown
+		if req.Interface.Spec.AdminState == v1alpha1.AdminStateUp {
+			svi.AdminSt = AdminStUp
+		}
+		svi.Medium = SVIMediumBroadcast
+		svi.MTU = DefaultMTU
+		if req.Interface.Spec.MTU != 0 {
+			svi.MTU = req.Interface.Spec.MTU
+		}
+		svi.VlanID = req.VLAN.Spec.ID
+		svi.RtvrfMbrItems = NewVrfMember(name, DefaultVRFName)
+
+		conf = append(conf, svi)
+
 	default:
 		return fmt.Errorf("unsupported interface type: %s", req.Interface.Spec.Type)
 	}
@@ -670,6 +693,11 @@ func (p *Provider) DeleteInterface(ctx context.Context, req *provider.InterfaceR
 			conf = append(conf, vpc)
 		}
 
+	case v1alpha1.InterfaceTypeRoutedVLAN:
+		svi := new(SwitchVirtualInterface)
+		svi.ID = name
+		conf = append(conf, svi)
+
 	default:
 		return fmt.Errorf("unsupported interface type: %s", req.Interface.Spec.Type)
 	}
@@ -715,10 +743,7 @@ func (p *Provider) GetInterfaceStatus(ctx context.Context, req *provider.Interfa
 		if err := p.client.GetState(ctx, svi); err != nil && !errors.Is(err, gnmiext.ErrNil) {
 			return provider.InterfaceStatus{}, err
 		}
-		operSt = OperStDown
-		if svi.OperAutoState {
-			operSt = OperStUp
-		}
+		operSt = svi.OperSt
 
 	default:
 		return provider.InterfaceStatus{}, fmt.Errorf("unsupported interface type: %s", req.Interface.Spec.Type)

internal/provider/cisco/nxos/testdata/svi.json

@@ -0,0 +1,16 @@
+{
+  "intf-items": {
+    "svi-items": {
+      "If-list": [
+        {
+          "adminSt": "up",
+          "descr": "Foo",
+          "id": "vlan10",
+          "medium": "bcast",
+          "mtu": 1500,
+          "vlanId": 10
+        }
+      ]
+    }
+  }
+}

internal/provider/cisco/nxos/testdata/svi.json.txt

@@ -0,0 +1,5 @@
+interface Vlan10
+ no shutdown
+ mtu 1500
+ description Foo
+ medium broadcast