Address comments

Signed-off-by: Wenqi Qiu <[email protected]>
vmware-tanzu · Jul 30, 2024 · 297c3e8 · 297c3e8
1 parent 111ba73
commit 297c3e8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/pkg/controllers/networkinfo/networkinfo_controller.go b/pkg/controllers/networkinfo/networkinfo_controller.go
@@ -104,13 +104,10 @@ func (r *NetworkInfoReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		vpcConnectivityProfileName := parts[len(parts)-1]
 		vpcConnectivityProfile, err := r.Service.NSXClient.VPCConnectivityProfilesClient.Get(nc.Org, nc.NSXProject, vpcConnectivityProfileName)
 		if err != nil {
-			log.Error(err, "failed to get NSX VPC ConnectivityProfile object")
+			log.Error(err, "failed to get NSX VPC ConnectivityProfile object", "vpcConnectivityProfileName", vpcConnectivityProfileName)
 			return common.ResultRequeue, err
 		}
 		isEnableAutoSNAT := func() bool {
-			if createdVpc.ServiceGateway != nil && createdVpc.ServiceGateway.AutoSnat != nil {
-				return *createdVpc.ServiceGateway.AutoSnat
-			}
 			if vpcConnectivityProfile.ServiceGateway == nil || vpcConnectivityProfile.ServiceGateway.Enable == nil {
 				return false
 			}

diff --git a/pkg/nsx/services/subnet/subnet.go b/pkg/nsx/services/subnet/subnet.go
@@ -235,7 +235,7 @@ func (service *SubnetService) GetSubnetStatus(subnet *model.VpcSubnet) ([]model.
 	}
 	if statusList.Results[0].NetworkAddress == nil || statusList.Results[0].GatewayAddress == nil {
 		err := fmt.Errorf("invalid status result: %+v", statusList.Results[0])
-		log.Error(err, "invalid subnet status")
+		log.Error(err, "subnet status does not have network address or network address", "subnet.Id", subnet.Id)
 		return nil, err
 	}
 	return statusList.Results, nil

diff --git a/pkg/nsx/services/subnetport/subnetport.go b/pkg/nsx/services/subnetport/subnetport.go
@@ -249,9 +249,9 @@ func (service *SubnetPortService) GetGatewayPrefixForSubnetPort(obj *v1alpha1.Su
 		return "", -1, err
 	}
 	status := statusList.Results[0]
-	if *status.Status != model.VpcSubnetStatus_STATUS_SUCCESS || status.GatewayAddress == nil {
+	if status.GatewayAddress == nil {
 		err := fmt.Errorf("invalid status result: %+v", status)
-		log.Error(err, "invalid subnet status")
+		log.Error(err, "subnet status does not have gateway address", "nsxSubnetPath", nsxSubnetPath)
 		return "", -1, err
 	}
 	gateway, err := util.RemoveIPPrefix(*status.GatewayAddress)

diff --git a/pkg/nsx/services/vpc/builder.go b/pkg/nsx/services/vpc/builder.go
@@ -73,6 +73,7 @@ func buildNSXVPC(obj *v1alpha1.NetworkInfo, nsObj *v1.Namespace, nc common.VPCNe
 
 	vpc.VpcConnectivityProfile = &nc.VPCConnectivityProfile
 
+	// TODO: add PrivateIps and remove PrivateIpv4Blocks once the NSX VPC API support private_ips field.
 	// vpc.PrivateIps = nc.PrivateIPs
 	vpc.PrivateIpv4Blocks = util.GetMapValues(pathMap)
 	if nc.ShortID != "" {

diff --git a/pkg/nsx/services/vpc/vpc.go b/pkg/nsx/services/vpc/vpc.go
@@ -489,7 +489,7 @@ func (s *VPCService) GetAVISubnetInfo(vpc model.Vpc) (string, string, error) {
 
 	if statusList.Results[0].NetworkAddress == nil {
 		err := fmt.Errorf("invalid status result: %+v", statusList.Results[0])
-		log.Error(err, "invalid subnet status")
+		log.Error(err, "subnet status does not have network address", "Subnet", common.AVISubnetLBID)
 		return "", "", err
 	}