From b354893393dc9d9467d1999462a44063046a3c4e Mon Sep 17 00:00:00 2001
From: Mike Tutkowski <mike.tutkowski@solidfire.com>
Date: Sat, 22 Mar 2014 00:41:25 -0600
Subject: [PATCH] CLOUDSTACK-6170 (Fixed an issue where custom compute offering
 and custom storage IOPS were leading to custom storage IOPS that were
 specified not being used)

---
 engine/schema/src/com/cloud/service/ServiceOfferingVO.java | 1 +
 engine/schema/src/com/cloud/storage/DiskOfferingVO.java    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
index 3873dd272f4..3be0aaa7745 100755
--- a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
+++ b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
@@ -173,6 +173,7 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering
             offering.getUseLocalStorage(),
             offering.getSystemUse(),
             true,
+            offering.isCustomizedIops(),
             offering.getDomainId());
         cpu = offering.getCpu();
         ramSize = offering.getRamSize();
diff --git a/engine/schema/src/com/cloud/storage/DiskOfferingVO.java b/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
index d1a48d20c91..99214b21905 100755
--- a/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
+++ b/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
@@ -207,7 +207,7 @@ public class DiskOfferingVO implements DiskOffering {
     }
 
     public DiskOfferingVO(long id, String name, String displayText, boolean mirrored, String tags, boolean recreatable,
-            boolean useLocalStorage, boolean systemUse, boolean customized, Long domainId) {
+            boolean useLocalStorage, boolean systemUse, boolean customized, boolean customizedIops, Long domainId) {
         this.id = id;
         type = Type.Service;
         this.name = name;
@@ -217,6 +217,7 @@ public class DiskOfferingVO implements DiskOffering {
         this.useLocalStorage = useLocalStorage;
         this.systemUse = systemUse;
         this.customized = customized;
+        this.customizedIops = customizedIops;
         this.domainId = domainId;
         uuid = UUID.randomUUID().toString();
         state = State.Active;