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/06/27 10:18:18 UTC
git commit: JCLOUDS-145: Upgrade Abiquo dependencies to the latest
version
Updated Branches:
refs/heads/master 66f73e4e6 -> 91960ff11
JCLOUDS-145: Upgrade Abiquo dependencies to the latest version
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/91960ff1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/tree/91960ff1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/diff/91960ff1
Branch: refs/heads/master
Commit: 91960ff1133ab7c48d26a2915b4c60f6c2402a4a
Parents: 66f73e4
Author: Ignasi Barrera <ig...@gmail.com>
Authored: Tue Jun 25 18:03:14 2013 +0200
Committer: Ignasi Barrera <ig...@gmail.com>
Committed: Thu Jun 27 10:05:13 2013 +0200
----------------------------------------------------------------------
abiquo/pom.xml | 8 +-
.../abiquo/domain/cloud/VirtualAppliance.java | 8 --
.../abiquo/domain/cloud/VirtualMachine.java | 6 +-
.../domain/cloud/VirtualMachineTemplate.java | 8 +-
.../jclouds/abiquo/domain/config/License.java | 12 +--
.../predicates/config/LicensePredicates.java | 10 ---
...mplateInVirtualDatacenterToHardwareTest.java | 87 +-------------------
.../VirtualMachineToNodeMetadataTest.java | 2 +-
.../jclouds/abiquo/domain/CloudResources.java | 20 +++--
.../jclouds/abiquo/domain/ConfigResources.java | 3 -
.../abiquo/domain/TemplateResources.java | 28 ++++++-
.../domain/cloud/VirtualMachineLiveApiTest.java | 2 +-
.../InfrastructureTestEnvironment.java | 19 ++++-
abiquo/src/test/resources/license/expired | 2 +-
.../src/test/resources/payloads/nst-create.xml | 2 +-
abiquo/src/test/resources/payloads/nst-edit.xml | 2 +-
abiquo/src/test/resources/payloads/nst-list.xml | 4 +-
17 files changed, 77 insertions(+), 146 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/91960ff1/abiquo/pom.xml
----------------------------------------------------------------------
diff --git a/abiquo/pom.xml b/abiquo/pom.xml
index 0429140..36dfe45 100644
--- a/abiquo/pom.xml
+++ b/abiquo/pom.xml
@@ -32,8 +32,8 @@
<packaging>bundle</packaging>
<properties>
- <abiquomodel.version>2.2.0.1</abiquomodel.version>
- <abiquoam.version>2.1.2.1</abiquoam.version>
+ <abiquomodel.version>2.3.0</abiquomodel.version>
+ <abiquoam.version>2.2.0</abiquoam.version>
<test.abiquo.endpoint>http://localhost/api</test.abiquo.endpoint>
<test.abiquo.identity>FIXME</test.abiquo.identity>
<test.abiquo.credential>FIXME</test.abiquo.credential>
@@ -80,6 +80,10 @@
<version>${abiquoam.version}</version>
<exclusions>
<exclusion>
+ <groupId>com.abiquo</groupId>
+ <artifactId>ovfmanager</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</exclusion>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/91960ff1/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualAppliance.java
----------------------------------------------------------------------
diff --git a/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualAppliance.java b/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualAppliance.java
index 9b16bc8..c0fe11f 100644
--- a/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualAppliance.java
+++ b/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualAppliance.java
@@ -341,10 +341,6 @@ public class VirtualAppliance extends DomainWrapper<VirtualApplianceDto> {
return target.getError();
}
- public int getHighDisponibility() {
- return target.getHighDisponibility();
- }
-
public Integer getId() {
return target.getId();
}
@@ -353,10 +349,6 @@ public class VirtualAppliance extends DomainWrapper<VirtualApplianceDto> {
return target.getName();
}
- public int getPublicApp() {
- return target.getPublicApp();
- }
-
public void setHighDisponibility(final int highDisponibility) {
target.setHighDisponibility(highDisponibility);
}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/91960ff1/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualMachine.java
----------------------------------------------------------------------
diff --git a/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualMachine.java b/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualMachine.java
index 0ed67b4..9e675ef 100644
--- a/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualMachine.java
+++ b/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualMachine.java
@@ -734,7 +734,7 @@ public class VirtualMachine extends DomainWithTasksWrapper<VirtualMachineWithNod
// Delegate methods
- public int getCpu() {
+ public Integer getCpu() {
return target.getCpu();
}
@@ -743,7 +743,7 @@ public class VirtualMachine extends DomainWithTasksWrapper<VirtualMachineWithNod
}
// Read-only field. This value is computed from the size of the Template
- public long getHdInBytes() {
+ public Long getHdInBytes() {
return target.getHdInBytes();
}
@@ -775,7 +775,7 @@ public class VirtualMachine extends DomainWithTasksWrapper<VirtualMachineWithNod
return target.getPassword();
}
- public int getRam() {
+ public Integer getRam() {
return target.getRam();
}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/91960ff1/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualMachineTemplate.java
----------------------------------------------------------------------
diff --git a/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualMachineTemplate.java b/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualMachineTemplate.java
index 75716c8..8cac027 100644
--- a/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualMachineTemplate.java
+++ b/abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualMachineTemplate.java
@@ -301,7 +301,7 @@ public class VirtualMachineTemplate extends DomainWrapper<VirtualMachineTemplate
// Delegate methods
- public int getCpuRequired() {
+ public Integer getCpuRequired() {
return target.getCpuRequired();
}
@@ -317,7 +317,7 @@ public class VirtualMachineTemplate extends DomainWrapper<VirtualMachineTemplate
return target.getDescription();
}
- public long getDiskFileSize() {
+ public Long getDiskFileSize() {
return target.getDiskFileSize();
}
@@ -325,7 +325,7 @@ public class VirtualMachineTemplate extends DomainWrapper<VirtualMachineTemplate
return DiskFormatType.valueOf(target.getDiskFormatType());
}
- public long getHdRequired() {
+ public Long getHdRequired() {
return target.getHdRequired();
}
@@ -337,7 +337,7 @@ public class VirtualMachineTemplate extends DomainWrapper<VirtualMachineTemplate
return target.getPath();
}
- public int getRamRequired() {
+ public Integer getRamRequired() {
return target.getRamRequired();
}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/91960ff1/abiquo/src/main/java/org/jclouds/abiquo/domain/config/License.java
----------------------------------------------------------------------
diff --git a/abiquo/src/main/java/org/jclouds/abiquo/domain/config/License.java b/abiquo/src/main/java/org/jclouds/abiquo/domain/config/License.java
index 1c69006..4fe1f4a 100644
--- a/abiquo/src/main/java/org/jclouds/abiquo/domain/config/License.java
+++ b/abiquo/src/main/java/org/jclouds/abiquo/domain/config/License.java
@@ -89,14 +89,6 @@ public class License extends DomainWrapper<LicenseDto> {
return target.getCode();
}
- public String getCustomerId() {
- return target.getCustomerid();
- }
-
- public String getEnabledIp() {
- return target.getEnabledip();
- }
-
public String getExpiration() {
return target.getExpiration();
}
@@ -111,8 +103,8 @@ public class License extends DomainWrapper<LicenseDto> {
@Override
public String toString() {
- return "License [id=" + getId() + ", code=" + getCode() + ", customerId=" + getCustomerId() + ", enabledIp="
- + getEnabledIp() + ", expiration=" + getExpiration() + ", numCores=" + getNumCores() + "]";
+ return "License [id=" + getId() + ", code=" + getCode() + ", expiration=" + getExpiration()
+ + ", numCores=" + getNumCores() + "]";
}
}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/91960ff1/abiquo/src/main/java/org/jclouds/abiquo/predicates/config/LicensePredicates.java
----------------------------------------------------------------------
diff --git a/abiquo/src/main/java/org/jclouds/abiquo/predicates/config/LicensePredicates.java b/abiquo/src/main/java/org/jclouds/abiquo/predicates/config/LicensePredicates.java
index 9d763e3..c306a65 100644
--- a/abiquo/src/main/java/org/jclouds/abiquo/predicates/config/LicensePredicates.java
+++ b/abiquo/src/main/java/org/jclouds/abiquo/predicates/config/LicensePredicates.java
@@ -30,16 +30,6 @@ import com.google.common.base.Predicate;
* @author Ignasi Barrera
*/
public class LicensePredicates {
- public static Predicate<License> customer(final String... customerIds) {
- checkNotNull(customerIds, "customers must be defined");
-
- return new Predicate<License>() {
- @Override
- public boolean apply(final License license) {
- return Arrays.asList(customerIds).contains(license.getCustomerId());
- }
- };
- }
public static Predicate<License> code(final String... codes) {
checkNotNull(codes, "customers must be defined");
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/91960ff1/abiquo/src/test/java/org/jclouds/abiquo/compute/functions/VirtualMachineTemplateInVirtualDatacenterToHardwareTest.java
----------------------------------------------------------------------
diff --git a/abiquo/src/test/java/org/jclouds/abiquo/compute/functions/VirtualMachineTemplateInVirtualDatacenterToHardwareTest.java b/abiquo/src/test/java/org/jclouds/abiquo/compute/functions/VirtualMachineTemplateInVirtualDatacenterToHardwareTest.java
index acd5a3f..5b27cd8 100644
--- a/abiquo/src/test/java/org/jclouds/abiquo/compute/functions/VirtualMachineTemplateInVirtualDatacenterToHardwareTest.java
+++ b/abiquo/src/test/java/org/jclouds/abiquo/compute/functions/VirtualMachineTemplateInVirtualDatacenterToHardwareTest.java
@@ -82,7 +82,7 @@ public class VirtualMachineTemplateInVirtualDatacenterToHardwareTest {
assertEquals(hardware.getName(), template.getName());
assertEquals(hardware.getUri(), URI.create("http://foo/bar"));
- assertEquals(hardware.getRam(), template.getRamRequired());
+ assertEquals(hardware.getRam(), template.getRamRequired().intValue());
assertEquals(hardware.getProcessors().size(), 1);
assertEquals(hardware.getProcessors().get(0).getCores(), (double) template.getCpuRequired());
assertEquals(hardware.getProcessors().get(0).getSpeed(),
@@ -138,91 +138,6 @@ public class VirtualMachineTemplateInVirtualDatacenterToHardwareTest {
}
@SuppressWarnings("unchecked")
- public void testConvertWithoutCpu() {
- ApiContext<AbiquoApi> context = EasyMock.createMock(ApiContext.class);
- Function<VirtualDatacenter, Location> vdcToLocation = mockVirtualDatacenterToLocation();
- VirtualMachineTemplateInVirtualDatacenterToHardware function = new VirtualMachineTemplateInVirtualDatacenterToHardware(
- vdcToLocation);
-
- VirtualMachineTemplateDto dto = new VirtualMachineTemplateDto();
- dto.setId(5);
- dto.setName("Template");
- dto.setDescription("Template description");
- dto.setHdRequired(50L * 1024 * 1024 * 1024); // 50 GB
- dto.setRamRequired(2048);
- VirtualMachineTemplate template = wrap(context, VirtualMachineTemplate.class, dto);
-
- VirtualDatacenterDto vdcDto = new VirtualDatacenterDto();
- vdcDto.setId(6);
- vdcDto.setHypervisorType(HypervisorType.VMX_04);
- VirtualDatacenter vdc = wrap(context, VirtualDatacenter.class, vdcDto);
-
- Hardware hardware = function.apply(new VirtualMachineTemplateInVirtualDatacenter(template, vdc));
-
- verify(vdcToLocation);
-
- assertEquals(hardware.getProcessors().size(), 1);
- assertEquals(hardware.getProcessors().get(0).getCores(), 0D);
- }
-
- @SuppressWarnings("unchecked")
- public void testConvertWithoutRam() {
- ApiContext<AbiquoApi> context = EasyMock.createMock(ApiContext.class);
- Function<VirtualDatacenter, Location> vdcToLocation = mockVirtualDatacenterToLocation();
- VirtualMachineTemplateInVirtualDatacenterToHardware function = new VirtualMachineTemplateInVirtualDatacenterToHardware(
- vdcToLocation);
-
- VirtualMachineTemplateDto dto = new VirtualMachineTemplateDto();
- dto.setId(5);
- dto.setName("Template");
- dto.setDescription("Template description");
- dto.setHdRequired(50L * 1024 * 1024 * 1024); // 50 GB
- dto.setCpuRequired(5);
- VirtualMachineTemplate template = wrap(context, VirtualMachineTemplate.class, dto);
-
- VirtualDatacenterDto vdcDto = new VirtualDatacenterDto();
- vdcDto.setId(6);
- vdcDto.setHypervisorType(HypervisorType.VMX_04);
- VirtualDatacenter vdc = wrap(context, VirtualDatacenter.class, vdcDto);
-
- Hardware hardware = function.apply(new VirtualMachineTemplateInVirtualDatacenter(template, vdc));
-
- verify(vdcToLocation);
-
- assertEquals(hardware.getRam(), 0);
- }
-
- @SuppressWarnings("unchecked")
- public void testConvertWithoutHd() {
- ApiContext<AbiquoApi> context = EasyMock.createMock(ApiContext.class);
- Function<VirtualDatacenter, Location> vdcToLocation = mockVirtualDatacenterToLocation();
- VirtualMachineTemplateInVirtualDatacenterToHardware function = new VirtualMachineTemplateInVirtualDatacenterToHardware(
- vdcToLocation);
-
- // VirtualMachineTemplate domain object does not have a builder, it is
- // read only
- VirtualMachineTemplateDto dto = new VirtualMachineTemplateDto();
- dto.setId(5);
- dto.setName("Template");
- dto.setDescription("Template description");
- dto.setCpuRequired(5);
- dto.setRamRequired(2048);
- VirtualMachineTemplate template = wrap(context, VirtualMachineTemplate.class, dto);
-
- VirtualDatacenterDto vdcDto = new VirtualDatacenterDto();
- vdcDto.setId(6);
- vdcDto.setHypervisorType(HypervisorType.VMX_04);
- VirtualDatacenter vdc = wrap(context, VirtualDatacenter.class, vdcDto);
-
- Hardware hardware = function.apply(new VirtualMachineTemplateInVirtualDatacenter(template, vdc));
-
- verify(vdcToLocation);
-
- assertEquals(hardware.getVolumes().size(), 1);
- assertEquals(hardware.getVolumes().get(0).getSize(), 0F);
- }
-
- @SuppressWarnings("unchecked")
private static Function<VirtualDatacenter, Location> mockVirtualDatacenterToLocation() {
Function<VirtualDatacenter, Location> mock = EasyMock.createMock(Function.class);
expect(mock.apply(anyObject(VirtualDatacenter.class))).andReturn(null);
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/91960ff1/abiquo/src/test/java/org/jclouds/abiquo/compute/functions/VirtualMachineToNodeMetadataTest.java
----------------------------------------------------------------------
diff --git a/abiquo/src/test/java/org/jclouds/abiquo/compute/functions/VirtualMachineToNodeMetadataTest.java b/abiquo/src/test/java/org/jclouds/abiquo/compute/functions/VirtualMachineToNodeMetadataTest.java
index 0b755ff..58851bf 100644
--- a/abiquo/src/test/java/org/jclouds/abiquo/compute/functions/VirtualMachineToNodeMetadataTest.java
+++ b/abiquo/src/test/java/org/jclouds/abiquo/compute/functions/VirtualMachineToNodeMetadataTest.java
@@ -122,7 +122,7 @@ public class VirtualMachineToNodeMetadataTest {
assertEquals(node.getLocation().getDescription(), "Mock Location");
assertEquals(node.getImageId(), "1");
assertEquals(node.getHardware().getId(), "1");
- assertEquals(node.getHardware().getRam(), vm.getRam());
+ assertEquals(node.getHardware().getRam(), vm.getRam().intValue());
assertEquals(node.getHardware().getProcessors().get(0).getCores(), (double) vm.getCpu());
assertEquals(node.getLoginPort(), vm.getVdrpPort());
assertEquals(node.getPrivateAddresses().size(), 1);
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/91960ff1/abiquo/src/test/java/org/jclouds/abiquo/domain/CloudResources.java
----------------------------------------------------------------------
diff --git a/abiquo/src/test/java/org/jclouds/abiquo/domain/CloudResources.java b/abiquo/src/test/java/org/jclouds/abiquo/domain/CloudResources.java
index d265f45..5bae3ad 100644
--- a/abiquo/src/test/java/org/jclouds/abiquo/domain/CloudResources.java
+++ b/abiquo/src/test/java/org/jclouds/abiquo/domain/CloudResources.java
@@ -57,6 +57,9 @@ public class CloudResources {
public static VirtualMachineDto virtualMachinePost() {
VirtualMachineDto virtualMachine = new VirtualMachineDto();
virtualMachine.setName("VM");
+ virtualMachine.setCpu(1);
+ virtualMachine.setRam(1);
+ virtualMachine.setHdInBytes(20l);
return virtualMachine;
}
@@ -136,6 +139,9 @@ public class CloudResources {
virtualMachine
.addLink(new RESTLink("configurations",
"http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/network/configurations"));
+ virtualMachine.setCpu(1);
+ virtualMachine.setRam(1);
+ virtualMachine.setHdInBytes(20l);
return virtualMachine;
}
@@ -184,7 +190,7 @@ public class CloudResources {
template.setName("m0n0wall");
template.setDiskFormatType(DiskFormatType.VMDK_FLAT.toString());
template.setPath("1/abiquo-repository.abiquo.com/m0n0wall/m0n0wall-1.3b18-i386-flat.vmdk");
- template.setDiskFileSize(27262976);
+ template.setDiskFileSize(27262976l);
template.setCpuRequired(1);
template.setRamRequired(128);
template.setCpuRequired(27262976);
@@ -255,13 +261,13 @@ public class CloudResources {
public static String virtualMachinePostPayload() {
StringBuilder buffer = new StringBuilder();
buffer.append("<virtualMachine>");
- buffer.append("<cpu>0</cpu>");
- buffer.append("<hdInBytes>0</hdInBytes>");
+ buffer.append("<cpu>1</cpu>");
+ buffer.append("<hdInBytes>20</hdInBytes>");
buffer.append("<highDisponibility>0</highDisponibility>");
buffer.append("<idState>0</idState>");
buffer.append("<idType>0</idType>");
buffer.append("<name>VM</name>");
- buffer.append("<ram>0</ram>");
+ buffer.append("<ram>1</ram>");
buffer.append("<vdrpPort>0</vdrpPort>");
buffer.append("</virtualMachine>");
return buffer.toString();
@@ -351,14 +357,14 @@ public class CloudResources {
buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/network/configurations",
"configurations"));
- buffer.append("<cpu>0</cpu>");
- buffer.append("<hdInBytes>0</hdInBytes>");
+ buffer.append("<cpu>1</cpu>");
+ buffer.append("<hdInBytes>20</hdInBytes>");
buffer.append("<highDisponibility>0</highDisponibility>");
buffer.append("<id>1</id>");
buffer.append("<idState>0</idState>");
buffer.append("<idType>0</idType>");
buffer.append("<name>VM</name>");
- buffer.append("<ram>0</ram>");
+ buffer.append("<ram>1</ram>");
buffer.append("<vdrpPort>0</vdrpPort>");
buffer.append("</virtualMachine>");
return buffer.toString();
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/91960ff1/abiquo/src/test/java/org/jclouds/abiquo/domain/ConfigResources.java
----------------------------------------------------------------------
diff --git a/abiquo/src/test/java/org/jclouds/abiquo/domain/ConfigResources.java b/abiquo/src/test/java/org/jclouds/abiquo/domain/ConfigResources.java
index 0223104..c3152f3 100644
--- a/abiquo/src/test/java/org/jclouds/abiquo/domain/ConfigResources.java
+++ b/abiquo/src/test/java/org/jclouds/abiquo/domain/ConfigResources.java
@@ -38,7 +38,6 @@ public class ConfigResources {
public static LicenseDto licensePost() {
LicenseDto license = new LicenseDto();
license.setCode(readLicense("license/expired"));
- license.setCustomerid("3bca6d1d-5fe2-42c5-82ea-a5276ea8c71c");
return license;
}
@@ -80,7 +79,6 @@ public class ConfigResources {
StringBuilder buffer = new StringBuilder();
buffer.append("<license>");
buffer.append(link("/admin/enterprises/config/licenses/1", "edit"));
- buffer.append("<customerid>3bca6d1d-5fe2-42c5-82ea-a5276ea8c71c</customerid>");
buffer.append("<code>" + readLicense("license/expired") + "</code>");
buffer.append("<id>1</id>");
buffer.append("</license>");
@@ -90,7 +88,6 @@ public class ConfigResources {
public static String licensePostPayload() {
StringBuilder buffer = new StringBuilder();
buffer.append("<license>");
- buffer.append("<customerid>3bca6d1d-5fe2-42c5-82ea-a5276ea8c71c</customerid>");
buffer.append("<code>" + readLicense("license/expired") + "</code>");
buffer.append("</license>");
return buffer.toString();
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/91960ff1/abiquo/src/test/java/org/jclouds/abiquo/domain/TemplateResources.java
----------------------------------------------------------------------
diff --git a/abiquo/src/test/java/org/jclouds/abiquo/domain/TemplateResources.java b/abiquo/src/test/java/org/jclouds/abiquo/domain/TemplateResources.java
index 57d757f..15a5807 100644
--- a/abiquo/src/test/java/org/jclouds/abiquo/domain/TemplateResources.java
+++ b/abiquo/src/test/java/org/jclouds/abiquo/domain/TemplateResources.java
@@ -20,6 +20,8 @@ import static org.jclouds.abiquo.domain.DomainUtils.link;
import com.abiquo.model.enumerator.ConversionState;
import com.abiquo.model.enumerator.DiskFormatType;
+import com.abiquo.model.enumerator.OSType;
+import com.abiquo.model.enumerator.VMTemplateState;
import com.abiquo.model.rest.RESTLink;
import com.abiquo.server.core.appslibrary.ConversionDto;
import com.abiquo.server.core.appslibrary.DatacenterRepositoryDto;
@@ -63,6 +65,17 @@ public class TemplateResources {
+ "/datacenterrepositories/1/virtualmachinetemplates/1/conversions"));
template.addLink(new RESTLink("tasks", "http://localhost/api/admin/enterprises/1"
+ "/datacenterrepositories/1/virtualmachinetemplates/1/tasks"));
+ template.addLink(new RESTLink("diskfile", "http://somewhere.com/file.vmdk"));
+ template.setDiskFormatType("RAW");
+ template.setOsType(OSType.MACOS);
+ template.setLoginUser("myuser");
+ template.setLoginPassword("mypass");
+ template.setState(VMTemplateState.DONE);
+ template.setCpuRequired(1);
+ template.setRamRequired(1);
+ template.setHdRequired(20l);
+ template.setDiskFileSize(30l);
+
template.setCostCode(0);
return template;
}
@@ -76,13 +89,20 @@ public class TemplateResources {
"conversions"));
buffer.append(link("/admin/enterprises/1" + "/datacenterrepositories/1/virtualmachinetemplates/1/tasks", "tasks"));
+ buffer.append(link(new RESTLink("diskfile", "http://somewhere.com/file.vmdk")));
buffer.append("<id>1</id>");
buffer.append("<name>Template</name>");
buffer.append("<description>Description</description>");
- buffer.append("<diskFileSize>0</diskFileSize>");
- buffer.append("<cpuRequired>0</cpuRequired>");
- buffer.append("<ramRequired>0</ramRequired>");
- buffer.append("<hdRequired>0</hdRequired>");
+ buffer.append("<diskFormatType>RAW</diskFormatType>");
+ buffer.append("<osType>MACOS</osType>");
+ buffer.append("<loginUser>myuser</loginUser>");
+ buffer.append("<loginPassword>mypass</loginPassword>");
+ buffer.append("<state>DONE</state>");
+
+ buffer.append("<diskFileSize>30</diskFileSize>");
+ buffer.append("<cpuRequired>1</cpuRequired>");
+ buffer.append("<ramRequired>1</ramRequired>");
+ buffer.append("<hdRequired>20</hdRequired>");
buffer.append("<shared>false</shared>");
buffer.append("<costCode>0</costCode>");
buffer.append("<chefEnabled>false</chefEnabled>");
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/91960ff1/abiquo/src/test/java/org/jclouds/abiquo/domain/cloud/VirtualMachineLiveApiTest.java
----------------------------------------------------------------------
diff --git a/abiquo/src/test/java/org/jclouds/abiquo/domain/cloud/VirtualMachineLiveApiTest.java b/abiquo/src/test/java/org/jclouds/abiquo/domain/cloud/VirtualMachineLiveApiTest.java
index 2093197..6ff8a8f 100644
--- a/abiquo/src/test/java/org/jclouds/abiquo/domain/cloud/VirtualMachineLiveApiTest.java
+++ b/abiquo/src/test/java/org/jclouds/abiquo/domain/cloud/VirtualMachineLiveApiTest.java
@@ -103,7 +103,7 @@ public class VirtualMachineLiveApiTest extends BaseAbiquoApiLiveApiTest {
AsyncTask task = vm.update(true);
assertNull(task);
- assertEquals(vm.getCpu(), 7);
+ assertEquals(vm.getCpu().intValue(), 7);
} finally {
env.virtualDatacenter.setCpuCountHardLimit(originalHard);
env.virtualDatacenter.setCpuCountSoftLimit(originalSoft);
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/91960ff1/abiquo/src/test/java/org/jclouds/abiquo/environment/InfrastructureTestEnvironment.java
----------------------------------------------------------------------
diff --git a/abiquo/src/test/java/org/jclouds/abiquo/environment/InfrastructureTestEnvironment.java b/abiquo/src/test/java/org/jclouds/abiquo/environment/InfrastructureTestEnvironment.java
index edcd2c1..b8101fc 100644
--- a/abiquo/src/test/java/org/jclouds/abiquo/environment/InfrastructureTestEnvironment.java
+++ b/abiquo/src/test/java/org/jclouds/abiquo/environment/InfrastructureTestEnvironment.java
@@ -66,6 +66,7 @@ import org.jclouds.abiquo.util.Config;
import com.abiquo.model.enumerator.HypervisorType;
import com.abiquo.model.enumerator.RemoteServiceType;
import com.google.common.collect.Iterables;
+import com.google.common.io.LineProcessor;
import com.google.common.io.Resources;
/**
@@ -460,8 +461,22 @@ public class InfrastructureTestEnvironment implements TestEnvironment {
public static String readLicense() throws IOException {
URL url = CloudTestEnvironment.class.getResource("/license/expired");
-
- return Resources.toString(url, Charset.defaultCharset());
+ return Resources.readLines(url, Charset.defaultCharset(), new LineProcessor<String>() {
+ StringBuilder sb = new StringBuilder();
+
+ @Override
+ public String getResult() {
+ return sb.toString();
+ }
+
+ @Override
+ public boolean processLine(String line) throws IOException {
+ if (!line.startsWith("#")) {
+ sb.append(line);
+ }
+ return true;
+ }
+ });
}
public RemoteService findRemoteService(final RemoteServiceType type) {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/91960ff1/abiquo/src/test/resources/license/expired
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/license/expired b/abiquo/src/test/resources/license/expired
index c73a711..6e56ec7 100644
--- a/abiquo/src/test/resources/license/expired
+++ b/abiquo/src/test/resources/license/expired
@@ -18,4 +18,4 @@
# under the License.
#
#
-B9cG06GaLHhUlpD9AWxKVkZPd4qPB0OAbm2Blr4374Y6rtPhcukg4MMLNK0uWn5fnsoBSqVX8o0hwQ1I6D3zUbFBSibMaK5xIZQfZmReHf04HPPBg0ZyaPRTBoKy6dCLnWpQIKe8vLemAudZ0w4spdzYMH2jw2TImN+2vd4QDU1qmUItYMsV5Sz+e8YVEGbUVkjRjQCmIUJskVxC+sW47dokgl5Qo8hN+4I6vKgEnXFdOSRFW2cyGgpHVH4Js4hwLG+PS2LXPS4UwvISJXRF6tO7Rgg9iaObcBD/byH5jGmggtSECUtXqI70nesIbMXRHQ1aGHARqbHH3+0Znjcu5g==
+R48/Z+e2HzLPtsHHJG/uJeF6Vn2jMseyPYeQQN/WVpYjGGsGNWWTcnbWcXg75Qk2rxDwU9TOiyFPUWOIJ1gUoiqQKLoy6OpN3TNqTHb56WFropU1wwefgoqEL/ZI2AJm+H9aCj6hf3agL8nlpkemBYeYbx1QgJ1g7g3exxmFZHPcLe+KBukkRBHoxB8TlbqupB2lWQ3hUWzMwcb0ayQAA7pt+O3XSZ4eML1fNyzgTLG82nO1SnSHj1dpLb4g3xzjZxt4SZFZ1Dq4X+2TVU4XEVmwO1mQYksYRy3KqtOdmvIA4z0sSDxAXQPds+qncp2jCiuXgyOyencbeSg4duwKBnl/v+dceFIALxsl2Y8wdJrdPibC4I4q1e5fKA8LowT7RRogbRJ8Fhwqw8VURG/MlhOKkb7zMFLR/wzjl1dM1itE3uxyg+Y3bY4K8aWCv0xZIJdRb3s2Cl1bzn6E7bg54UGhIGKxCnsLgXy+GLZTsdhOmxqs0a9HudJEGcDcqRiaa7/OFYfcyyVCxDxg6qS4M5goXMRxI7pMFhxlQvuxoKSOuijrTmXAFxMjQ6TCbYNogh454k+IwpreHDF67ey07rS9KyygyyflvO2bNCP6ng93drsGqY4ZWR4D9AeEPvCytkMNyzO4siWKmjIy8PcwzRYUSbt/6bat7E1RNj3d9/c=
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/91960ff1/abiquo/src/test/resources/payloads/nst-create.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/nst-create.xml b/abiquo/src/test/resources/payloads/nst-create.xml
index aa34c41..1accdeb 100644
--- a/abiquo/src/test/resources/payloads/nst-create.xml
+++ b/abiquo/src/test/resources/payloads/nst-create.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<networkservicetype>
- <defaultNST>true</defaultNST>
<name>Service Network</name>
+ <defaultNST>true</defaultNST>
</networkservicetype>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/91960ff1/abiquo/src/test/resources/payloads/nst-edit.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/nst-edit.xml b/abiquo/src/test/resources/payloads/nst-edit.xml
index 97b1ee6..cf564af 100644
--- a/abiquo/src/test/resources/payloads/nst-edit.xml
+++ b/abiquo/src/test/resources/payloads/nst-edit.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<networkservicetype>
<link href="http://localhost/api/admin/datacenters/1/networkservicetypes/1" type="application/vnd.abiquo.networkservicetype+xml" rel="edit"/>
- <defaultNST>true</defaultNST>
<id>1</id>
<name>Service Network</name>
+ <defaultNST>true</defaultNST>
</networkservicetype>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/91960ff1/abiquo/src/test/resources/payloads/nst-list.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/nst-list.xml b/abiquo/src/test/resources/payloads/nst-list.xml
index c818448..d83f468 100644
--- a/abiquo/src/test/resources/payloads/nst-list.xml
+++ b/abiquo/src/test/resources/payloads/nst-list.xml
@@ -2,14 +2,14 @@
<networkservicestypes>
<networkservicetype>
<link rel="edit" type="application/vnd.abiquo.networkservicetype+xml" href="http://localhost:80/api/admin/datacenters/1/networkservicetypes/3"/>
- <defaultNST>true</defaultNST>
<id>1</id>
<name>Service Network</name>
+ <defaultNST>true</defaultNST>
</networkservicetype>
<networkservicetype>
<link rel="edit" type="application/vnd.abiquo.networkservicetype+xml" href="http://localhost:80/api/admin/datacenters/1/networkservicetypes/2"/>
- <defaultNST>false</defaultNST>
<id>2</id>
<name>Storage Network</name>
+ <defaultNST>false</defaultNST>
</networkservicetype>
</networkservicestypes>
\ No newline at end of file