[NX-OS] Allow to configure spanning-tree-port-type on Interfaces

Author: felix-kaestner

internal/provider/cisco/nxos/intf.go

@@ -22,7 +22,6 @@ var (
 	_ gnmiext.Configurable = (*PhysIfOperItems)(nil)
 	_ gnmiext.Configurable = (*VrfMember)(nil)
 	_ gnmiext.Configurable = (*SpanningTree)(nil)
-	_ gnmiext.Defaultable  = (*SpanningTree)(nil)
 	_ gnmiext.Configurable = (*PortChannel)(nil)
 	_ gnmiext.Configurable = (*PortChannelOperItems)(nil)
 	_ gnmiext.Configurable = (*SwitchVirtualInterface)(nil)
@@ -132,9 +131,8 @@ func NewVrfMember(ifName, vrfName string) *VrfMember {
 
 // SpanningTree represents the spanning tree configuration for an interface.
 type SpanningTree struct {
-	AdminSt AdminSt          `json:"adminSt"`
-	Mode    SpanningTreeMode `json:"mode"`
-	IfName  string           `json:"-"`
+	Mode   SpanningTreeMode `json:"mode"`
+	IfName string           `json:"-"`
 }
 
 func (*SpanningTree) IsListItem() {}
@@ -144,7 +142,6 @@ func (s *SpanningTree) XPath() string {
 }
 
 func (s *SpanningTree) Default() {
-	s.AdminSt = AdminStDisabled
 	s.Mode = SpanningTreeModeDefault
 }
 
@@ -466,6 +463,15 @@ const (
 	SpanningTreeModeTrunk   SpanningTreeMode = "trunk"
 )
 
+func (s SpanningTreeMode) IsValid() bool {
+	switch s {
+	case SpanningTreeModeDefault, SpanningTreeModeEdge, SpanningTreeModeNetwork, SpanningTreeModeTrunk:
+		return true
+	default:
+		return false
+	}
+}
+
 type PortChannelMode string
 
 const (

internal/provider/cisco/nxos/provider.go

@@ -28,6 +28,8 @@ import (
 	"github.com/ironcore-dev/network-operator/internal/provider/cisco/gnmiext/v2"
 )
 
+const SpanningTreePortTypeAnnotation = "nx.cisco.networking.metal.ironcore.dev/spanning-tree-port-type"
+
 var (
 	_ provider.Provider                 = (*Provider)(nil)
 	_ provider.DeviceProvider           = (*Provider)(nil)
@@ -810,6 +812,19 @@ func (p *Provider) EnsureInterface(ctx context.Context, req *provider.EnsureInte
 		return fmt.Errorf("unsupported interface type: %s", req.Interface.Spec.Type)
 	}
 
+	if (req.Interface.Spec.Type == v1alpha1.InterfaceTypePhysical && req.IPv4 == nil) || req.Interface.Spec.Type == v1alpha1.InterfaceTypeAggregate {
+		stp := new(SpanningTree)
+		stp.IfName = name
+		stp.Mode = SpanningTreeModeDefault
+
+		m, ok := req.Interface.GetAnnotations()[SpanningTreePortTypeAnnotation]
+		if mode := SpanningTreeMode(m); ok && mode.IsValid() {
+			stp.Mode = mode
+		}
+
+		conf = append(conf, stp)
+	}
+
 	// Add the address items last, as they depend on the interface being created first.
 	if addr != nil {
 		conf = append(conf, addr)