fix DISTINCT class field

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

Author: shwstppr

engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java

@@ -1744,17 +1744,18 @@ public List<Long> findHostIdsByZoneClusterResourceStateTypeAndHypervisorType(fin
 
     @Override
     public List<HypervisorType> listDistinctHypervisorTypes(final Long zoneId) {
-        GenericSearchBuilder<HostVO, HypervisorType> sb = createSearchBuilder(HypervisorType.class);
+        GenericSearchBuilder<HostVO, String> sb = createSearchBuilder(String.class);
         sb.and("zoneId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ);
         sb.and("type", sb.entity().getType(), SearchCriteria.Op.EQ);
         sb.select(null, Func.DISTINCT, sb.entity().getHypervisorType());
         sb.done();
-        SearchCriteria<HypervisorType> sc = sb.create();
+        SearchCriteria<String> sc = sb.create();
         if (zoneId != null) {
             sc.setParameters("zoneId", zoneId);
         }
         sc.setParameters("type", Type.Routing);
-        return customSearch(sc, null);
+        List<String> hypervisorString = customSearch(sc, null);
+        return hypervisorString.stream().map(HypervisorType::getType).collect(Collectors.toList());
     }
 
     @Override
@@ -1777,17 +1778,18 @@ public List<Pair<HypervisorType, CPU.CPUArch>> listDistinctHypervisorArchTypes(f
 
     @Override
     public List<CPU.CPUArch> listDistinctArchTypes(final Long clusterId) {
-        GenericSearchBuilder<HostVO, CPU.CPUArch> sb = createSearchBuilder(CPU.CPUArch.class);
+        GenericSearchBuilder<HostVO, String> sb = createSearchBuilder(String.class);
         sb.and("clusterId", sb.entity().getClusterId(), SearchCriteria.Op.EQ);
         sb.and("type", sb.entity().getType(), SearchCriteria.Op.EQ);
-        sb.select(null, Func.DISTINCT, sb.entity().getHypervisorType());
+        sb.select(null, Func.DISTINCT, sb.entity().getArch());
         sb.done();
-        SearchCriteria<CPU.CPUArch> sc = sb.create();
+        SearchCriteria<String> sc = sb.create();
         if (clusterId != null) {
             sc.setParameters("clusterId", clusterId);
         }
         sc.setParameters("type", Type.Routing);
-        return customSearch(sc, null);
+        List<String> archStrings = customSearch(sc, null);
+        return archStrings.stream().map(CPU.CPUArch::fromType).collect(Collectors.toList());
     }
 
     @Override