Update MaxNameLength and use GenerateTruncName to build subnet name

nsx-t limits the name to 80-byte.
zhengxiexie · Sep 5, 2023 · b5ac38e · b5ac38e
1 parent 39a88d6
commit b5ac38e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/nsx/services/common/types.go b/pkg/nsx/services/common/types.go
@@ -18,7 +18,7 @@ const (
 	HashLength                      int    = 8
 	MaxTagLength                    int    = 256
 	MaxIdLength                     int    = 255
-	MaxNameLength                   int    = 255
+	MaxNameLength                   int    = 80
 	TagScopeNCPCluster              string = "ncp/cluster"
 	TagScopeNCPProjectUID           string = "ncp/project_uid"
 	TagScopeNCPVIFProjectUID        string = "ncp/vif_project_uid"

diff --git a/pkg/nsx/services/subnet/builder.go b/pkg/nsx/services/subnet/builder.go
@@ -33,11 +33,11 @@ func (service *SubnetService) buildSubnetSetID(subnetset *v1alpha1.SubnetSet, in
 }
 
 func (service *SubnetService) buildSubnetName(subnet *v1alpha1.Subnet) string {
-	return util.GenerateDisplayName(subnet.ObjectMeta.Name, SUBNETPREFIX, "", "", getCluster(service))
+	return util.GenerateTruncName(common.MaxNameLength, subnet.ObjectMeta.Name, SUBNETPREFIX, "", "", getCluster(service))
 }
 
 func (service *SubnetService) buildSubnetSetName(subnetset *v1alpha1.SubnetSet, index string) string {
-	return util.GenerateDisplayName(subnetset.ObjectMeta.Name, SUBNETPREFIX, index, "", getCluster(service))
+	return util.GenerateTruncName(common.MaxNameLength, subnetset.ObjectMeta.Name, SUBNETPREFIX, index, "", getCluster(service))
 }
 
 func (service *SubnetService) buildSubnet(obj client.Object, tags []model.Tag) (*model.VpcSubnet, error) {