Add setNextHop ipAddr action to RoutingPolicy BGP actions

Author: nikatza

api/core/v1alpha1/routingpolicy_types.go

@@ -130,7 +130,7 @@ const (
 )
 
 // BgpActions defines BGP-specific actions for a policy statement.
-// +kubebuilder:validation:XValidation:rule="has(self.setCommunity) || has(self.setExtCommunity) || has(self.setASPath)",message="at least one BGP action must be specified"
+// +kubebuilder:validation:XValidation:rule="has(self.setCommunity) || has(self.setExtCommunity) || has(self.setASPath) || has(self.setNextHop)",message="at least one BGP action must be specified"
 type BgpActions struct {
 	// SetCommunity configures BGP standard community attributes.
 	// +optional
@@ -143,6 +143,17 @@ type BgpActions struct {
 	// SetASPath configures modifications to the BGP AS path attribute.
 	// +optional
 	SetASPath *SetASPathAction `json:"setASPath,omitempty"`
+
+	// SetNextHop configures the BGP next-hop for advertised routes.
+	// +optional
+	SetNextHop *SetNextHopAction `json:"setNextHop,omitempty"`
+}
+
+// SetNextHopAction defines how to replace the BGP next-hop for advertised routes.
+type SetNextHopAction struct {
+	// IPAddr specifies the next-hop IP address to set for advertised routes.
+	// +required
+	IPAddr IPAddr `json:"ipAddr"`
 }
 
 // SetASPathAction defines actions to modify the BGP AS path attribute.

api/core/v1alpha1/zz_generated.deepcopy.go

@@ -183,3 +183,22 @@ spec:
       regex: "65200:[0-9][0-9]"
     - sequence: 15
       regex: "65300:[0-9]+"
+---
+apiVersion: networking.metal.ironcore.dev/v1alpha1
+kind: RoutingPolicy
+metadata:
+  labels:
+    app.kubernetes.io/name: network-operator
+    app.kubernetes.io/managed-by: kustomize
+  name: bgp-next-hop-self
+spec:
+  deviceRef:
+    name: leaf1
+  name: BGP-NEXT-HOP-SELF
+  statements:
+    - sequence: 10
+      actions:
+        routeDisposition: AcceptRoute
+        bgpActions:
+          setNextHop:
+            ipAddr: 10.0.0.1

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

@@ -487,7 +487,6 @@ type DeviceState struct {
 	PIM                  *v1alpha1.PIM
 	BGP                  *v1alpha1.BGP
 	BGPVRF               *v1alpha1.VRF
-	BGPValidation        func(*provider.EnsureBGPRequest) error
 	BGPPeers             sets.Set[string]
 	BGPPeerPolicies      map[v1alpha1.BGPAddressFamilyType]*v1alpha1.RoutingPolicy
 	BGPPeerError         error
@@ -921,11 +920,6 @@ func (p *Provider) EnsureBGP(_ context.Context, req *provider.EnsureBGPRequest)
 	s := p.devices.StateFor(p.deviceName)
 	s.Lock()
 	defer s.Unlock()
-	if s.BGPValidation != nil {
-		if err := s.BGPValidation(req); err != nil {
-			return err
-		}
-	}
 	s.BGP = req.BGP
 	s.BGPVRF = req.VRF
 	return nil

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

@@ -14,6 +14,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 
 	"github.com/ironcore-dev/network-operator/api/core/v1alpha1"
+	"github.com/ironcore-dev/network-operator/internal/apistatus"
 	"github.com/ironcore-dev/network-operator/internal/provider"
 	"github.com/ironcore-dev/network-operator/internal/transport/gnmiext"
 )
@@ -153,6 +154,12 @@ func (al *Actions) String() string {
 
 func NewActions(actions v1alpha1.PolicyActions) (Actions, error) {
 	var result Actions
+	if actions.BgpActions != nil && actions.BgpActions.SetNextHop != nil {
+		return result, apistatus.NewUnsupportedFieldError(apistatus.FieldViolation{
+			Field:       "spec.statements[].actions.bgpActions.setNextHop",
+			Description: "iosxr provider does not support setting the BGP next-hop",
+		})
+	}
 
 	if actions.BgpActions != nil && actions.BgpActions.SetCommunity != nil {
 		result.Actions = append(result.Actions, &CommAction{

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

@@ -2910,6 +2910,7 @@ func (p *Provider) DeletePrefixSet(ctx context.Context, req *provider.DeletePref
 	return p.client.Delete(ctx, s)
 }
 
+// EnsureRoutingPolicy installs the route-map definition and its statement actions.
 func (p *Provider) EnsureRoutingPolicy(ctx context.Context, req *provider.EnsureRoutingPolicyRequest) error {
 	rm := new(RouteMap)
 	rm.Name = req.Name
@@ -2938,6 +2939,10 @@ func (p *Provider) EnsureRoutingPolicy(ctx context.Context, req *provider.Ensure
 		}
 
 		if stmt.Actions.BgpActions != nil {
+			if stmt.Actions.BgpActions.SetNextHop != nil {
+				nextHop := stmt.Actions.BgpActions.SetNextHop
+				e.NhItems.SetNhList.Set(&RouteMapNextHop{Addr: nextHop.IPAddr.String()})
+			}
 			if stmt.Actions.BgpActions.SetCommunity != nil {
 				if err := e.SetCommunities(stmt.Actions.BgpActions.SetCommunity.Communities, stmt.Actions.BgpActions.SetCommunity.Operation); err != nil {
 					return err