Merge pull request #958 from lxiaopei/topic/lxiaopei/vpc_name

Truncate VPC display name if it exceeds 80 chars
vmware-tanzu · Dec 13, 2024 · dad2d81 · dad2d81
2 parents e6a2c72 + 2b7b4b4
commit dad2d81
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/pkg/nsx/services/vpc/builder.go b/pkg/nsx/services/vpc/builder.go
@@ -67,7 +67,7 @@ func buildNSXVPC(obj *v1alpha1.NetworkInfo, nsObj *v1.Namespace, nc common.VPCNe
 		*vpc = *nsxVPC
 	} else {
 		// for creating vpc case, fill in vpc properties based on networkconfig
-		vpcName := util.GenerateIDByObjectByLimit(obj, common.MaxNameLength)
+		vpcName := util.GenerateIDByObjectByLimit(obj, common.MaxSubnetNameLength)
 		vpc.DisplayName = &vpcName
 		vpc.Id = common.String(util.GenerateIDByObject(obj))
 		vpc.IpAddressType = &DefaultVPCIPAddressType

diff --git a/pkg/nsx/services/vpc/builder_test.go b/pkg/nsx/services/vpc/builder_test.go
@@ -96,6 +96,7 @@ func TestBuildNSXVPC(t *testing.T) {
 		existingVPC       *model.Vpc
 		ncPrivateIps      []string
 		useAVILB          bool
+		netInfoObj        *v1alpha1.NetworkInfo
 		expVPC            *model.Vpc
 		lbProviderChanged bool
 	}{
@@ -159,6 +160,29 @@ func TestBuildNSXVPC(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:              "create new VPC with 81 chars networkinfo name",
+			ncPrivateIps:      []string{"192.168.3.0/24"},
+			useAVILB:          false,
+			lbProviderChanged: false,
+			netInfoObj: &v1alpha1.NetworkInfo{
+				ObjectMeta: metav1.ObjectMeta{Namespace: "ns1", Name: "test-ns-03a2def3-0087-4077-904e-23e4dd788fb7", UID: "ecc6eb9f-92b5-4893-b809-e3ebc1fcf59e"},
+				VPCs:       nil,
+			},
+			expVPC: &model.Vpc{
+				Id:            common.String("test-ns-03a2def3-0087-4077-904e-23e4dd788fb7_ecc6eb9f-92b5-4893-b809-e3ebc1fcf59e"),
+				DisplayName:   common.String("test-ns-03a2def3-0087-4077-904e-23e4dd788fb7_f4f0080e"),
+				PrivateIps:    []string{"192.168.3.0/24"},
+				IpAddressType: common.String("IPV4"),
+				Tags: []model.Tag{
+					{Scope: common.String("nsx-op/cluster"), Tag: common.String("cluster1")},
+					{Scope: common.String("nsx-op/version"), Tag: common.String("1.0.0")},
+					{Scope: common.String("nsx-op/namespace"), Tag: common.String("ns1")},
+					{Scope: common.String("nsx-op/namespace_uid"), Tag: common.String("nsuid1")},
+					{Scope: common.String("nsx/managed-by"), Tag: common.String("nsx-op")},
+				},
+			},
+		},
 		{
 			name:         "update VPC with AVI load balancer disabled -> enabled",
 			ncPrivateIps: []string{"192.168.3.0/24"},
@@ -199,6 +223,9 @@ func TestBuildNSXVPC(t *testing.T) {
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			nc.PrivateIPs = tc.ncPrivateIps
+			if tc.netInfoObj != nil {
+				netInfoObj = tc.netInfoObj
+			}
 			got, err := buildNSXVPC(netInfoObj, nsObj, nc, clusterStr, tc.existingVPC, tc.useAVILB, tc.lbProviderChanged)
 			assert.Nil(t, err)
 			assert.Equal(t, tc.expVPC, got)