engine-schema: fix finding guestos mapping with parent version

Fixes #8412

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

engine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java

@@ -20,9 +20,11 @@
 import java.util.Date;
 import java.util.List;
 
+import org.apache.cloudstack.utils.CloudStackVersion;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Component;
 
+import com.cloud.hypervisor.Hypervisor;
 import com.cloud.storage.GuestOSHypervisorVO;
 import com.cloud.utils.db.Filter;
 import com.cloud.utils.db.QueryBuilder;
@@ -87,8 +89,7 @@ public List<GuestOSHypervisorVO> listByGuestOsId(long guestOsId) {
         return listBy(sc);
     }
 
-    @Override
-    public GuestOSHypervisorVO findByOsIdAndHypervisor(long guestOsId, String hypervisorType, String hypervisorVersion) {
+    private GuestOSHypervisorVO findByOsIdAndHypervisorInternal(long guestOsId, String hypervisorType, String hypervisorVersion) {
         SearchCriteria<GuestOSHypervisorVO> sc = mappingSearch.create();
         String version = "default";
         if (!(hypervisorVersion == null || hypervisorVersion.isEmpty())) {
@@ -100,6 +101,19 @@ public GuestOSHypervisorVO findByOsIdAndHypervisor(long guestOsId, String hyperv
         return findOneBy(sc);
     }
 
+    @Override
+    public GuestOSHypervisorVO findByOsIdAndHypervisor(long guestOsId, String hypervisorType, String hypervisorVersion) {
+        GuestOSHypervisorVO mapping = findByOsIdAndHypervisorInternal(guestOsId, hypervisorType, hypervisorVersion);
+        if (mapping != null || !Hypervisor.HypervisorType.VMware.toString().equals(hypervisorType)) {
+            return mapping;
+        }
+        String parentVersion = CloudStackVersion.getVMwareParentVersion(hypervisorVersion);
+        if (parentVersion == null) {
+            return null;
+        }
+        return findByOsIdAndHypervisorInternal(guestOsId, hypervisorType, parentVersion);
+    }
+
     @Override
     public GuestOSHypervisorVO findByOsIdAndHypervisorAndUserDefined(long guestOsId, String hypervisorType, String hypervisorVersion, boolean isUserDefined) {
         SearchCriteria<GuestOSHypervisorVO> sc = userDefinedMappingSearch.create();
@@ -123,8 +137,7 @@ public boolean removeGuestOsMapping(Long id) {
         return super.remove(id);
     }
 
-    @Override
-    public GuestOSHypervisorVO findByOsNameAndHypervisor(String guestOsName, String hypervisorType, String hypervisorVersion) {
+    private GuestOSHypervisorVO findByOsNameAndHypervisorInternal(String guestOsName, String hypervisorType, String hypervisorVersion) {
         SearchCriteria<GuestOSHypervisorVO> sc = guestOsNameSearch.create();
         String version = "default";
         if (!(hypervisorVersion == null || hypervisorVersion.isEmpty())) {
@@ -138,6 +151,19 @@ public GuestOSHypervisorVO findByOsNameAndHypervisor(String guestOsName, String
         return CollectionUtils.isNotEmpty(results) ? results.get(0) : null;
     }
 
+    @Override
+    public GuestOSHypervisorVO findByOsNameAndHypervisor(String guestOsName, String hypervisorType, String hypervisorVersion) {
+        GuestOSHypervisorVO mapping = findByOsNameAndHypervisorInternal(guestOsName, hypervisorType, hypervisorVersion);
+        if (mapping != null || !Hypervisor.HypervisorType.VMware.toString().equals(hypervisorType)) {
+            return mapping;
+        }
+        String parentVersion = CloudStackVersion.getVMwareParentVersion(hypervisorVersion);
+        if (parentVersion == null) {
+            return null;
+        }
+        return findByOsNameAndHypervisorInternal(guestOsName, hypervisorType, parentVersion);
+    }
+
     @Override
     public GuestOSHypervisorVO findByOsNameAndHypervisorOrderByCreatedDesc(String guestOsName, String hypervisorType, String hypervisorVersion) {
         SearchCriteria<GuestOSHypervisorVO> sc = guestOsNameSearch.create();