Add VPCConnectivityProfile

Signed-off-by: Wenqi Qiu <wenqiq@vmware.com>
vmware-tanzu · Jun 21, 2024 · 247ef00 · 247ef00
1 parent e785932
commit 247ef00
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/pkg/nsx/services/vpc/builder.go b/pkg/nsx/services/vpc/builder.go
@@ -83,6 +83,7 @@ func buildNSXVPC(obj *v1alpha1.NetworkInfo, nsObj *v1.Namespace, nc common.VPCNe
 	// update private/public blocks
 	vpc.ExternalIpv4Blocks = nc.ExternalIPv4Blocks
 	vpc.PrivateIpv4Blocks = util.GetMapValues(pathMap)
+	vpc.VpcConnectivityProfile = &nc.VPCConnectivityProfile
 	if nc.ShortID != "" {
 		vpc.ShortId = &nc.ShortID
 	}

diff --git a/pkg/nsx/services/vpc/vpc.go b/pkg/nsx/services/vpc/vpc.go
@@ -558,6 +558,15 @@ func (s *VPCService) CreateOrUpdateVPC(obj *v1alpha1.NetworkInfo) (*model.Vpc, *
 		return existingVPC[0], &nc, nil
 	}
 
+	if nc.VPCConnectivityProfile != "" {
+		vpcConnectivityProfile, err := s.NSXClient.VpcConnectivityProfilesClient.Get(nc.Org, nc.NsxtProject, nc.VPCConnectivityProfile)
+		if err != nil {
+			log.Error(err, "vpcConnectivityProfile does not exists", "Project", nc.NsxtProject, "VPCConnectivityProfile", nc.VPCConnectivityProfile)
+			return nil, nil, err
+		}
+		createdVpc.ExternalIpv4Blocks = vpcConnectivityProfile.ExternalIpBlocks
+	}
+
 	log.Info("creating NSX VPC", "VPC", *createdVpc.Id)
 	err = s.NSXClient.VPCClient.Patch(nc.Org, nc.NsxtProject, *createdVpc.Id, *createdVpc)
 	if err != nil {