add support for set community additive

add option to enable setting community and extcommunity additive
instead of replacing the list.

Signed-off-by: Ivo Gosemann <ivo.gosemann@sap.com>

Author: IvoGoman

Tiltfile

@@ -165,7 +165,7 @@ k8s_yaml('./config/samples/v1alpha1_prefixset.yaml')
 k8s_resource(new_name='ccloud-prefixset', objects=['ccloud-prefixset:prefixset'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False, labels=['samples'])
 
 k8s_yaml('./config/samples/v1alpha1_routingpolicy.yaml')
-k8s_resource(new_name='bgp-import-policy', objects=['bgp-import-policy:routingpolicy', 'internal-networks:prefixset', 'partner-networks:prefixset', 'blocked-networks:prefixset'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False, labels=['samples'])
+k8s_resource(new_name='bgp-import-policy', objects=['bgp-import-policy:routingpolicy', 'internal-networks:prefixset', 'partner-networks:prefixset', 'blocked-networks:prefixset', 'communityset-regular:communityset', 'communityset-extended:communityset'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False, labels=['samples'])
 
 k8s_yaml('./config/samples/cisco/nx/v1alpha1_vpcdomain.yaml')
 k8s_resource(new_name='vpcdomain', objects=['leaf1-vpcdomain:vpcdomain', 'leaf1-vrfvpckeepalive:vrf', 'eth1-30:interface', 'vpc-peer-link:interfaceconfig', 'eth1-31:interface','eth1-32:interface', 'po1:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False, labels=['samples'])

api/core/v1alpha1/routingpolicy_types.go

@@ -197,6 +197,18 @@ type SetASPathReplace struct {
 	Replacement intstr.IntOrString `json:"replacement"`
 }
 
+// CommunityOperation defines whether communities are added to the route's existing
+// set (Add) or replace it (Replace).
+// +kubebuilder:validation:Enum=Add;Replace
+type CommunityOperation string
+
+const (
+	// CommunityOperationAdd appends the communities to the route's existing set.
+	CommunityOperationAdd CommunityOperation = "Add"
+	// CommunityOperationReplace overwrites the route's communities with the configured set.
+	CommunityOperationReplace CommunityOperation = "Replace"
+)
+
 // SetCommunityAction defines the action to set BGP standard communities.
 type SetCommunityAction struct {
 	// Communities is the list of BGP standard communities to set.
@@ -205,6 +217,12 @@ type SetCommunityAction struct {
 	// +required
 	// +kubebuilder:validation:MinItems=1
 	Communities []string `json:"communities"`
+
+	// Operation controls whether the communities are added to the route's existing
+	// communities (Add) or replace them (Replace).
+	// +optional
+	// +kubebuilder:default=Replace
+	Operation CommunityOperation `json:"operation,omitempty"`
 }
 
 // SetExtCommunityAction defines the action to set BGP extended communities.
@@ -215,6 +233,12 @@ type SetExtCommunityAction struct {
 	// +required
 	// +kubebuilder:validation:MinItems=1
 	Communities []string `json:"communities"`
+
+	// Operation controls whether the communities are added to the route's existing
+	// communities (Add) or replace them (Replace).
+	// +optional
+	// +kubebuilder:default=Replace
+	Operation CommunityOperation `json:"operation,omitempty"`
 }
 
 // RoutingPolicyStatus defines the observed state of RoutingPolicy.

charts/network-operator/templates/crd/routingpolicies.networking.metal.ironcore.dev.yaml

@@ -23,9 +23,11 @@ spec:
             communities:
               - "65137:100"
               - "65137:200"
+            operation: Add
           setExtCommunity:
             communities:
               - "65137:100"
+            operation: Replace
     - sequence: 20
       conditions:
         matchPrefixSet:

charts/network-operator/templates/prometheus/controller-manager-metrics-monitor.yaml

@@ -2855,12 +2855,12 @@ func (p *Provider) EnsureRoutingPolicy(ctx context.Context, req *provider.Ensure
 
 		if stmt.Actions.BgpActions != nil {
 			if stmt.Actions.BgpActions.SetCommunity != nil {
-				if err := e.SetCommunities(stmt.Actions.BgpActions.SetCommunity.Communities); err != nil {
+				if err := e.SetCommunities(stmt.Actions.BgpActions.SetCommunity.Communities, stmt.Actions.BgpActions.SetCommunity.Operation); err != nil {
 					return err
 				}
 			}
 			if stmt.Actions.BgpActions.SetExtCommunity != nil {
-				if err := e.SetExtCommunities(stmt.Actions.BgpActions.SetExtCommunity.Communities); err != nil {
+				if err := e.SetExtCommunities(stmt.Actions.BgpActions.SetExtCommunity.Communities, stmt.Actions.BgpActions.SetExtCommunity.Operation); err != nil {
 					return err
 				}
 			}

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

@@ -27,11 +27,13 @@ type RouteMapEntry struct {
 	Action    Action `json:"action"`
 	Order     int32  `json:"order"`
 	SrttItems struct {
+		Additive  AdminSt `json:"additive"`
 		ItemItems struct {
 			ItemList gnmiext.List[ExtCommItem, *ExtCommItem] `json:"Item-list,omitzero"`
 		} `json:"item-items,omitzero"`
 	} `json:"srtt-items,omitzero"`
 	SregcommItems struct {
+		Additive   AdminSt `json:"additive"`
 		NoCommAttr AdminSt `json:"noCommAttr"`
 		ItemItems  struct {
 			ItemList gnmiext.List[string, *CommItem] `json:"Item-list,omitzero"`
@@ -73,7 +75,7 @@ type RouteMapEntry struct {
 
 func (e *RouteMapEntry) Key() int32 { return e.Order }
 
-func (e *RouteMapEntry) SetCommunities(communities []string) error {
+func (e *RouteMapEntry) SetCommunities(communities []string, operation v1alpha1.CommunityOperation) error {
 	for _, comm := range communities {
 		c, err := Community(comm)
 		if err != nil {
@@ -82,17 +84,25 @@ func (e *RouteMapEntry) SetCommunities(communities []string) error {
 		e.SregcommItems.NoCommAttr = AdminStDisabled
 		e.SregcommItems.ItemItems.ItemList.Set(&CommItem{Community: c})
 	}
+	e.SregcommItems.Additive = AdminStDisabled
+	if operation == v1alpha1.CommunityOperationAdd {
+		e.SregcommItems.Additive = AdminStEnabled
+	}
 	return nil
 }
 
-func (e *RouteMapEntry) SetExtCommunities(communities []string) error {
+func (e *RouteMapEntry) SetExtCommunities(communities []string, operation v1alpha1.CommunityOperation) error {
 	for _, comm := range communities {
 		c, err := RouteTarget(comm)
 		if err != nil {
 			return err
 		}
 		e.SrttItems.ItemItems.ItemList.Set(&ExtCommItem{Community: c, Scope: RtExtComScopeTransitive})
 	}
+	e.SrttItems.Additive = AdminStDisabled
+	if operation == v1alpha1.CommunityOperationAdd {
+		e.SrttItems.Additive = AdminStEnabled
+	}
 	return nil
 }
 

config/samples/v1alpha1_routingpolicy.yaml

@@ -141,4 +141,28 @@ func init() {
 	comboRM.Name = "RM-COMBINED-MATCH"
 	comboRM.EntItems.EntryList.Set(comboEntry)
 	Register("route_map_combined_match", comboRM)
+
+	commAdditiveEntry := &RouteMapEntry{}
+	commAdditiveEntry.Order = 10
+	commAdditiveEntry.Action = ActionPermit
+	if err := commAdditiveEntry.SetCommunities([]string{"65000:10", "65000:20"}, v1alpha1.CommunityOperationAdd); err != nil {
+		panic(err)
+	}
+
+	commAdditiveRM := &RouteMap{}
+	commAdditiveRM.Name = "RM-COMMUNITY-ADDITIVE"
+	commAdditiveRM.EntItems.EntryList.Set(commAdditiveEntry)
+	Register("route_map_community_additive", commAdditiveRM)
+
+	extCommAdditiveEntry := &RouteMapEntry{}
+	extCommAdditiveEntry.Order = 10
+	extCommAdditiveEntry.Action = ActionPermit
+	if err := extCommAdditiveEntry.SetExtCommunities([]string{"65000:10", "65000:20"}, v1alpha1.CommunityOperationAdd); err != nil {
+		panic(err)
+	}
+
+	extCommAdditiveRM := &RouteMap{}
+	extCommAdditiveRM.Name = "RM-EXTCOMMUNITY-ADDITIVE"
+	extCommAdditiveRM.EntItems.EntryList.Set(extCommAdditiveEntry)
+	Register("route_map_extcommunity_additive", extCommAdditiveRM)
 }