routeimport: set outport to external port in imported routes

Signed-off-by: Jaime Caamaño Ruiz <[email protected]>

Author: jcaamano

go-controller/pkg/libovsdb/ops/router.go

@@ -692,23 +692,53 @@ func PolicyEqualPredicate(p1, p2 *nbdb.LogicalRouterStaticRoutePolicy) bool {
 	return *p1 == *p2
 }
 
-// CreateOrReplaceLogicalRouterStaticRouteWithPredicate looks up a logical
-// router static route from the cache based on a given predicate. If it does not
-// exist, it creates the provided logical router static route. If it does, it
-// updates it. The logical router static route is added to the provided logical
-// router.
-// If more than one route matches the predicate on the router, the additional routes are removed.
-func CreateOrReplaceLogicalRouterStaticRouteWithPredicate(nbClient libovsdbclient.Client, routerName string,
-	lrsr *nbdb.LogicalRouterStaticRoute, p logicalRouterStaticRoutePredicate, fields ...interface{}) error {
+// CreateOrReplaceLogicalRouterStaticRouteWithPredicateOps executes ops
+// according to the following logic:
+//   - Looks up a logical router static route from the cache based on a given predicate.
+//   - If the route does not exist, it creates the provided logical router static
+//     route.
+//   - If it does, it updates it.
+//   - The logical router static route is added to the provided logical router.
+//   - If more than one route matches the predicate on the router, the additional
+//     routes are removed.
+func CreateOrReplaceLogicalRouterStaticRouteWithPredicate(
+	nbClient libovsdbclient.Client,
+	routerName string,
+	lrsr *nbdb.LogicalRouterStaticRoute,
+	p logicalRouterStaticRoutePredicate,
+	fields ...interface{},
+) error {
+	ops, err := CreateOrReplaceLogicalRouterStaticRouteWithPredicateOps(nbClient, nil, routerName, lrsr, p, fields...)
+	if err != nil {
+		return err
+	}
+	_, err = TransactAndCheck(nbClient, ops)
+	return err
+}
 
+// CreateOrReplaceLogicalRouterStaticRouteWithPredicateOps returns ops according
+// to the following logic:
+//   - Looks up a logical router static route from the cache based on a given predicate.
+//   - If the route does not exist, it creates the provided logical router static
+//     route.
+//   - If it does, it updates it.
+//   - The logical router static route is added to the provided logical router.
+//   - If more than one route matches the predicate on the router, the additional
+//     routes are removed.
+func CreateOrReplaceLogicalRouterStaticRouteWithPredicateOps(
+	nbClient libovsdbclient.Client,
+	ops []ovsdb.Operation,
+	routerName string,
+	lrsr *nbdb.LogicalRouterStaticRoute,
+	p logicalRouterStaticRoutePredicate,
+	fields ...interface{},
+) ([]ovsdb.Operation, error) {
 	lr := &nbdb.LogicalRouter{Name: routerName}
 	routes, err := GetRouterLogicalRouterStaticRoutesWithPredicate(nbClient, lr, p)
 	if err != nil {
-		return fmt.Errorf("unable to get logical router static routes with predicate on router %s: %w", routerName, err)
+		return nil, fmt.Errorf("unable to get logical router static routes with predicate on router %s: %w", routerName, err)
 	}
 
-	var ops []ovsdb.Operation
-
 	if len(routes) > 0 {
 		lrsr.UUID = routes[0].UUID
 	}
@@ -718,16 +748,16 @@ func CreateOrReplaceLogicalRouterStaticRouteWithPredicate(nbClient libovsdbclien
 		routes = routes[1:]
 		ops, err = DeleteLogicalRouterStaticRoutesOps(nbClient, ops, routerName, routes...)
 		if err != nil {
-			return err
+			return nil, err
 		}
 	}
 
 	ops, err = CreateOrUpdateLogicalRouterStaticRoutesWithPredicateOps(nbClient, ops, routerName, lrsr, nil, fields...)
 	if err != nil {
-		return fmt.Errorf("unable to get create or update logical router static routes on router %s: %w", routerName, err)
+		return nil, fmt.Errorf("unable to get create or update logical router static routes on router %s: %w", routerName, err)
 	}
-	_, err = TransactAndCheck(nbClient, ops)
-	return err
+
+	return ops, nil
 }
 
 // DeleteLogicalRouterStaticRoutesWithPredicate looks up logical router static

go-controller/pkg/ovn/routeimport/route_import.go

@@ -356,6 +356,8 @@ func (c *controller) syncNetwork(network string) error {
 	}
 
 	router := info.GetNetworkScopedGWRouterName(c.node)
+	// we set the outport incase our IPv6 next hops are link local addresses
+	outport := types.GWRouterToExtSwitchPrefix + router
 	actual, uuids, err := c.getOVNRoutes(router)
 	if err != nil {
 		return fmt.Errorf("failed to get routes from OVN: %w", err)
@@ -380,10 +382,11 @@ func (c *controller) syncNetwork(network string) error {
 			UUID:        uuids[add],
 			IPPrefix:    add.dst,
 			Nexthop:     add.gw,
+			OutputPort:  &outport,
 			ExternalIDs: map[string]string{controllerExternalIDKey: controllerName},
 		}
 		p := func(db *nbdb.LogicalRouterStaticRoute) bool { return p(lrsr, db) }
-		ops, err = nbdbops.CreateOrUpdateLogicalRouterStaticRoutesWithPredicateOps(c.nbClient, ops, router, lrsr, p)
+		ops, err = nbdbops.CreateOrReplaceLogicalRouterStaticRouteWithPredicateOps(c.nbClient, ops, router, lrsr, p)
 		if err != nil {
 			err := fmt.Errorf("failed to add routes on router %s: %w", router, err)
 			errs = append(errs, err)

go-controller/pkg/ovn/routeimport/route_import_test.go

@@ -27,6 +27,8 @@ func Test_controller_syncNetwork(t *testing.T) {
 	node := "testnode"
 
 	defaultNetwork := &util.DefaultNetInfo{}
+	defaultNetworkRouter := defaultNetwork.GetNetworkScopedGWRouterName(node)
+	defaultNetworkRouterPort := types.GWRouterToExtSwitchPrefix + defaultNetworkRouter
 
 	udn := &multinetworkmocks.NetInfo{}
 	udn.On("IsDefault").Return(false)
@@ -142,23 +144,28 @@ func Test_controller_syncNetwork(t *testing.T) {
 			},
 			link: &netlink.Vrf{Table: unix.RT_TABLE_MAIN},
 			initial: []libovsdb.TestData{
-				&nbdb.LogicalRouter{Name: defaultNetwork.GetNetworkScopedGWRouterName(node), StaticRoutes: []string{"keep-1", "keep-2", "remove"}},
-				&nbdb.LogicalRouterStaticRoute{UUID: "keep-1", IPPrefix: "1.1.1.0/24", Nexthop: "1.1.1.1", ExternalIDs: map[string]string{controllerExternalIDKey: controllerName}},
+				&nbdb.LogicalRouter{Name: defaultNetworkRouter, StaticRoutes: []string{"keep-1", "keep-2", "remove"}},
+				&nbdb.LogicalRouterStaticRoute{UUID: "keep-1", IPPrefix: "1.1.1.0/24", Nexthop: "1.1.1.1", OutputPort: &defaultNetworkRouterPort, ExternalIDs: map[string]string{controllerExternalIDKey: controllerName}},
 				&nbdb.LogicalRouterStaticRoute{UUID: "keep-2", IPPrefix: "5.5.5.0/24", Nexthop: "5.5.5.1"},
-				&nbdb.LogicalRouterStaticRoute{UUID: "remove", IPPrefix: "6.6.6.0/24", Nexthop: "6.6.6.1", ExternalIDs: map[string]string{controllerExternalIDKey: controllerName}},
+				&nbdb.LogicalRouterStaticRoute{UUID: "remove", IPPrefix: "6.6.6.0/24", Nexthop: "6.6.6.1", OutputPort: &defaultNetworkRouterPort, ExternalIDs: map[string]string{controllerExternalIDKey: controllerName}},
+				&nbdb.LogicalRouter{UUID: "otherRouter", Name: "otherRouter", StaticRoutes: []string{"untouched-1"}},
+				&nbdb.LogicalRouterStaticRoute{UUID: "untouched-1", IPPrefix: "3.3.3.0/24", Nexthop: "3.3.3.2", ExternalIDs: map[string]string{controllerExternalIDKey: controllerName}},
 			},
 			routes: []netlink.Route{
 				{Dst: ovntesting.MustParseIPNet("1.1.1.0/24"), Gw: ovntesting.MustParseIP("1.1.1.1")},
 				{Dst: ovntesting.MustParseIPNet("2.2.2.0/24"), Gw: ovntesting.MustParseIP("2.2.2.1")},
 				{Dst: ovntesting.MustParseIPNet("3.3.3.0/24"), MultiPath: []*netlink.NexthopInfo{{Gw: ovntesting.MustParseIP("3.3.3.1")}, {Gw: ovntesting.MustParseIP("3.3.3.2")}}},
 			},
 			expected: []libovsdb.TestData{
-				&nbdb.LogicalRouter{UUID: "router", Name: defaultNetwork.GetNetworkScopedGWRouterName(node), StaticRoutes: []string{"keep-1", "keep-2", "add-1", "add-2", "add-3"}},
-				&nbdb.LogicalRouterStaticRoute{UUID: "keep-1", IPPrefix: "1.1.1.0/24", Nexthop: "1.1.1.1", ExternalIDs: map[string]string{controllerExternalIDKey: controllerName}},
+				&nbdb.LogicalRouter{UUID: "router", Name: defaultNetworkRouter, StaticRoutes: []string{"keep-1", "keep-2", "add-1", "add-2", "add-3"}},
+				&nbdb.LogicalRouterStaticRoute{UUID: "keep-1", IPPrefix: "1.1.1.0/24", Nexthop: "1.1.1.1", OutputPort: &defaultNetworkRouterPort, ExternalIDs: map[string]string{controllerExternalIDKey: controllerName}},
 				&nbdb.LogicalRouterStaticRoute{UUID: "keep-2", IPPrefix: "5.5.5.0/24", Nexthop: "5.5.5.1"},
-				&nbdb.LogicalRouterStaticRoute{UUID: "add-1", IPPrefix: "2.2.2.0/24", Nexthop: "2.2.2.1", ExternalIDs: map[string]string{controllerExternalIDKey: controllerName}},
-				&nbdb.LogicalRouterStaticRoute{UUID: "add-2", IPPrefix: "3.3.3.0/24", Nexthop: "3.3.3.1", ExternalIDs: map[string]string{controllerExternalIDKey: controllerName}},
-				&nbdb.LogicalRouterStaticRoute{UUID: "add-3", IPPrefix: "3.3.3.0/24", Nexthop: "3.3.3.2", ExternalIDs: map[string]string{controllerExternalIDKey: controllerName}},
+				&nbdb.LogicalRouterStaticRoute{UUID: "add-1", IPPrefix: "2.2.2.0/24", Nexthop: "2.2.2.1", OutputPort: &defaultNetworkRouterPort, ExternalIDs: map[string]string{controllerExternalIDKey: controllerName}},
+				&nbdb.LogicalRouterStaticRoute{UUID: "add-2", IPPrefix: "3.3.3.0/24", Nexthop: "3.3.3.1", OutputPort: &defaultNetworkRouterPort, ExternalIDs: map[string]string{controllerExternalIDKey: controllerName}},
+				&nbdb.LogicalRouterStaticRoute{UUID: "add-3", IPPrefix: "3.3.3.0/24", Nexthop: "3.3.3.2", OutputPort: &defaultNetworkRouterPort, ExternalIDs: map[string]string{controllerExternalIDKey: controllerName}},
+				&nbdb.LogicalRouter{UUID: "otherRouter", Name: "otherRouter", StaticRoutes: []string{"untouched-1"}},
+				// this route should not be updated as it belongs to a different network
+				&nbdb.LogicalRouterStaticRoute{UUID: "untouched-1", IPPrefix: "3.3.3.0/24", Nexthop: "3.3.3.2", ExternalIDs: map[string]string{controllerExternalIDKey: controllerName}},
 			},
 		},
 	}