as: simplify windows vm name

Author: weizhouapache

server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java

@@ -195,9 +195,6 @@
 import com.google.gson.reflect.TypeToken;
 
 public class AutoScaleManagerImpl extends ManagerBase implements AutoScaleManager, AutoScaleService, Configurable {
-    // Windows OS has a limit of 15 characters for hostname
-    // https://learn.microsoft.com/en-us/troubleshoot/windows-server/active-directory/naming-conventions-for-computer-domain-site-ou
-    protected static final int MAX_WINDOWS_VM_HOSTNAME_LENGTH = 15;
 
     @Inject
     protected DispatchChainFactory dispatchChainFactory = null;
@@ -303,6 +300,10 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScaleManage
     protected static final String VM_HOSTNAME_PREFIX = "autoScaleVm-";
     protected static final int VM_HOSTNAME_RANDOM_SUFFIX_LENGTH = 6;
 
+    // Windows OS has a limit of 15 characters for hostname
+    // https://learn.microsoft.com/en-us/troubleshoot/windows-server/active-directory/naming-conventions-for-computer-domain-site-ou
+    protected static final String WINDOWS_VM_HOSTNAME_PREFIX = "as-WinVm-";
+
     private static final Long DEFAULT_HOST_ID = -1L;
 
     ExecutorService groupExecutor;
@@ -1974,25 +1975,6 @@ public void updateVmDetails(Map<String, String> deployParams, Map<String, String
         }
     }
 
