fix

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

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

@@ -1991,7 +1991,8 @@ protected String getTrimmedHostNameForWindows(String name) {
     protected Pair<String, String> getNextVmHostAndDisplayName(AutoScaleVmGroupVO asGroup, VirtualMachineTemplate template) {
         template.getGuestOSId();
         GuestOSVO guestOSVO = guestOSDao.findById(template.getGuestOSId());
-        boolean isWindows = guestOSVO != null && guestOSVO.getName().toLowerCase().contains("windows");
+        String osName = guestOSVO != null ? StringUtils.firstNonBlank(guestOSVO.getName(), guestOSVO.getDisplayName()) : "";
+        boolean isWindows = osName.toLowerCase().contains("windows");
         String vmHostNameSuffix = "-" + asGroup.getNextVmSeq() + "-" +
                 RandomStringUtils.random(VM_HOSTNAME_RANDOM_SUFFIX_LENGTH, 0, 0, true, false, (char[])null, new SecureRandom()).toLowerCase();
         // Truncate vm group name because max length of vm name is 63

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

@@ -2515,20 +2515,31 @@ public void getNextVmHostAndDisplayNameGeneratesCorrectHostAndDisplayNameForLinu
         Assert.assertEquals(result.first(), result.second());
     }
 
-    @Test
-    public void getNextVmHostAndDisplayNameGeneratesCorrectHostAndDisplayNameForWindowsTemplate() {
-        GuestOSVO guestOS = Mockito.mock(GuestOSVO.class);
+    private void runGetNextVmHostAndDisplayNameGeneratesCorrectHostAndDisplayNameForWindowsTemplate() {
         when(asVmGroupMock.getName()).thenReturn(vmGroupName);
         when(asVmGroupMock.getNextVmSeq()).thenReturn(1L);
         when(templateMock.getGuestOSId()).thenReturn(1L);
-        when(guestOS.getName()).thenReturn("Windows Server");
-        when(guestOSDao.findById(1L)).thenReturn(guestOS);
         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));
         Assert.assertEquals(15, result.first().length());
         Assert.assertTrue(result.second().endsWith(result.first()));
+
+    }
+
+    @Test
+    public void getNextVmHostAndDisplayNameGeneratesCorrectHostAndDisplayNameForWindowsTemplateUsingGuestOsName() {
+        GuestOSVO guestOS = Mockito.mock(GuestOSVO.class);
+        when(guestOS.getName()).thenReturn("Windows Server");
+        when(guestOSDao.findById(1L)).thenReturn(guestOS);
+    }
+
+    @Test
+    public void getNextVmHostAndDisplayNameGeneratesCorrectHostAndDisplayNameForWindowsTemplateUsingGuestOsDisplayName() {
+        GuestOSVO guestOS = Mockito.mock(GuestOSVO.class);
+        when(guestOS.getDisplayName()).thenReturn("Windows Server");
+        when(guestOSDao.findById(1L)).thenReturn(guestOS);
     }
 
     @Test