VPC controller: add externalids with static routes across various locations

Signed-off-by: isabelleatkins <[email protected]>

Author: isabelleatkins

pkg/controller/vpc.go

@@ -480,15 +480,15 @@ func (c *Controller) handleAddOrUpdateVpc(key string) error {
 		if item.BfdID != "" {
 			klog.Infof("vpc %s add static ecmp route: %+v", vpc.Name, item)
 			if err = c.OVNNbClient.AddLogicalRouterStaticRoute(
-				vpc.Name, item.RouteTable, convertPolicy(item.Policy), item.CIDR, &item.BfdID, nil, item.NextHopIP,
+				vpc.Name, item.RouteTable, convertPolicy(item.Policy), item.CIDR, &item.BfdID, externalIDs, item.NextHopIP,
 			); err != nil {
 				klog.Errorf("failed to add bfd static route to vpc %s , %v", vpc.Name, err)
 				return err
 			}
 		} else {
 			klog.Infof("vpc %s add static route: %+v", vpc.Name, item)
 			if err = c.OVNNbClient.AddLogicalRouterStaticRoute(
-				vpc.Name, item.RouteTable, convertPolicy(item.Policy), item.CIDR, nil, nil, item.NextHopIP,
+				vpc.Name, item.RouteTable, convertPolicy(item.Policy), item.CIDR, nil, externalIDs, item.NextHopIP,
 			); err != nil {
 				klog.Errorf("failed to add normal static route to vpc %s , %v", vpc.Name, err)
 				return err
@@ -961,7 +961,7 @@ func (c *Controller) addStaticRouteToVpc(name string, route *kubeovnv1.StaticRou
 	} else {
 		klog.Infof("vpc %s add static route: %+v", name, route)
 		if err := c.OVNNbClient.AddLogicalRouterStaticRoute(
-			name, route.RouteTable, convertPolicy(route.Policy), route.CIDR, nil, nil, route.NextHopIP,
+			name, route.RouteTable, convertPolicy(route.Policy), route.CIDR, nil, externalIDs, route.NextHopIP,
 		); err != nil {
 			klog.Errorf("failed to add normal static route to vpc %s , %v", name, err)
 			return err

pkg/controller/vpc_test.go

@@ -7,13 +7,12 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/keymutex"
 
 	kubeovnv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1"
 	"github.com/kubeovn/kube-ovn/pkg/ovsdb/ovnnb"
 	"github.com/kubeovn/kube-ovn/pkg/util"
-	"k8s.io/utils/keymutex"
 )
 
 func Test_handleAddOrUpdateVpc_staticRoutes(t *testing.T) {
@@ -106,7 +105,7 @@ func Test_handleAddOrUpdateVpc_staticRoutes(t *testing.T) {
 			"dst-ip",
 			"192.168.0.0/24",
 			nil,
-			nil,
+			externalIDs,
 			"10.0.0.1",
 		).Return(nil)
 		mockOvnClient.EXPECT().ClearLogicalRouterPolicy(vpcName).Return(nil)
@@ -283,7 +282,7 @@ func Test_handleAddOrUpdateVpc_staticRoutes(t *testing.T) {
 			"dst-ip",
 			"192.168.0.0/24",
 			nil,
-			nil,
+			externalIDs,
 			"10.0.0.1",
 		).Return(nil)
 		mockOvnClient.EXPECT().ClearLogicalRouterPolicy(vpcName).Return(nil)