Updated Branches: refs/heads/1.6.x 070ebb230 -> 1d551e91d
JCLOUDS-275: Renamed the getter/setter methods for the HD size limits to remove the reference to the Mb storage unit Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/commit/1d551e91 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/tree/1d551e91 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/diff/1d551e91 Branch: refs/heads/1.6.x Commit: 1d551e91da9a2663d691a99039d555e2683cedb1 Parents: 070ebb2 Author: Carlos Garcia <[email protected]> Authored: Wed Oct 23 11:45:18 2013 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Thu Oct 24 23:35:56 2013 +0200 ---------------------------------------------------------------------- .../abiquo/domain/DomainWithLimitsWrapper.java | 24 ++++++++++++++------ .../abiquo/domain/cloud/VirtualDatacenter.java | 2 +- .../abiquo/domain/enterprise/Enterprise.java | 2 +- .../abiquo/domain/enterprise/Limits.java | 4 ++-- 4 files changed, 21 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/1d551e91/abiquo/src/main/java/org/jclouds/abiquo/domain/DomainWithLimitsWrapper.java ---------------------------------------------------------------------- diff --git a/abiquo/src/main/java/org/jclouds/abiquo/domain/DomainWithLimitsWrapper.java b/abiquo/src/main/java/org/jclouds/abiquo/domain/DomainWithLimitsWrapper.java index 2e70160..8c416c5 100644 --- a/abiquo/src/main/java/org/jclouds/abiquo/domain/DomainWithLimitsWrapper.java +++ b/abiquo/src/main/java/org/jclouds/abiquo/domain/DomainWithLimitsWrapper.java @@ -43,11 +43,15 @@ public abstract class DomainWithLimitsWrapper<T extends SingleResourceWithLimits return target.getCpuCountSoftLimit(); } - public long getHdHardLimitInMb() { + public long getHdHardLimitInBytes() { + // Due to a bug in Abiquo, the hard drive limits are interpreted as bytes, + // though the name of the method makes reference to Mb return target.getHdHardLimitInMb(); } - public long getHdSoftLimitInMb() { + public long getHdSoftLimitInBytes() { + // Due to a bug in Abiquo, the hard drive limits are interpreted as bytes, + // though the name of the method makes reference to Mb return target.getHdSoftLimitInMb(); } @@ -95,16 +99,22 @@ public abstract class DomainWithLimitsWrapper<T extends SingleResourceWithLimits target.setCpuCountSoftLimit(cpuCountSoftLimit); } - public void setHdHardLimitInMb(final long hdHardLimitInMb) { - target.setHdHardLimitInMb(hdHardLimitInMb); + public void setHdHardLimitInBytes(final long hdHardLimit) { + // Due to a bug in Abiquo, the hard drive limits are interpreted as bytes, + // though the name of the method makes reference to Mb + target.setHdHardLimitInMb(hdHardLimit); } - public void setHdLimitsInMb(final long softLimit, final long hardLimit) { + public void setHdLimitsInBytes(final long softLimit, final long hardLimit) { + // Due to a bug in Abiquo, the hard drive limits are interpreted as bytes, + // though the name of the method makes reference to Mb target.setHdLimitsInMb(softLimit, hardLimit); } - public void setHdSoftLimitInMb(final long hdSoftLimitInMb) { - target.setHdSoftLimitInMb(hdSoftLimitInMb); + public void setHdSoftLimitInBytes(final long hdSoftLimit) { + // Due to a bug in Abiquo, the hard drive limits are interpreted as bytes, + // though the name of the method makes reference to Mb + target.setHdSoftLimitInMb(hdSoftLimit); } public void setPublicIPLimits(final long softLimit, final long hardLimit) { http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/1d551e91/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualDatacenter.java ---------------------------------------------------------------------- diff --git a/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualDatacenter.java b/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualDatacenter.java index c5ed0e5..112d849 100644 --- a/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualDatacenter.java +++ b/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualDatacenter.java @@ -587,7 +587,7 @@ public class VirtualDatacenter extends DomainWithLimitsWrapper<VirtualDatacenter return VirtualDatacenter.builder(in.context, in.datacenter, in.enterprise).name(in.getName()) .ramLimits(in.getRamSoftLimitInMb(), in.getRamHardLimitInMb()) .cpuCountLimits(in.getCpuCountSoftLimit(), in.getCpuCountHardLimit()) - .hdLimitsInMb(in.getHdSoftLimitInMb(), in.getHdHardLimitInMb()) + .hdLimitsInMb(in.getHdSoftLimitInBytes(), in.getHdHardLimitInBytes()) .storageLimits(in.getStorageSoft(), in.getStorageHard()) .vlansLimits(in.getVlansSoft(), in.getVlansHard()) .publicIpsLimits(in.getPublicIpsSoft(), in.getPublicIpsHard()).hypervisorType(in.getHypervisorType()); http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/1d551e91/abiquo/src/main/java/org/jclouds/abiquo/domain/enterprise/Enterprise.java ---------------------------------------------------------------------- diff --git a/abiquo/src/main/java/org/jclouds/abiquo/domain/enterprise/Enterprise.java b/abiquo/src/main/java/org/jclouds/abiquo/domain/enterprise/Enterprise.java index 96b3824..a07897a 100644 --- a/abiquo/src/main/java/org/jclouds/abiquo/domain/enterprise/Enterprise.java +++ b/abiquo/src/main/java/org/jclouds/abiquo/domain/enterprise/Enterprise.java @@ -802,7 +802,7 @@ public class Enterprise extends DomainWithLimitsWrapper<EnterpriseDto> { return Enterprise.builder(in.context).name(in.getName()) .ramLimits(in.getRamSoftLimitInMb(), in.getRamHardLimitInMb()) .cpuCountLimits(in.getCpuCountSoftLimit(), in.getCpuCountHardLimit()) - .hdLimitsInMb(in.getHdSoftLimitInMb(), in.getHdHardLimitInMb()) + .hdLimitsInMb(in.getHdSoftLimitInBytes(), in.getHdHardLimitInBytes()) .storageLimits(in.getStorageSoft(), in.getStorageHard()) .vlansLimits(in.getVlansSoft(), in.getVlansHard()) .publicIpsLimits(in.getPublicIpsSoft(), in.getPublicIpsHard()) http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/1d551e91/abiquo/src/main/java/org/jclouds/abiquo/domain/enterprise/Limits.java ---------------------------------------------------------------------- diff --git a/abiquo/src/main/java/org/jclouds/abiquo/domain/enterprise/Limits.java b/abiquo/src/main/java/org/jclouds/abiquo/domain/enterprise/Limits.java index 9c9c4f9..d6377fa 100644 --- a/abiquo/src/main/java/org/jclouds/abiquo/domain/enterprise/Limits.java +++ b/abiquo/src/main/java/org/jclouds/abiquo/domain/enterprise/Limits.java @@ -112,7 +112,7 @@ public class Limits extends DomainWithLimitsWrapper<DatacenterLimitsDto> { return Limits.builder(in.context, in.getDatacenter()) .ramLimits(in.getRamSoftLimitInMb(), in.getRamHardLimitInMb()) .cpuCountLimits(in.getCpuCountSoftLimit(), in.getCpuCountHardLimit()) - .hdLimitsInMb(in.getHdSoftLimitInMb(), in.getHdHardLimitInMb()) + .hdLimitsInMb(in.getHdSoftLimitInBytes(), in.getHdHardLimitInBytes()) .storageLimits(in.getStorageSoft(), in.getStorageHard()) .vlansLimits(in.getVlansSoft(), in.getVlansHard()) .publicIpsLimits(in.getPublicIpsSoft(), in.getPublicIpsHard()) @@ -158,7 +158,7 @@ public class Limits extends DomainWithLimitsWrapper<DatacenterLimitsDto> { public String toString() { return "Limits [id=" + getId() + ", repositoryHard=" + getRepositoryHard() + ", repositorySoft=" + getRepositorySoft() + ", cpuCountHard=" + getCpuCountHardLimit() + ", cpuCountSoft=" - + getCpuCountSoftLimit() + ", hdHardInMB=" + getHdHardLimitInMb() + ", hdSoftInMB=" + getHdSoftLimitInMb() + + getCpuCountSoftLimit() + ", hdHardInBytes=" + getHdHardLimitInBytes() + ", hdSoftInBytes=" + getHdSoftLimitInBytes() + ", publicIPsHard=" + getPublicIpsHard() + ", publicIpsSoft=" + getPublicIpsSoft() + ", ramHardInMB=" + getRamHardLimitInMb() + ", ramSoftInMB=" + getRamSoftLimitInMb() + ", storageHard=" + getStorageHard() + ", storageSoft=" + getStorageSoft() + ", vlansHard=" + getVlansHard() + ", vlansSoft=" + getVlansSoft()
