consider offering sortkey while listing custom diskofferings

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

Author: shwstppr

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

@@ -30,7 +30,7 @@ public interface DiskOfferingDao extends GenericDao<DiskOfferingVO, Long> {
 
     List<DiskOfferingVO> listAllBySizeAndProvisioningType(long size, Storage.ProvisioningType provisioningType);
 
-    List<DiskOfferingVO> findCustomDiskOfferings();
+    List<DiskOfferingVO> listCustomDiskOfferings();
 
     List<DiskOfferingVO> listByStorageTag(String tag);
 

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

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.storage.dao;
 
+import static org.apache.cloudstack.query.QueryService.SortKeyAscending;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -33,6 +35,7 @@
 import com.cloud.storage.DiskOfferingVO;
 import com.cloud.storage.Storage;
 import com.cloud.utils.db.Attribute;
+import com.cloud.utils.db.Filter;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
@@ -138,13 +141,14 @@ public List<DiskOfferingVO> listAllBySizeAndProvisioningType(long size, Storage.
     }
 
     @Override
-    public List<DiskOfferingVO> findCustomDiskOfferings() {
+    public List<DiskOfferingVO> listCustomDiskOfferings() {
         SearchBuilder<DiskOfferingVO> sb = createSearchBuilder();
         sb.and("customized", sb.entity().isCustomized(), SearchCriteria.Op.EQ);
         sb.done();
         SearchCriteria<DiskOfferingVO> sc = sb.create();
         sc.setParameters("customized", true);
-        return listBy(sc);
+        Filter searchFilter = new Filter(DiskOfferingVO.class, "sortKey", SortKeyAscending.value());
+        return listBy(sc, searchFilter);
     }
 
     @Override

server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java

@@ -737,7 +737,7 @@ public Long getCustomDiskOfferingIdForVolumeUpload(Account owner, DataCenter zon
         if (offeringId != null) {
             return offeringId;
         }
-        List<DiskOfferingVO> offerings = _diskOfferingDao.findCustomDiskOfferings();
+        List<DiskOfferingVO> offerings = _diskOfferingDao.listCustomDiskOfferings();
         for (DiskOfferingVO offering : offerings) {
             try {
                 _configMgr.checkDiskOfferingAccess(owner, offering, zone);