-    protected String getTrimmedHostNameForWindows(String name) {
-        String valid = name.replaceAll("[^a-zA-Z0-9-]", "");
-        String hostName = valid.length() > MAX_WINDOWS_VM_HOSTNAME_LENGTH ?
-                valid.substring(valid.length() - MAX_WINDOWS_VM_HOSTNAME_LENGTH) :
-                valid;
-        if (!hostName.isEmpty() && !Character.isLetter(hostName.charAt(0))) {
-            for (int i = 0; i < hostName.length(); i++) {
-                if (Character.isLetter(hostName.charAt(i))) {
-                    hostName = hostName.charAt(i) + hostName.substring(i + 1);
-                    break;
-                }
-            }
-            if (!Character.isLetter(hostName.charAt(0))) {
-                hostName = "a" + hostName.substring(hostName.length() < MAX_WINDOWS_VM_HOSTNAME_LENGTH ? 0 : 1);
-            }
-        }
-        return hostName;
-    }
-
     protected boolean isWindowsOs(VirtualMachineTemplate template) {
         GuestOSVO guestOSVO = guestOSDao.findById(template.getGuestOSId());
         if (guestOSVO == null) {
@@ -2007,15 +1989,15 @@ protected boolean isWindowsOs(VirtualMachineTemplate template) {
 
     protected Pair<String, String> getNextVmHostAndDisplayName(AutoScaleVmGroupVO asGroup, VirtualMachineTemplate template) {
         boolean isWindows = isWindowsOs(template);
-        String vmHostNameSuffix = "-" + asGroup.getNextVmSeq() + "-" +
-                RandomStringUtils.random(VM_HOSTNAME_RANDOM_SUFFIX_LENGTH, 0, 0, true, false, (char[])null, new SecureRandom()).toLowerCase();
+        String winVmHostNameSuffix = RandomStringUtils.random(VM_HOSTNAME_RANDOM_SUFFIX_LENGTH, 0, 0, true, false, (char[])null, new SecureRandom()).toLowerCase();
+        String vmHostNameSuffix = "-" + asGroup.getNextVmSeq() + "-" + winVmHostNameSuffix;
         // Truncate vm group name because max length of vm name is 63
         int subStringLength = Math.min(asGroup.getName().length(), 63 - VM_HOSTNAME_PREFIX.length() - vmHostNameSuffix.length());
         String name = VM_HOSTNAME_PREFIX + asGroup.getName().substring(0, subStringLength) + vmHostNameSuffix;
-        if (!isWindows || name.length() <= MAX_WINDOWS_VM_HOSTNAME_LENGTH) {
+        if (!isWindows) {
             return new Pair<>(name, name);
         }
-        return new Pair<>(getTrimmedHostNameForWindows(name), name);
+        return new Pair<>(WINDOWS_VM_HOSTNAME_PREFIX + winVmHostNameSuffix, name);
     }
 
     @Override

server/src/test/java/com/cloud/network/as/AutoScaleManagerImplTest.java

@@ -2520,12 +2520,14 @@ private void runGetNextVmHostAndDisplayNameGeneratesCorrectHostAndDisplayNameFor
         when(asVmGroupMock.getNextVmSeq()).thenReturn(1L);
         when(templateMock.getGuestOSId()).thenReturn(1L);
         Pair<String, String> result = autoScaleManagerImplSpy.getNextVmHostAndDisplayName(asVmGroupMock, templateMock);
-        String vmHostNamePattern = AutoScaleManagerImpl.VM_HOSTNAME_PREFIX + vmGroupName +
-                "-" + asVmGroupMock.getNextVmSeq() + "-[a-z]{6}";
-        Assert.assertTrue(result.second().matches(vmHostNamePattern));
+        String vmHostNamePattern = AutoScaleManagerImpl.WINDOWS_VM_HOSTNAME_PREFIX + "[a-z]{6}";
+        Assert.assertTrue(result.first().matches(vmHostNamePattern));
         Assert.assertEquals(15, result.first().length());
-        Assert.assertTrue(result.second().endsWith(result.first()));
-
+        String vmDisplayHostNamePattern = AutoScaleManagerImpl.VM_HOSTNAME_PREFIX + vmGroupName +
+                "-" + asVmGroupMock.getNextVmSeq() + "-[a-z]{6}";
+        Assert.assertTrue(result.second().matches(vmDisplayHostNamePattern));
+        Assert.assertTrue(result.second().length() <= 63);
+        Assert.assertTrue(result.second().endsWith(result.first().split("-")[2]));
     }
 
     @Test
@@ -2565,57 +2567,4 @@ public void getNextVmHostAndDisplayNameHandlesNullGuestOS() {
         Assert.assertTrue(result.first().matches(vmHostNamePattern));
         Assert.assertEquals(result.first(), result.second());
     }
-
-    @Test
-    public void trimsValidWindowsHostName() {
-        AutoScaleManagerImpl manager = new AutoScaleManagerImpl();
-        String result = manager.getTrimmedHostNameForWindows("ValidVMName1234");
-        Assert.assertEquals("ValidVMName1234", result);
-    }
-
-    @Test
-    public void trimsInvalidCharactersFromHostName() {
-        AutoScaleManagerImpl manager = new AutoScaleManagerImpl();
-        String result = manager.getTrimmedHostNameForWindows("Invalid@Host#Name!");
-        Assert.assertEquals("InvalidHostName", result);
-    }
-
-    @Test
-    public void ensuresHostNameStartsWithLetter() {
-        AutoScaleManagerImpl manager = new AutoScaleManagerImpl();
-        String result = manager.getTrimmedHostNameForWindows("123456789012345");
-        Assert.assertTrue(Character.isLetter(result.charAt(0)));
-    }
-
-    @Test
-    public void prefixesWithLetterIfNoLetterExists() {
-        AutoScaleManagerImpl manager = new AutoScaleManagerImpl();
-        String result = manager.getTrimmedHostNameForWindows("1234567890-12345");
-        Assert.assertEquals("a34567890-12345", result);
-    }
-
-    @Test
-    public void trimsHostNameToLastMaxCharacters() {
-        String name = "ThisIsAReallyLongHost-Name_1234";
-        AutoScaleManagerImpl manager = new AutoScaleManagerImpl();
-        String result = manager.getTrimmedHostNameForWindows(name);
-        String normalized = name.replace("_", "");
-        Assert.assertEquals(normalized
-                        .substring(normalized.length() - AutoScaleManagerImpl.MAX_WINDOWS_VM_HOSTNAME_LENGTH),
-                result);
-    }
-
-    @Test
-    public void handlesEmptyHostName() {
-        AutoScaleManagerImpl manager = new AutoScaleManagerImpl();
-        String result = manager.getTrimmedHostNameForWindows("");
-        Assert.assertEquals("", result);
-    }
-
-    @Test
-    public void handlesHostNameWithOnlyMostlyInvalidCharacters() {
-        AutoScaleManagerImpl manager = new AutoScaleManagerImpl();
-        String result = manager.getTrimmedHostNameForWindows("@#$%^&*()   1");
-        Assert.assertEquals("a1", result);
-    }
 }