From 92175f2385baa15b8936fe82ea3404a6bf346bba Mon Sep 17 00:00:00 2001 From: Wenqi Qiu Date: Wed, 4 Sep 2024 18:15:23 +0800 Subject: [PATCH] update Signed-off-by: Wenqi Qiu --- .../networkinfo/networkinfo_controller.go | 2 +- .../networkinfo_controller_test.go | 12 +++++----- pkg/nsx/services/vpc/vpc.go | 24 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkg/controllers/networkinfo/networkinfo_controller.go b/pkg/controllers/networkinfo/networkinfo_controller.go index 694e69375..328ade4e0 100644 --- a/pkg/controllers/networkinfo/networkinfo_controller.go +++ b/pkg/controllers/networkinfo/networkinfo_controller.go @@ -215,7 +215,7 @@ func (r *NetworkInfoReconciler) Reconcile(ctx context.Context, req ctrl.Request) VPCPath: *createdVpc.Path, } // AKO needs to know the AVI subnet path created by NSX - setVPCNetworkConfigurationStatusWithLBS(ctx, r.Client, ncName, state.Name, path, r.Service.GetNSXLBSPath(*createdVpc.Id), *createdVpc.Path) + setVPCNetworkConfigurationStatusWithLBS(ctx, r.Client, ncName, state.Name, path, r.Service.GetDefaultNSXLBSPathByVPC(*createdVpc.Id), *createdVpc.Path) updateSuccess(r, ctx, obj, r.Client, state, nc.Name, path) } else { if controllerutil.ContainsFinalizer(obj, commonservice.NetworkInfoFinalizerName) { diff --git a/pkg/controllers/networkinfo/networkinfo_controller_test.go b/pkg/controllers/networkinfo/networkinfo_controller_test.go index d2b978daa..5885e4807 100644 --- a/pkg/controllers/networkinfo/networkinfo_controller_test.go +++ b/pkg/controllers/networkinfo/networkinfo_controller_test.go @@ -145,7 +145,7 @@ func TestNetworkInfoReconciler_Reconcile(t *testing.T) { Values: gomonkey.Params{model.VpcConnectivityProfile{ExternalIpBlocks: []string{"fake-ip-block"}}, nil}, Times: 1, }}) - patches.ApplyMethod(reflect.TypeOf(r.Service), "GetNSXLBSPath", func(_ *vpc.VPCService, _ string) string { + patches.ApplyMethod(reflect.TypeOf(r.Service), "GetDefaultNSXLBSPathByVPC", func(_ *vpc.VPCService, _ string) string { return "lbs-path" }) @@ -206,7 +206,7 @@ func TestNetworkInfoReconciler_Reconcile(t *testing.T) { Values: gomonkey.Params{model.VpcConnectivityProfile{ExternalIpBlocks: []string{"fake-ip-block"}}, nil}, Times: 1, }}) - patches.ApplyMethod(reflect.TypeOf(r.Service), "GetNSXLBSPath", func(_ *vpc.VPCService, _ string) string { + patches.ApplyMethod(reflect.TypeOf(r.Service), "GetDefaultNSXLBSPathByVPC", func(_ *vpc.VPCService, _ string) string { return "lbs-path" }) @@ -318,7 +318,7 @@ func TestNetworkInfoReconciler_Reconcile(t *testing.T) { }, nil}, Times: 1, }}) - patches.ApplyMethod(reflect.TypeOf(r.Service), "GetNSXLBSPath", func(_ *vpc.VPCService, _ string) string { + patches.ApplyMethod(reflect.TypeOf(r.Service), "GetDefaultNSXLBSPathByVPC", func(_ *vpc.VPCService, _ string) string { return "lbs-path" }) @@ -392,7 +392,7 @@ func TestNetworkInfoReconciler_Reconcile(t *testing.T) { }, nil}, Times: 1, }}) - patches.ApplyMethod(reflect.TypeOf(r.Service), "GetNSXLBSPath", func(_ *vpc.VPCService, _ string) string { + patches.ApplyMethod(reflect.TypeOf(r.Service), "GetDefaultNSXLBSPathByVPC", func(_ *vpc.VPCService, _ string) string { return "lbs-path" }) @@ -471,7 +471,7 @@ func TestNetworkInfoReconciler_Reconcile(t *testing.T) { }, nil}, Times: 1, }}) - patches.ApplyMethod(reflect.TypeOf(r.Service), "GetNSXLBSPath", func(_ *vpc.VPCService, _ string) string { + patches.ApplyMethod(reflect.TypeOf(r.Service), "GetDefaultNSXLBSPathByVPC", func(_ *vpc.VPCService, _ string) string { return "lbs-path" }) @@ -547,7 +547,7 @@ func TestNetworkInfoReconciler_Reconcile(t *testing.T) { t.Log("setVPCNetworkConfigurationStatusWithNoExternalIPBlock") }) - patches.ApplyMethod(reflect.TypeOf(r.Service), "GetNSXLBSPath", func(_ *vpc.VPCService, _ string) string { + patches.ApplyMethod(reflect.TypeOf(r.Service), "GetDefaultNSXLBSPathByVPC", func(_ *vpc.VPCService, _ string) string { return "lbs-path" }) diff --git a/pkg/nsx/services/vpc/vpc.go b/pkg/nsx/services/vpc/vpc.go index ff776de40..6297ad8bd 100644 --- a/pkg/nsx/services/vpc/vpc.go +++ b/pkg/nsx/services/vpc/vpc.go @@ -970,9 +970,9 @@ func (s *VPCService) Cleanup(ctx context.Context) error { return nil } -func (service *VPCService) ListVPCInfo(ns string) []common.VPCResourceInfo { +func (s *VPCService) ListVPCInfo(ns string) []common.VPCResourceInfo { var VPCInfoList []common.VPCResourceInfo - nc := service.GetVPCNetworkConfigByNamespace(ns) + nc := s.GetVPCNetworkConfigByNamespace(ns) // Return the pre-created VPC resource info if it is set in VPCNetworkConfiguration. if nc != nil && IsPreCreatedVPC(*nc) { vpcResourceInfo, err := common.ParseVPCResourcePath(nc.VPCPath) @@ -985,7 +985,7 @@ func (service *VPCService) ListVPCInfo(ns string) []common.VPCResourceInfo { } // List VPCs from local store. - vpcs := service.GetVPCsByNamespace(ns) // Transparently call the VPCService.GetVPCsByNamespace method + vpcs := s.GetVPCsByNamespace(ns) // Transparently call the VPCService.GetVPCsByNamespace method for _, v := range vpcs { vpcResourceInfo, err := common.ParseVPCResourcePath(*v.Path) if err != nil { @@ -997,7 +997,7 @@ func (service *VPCService) ListVPCInfo(ns string) []common.VPCResourceInfo { return VPCInfoList } -func (s *VPCService) GetNSXLBSPath(vpcID string) string { +func (s *VPCService) GetDefaultNSXLBSPathByVPC(vpcID string) string { vpcLBS := s.LbsStore.GetByKey(vpcID) if vpcLBS == nil { return "" @@ -1010,21 +1010,21 @@ func GetAlbEndpoint(cluster *nsx.Cluster) error { return err } -func (vpcService *VPCService) NSXLBEnabled() bool { +func (s *VPCService) NSXLBEnabled() bool { lbProviderMutex.Lock() defer lbProviderMutex.Unlock() if lbProvider == "" { - lbProvider = vpcService.getLBProvider() + lbProvider = s.getLBProvider() } return lbProvider == LBProviderNSX } -func (vpcService *VPCService) getLBProvider() string { +func (s *VPCService) getLBProvider() string { // if no Alb endpoint found, return nsx-lb // if found, and nsx lbs found, return nsx-lb // else return avi - if !vpcService.Service.NSXConfig.UseAVILoadBalancer { + if !s.Service.NSXConfig.UseAVILoadBalancer { return LBProviderNSX } albEndpointFound := false @@ -1038,26 +1038,26 @@ func (vpcService *VPCService) getLBProvider() string { return false } }, func() error { - return GetAlbEndpoint(vpcService.Service.NSXClient.Cluster) + return GetAlbEndpoint(s.Service.NSXClient.Cluster) }); err == nil { albEndpointFound = true } if !albEndpointFound { return LBProviderNSX } - if len(vpcService.LbsStore.List()) > 0 { + if len(s.LbsStore.List()) > 0 { return LBProviderNSX } return LBProviderAVI } -func (service *VPCService) GetVPCFromNSXByPath(vpcPath string) (*model.Vpc, error) { +func (s *VPCService) GetVPCFromNSXByPath(vpcPath string) (*model.Vpc, error) { vpcResInfo, err := common.ParseVPCResourcePath(vpcPath) if err != nil { log.Error(err, "failed to parse VPCResourceInfo from the given VPC path", "VPC", vpcPath) return nil, err } - vpc, err := service.NSXClient.VPCClient.Get(vpcResInfo.OrgID, vpcResInfo.ProjectID, vpcResInfo.VPCID) + vpc, err := s.NSXClient.VPCClient.Get(vpcResInfo.OrgID, vpcResInfo.ProjectID, vpcResInfo.VPCID) err = nsxutil.NSXApiError(err) if err != nil { log.Error(err, "failed to read VPC object from NSX", "VPC", vpcPath)