Address CRs

Author: huangpf

src/ServiceManagement/Common/Commands.ScenarioTest/ServiceManagement/UnitTests.cs

@@ -40,6 +40,7 @@ public void TestExtensionRoleNames()
             foreach (var roleName in roleNames)
             {
                 ExtensionRole er = new ExtensionRole(roleName);
+                Assert.Equal(er.RoleName, roleName.Trim());
                 Assert.Equal(er.PrefixName, expectedPrefixName);
                 Assert.Equal(er.GetExtensionId("test", "test", 0), expectedExtensionId);
             }
@@ -48,26 +49,41 @@ public void TestExtensionRoleNames()
             {
                 "A123456789B123456789C123456789D123456789E123456789F123456789G123456789H123456789",
                 "   A123456789B123456789C123456789D123456789E123456789F123456789G123456789H123456789 ~~~"
-            }; 
-            
-            // Extenion ID's Max Length 60 = 43 + 1 + 4 + 1 + 4 + 1 + 5
+            };
+
+            // PrefixName = A123456789B123456789C123456789D123456789E123456789F123456789G123456789H123456789
+            // Extension Name = test
+            // Slot = test
+            // Index = 0
+            // Extension ID Format = {prefix_name_part}-{extension_name_part}-{slot}-Ext-{index}
+            // Extenion ID's Max Length: 60 = 43 + 1 + 4 + 1 + 4 + 1 + 5
             // i.e. 'A123...E123' + '-' + 'test' + '-' + 'test' + '-' + 'Ext-0'
-            //           L=43       L=1    L=4     L=1    L=4     L=1  L=5
+            //           L=43       L=1    L=4     L=1    L=4     L=1     L=5
             expectedPrefixName = longRoleNames[0];
             expectedExtensionId = "A123456789B123456789C123456789D123456789E123-test-test-Ext-0";
             foreach (var roleName in longRoleNames)
             {
                 ExtensionRole er = new ExtensionRole(roleName);
+                Assert.Equal(er.RoleName, roleName.Trim());
                 Assert.Equal(er.PrefixName, expectedPrefixName);
                 Assert.Equal(er.GetExtensionId("test", "test", 0), expectedExtensionId);
             }
 
 
             var longExtensionNames = longRoleNames;
+            // PrefixName = Default
+            // Extension Name = A123456789B123456789C123456789D123456789E123456789F123456789G123456789H123456789
+            // Slot = test
+            // Index = 1
+            // Extension ID Format = {prefix_name_part}-{extension_name_part}-{slot}-Ext-{index}
+            // Extenion ID's Max Length: 60 = 1 + 1 + 47 + 1 + 4 + 1 + 5
+            // i.e. 'D' + '-' + 'A123...456' + '-' + 'test' + '-' + 'Ext-0'
+            //      L=1   L=1       L=47       L=1    L=4     L=1     L=5
             expectedExtensionId = "D-A123456789B123456789C123456789D123456789E123456-test-Ext-1";
             foreach (var extensionName in longExtensionNames)
             {
                 ExtensionRole er = new ExtensionRole();
+                Assert.Equal(er.RoleName, string.Empty);
                 Assert.Equal(er.PrefixName, "Default");
                 Assert.Equal(er.GetExtensionId(extensionName, "test", 1), expectedExtensionId);
             }

src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionRole.cs

@@ -23,7 +23,8 @@ public class ExtensionRole
         protected const string DefaultExtensionIdPrefixStr = "Default";
         protected const string ExtensionIdSuffixTemplate = "-{0}-{1}-Ext-{2}";
         protected const int MaxExtensionIdLength = 60;
-        protected const int MaxSuffixLength = MaxExtensionIdLength - 1;
+        protected const int MinRoleNamePartLength = 1;
+        protected const int MaxSuffixLength = MaxExtensionIdLength - MinRoleNamePartLength;
 
         public string RoleName { get; private set; }
         public string PrefixName { get; private set; }
@@ -34,15 +35,7 @@ private static string RemoveDisallowedCharacters(string roleName)
         {
             // Remove characters that are not allowed in the extension id
             var disallowedCharactersRegex = new Regex(@"[^A-Za-z0-9\-]");
-            var match = disallowedCharactersRegex.Match(roleName);
-
-            while (match.Success)
-            {
-                roleName = roleName.Remove(match.Index, match.Length);
-                match = disallowedCharactersRegex.Match(roleName);
-            }
-
-            return roleName;
+            return disallowedCharactersRegex.Replace(roleName, string.Empty);
         }
 
         public ExtensionRole()
@@ -81,14 +74,18 @@ public string GetExtensionId(string extensionName, string slot, int index)
             var normalizedExtName = RemoveDisallowedCharacters(extensionName);
 
             var suffix = new StringBuilder();
+            // Suffix format: -{extension_name_part}-{slot}-Ext-{index}
             suffix.AppendFormat(ExtensionIdSuffixTemplate, normalizedExtName, slot, index);
             if (suffix.Length > MaxSuffixLength)
             {
+                // If the suffix is too long, truncate the {extension_name_part}
                 int lenDiff = suffix.Length - MaxSuffixLength;
                 int startIndex = 1; // Suffix starts with '-'
                 suffix.Remove(startIndex + normalizedExtName.Length - lenDiff, lenDiff);
             }
 
+            // Calculate the prefix length by the difference between the suffix and the max ID length.
+            // The difference should always be at least 1.
             int prefixSubStrLen = Math.Min(Math.Max(MaxExtensionIdLength - suffix.Length, 0), PrefixName.Length);
 
             var result = new StringBuilder();