[NXOS] Add annotation to force members on interface aggregates

Use `nx.cisco.networking.metal.ironcore.dev/channel-group-force` to tag
an interface of type `Aggregate` on a Cisco NX device and force the
addition of member interfaces to the port-channel. The value of the
annotation is ignored.

Author: nikatza

internal/provider/cisco/nxos/intf.go

@@ -130,9 +130,8 @@ func NewVrfMember(ifName, vrfName string) *VrfMember {
 
 // SpanningTree represents the spanning tree configuration for an interface.
 type SpanningTree struct {
-	Mode   SpanningTreeMode      `json:"mode"`
-	IfName string                `json:"-"`
-	Bridge Option[BridgeControl] `json:"bridge"`
+	Mode   SpanningTreeMode `json:"mode"`
+	IfName string           `json:"-"`
 }
 
 func (*SpanningTree) IsListItem() {}
@@ -145,22 +144,6 @@ func (s *SpanningTree) Default() {
 	s.Mode = SpanningTreeModeDefault
 }
 
-type BridgeControl string
-
-const (
-	BridgeControlEnabled  BridgeControl = "enabled"
-	BridgeControlDisabled BridgeControl = "disabled"
-)
-
-func (b BridgeControl) IsValid() bool {
-	switch b {
-	case BridgeControlEnabled, BridgeControlDisabled:
-		return true
-	default:
-		return false
-	}
-}
-
 // PortChannel represents a port-channel (LAG) interface on a NX-OS device.
 type PortChannel struct {
 	AccessVlan    string          `json:"accessVlan"`
@@ -184,11 +167,21 @@ type PortChannelMember struct {
 	Force bool   `json:"isMbrForce,omitempty"`
 }
 
-func NewPortChannelMember(name string) *PortChannelMember {
-	return &PortChannelMember{
+type PortChannelMemberOption func(*PortChannelMember)
+
+func WithForce(force bool) PortChannelMemberOption {
+	return func(m *PortChannelMember) { m.Force = force }
+}
+
+func NewPortChannelMember(name string, opts ...PortChannelMemberOption) *PortChannelMember {
+	m := &PortChannelMember{
 		TDn:   fmt.Sprintf("/System/intf-items/phys-items/PhysIf-list[id='%s']", name),
 		Force: false,
 	}
+	for _, o := range opts {
+		o(m)
+	}
+	return m
 }
 
 func (m *PortChannelMember) Key() string { return m.TDn }

internal/provider/cisco/nxos/provider.go

@@ -31,6 +31,7 @@ import (
 
 const (
 	SpanningTreePortTypeAnnotation = "nx.cisco.networking.metal.ironcore.dev/spanning-tree-port-type"
+	ChannelGroupForceAnnotation    = "nx.cisco.networking.metal.ironcore.dev/channel-group-force"
 )
 
 var (
@@ -754,12 +755,13 @@ func (p *Provider) EnsureInterface(ctx context.Context, req *provider.EnsureInte
 			}
 		}
 
+		_, force := req.Interface.GetAnnotations()[ChannelGroupForceAnnotation]
 		for _, member := range req.Members {
 			n, err := ShortNamePhysicalInterface(member.Spec.Name)
 			if err != nil {
 				return err
 			}
-			pc.RsmbrIfsItems.RsMbrIfsList.Set(NewPortChannelMember(n))
+			pc.RsmbrIfsItems.RsMbrIfsList.Set(NewPortChannelMember(n, WithForce(force)))
 		}
 
 		v := new(VPCIfItems)