Fix VMware import guest OS mapping fallback

Author: andrijapanicsb

server/src/main/java/com/cloud/server/ManagementServerImpl.java

@@ -3077,10 +3077,11 @@ public Pair<List<? extends GuestOSHypervisor>, Integer> listGuestOSMappingByCrit
 
         if (osDisplayName != null) {
             List<GuestOSVO> guestOSVOS = _guestOSDao.listLikeDisplayName(osDisplayName);
-            if (CollectionUtils.isNotEmpty(guestOSVOS)) {
-                List<Long> guestOSids = guestOSVOS.stream().map(mo -> mo.getId()).collect(Collectors.toList());
-                sc.addAnd(guestOsId, SearchCriteria.Op.IN, guestOSids.toArray());
+            if (CollectionUtils.isEmpty(guestOSVOS)) {
+                return new Pair<>(Collections.emptyList(), 0);
             }
+            List<Long> guestOSids = guestOSVOS.stream().map(mo -> mo.getId()).collect(Collectors.toList());
+            sc.addAnd(guestOsId, SearchCriteria.Op.IN, guestOSids.toArray());
         }
 
         final Pair<List<GuestOSHypervisorVO>, Integer> result = _guestOSHypervisorDao.searchAndCount(sc, searchFilter);

ui/src/views/tools/ImportUnmanagedInstance.vue

@@ -253,7 +253,7 @@
                     :filterOption="(input, option) => {
                       return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
                     }">
-                    <a-select-option v-for="mapping in resource.guestOsMappings" :key="mapping.ostypeid" :label="mapping.osdisplayname">
+                    <a-select-option v-for="mapping in resource.guestOsMappings" :key="mapping.ostypeid" :value="mapping.ostypeid" :label="mapping.osdisplayname">
                       <span>
                         {{ mapping.osdisplayname }}
                       </span>

ui/src/views/tools/ManageInstances.vue

@@ -1388,7 +1388,12 @@ export default {
       })
     },
     normalizeGuestOsName (name) {
-      return (name || '').toLowerCase().replace(/[^a-z0-9]+/g, ' ').trim()
+      return (name || '')
+        .toLowerCase()
+        .replace(/^microsoft\s+/, '')
+        .replace(/[^a-z0-9]+/g, ' ')
+        .replace(/\s+/g, ' ')
+        .trim()
     },
     isStrongGuestOsNameMatch (osType, osDisplayName) {
       const candidate = this.normalizeGuestOsName(osType.description || osType.osdisplayname)
@@ -1425,32 +1430,55 @@ export default {
         return []
       })
     },
+    filterGuestOsMappings (mappings, params, osDisplayName) {
+      if (!mappings || mappings.length === 0) {
+        return []
+      }
+
+      const osNameForHypervisor = (params.osnameforhypervisor || '').toLowerCase()
+      let filteredMappings = mappings
+      if (osNameForHypervisor) {
+        filteredMappings = mappings.filter(mapping => (mapping.osnameforhypervisor || '').toLowerCase() === osNameForHypervisor)
+      }
+
+      if (osDisplayName) {
+        const displayNameMatches = filteredMappings.filter(mapping => this.isStrongGuestOsNameMatch(mapping, osDisplayName))
+        if (displayNameMatches.length > 0) {
+          return displayNameMatches
+        }
+        if (params.osdisplayname) {
+          return []
+        }
+      }
+
+      return filteredMappings
+    },
     async fetchGuestOsMappings (osIdentifier, osDisplayName, hypervisorVersion) {
       const lookups = []
-      if (osDisplayName) {
+      if (osIdentifier) {
         lookups.push({
           hypervisor: 'VMware',
           hypervisorversion: hypervisorVersion,
-          osdisplayname: osDisplayName
+          osnameforhypervisor: osIdentifier
         })
       }
       if (osIdentifier) {
         lookups.push({
           hypervisor: 'VMware',
-          hypervisorversion: hypervisorVersion,
           osnameforhypervisor: osIdentifier
         })
       }
       if (osDisplayName) {
         lookups.push({
           hypervisor: 'VMware',
+          hypervisorversion: hypervisorVersion,
           osdisplayname: osDisplayName
         })
       }
-      if (osIdentifier) {
+      if (osDisplayName) {
         lookups.push({
           hypervisor: 'VMware',
-          osnameforhypervisor: osIdentifier
+          osdisplayname: osDisplayName
         })
       }
 
@@ -1459,8 +1487,9 @@ export default {
           delete params.hypervisorversion
         }
         const mappings = await this.fetchGuestOsMappingsByParams(params)
-        if (mappings.length > 0) {
-          return mappings
+        const filteredMappings = this.filterGuestOsMappings(mappings, params, osDisplayName)
+        if (filteredMappings.length > 0) {
+          return filteredMappings
         }
       }
       return await this.fetchGuestOsTypeFallbackMappings(osDisplayName)