Add UT

Signed-off-by: Wenqi Qiu <wenqiq@vmware.com>
vmware-tanzu · Sep 11, 2024 · 4d0596a · 4d0596a
1 parent ba70b39
commit 4d0596a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/pkg/nsx/services/vpc/vpc.go b/pkg/nsx/services/vpc/vpc.go
@@ -1032,7 +1032,7 @@ func (s *VPCService) GetDefaultNSXLBSPathByVPC(vpcID string) string {
  return *vpcLBS.Path
 }
 
-func (vpcService *VPCService) EdgeClusterEnabled(nc *common.VPCNetworkConfigInfo) bool {
+func (vpcService *VPCService) edgeClusterEnabled(nc *common.VPCNetworkConfigInfo) bool {
  isRetryableError := func(err error) bool {
  if err == nil {
  return false
@@ -1048,7 +1048,7 @@ func (vpcService *VPCService) EdgeClusterEnabled(nc *common.VPCNetworkConfigInfo
  if getErr != nil {
  return getErr
  }
- log.Info("VPC connectivity profile retrieved", "serviceGateway", *vpcConnectivityProfile.ServiceGateway)
+ log.Info("VPC connectivity profile retrieved", "profile", *vpcConnectivityProfile)
  return nil
  }); err != nil {
  log.Error(err, "Failed to retrieve VPC connectivity profile", "profile", nc.VPCConnectivityProfile)
@@ -1091,11 +1091,12 @@ func (vpcService *VPCService) GetLBProvider() LBProvider {
  }
  nc := &netConfig
 
- edgeEnable := vpcService.EdgeClusterEnabled(nc)
+ edgeEnable := vpcService.edgeClusterEnabled(nc)
  globalLbProvider = vpcService.getLBProvider(edgeEnable)
  log.Info("lb provider", "provider", globalLbProvider)
  return globalLbProvider
 }
+
 func (vpcService *VPCService) getLBProvider(edgeEnable bool) LBProvider {
  // if no Alb endpoint found, return nsx-lb
  // if found, and nsx lbs found, return nsx-lb

diff --git a/pkg/nsx/services/vpc/vpc_test.go b/pkg/nsx/services/vpc/vpc_test.go
@@ -419,7 +419,7 @@ func TestGetLBProvider(t *testing.T) {
 
  // Test when globalLbProvider is none lb
  globalLbProvider = NoneLB
- patch1 := gomonkey.ApplyMethod(reflect.TypeOf(vpcService), "EdgeClusterEnabled", func(_ *VPCService, _ *common.VPCNetworkConfigInfo) bool {
+ patch1 := gomonkey.ApplyMethod(reflect.TypeOf(vpcService), "edgeClusterEnabled", func(_ *VPCService, _ *common.VPCNetworkConfigInfo) bool {
  return false
  })
  patch2 := gomonkey.ApplyPrivateMethod(reflect.TypeOf(vpcService), "getLBProvider", func(_ *VPCService, _ bool) LBProvider {
@@ -480,24 +480,32 @@ func TestEdgeClusterEnabled(t *testing.T) {
  patch := gomonkey.ApplyMethod(reflect.TypeOf(vpcService), "GetVpcConnectivityProfile", func(_ *VPCService, _ *common.VPCNetworkConfigInfo, _ string) (*model.VpcConnectivityProfile, error) {
  return &vpcConnPrfile, nil
  })
- enable := vpcService.EdgeClusterEnabled(&nc)
+ enable := vpcService.edgeClusterEnabled(&nc)
  assert.Equal(t, false, enable)
  vpcConnPrfile.ServiceGateway.Enable = common.Bool(true)
- enable = vpcService.EdgeClusterEnabled(&nc)
+ enable = vpcService.edgeClusterEnabled(&nc)
  assert.Equal(t, true, enable)
  patch.Reset()
 
  patch = gomonkey.ApplyMethod(reflect.TypeOf(vpcService), "GetVpcConnectivityProfile", func(_ *VPCService, _ *common.VPCNetworkConfigInfo, _ string) (*model.VpcConnectivityProfile, error) {
  return &vpcConnPrfile, apierrors.NewNotFound()
  })
- enable = vpcService.EdgeClusterEnabled(&nc)
+ enable = vpcService.edgeClusterEnabled(&nc)
  assert.Equal(t, false, enable)
  patch.Reset()
 
  patch = gomonkey.ApplyMethod(reflect.TypeOf(vpcService), "GetVpcConnectivityProfile", func(_ *VPCService, _ *common.VPCNetworkConfigInfo, _ string) (*model.VpcConnectivityProfile, error) {
  return &vpcConnPrfile, apierrors.NewInternalServerError()
  })
- enable = vpcService.EdgeClusterEnabled(&nc)
+ enable = vpcService.edgeClusterEnabled(&nc)
+ assert.Equal(t, false, enable)
+ patch.Reset()
+
+ // Simulate the scenario when the VpcConnectivityProfile value returned by NSX is nil.
+ patch = gomonkey.ApplyMethod(reflect.TypeOf(vpcService), "GetVpcConnectivityProfile", func(_ *VPCService, _ *common.VPCNetworkConfigInfo, _ string) (*model.VpcConnectivityProfile, error) {
+ return &model.VpcConnectivityProfile{}, nil
+ })
+ enable = vpcService.edgeClusterEnabled(&nc)
  assert.Equal(t, false, enable)
  patch.Reset()
 }