Merge branch '4.19'

Author: nvazquez

framework/db/src/main/java/com/cloud/utils/db/Filter.java

@@ -22,6 +22,7 @@
 
 import com.cloud.utils.Pair;
 import com.cloud.utils.ReflectUtil;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *  Try to use static initialization to help you in finding incorrect
@@ -59,6 +60,11 @@ public Filter(long limit) {
         _orderBy = " ORDER BY RAND() LIMIT " + limit;
     }
 
+    public Filter(Long offset, Long limit) {
+        _offset = offset;
+        _limit = limit;
+    }
+
     /**
      * Note that this copy constructor does not copy offset and limit.
      * @param that filter
@@ -70,6 +76,10 @@ public Filter(Filter that) {
     }
 
     public void addOrderBy(Class<?> clazz, String field, boolean ascending) {
+        addOrderBy(clazz, field, ascending, null);
+    }
+
+    public void addOrderBy(Class<?> clazz, String field, boolean ascending, String tableAlias) {
         if (field == null) {
             return;
         }
@@ -83,7 +93,9 @@ public void addOrderBy(Class<?> clazz, String field, boolean ascending) {
         String name = column != null ? column.name() : field;
 
         StringBuilder order = new StringBuilder();
-        if (column == null || column.table() == null || column.table().length() == 0) {
+        if (StringUtils.isNotBlank(tableAlias)) {
+            order.append(tableAlias);
+        } else if (column == null || column.table() == null || column.table().length() == 0) {
             order.append(DbUtil.getTableName(clazz));
         } else {
             order.append(column.table());

server/src/main/java/com/cloud/resource/ResourceManagerImpl.java

@@ -3400,7 +3400,8 @@ public boolean isHostGpuEnabled(final long hostId) {
 
     @Override
     public List<HostGpuGroupsVO> listAvailableGPUDevice(final long hostId, final String groupName, final String vgpuType) {
-        final Filter searchFilter = new Filter(VGPUTypesVO.class, "remainingCapacity", false, null, null);
+        Filter searchFilter = new Filter(null, null);
+        searchFilter.addOrderBy(VGPUTypesVO.class, "remainingCapacity", false, "groupId");
         final SearchCriteria<HostGpuGroupsVO> sc = _gpuAvailability.create();
         sc.setParameters("hostId", hostId);
         sc.setParameters("groupName", groupName);