vpc controller: only manage static routes with kube-ovn as vendor #5838
+309
−6
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,296 @@ | ||
| package controller | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| "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" | ||
| ) | ||
|
|
||
| func Test_handleAddOrUpdateVpc_staticRoutes(t *testing.T) { | ||
|
There was a problem hiding this comment. The test suite is missing a key scenario to validate the main goal of this PR. You should add a test case to ensure that static routes without the This would involve:
There was a problem hiding this comment. This is implicitly tested - if there was an additional call to DeleteLogicalRouterStaticRoute, the test would fail. In addition - we check that the ListLogicalRouterStaticRoute is called with the externalIDs filter. |
||
| t.Parallel() | ||
|
|
||
| vpcName := "test-vpc" | ||
|
|
||
| // Policy variables for taking pointers | ||
| srcIPPolicy := ovnnb.LogicalRouterStaticRoutePolicySrcIP | ||
| dstIPPolicy := ovnnb.LogicalRouterStaticRoutePolicyDstIP | ||
|
|
||
| // Internal static route created directly in OVN with kube-ovn vendor | ||
| internalStaticRoute := &ovnnb.LogicalRouterStaticRoute{ | ||
| UUID: "internal-static-route-uuid", | ||
| ExternalIDs: map[string]string{ | ||
| "vendor": util.CniTypeName, | ||
| }, | ||
| IPPrefix: "10.0.0.0/24", | ||
| Nexthop: "1.2.3.4", | ||
| Policy: &srcIPPolicy, | ||
| RouteTable: util.MainRouteTable, | ||
| } | ||
|
|
||
| // Static route that matches VPC spec | ||
| managedStaticRoute := &ovnnb.LogicalRouterStaticRoute{ | ||
| UUID: "managed-static-route-uuid", | ||
| ExternalIDs: map[string]string{ | ||
| "vendor": util.CniTypeName, | ||
| }, | ||
| IPPrefix: "192.168.0.0/24", | ||
| Nexthop: "10.0.0.1", | ||
| Policy: &dstIPPolicy, | ||
| RouteTable: util.MainRouteTable, | ||
| } | ||
|
|
||
| t.Run("only try to manage static routes with vendor kube-ovn", func(t *testing.T) { | ||
| fakeController := newFakeController(t) | ||
| ctrl := fakeController.fakeController | ||
| fakeinformers := fakeController.fakeInformers | ||
| mockOvnClient := fakeController.mockOvnClient | ||
|
|
||
| // Initialize mutexes | ||
| ctrl.vpcKeyMutex = keymutex.NewHashed(500) | ||
|
|
||
| vpc := &kubeovnv1.Vpc{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: vpcName, | ||
| }, | ||
| Spec: kubeovnv1.VpcSpec{ | ||
| StaticRoutes: []*kubeovnv1.StaticRoute{ | ||
| { | ||
| CIDR: "192.168.0.0/24", | ||
| NextHopIP: "10.0.0.1", | ||
| Policy: kubeovnv1.PolicyDst, | ||
| RouteTable: util.MainRouteTable, | ||
| }, | ||
| }, | ||
| EnableExternal: false, | ||
| PolicyRoutes: nil, | ||
| }, | ||
| Status: kubeovnv1.VpcStatus{ | ||
| Subnets: []string{}, | ||
| EnableExternal: false, | ||
| }, | ||
| } | ||
|
|
||
| _, err := ctrl.config.KubeOvnClient.KubeovnV1().Vpcs().Create(context.Background(), vpc, metav1.CreateOptions{}) | ||
| require.NoError(t, err) | ||
|
|
||
| err = fakeinformers.vpcInformer.Informer().GetStore().Add(vpc) | ||
| require.NoError(t, err) | ||
|
|
||
| existingKubeOvnRoutes := []*ovnnb.LogicalRouterStaticRoute{ | ||
| internalStaticRoute, | ||
| } | ||
|
|
||
| externalIDs := map[string]string{"vendor": util.CniTypeName} | ||
|
|
||
| mockOvnClient.EXPECT().CreateLogicalRouter(vpcName).Return(nil) | ||
| mockOvnClient.EXPECT().UpdateLogicalRouter(gomock.Any(), gomock.Any()).Return(nil) | ||
| mockOvnClient.EXPECT().ListLogicalRouterStaticRoutes(vpcName, nil, nil, "", externalIDs).Return(existingKubeOvnRoutes, nil) | ||
| mockOvnClient.EXPECT().GetLogicalRouter(vpcName, false).Return(&ovnnb.LogicalRouter{ | ||
| Name: vpcName, | ||
| Nat: []string{}, | ||
| }, nil) | ||
| mockOvnClient.EXPECT().DeleteLogicalRouterStaticRoute(vpcName, gomock.Any(), gomock.Any(), "10.0.0.0/24", "1.2.3.4").Return(nil) | ||
| mockOvnClient.EXPECT().AddLogicalRouterStaticRoute( | ||
| vpcName, | ||
| util.MainRouteTable, | ||
| "dst-ip", | ||
| "192.168.0.0/24", | ||
| nil, | ||
| externalIDs, | ||
| "10.0.0.1", | ||
| ).Return(nil) | ||
| mockOvnClient.EXPECT().ClearLogicalRouterPolicy(vpcName).Return(nil) | ||
| mockOvnClient.EXPECT().ListLogicalSwitch(gomock.Any(), gomock.Any()).Return([]ovnnb.LogicalSwitch{}, nil).AnyTimes() | ||
| mockOvnClient.EXPECT().ListLogicalRouter(gomock.Any(), gomock.Any()).Return([]ovnnb.LogicalRouter{}, nil).AnyTimes() | ||
| mockOvnClient.EXPECT().DeleteLogicalRouterPort(fmt.Sprintf("bfd@%s", vpcName)).Return(nil) | ||
| mockOvnClient.EXPECT().DeleteHAChassisGroup(fmt.Sprintf("bfd@%s", vpcName)).Return(nil) | ||
| err = ctrl.handleAddOrUpdateVpc(vpcName) | ||
| require.NoError(t, err) | ||
| }) | ||
|
|
||
| t.Run("delete orphaned kube-ovn routes", func(t *testing.T) { | ||
| fakeController := newFakeController(t) | ||
| ctrl := fakeController.fakeController | ||
| fakeinformers := fakeController.fakeInformers | ||
| mockOvnClient := fakeController.mockOvnClient | ||
|
|
||
| ctrl.vpcKeyMutex = keymutex.NewHashed(500) | ||
|
|
||
| vpc := &kubeovnv1.Vpc{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: vpcName, | ||
| }, | ||
| Spec: kubeovnv1.VpcSpec{ | ||
| StaticRoutes: []*kubeovnv1.StaticRoute{ | ||
| { | ||
| CIDR: "192.168.0.0/24", | ||
| NextHopIP: "10.0.0.1", | ||
| Policy: kubeovnv1.PolicyDst, | ||
| RouteTable: util.MainRouteTable, | ||
| }, | ||
| }, | ||
| EnableExternal: false, | ||
| PolicyRoutes: nil, | ||
| }, | ||
| Status: kubeovnv1.VpcStatus{ | ||
| Subnets: []string{}, | ||
| EnableExternal: false, | ||
| }, | ||
| } | ||
|
|
||
| _, err := ctrl.config.KubeOvnClient.KubeovnV1().Vpcs().Create(context.Background(), vpc, metav1.CreateOptions{}) | ||
| require.NoError(t, err) | ||
|
|
||
| err = fakeinformers.vpcInformer.Informer().GetStore().Add(vpc) | ||
| require.NoError(t, err) | ||
|
|
||
| existingKubeOvnRoutes := []*ovnnb.LogicalRouterStaticRoute{ | ||
| internalStaticRoute, | ||
| managedStaticRoute, | ||
| } | ||
|
|
||
| externalIDs := map[string]string{"vendor": util.CniTypeName} | ||
|
|
||
| mockOvnClient.EXPECT().CreateLogicalRouter(vpcName).Return(nil) | ||
| mockOvnClient.EXPECT().UpdateLogicalRouter(gomock.Any(), gomock.Any()).Return(nil) | ||
| mockOvnClient.EXPECT().ListLogicalRouterStaticRoutes(vpcName, nil, nil, "", externalIDs).Return(existingKubeOvnRoutes, nil) | ||
| mockOvnClient.EXPECT().GetLogicalRouter(vpcName, false).Return(&ovnnb.LogicalRouter{ | ||
| Name: vpcName, | ||
| Nat: []string{}, | ||
| }, nil) | ||
| mockOvnClient.EXPECT().DeleteLogicalRouterStaticRoute(vpcName, gomock.Any(), gomock.Any(), "10.0.0.0/24", "1.2.3.4").Return(nil) | ||
| mockOvnClient.EXPECT().ClearLogicalRouterPolicy(vpcName).Return(nil) | ||
| mockOvnClient.EXPECT().ListLogicalSwitch(gomock.Any(), gomock.Any()).Return([]ovnnb.LogicalSwitch{}, nil).AnyTimes() | ||
| mockOvnClient.EXPECT().ListLogicalRouter(gomock.Any(), gomock.Any()).Return([]ovnnb.LogicalRouter{}, nil).AnyTimes() | ||
| mockOvnClient.EXPECT().DeleteLogicalRouterPort(fmt.Sprintf("bfd@%s", vpcName)).Return(nil) | ||
| mockOvnClient.EXPECT().DeleteHAChassisGroup(fmt.Sprintf("bfd@%s", vpcName)).Return(nil) | ||
| err = ctrl.handleAddOrUpdateVpc(vpcName) | ||
| require.NoError(t, err) | ||
| }) | ||
|
|
||
| t.Run("handle empty VPC static routes", func(t *testing.T) { | ||
| fakeController := newFakeController(t) | ||
| ctrl := fakeController.fakeController | ||
| fakeinformers := fakeController.fakeInformers | ||
| mockOvnClient := fakeController.mockOvnClient | ||
|
|
||
| ctrl.vpcKeyMutex = keymutex.NewHashed(500) | ||
|
|
||
| vpcEmpty := &kubeovnv1.Vpc{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: vpcName, | ||
| }, | ||
| Spec: kubeovnv1.VpcSpec{ | ||
| StaticRoutes: []*kubeovnv1.StaticRoute{}, | ||
| EnableExternal: false, | ||
| PolicyRoutes: nil, | ||
| }, | ||
| Status: kubeovnv1.VpcStatus{ | ||
| Subnets: []string{}, | ||
| EnableExternal: false, | ||
| }, | ||
| } | ||
|
|
||
| _, err := ctrl.config.KubeOvnClient.KubeovnV1().Vpcs().Create(context.Background(), vpcEmpty, metav1.CreateOptions{}) | ||
| require.NoError(t, err) | ||
|
|
||
| err = fakeinformers.vpcInformer.Informer().GetStore().Add(vpcEmpty) | ||
| require.NoError(t, err) | ||
|
|
||
| existingKubeOvnRoutes := []*ovnnb.LogicalRouterStaticRoute{ | ||
| internalStaticRoute, | ||
| managedStaticRoute, | ||
| } | ||
|
|
||
| externalIDs := map[string]string{"vendor": util.CniTypeName} | ||
|
|
||
| mockOvnClient.EXPECT().CreateLogicalRouter(vpcName).Return(nil) | ||
| mockOvnClient.EXPECT().UpdateLogicalRouter(gomock.Any(), gomock.Any()).Return(nil) | ||
| mockOvnClient.EXPECT().ListLogicalRouterStaticRoutes(vpcName, nil, nil, "", externalIDs).Return(existingKubeOvnRoutes, nil) | ||
| mockOvnClient.EXPECT().GetLogicalRouter(vpcName, false).Return(&ovnnb.LogicalRouter{ | ||
| Name: vpcName, | ||
| Nat: []string{}, | ||
| }, nil) | ||
| mockOvnClient.EXPECT().DeleteLogicalRouterStaticRoute(vpcName, gomock.Any(), gomock.Any(), "10.0.0.0/24", "1.2.3.4").Return(nil) | ||
| mockOvnClient.EXPECT().DeleteLogicalRouterStaticRoute(vpcName, gomock.Any(), gomock.Any(), "192.168.0.0/24", "10.0.0.1").Return(nil) | ||
| mockOvnClient.EXPECT().ClearLogicalRouterPolicy(vpcName).Return(nil) | ||
| mockOvnClient.EXPECT().ListLogicalSwitch(gomock.Any(), gomock.Any()).Return([]ovnnb.LogicalSwitch{}, nil).AnyTimes() | ||
| mockOvnClient.EXPECT().ListLogicalRouter(gomock.Any(), gomock.Any()).Return([]ovnnb.LogicalRouter{}, nil).AnyTimes() | ||
| mockOvnClient.EXPECT().DeleteLogicalRouterPort(fmt.Sprintf("bfd@%s", vpcName)).Return(nil) | ||
| mockOvnClient.EXPECT().DeleteHAChassisGroup(fmt.Sprintf("bfd@%s", vpcName)).Return(nil) | ||
| err = ctrl.handleAddOrUpdateVpc(vpcName) | ||
| require.NoError(t, err) | ||
| }) | ||
|
|
||
| t.Run("add static routes from VPC spec when none exist", func(t *testing.T) { | ||
| fakeController := newFakeController(t) | ||
| ctrl := fakeController.fakeController | ||
| fakeinformers := fakeController.fakeInformers | ||
| mockOvnClient := fakeController.mockOvnClient | ||
|
|
||
| ctrl.vpcKeyMutex = keymutex.NewHashed(500) | ||
|
|
||
| vpc := &kubeovnv1.Vpc{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: vpcName, | ||
| }, | ||
| Spec: kubeovnv1.VpcSpec{ | ||
| StaticRoutes: []*kubeovnv1.StaticRoute{ | ||
| { | ||
| CIDR: "192.168.0.0/24", | ||
| NextHopIP: "10.0.0.1", | ||
| Policy: kubeovnv1.PolicyDst, | ||
| RouteTable: util.MainRouteTable, | ||
| }, | ||
| }, | ||
| EnableExternal: false, | ||
| PolicyRoutes: nil, | ||
| }, | ||
| Status: kubeovnv1.VpcStatus{ | ||
| Subnets: []string{}, | ||
| EnableExternal: false, | ||
| }, | ||
| } | ||
|
|
||
| _, err := ctrl.config.KubeOvnClient.KubeovnV1().Vpcs().Create(context.Background(), vpc, metav1.CreateOptions{}) | ||
| require.NoError(t, err) | ||
|
|
||
| err = fakeinformers.vpcInformer.Informer().GetStore().Add(vpc) | ||
| require.NoError(t, err) | ||
|
|
||
| externalIDs := map[string]string{"vendor": util.CniTypeName} | ||
|
|
||
| mockOvnClient.EXPECT().CreateLogicalRouter(vpcName).Return(nil) | ||
| mockOvnClient.EXPECT().UpdateLogicalRouter(gomock.Any(), gomock.Any()).Return(nil) | ||
| mockOvnClient.EXPECT().ListLogicalRouterStaticRoutes(vpcName, nil, nil, "", externalIDs).Return(nil, nil) | ||
| mockOvnClient.EXPECT().GetLogicalRouter(vpcName, false).Return(&ovnnb.LogicalRouter{ | ||
| Name: vpcName, | ||
| Nat: []string{}, | ||
| }, nil) | ||
| mockOvnClient.EXPECT().AddLogicalRouterStaticRoute( | ||
| vpcName, | ||
| util.MainRouteTable, | ||
| "dst-ip", | ||
| "192.168.0.0/24", | ||
| nil, | ||
| externalIDs, | ||
| "10.0.0.1", | ||
| ).Return(nil) | ||
| mockOvnClient.EXPECT().ClearLogicalRouterPolicy(vpcName).Return(nil) | ||
| mockOvnClient.EXPECT().ListLogicalSwitch(gomock.Any(), gomock.Any()).Return([]ovnnb.LogicalSwitch{}, nil).AnyTimes() | ||
| mockOvnClient.EXPECT().ListLogicalRouter(gomock.Any(), gomock.Any()).Return([]ovnnb.LogicalRouter{}, nil).AnyTimes() | ||
| mockOvnClient.EXPECT().DeleteLogicalRouterPort(fmt.Sprintf("bfd@%s", vpcName)).Return(nil) | ||
| mockOvnClient.EXPECT().DeleteHAChassisGroup(fmt.Sprintf("bfd@%s", vpcName)).Return(nil) | ||
| err = ctrl.handleAddOrUpdateVpc(vpcName) | ||
| require.NoError(t, err) | ||
| }) | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.