Adding IOPS/GB offering

Author: syed

api/src/com/cloud/offering/DiskOffering.java

@@ -16,13 +16,12 @@
 // under the License.
 package com.cloud.offering;
 
-import java.util.Date;
-
+import com.cloud.storage.Storage.ProvisioningType;
 import org.apache.cloudstack.acl.InfrastructureEntity;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
-import com.cloud.storage.Storage.ProvisioningType;
+import java.util.Date;
 
 /**
  * Represents a disk offering that specifies what the end user needs in
@@ -111,6 +110,22 @@ public String toString() {
 
     Long getIopsWriteRate();
 
+    Long getMinIopsPerGb();
+
+    void setMinIopsPerGb(Long minIopsPerGB);
+
+    Long getMaxIopsPerGb();
+
+    void setMaxIopsPerGb(Long maxIopsPerGB);
+
+    Long getHighestMinIops();
+
+    void setHighestMinIops(Long highestMinIops);
+
+    Long getHighestMaxIops();
+
+    void setHighestMaxIops(Long highestMaxIops);
+
     void setHypervisorSnapshotReserve(Integer hypervisorSnapshotReserve);
 
     Integer getHypervisorSnapshotReserve();

api/src/org/apache/cloudstack/api/ApiConstants.java

@@ -654,6 +654,10 @@ public class ApiConstants {
     public static final String CLEAN_UP_DETAILS = "cleanupdetails";
     public static final String NETSCALER_CONTROLCENTER_ID = "netscalercontrolcenterid";
     public static final String NETSCALER_SERVICEPACKAGE_ID = "netscalerservicepackageid";
+    public static final String MIN_IOPS_PER_GB = "miniopspergb";
+    public static final String MAX_IOPS_PER_GB = "maxiopspergb";
+    public static final String HIGHEST_MIN_IOPS = "highestminiops";
+    public static final String HIGHEST_MAX_IOPS = "highestmaxiops";
 
     public static final String ZONE_ID_LIST = "zoneids";
     public static final String DESTINATION_ZONE_ID_LIST = "destzoneids";

api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java

@@ -98,6 +98,18 @@ public class CreateDiskOfferingCmd extends BaseCmd {
     @Parameter(name = ApiConstants.MAX_IOPS, type = CommandType.LONG, required = false, description = "max iops of the disk offering")
     private Long maxIops;
 
+    @Parameter(name = ApiConstants.MIN_IOPS_PER_GB, type = CommandType.LONG, required = false, description = "IOPS/GB rate for min IOPS. miniops = size * miniopspergb")
+    private Long minIopsPerGb;
+
+    @Parameter(name = ApiConstants.MAX_IOPS_PER_GB, type = CommandType.LONG, required = false, description = "IOPS/GB rate for max IOPS. maxiops = size * maxiopspergb")
+    private Long maxIopsPerGb;
+
+    @Parameter(name = ApiConstants.HIGHEST_MIN_IOPS, type = CommandType.LONG, required = false, description = "Highest Min IOPS value that is allowed for this offering")
+    private Long highestMinIops;
+
+    @Parameter(name = ApiConstants.HIGHEST_MAX_IOPS, type = CommandType.LONG, required = false, description = "Highest Max IOPS value that is allowed for this offering")
+    private Long highestMaxIops;
+
     @Parameter(name = ApiConstants.HYPERVISOR_SNAPSHOT_RESERVE,
             type = CommandType.INTEGER,
             required = false,
@@ -176,6 +188,21 @@ public Integer getHypervisorSnapshotReserve() {
         return hypervisorSnapshotReserve;
     }
 
+    public Long getMinIopsPerGb() {
+        return minIopsPerGb;
+    }
+
+    public Long getMaxIopsPerGb() {
+        return maxIopsPerGb;
+    }
+
+    public Long getHighestMinIops() {
+        return highestMinIops;
+    }
+
+    public Long getHighestMaxIops() {
+        return highestMaxIops;
+    }
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////

engine/schema/src/com/cloud/storage/DiskOfferingVO.java

@@ -16,9 +16,8 @@
 // under the License.
 package com.cloud.storage;
 
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import com.cloud.offering.DiskOffering;
+import com.cloud.utils.db.GenericDao;
 
 import javax.persistence.Column;
 import javax.persistence.DiscriminatorColumn;
@@ -35,9 +34,9 @@
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
-
-import com.cloud.offering.DiskOffering;
-import com.cloud.utils.db.GenericDao;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
 
 @Entity
 @Table(name = "disk_offering")
@@ -117,6 +116,18 @@ public class DiskOfferingVO implements DiskOffering {
     @Column(name = "iops_write_rate")
     Long iopsWriteRate;
 
+    @Column(name = "min_iops_per_gb")
+    Long minIopsPerGb;
+
+    @Column(name = "max_iops_per_gb")
+    Long maxIopsPerGb;
+
+    @Column(name = "highest_min_iops")
+    Long highestMinIops;
+
+    @Column(name = "highest_max_iops")
+    Long highestMaxIops;
+
     @Column(name = "cache_mode", updatable = true, nullable = false)
     @Enumerated(value = EnumType.STRING)
     private DiskCacheMode cacheMode;
@@ -465,7 +476,7 @@ public void setDisplayOffering(boolean displayOffering) {
         this.displayOffering = displayOffering;
     }
 
-    @Override
+   @Override
     public void setBytesReadRate(Long bytesReadRate) {
         this.bytesReadRate = bytesReadRate;
     }
@@ -505,6 +516,46 @@ public Long getIopsWriteRate() {
         return iopsWriteRate;
     }
 
+    @Override
+    public Long getMinIopsPerGb() {
+        return this.minIopsPerGb;
+    }
+
+    @Override
+    public void setMinIopsPerGb(Long minIopsPerGb) {
+        this.minIopsPerGb = minIopsPerGb;
+    }
+
+    @Override
+    public Long getMaxIopsPerGb() {
+        return maxIopsPerGb;
+    }
+
+    @Override
+    public void setMaxIopsPerGb(Long maxIopsPerGb) {
+        this.maxIopsPerGb = maxIopsPerGb;
+    }
+
+    @Override
+    public Long getHighestMinIops() {
+        return this.highestMinIops;
+    }
+
+    @Override
+    public void setHighestMinIops(Long highestMinIops) {
+        this.highestMinIops = highestMinIops;
+    }
+
+    @Override
+    public Long getHighestMaxIops() {
+        return this.highestMaxIops;
+    }
+
+    @Override
+    public void setHighestMaxIops(Long highestMaxIops) {
+        this.highestMaxIops = highestMaxIops;
+    }
+
     @Override
     public void setHypervisorSnapshotReserve(Integer hypervisorSnapshotReserve) {
         this.hypervisorSnapshotReserve = hypervisorSnapshotReserve;