cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mtutkow...@apache.org
Subject git commit: updated refs/heads/master to dd4f6bc
Date Fri, 19 Sep 2014 22:06:46 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 082aed3d3 -> dd4f6bcaf


IOPS null issue CLOUDSTACK-7570

Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dd4f6bca
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dd4f6bca
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dd4f6bca

Branch: refs/heads/master
Commit: dd4f6bcaf3a380e52c987e4a400fce09fb180006
Parents: 082aed3
Author: punith-cloudbyte <punith.s@cloudbyte.com>
Authored: Wed Sep 17 17:53:47 2014 +0530
Committer: Mike Tutkowski <mike.tutkowski@solidfire.com>
Committed: Fri Sep 19 16:05:53 2014 -0600

----------------------------------------------------------------------
 engine/schema/src/com/cloud/service/ServiceOfferingVO.java | 4 +++-
 engine/schema/src/com/cloud/storage/DiskOfferingVO.java    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd4f6bca/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
index df68fb8..805765b 100755
--- a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
+++ b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
@@ -177,7 +177,9 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering
             offering.getSystemUse(),
             true,
             offering.isCustomizedIops()== null ? false:offering.isCustomizedIops(),
-            offering.getDomainId());
+            offering.getDomainId(),
+            offering.getMinIops(),
+            offering.getMaxIops());
         cpu = offering.getCpu();
         ramSize = offering.getRamSize();
         speed = offering.getSpeed();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd4f6bca/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/storage/DiskOfferingVO.java b/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
index 152fa2c..74f65ab 100755
--- a/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
+++ b/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
@@ -214,7 +214,7 @@ public class DiskOfferingVO implements DiskOffering {
     }
 
     public DiskOfferingVO(long id, String name, String displayText, Storage.ProvisioningType
provisioningType, boolean mirrored, String tags, boolean recreatable,
-            boolean useLocalStorage, boolean systemUse, boolean customized, boolean customizedIops,
Long domainId) {
+            boolean useLocalStorage, boolean systemUse, boolean customized, boolean customizedIops,
Long domainId, Long minIops, Long maxIops) {
         this.id = id;
         type = Type.Service;
         this.name = name;
@@ -229,6 +229,8 @@ public class DiskOfferingVO implements DiskOffering {
         this.domainId = domainId;
         uuid = UUID.randomUUID().toString();
         state = State.Active;
+        this.minIops = minIops;
+        this.maxIops = maxIops;
     }
 
     @Override


Mime
View raw message