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

Author: felix-kaestner

internal/provider/cisco/nxos/intf.go

@@ -132,9 +132,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 +143,6 @@ func (s *SpanningTree) XPath() string {
 }
 
 func (s *SpanningTree) Default() {
-	s.AdminSt = AdminStDisabled
 	s.Mode = SpanningTreeModeDefault
 }
 

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)
@@ -790,6 +792,24 @@ 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.Interface.Spec.Type == v1alpha1.InterfaceTypeAggregate {
+		stp := new(SpanningTree)
+		stp.IfName = name
+
+		m, ok := req.Interface.GetAnnotations()[SpanningTreePortTypeAnnotation]
+		switch {
+		case ok && slices.Contains([]SpanningTreeMode{SpanningTreeModeDefault, SpanningTreeModeEdge, SpanningTreeModeNetwork, SpanningTreeModeTrunk}, SpanningTreeMode(m)):
+			stp.Mode = SpanningTreeMode(m)
+			conf = append(conf, stp)
+		default:
+			if err := p.client.GetConfig(ctx, stp); err == nil {
+				if err := p.client.Delete(ctx, stp); err != nil {
+					return err
+				}
+			}
+		}
+	}
+
 	// Add the address items last, as they depend on the interface being created first.
 	if addr != nil {
 		conf = append(conf, addr)
@@ -821,10 +841,6 @@ func (p *Provider) DeleteInterface(ctx context.Context, req *provider.InterfaceR
 		p.ID = name
 		conf = append(conf, p)
 
-		stp := new(SpanningTree)
-		stp.IfName = name
-		conf = append(conf, stp)
-
 	case v1alpha1.InterfaceTypeLoopback:
 		lb := new(Loopback)
 		lb.ID = name
@@ -854,6 +870,12 @@ func (p *Provider) DeleteInterface(ctx context.Context, req *provider.InterfaceR
 		return fmt.Errorf("unsupported interface type: %s", req.Interface.Spec.Type)
 	}
 
+	if req.Interface.Spec.Type == v1alpha1.InterfaceTypePhysical || req.Interface.Spec.Type == v1alpha1.InterfaceTypeAggregate {
+		stp := new(SpanningTree)
+		stp.IfName = name
+		conf = append(conf, stp)
+	}
+
 	return p.client.Delete(ctx, conf...)
 }