Repository: cloudstack Updated Branches: refs/heads/4.4 661b42b50 -> bd6f0db31
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) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bd6f0db3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bd6f0db3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bd6f0db3 Branch: refs/heads/4.4 Commit: bd6f0db31a93ce228ce1dd7eb335c67595f4f80b Parents: 661b42b Author: Mike Tutkowski <[email protected]> Authored: Sat Mar 22 00:41:25 2014 -0600 Committer: Mike Tutkowski <[email protected]> Committed: Sat Mar 22 00:41:25 2014 -0600 ---------------------------------------------------------------------- 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd6f0db3/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 3873dd2..3be0aaa 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(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd6f0db3/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 d1a48d2..99214b2 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;
