You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2013/10/24 15:18:49 UTC
git commit: JCLOUDS-275: Renamed the getter/setter methods for the HD
size limits to remove the reference to the Mb storage unit
Updated Branches:
refs/heads/master edd15e3d1 -> e271cf660
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/e271cf66
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/tree/e271cf66
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/diff/e271cf66
Branch: refs/heads/master
Commit: e271cf66053090b32a24295cd4cdda69ac105b66
Parents: edd15e3
Author: Carlos Garcia <ca...@emea.nec.com>
Authored: Wed Oct 23 11:45:18 2013 +0200
Committer: Ignasi Barrera <na...@apache.org>
Committed: Thu Oct 24 15:14:41 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/e271cf66/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/e271cf66/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 5bbe292..7ae4646 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
@@ -446,7 +446,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/e271cf66/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 b198858..44e98fe 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
@@ -534,7 +534,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/e271cf66/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()