Add cpuspeed to listServiceOfferings API and persist OVF configurations with index on its name

Author: nvazquez

api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java

@@ -77,6 +77,12 @@ public class ListServiceOfferingsCmd extends BaseListDomainResourcesCmd {
             since = "4.15")
     private Integer memory;
 
+    @Parameter(name = ApiConstants.CPU_SPEED,
+            type = CommandType.INTEGER,
+            description = "the CPU speed that listed offerings must support",
+            since = "4.15")
+    private Integer cpuSpeed;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -113,6 +119,10 @@ public Integer getMemory() {
         return memory;
     }
 
+    public Integer getCpuSpeed() {
+        return cpuSpeed;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////

engine/storage/src/main/java/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java

@@ -391,7 +391,7 @@ private void persistOVFHardwareSectionAsTemplateDetails(OVFVirtualHardwareSectio
             if (CollectionUtils.isNotEmpty(ovfHardwareSection.getConfigurations())) {
                 for (OVFConfigurationTO configuration : ovfHardwareSection.getConfigurations()) {
                     String key = configuration.getId();
-                    String propKey = ImageStore.OVF_HARDWARE_CONFIGURATION_PREFIX + key;
+                    String propKey = ImageStore.OVF_HARDWARE_CONFIGURATION_PREFIX + configuration.getIndex() + "-" + key;
                     persistTemplateDetailGsonEncoded(templateId, propKey, configuration);
                 }
             }

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

@@ -2859,6 +2859,7 @@ private Pair<List<ServiceOfferingJoinVO>, Integer> searchForServiceOfferingsInte
         Long zoneId = cmd.getZoneId();
         Integer cpuNumber = cmd.getCpuNumber();
         Integer memory = cmd.getMemory();
+        Integer cpuSpeed = cmd.getCpuSpeed();
 
         SearchCriteria<ServiceOfferingJoinVO> sc = _srvOfferingJoinDao.createSearchCriteria();
         if (!_accountMgr.isRootAdmin(caller.getId()) && isSystem) {
@@ -2981,6 +2982,13 @@ private Pair<List<ServiceOfferingJoinVO>, Integer> searchForServiceOfferingsInte
             sc.addAnd("memoryConstraints", SearchCriteria.Op.SC, memSearchCriteria);
         }
 
+        if (cpuSpeed != null) {
+            SearchCriteria<ServiceOfferingJoinVO> cpuSpeedSearchCriteria = _srvOfferingJoinDao.createSearchCriteria();
+            cpuSpeedSearchCriteria.addOr("speed", Op.NULL);
+            cpuSpeedSearchCriteria.addOr("speed", Op.GTEQ, cpuSpeed);
+            sc.addAnd("cpuspeedconstraints", SearchCriteria.Op.SC, cpuSpeedSearchCriteria);
+        }
+
         Pair<List<ServiceOfferingJoinVO>, Integer> result = _srvOfferingJoinDao.searchAndCount(sc, searchFilter);
 
         //Couldn't figure out a smart way to filter offerings based on tags in sql so doing it in Java.