Repository: jclouds-labs
Updated Branches:
  refs/heads/master 3bceb3f4e -> 1b689dc17


http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/enterprises-page.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/enterprises-page.xml 
b/abiquo/src/test/resources/payloads/enterprises-page.xml
deleted file mode 100644
index c7e9b07..0000000
--- a/abiquo/src/test/resources/payloads/enterprises-page.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<enterprises>
-    <link rel="first" href="http://localhost/api/admin/enterprises"; />
-    <link rel="next" 
href="http://localhost/api/admin/enterprises?startwith=1"/>
-    <link rel="last" 
href="http://localhost/api/admin/enterprises?startwith=1"/>
-    <totalSize>2</totalSize>
-    <enterprise>
-        <link rel="appslib/templateDefinitionLists" 
type="application/vnd.abiquo.templatedefinitionlists+xml" 
href="http://localhost/api/admin/enterprises/1/appslib/templateDefinitionLists"/>
-        <link rel="appslib/templateDefinitions" 
type="application/vnd.abiquo.templatedefinitions+xml" 
href="http://localhost/api/admin/enterprises/1/appslib/templateDefinitions"/>
-        <link rel="cloud/virtualdatacenters" 
type="application/vnd.abiquo.virtualdatacenters+xml" 
href="http://localhost/api/admin/enterprises/1/action/virtualdatacenters"/>
-        <link rel="datacenterrepositories" 
type="application/vnd.abiquo.datacenterrepositories+xml" 
href="http://localhost/api/admin/enterprises/1/datacenterrepositories"/>
-        <link rel="edit" type="application/vnd.abiquo.enterprise+xml" 
href="http://localhost/api/admin/enterprises/1"/>
-        <link rel="externalnetworks" type="application/vnd.abiquo.vlans+xml" 
href="http://localhost/api/admin/enterprises/1/action/externalnetworks"/>
-        <link rel="ips" 
href="http://localhost/api/admin/enterprises/1/action/ips"/>
-        <link rel="limits" type="application/vnd.abiquo.limits+xml" 
href="http://localhost/api/admin/enterprises/1/limits"/>
-        <link rel="properties" 
type="application/vnd.abiquo.enterpriseproperties+xml" 
href="http://localhost/api/admin/enterprises/1/properties"/>
-        <link rel="reservedmachines" 
type="application/vnd.abiquo.machines+xml" 
href="http://localhost/api/admin/enterprises/1/reservedmachines"/>
-        <link rel="users" type="application/vnd.abiquo.users+xml" 
href="http://localhost/api/admin/enterprises/1/users"/>
-        <link rel="virtualappliances" 
type="application/vnd.abiquo.virtualappliances+xml" 
href="http://localhost/api/admin/enterprises/1/action/virtualappliances"/>
-        <link rel="virtualmachines" 
type="application/vnd.abiquo.virtualmachines+xml" 
href="http://localhost/api/admin/enterprises/1/action/virtualmachines"/>
-        <link rel="volumes" type="application/vnd.abiquo.iscsivolumes+xml" 
href="http://localhost/api/admin/enterprises/1/action/volumes"/>
-        <cpuHard>0</cpuHard>
-        <cpuSoft>0</cpuSoft>
-        <hdHard>0</hdHard>
-        <hdSoft>0</hdSoft>
-        <publicIpsHard>0</publicIpsHard>
-        <publicIpsSoft>0</publicIpsSoft>
-        <ramHard>0</ramHard>
-        <ramSoft>0</ramSoft>
-        <storageHard>0</storageHard>
-        <storageSoft>0</storageSoft>
-        <vlansHard>0</vlansHard>
-        <vlansSoft>0</vlansSoft>
-        <id>1</id>
-        <isReservationRestricted>false</isReservationRestricted>
-        <name>Abiquo</name>
-        <repositoryHard>0</repositoryHard>
-        <repositorySoft>0</repositorySoft>
-    </enterprise>
-</enterprises>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/events-lastpage.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/events-lastpage.xml 
b/abiquo/src/test/resources/payloads/events-lastpage.xml
deleted file mode 100644
index 84e1a73..0000000
--- a/abiquo/src/test/resources/payloads/events-lastpage.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<events>
-    <link rel="first" href="http://localhost/api/events"/>
-    <link rel="previous" href="http://localhost/api/events?startwith=0"/>
-    <link rel="last" href="http://localhost/api/events?startwith=1"/>
-    <totalSize>4</totalSize>
-    <event>
-        <actionPerformed>VOLUME_DELETE</actionPerformed>
-        <component>VOLUME</component>
-        <enterprise>Abiquo</enterprise>
-        <id>110</id>
-        <idEnterprise>1</idEnterprise>
-        <idUser>1</idUser>
-        <idVirtualDatacenter>1</idVirtualDatacenter>
-        <idVolume>1786</idVolume>
-        <performedBy>admin</performedBy>
-        <severity>INFO</severity>
-        <stacktrace>Deleting volume &apos;JC-3972c0f8-28b&apos;</stacktrace>
-        <timestamp>2013-01-23T14:07:14Z</timestamp>
-        <user>admin</user>
-        <virtualDatacenter>JC-d0cf5cd6-67b</virtualDatacenter>
-        <volume>JC-3972c0f8-28b</volume>
-    </event>
-    <event>
-        <actionPerformed>VOLUME_MODIFY</actionPerformed>
-        <component>VOLUME</component>
-        <enterprise>Abiquo</enterprise>
-        <id>111</id>
-        <idEnterprise>1</idEnterprise>
-        <idUser>1</idUser>
-        <idVirtualDatacenter>1</idVirtualDatacenter>
-        <idVolume>1786</idVolume>
-        <performedBy>admin</performedBy>
-        <severity>INFO</severity>
-        <stacktrace>Updated size of volume &apos;JC-Event vol&apos; to 
&apos;32&apos; MB</stacktrace>
-        <timestamp>2013-01-23T14:07:12Z</timestamp>
-        <user>admin</user>
-        <virtualDatacenter>JC-d0cf5cd6-67b</virtualDatacenter>
-        <volume>JC-3972c0f8-28b</volume>
-    </event>
-</events>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/events-page.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/events-page.xml 
b/abiquo/src/test/resources/payloads/events-page.xml
deleted file mode 100644
index 4ac8d22..0000000
--- a/abiquo/src/test/resources/payloads/events-page.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<events>
-    <link rel="first" href="http://localhost/api/events"/>
-    <link rel="next" href="http://localhost/api/events?startwith=1"/>
-    <link rel="last" href="http://localhost/api/events?startwith=1"/>
-    <totalSize>4</totalSize>
-    <event>
-        <actionPerformed>VOLUME_DELETE</actionPerformed>
-        <component>VOLUME</component>
-        <enterprise>Abiquo</enterprise>
-        <id>109</id>
-        <idEnterprise>1</idEnterprise>
-        <idUser>1</idUser>
-        <idVirtualDatacenter>1</idVirtualDatacenter>
-        <idVolume>1786</idVolume>
-        <performedBy>admin</performedBy>
-        <severity>INFO</severity>
-        <stacktrace>Deleting volume &apos;JC-3972c0f8-28b&apos;</stacktrace>
-        <timestamp>2013-01-23T14:07:14Z</timestamp>
-        <user>admin</user>
-        <virtualDatacenter>JC-d0cf5cd6-67b</virtualDatacenter>
-        <volume>JC-3972c0f8-28b</volume>
-    </event>
-    <event>
-        <actionPerformed>VOLUME_MODIFY</actionPerformed>
-        <component>VOLUME</component>
-        <enterprise>Abiquo</enterprise>
-        <id>108</id>
-        <idEnterprise>1</idEnterprise>
-        <idUser>1</idUser>
-        <idVirtualDatacenter>1</idVirtualDatacenter>
-        <idVolume>1786</idVolume>
-        <performedBy>admin</performedBy>
-        <severity>INFO</severity>
-        <stacktrace>Updated size of volume &apos;JC-Event vol&apos; to 
&apos;32&apos; MB</stacktrace>
-        <timestamp>2013-01-23T14:07:12Z</timestamp>
-        <user>admin</user>
-        <virtualDatacenter>JC-d0cf5cd6-67b</virtualDatacenter>
-        <volume>JC-3972c0f8-28b</volume>
-    </event>
-</events>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/externalips-lastpage.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/externalips-lastpage.xml 
b/abiquo/src/test/resources/payloads/externalips-lastpage.xml
deleted file mode 100644
index 5e9311a..0000000
--- a/abiquo/src/test/resources/payloads/externalips-lastpage.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<externalips>
-    <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips"; 
rel="first" />
-    <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips?startwith=0";
 rel="previous" />
-    <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips?startwith=3";
 rel="last" />
-    <totalSize>4</totalSize>
-    <externalip>
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2"; 
rel="externalnetwork" title="ExternalNetwork" 
type="application/vnd.abiquo.vlan+xml" />
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips"; 
rel="ips" type="application/vnd.abiquo.externalips+xml" />
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips/3";
 rel="self" title="externalip" type="application/vnd.abiquo.externalip+xml" />
-        <id>3</id>
-        <ip>10.0.0.1</ip>
-        <networkName>ExternalNetwork</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-    </externalip>
-    <externalip>
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2"; 
rel="externalnetwork" title="ExternalNetwork" 
type="application/vnd.abiquo.vlan+xml" />
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips"; 
rel="ips" type="application/vnd.abiquo.externalips+xml" />
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips/4";
 rel="self" title="externalip" type="application/vnd.abiquo.externalip+xml" />
-        <id>4</id>
-        <ip>10.0.0.2</ip>
-        <networkName>ExternalNetwork</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-    </externalip>
-</externalips>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/externalips-page.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/externalips-page.xml 
b/abiquo/src/test/resources/payloads/externalips-page.xml
deleted file mode 100644
index 4abe4a8..0000000
--- a/abiquo/src/test/resources/payloads/externalips-page.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<externalips>
-    <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips"; 
rel="first" />
-    <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips?startwith=3";
 rel="next" />
-    <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips?startwith=3";
 rel="last" />
-    <totalSize>4</totalSize>
-    <externalip>
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2"; 
rel="externalnetwork" title="ExternalNetwork" 
type="application/vnd.abiquo.vlan+xml" />
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips"; 
rel="ips" type="application/vnd.abiquo.externalips+xml" />
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips/1";
 rel="self" title="externalip" type="application/vnd.abiquo.externalip+xml" />
-        <id>1</id>
-        <ip>10.0.0.1</ip>
-        <networkName>ExternalNetwork</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-    </externalip>
-    <externalip>
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2"; 
rel="externalnetwork" title="ExternalNetwork" 
type="application/vnd.abiquo.vlan+xml" />
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips"; 
rel="ips" type="application/vnd.abiquo.externalips+xml" />
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips/2";
 rel="self" title="externalip" type="application/vnd.abiquo.externalip+xml" />
-        <id>2</id>
-        <ip>10.0.0.2</ip>
-        <networkName>ExternalNetwork</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-    </externalip>
-</externalips>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/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
deleted file mode 100644
index 1accdeb..0000000
--- a/abiquo/src/test/resources/payloads/nst-create.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<networkservicetype>
-    <name>Service Network</name>
-    <defaultNST>true</defaultNST>
-</networkservicetype>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/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
deleted file mode 100644
index cf564af..0000000
--- a/abiquo/src/test/resources/payloads/nst-edit.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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"/>
-    <id>1</id>
-    <name>Service Network</name>
-    <defaultNST>true</defaultNST>
-</networkservicetype>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/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
deleted file mode 100644
index d83f468..0000000
--- a/abiquo/src/test/resources/payloads/nst-list.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<networkservicestypes>
-    <networkservicetype>
-        <link rel="edit" type="application/vnd.abiquo.networkservicetype+xml" 
href="http://localhost:80/api/admin/datacenters/1/networkservicetypes/3"/>
-        <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"/>
-        <id>2</id>
-        <name>Storage Network</name>
-        <defaultNST>false</defaultNST>
-    </networkservicetype>
-</networkservicestypes>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/privateips-lastpage.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/privateips-lastpage.xml 
b/abiquo/src/test/resources/payloads/privateips-lastpage.xml
deleted file mode 100644
index d289567..0000000
--- a/abiquo/src/test/resources/payloads/privateips-lastpage.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<privateips>
-    <link 
href="http://localhost/api/cloud/virtualdatacenters/1/privatenetworks/1/ips"; 
rel="first" />
-    <link 
href="http://localhost/api/cloud/virtualdatacenters/1/privatenetworks/1/ips?startwith=0";
 rel="previous" />
-    <link 
href="http://localhost/api/cloud/virtualdatacenters/1/privatenetworks/1/ips?startwith=1";
 rel="last" />
-    <totalSize>2</totalSize>
-    <privateip>
-        <link 
href="http://localhost/api/cloud/virtualdatacenters/1/privatenetworks/1"; 
rel="privatenetwork" title="JC--privatenetwork-test" 
type="application/vnd.abiquo.vlan+xml" />
-        <link 
href="http://localhost/api/cloud/virtualdatacenters/1/privatenetworks/1/ips/3311";
 rel="self" title="privateip" type="application/vnd.abiquo.privateip+xml" />
-        <link href="http://localhost/api/cloud/virtualdatacenters/1"; 
rel="virtualdatacenter" title="Aloha updated" 
type="application/vnd.abiquo.virtualdatacenter+xml" />
-        <id>2</id>
-        <ip>192.168.1.1</ip>
-        <mac>00:50:56:11:d4:a2</mac>
-        <name>00505611d4a2_host</name>
-        <networkName>JC--privatenetwork-test</networkName>
-    </privateip>
-</privateips>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/privateips-page.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/privateips-page.xml 
b/abiquo/src/test/resources/payloads/privateips-page.xml
deleted file mode 100644
index 4a6acb1..0000000
--- a/abiquo/src/test/resources/payloads/privateips-page.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<privateips>
-    <link 
href="http://localhost/api/cloud/virtualdatacenters/1/privatenetworks/1/ips"; 
rel="first" />
-    <link 
href="http://localhost/api/cloud/virtualdatacenters/1/privatenetworks/1/ips?startwith=1";
 rel="next" />
-    <link 
href="http://localhost/api/cloud/virtualdatacenters/1/privatenetworks/1/ips?startwith=1";
 rel="last" />
-    <totalSize>2</totalSize>
-    <privateip>
-        <link 
href="http://localhost/api/cloud/virtualdatacenters/1/privatenetworks/1"; 
rel="privatenetwork" title="JC--privatenetwork-test" 
type="application/vnd.abiquo.vlan+xml" />
-        <link 
href="http://localhost/api/cloud/virtualdatacenters/1/privatenetworks/1/ips/3311";
 rel="self" title="privateip" type="application/vnd.abiquo.privateip+xml" />
-        <link href="http://localhost/api/cloud/virtualdatacenters/1"; 
rel="virtualdatacenter" title="Aloha updated" 
type="application/vnd.abiquo.virtualdatacenter+xml" />
-        <id>1</id>
-        <ip>192.168.1.1</ip>
-        <mac>00:50:56:11:d4:a2</mac>
-        <name>00505611d4a2_host</name>
-        <networkName>JC--privatenetwork-test</networkName>
-    </privateip>
-</privateips>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/publicips-available-lastpage.xml
----------------------------------------------------------------------
diff --git 
a/abiquo/src/test/resources/payloads/publicips-available-lastpage.xml 
b/abiquo/src/test/resources/payloads/publicips-available-lastpage.xml
deleted file mode 100644
index dec31ec..0000000
--- a/abiquo/src/test/resources/payloads/publicips-available-lastpage.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<publicips>
-    <link rel="first" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/topurchase"; />
-    <link rel="previous" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/topurchase?startwith=0";
 />
-    <link rel="last" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/topurchase?startwith=3";
 />
-    <totalSize>4</totalSize>
-    <publicip>
-        <link title="publicip" rel="edit" 
type="application/vnd.abiquo.publicips+xml" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/topurchase/3"; />
-        <link title="publi" rel="publicnetwork" 
type="application/vnd.abiquo.vlan+xml" 
href="http://localhost/api/admin/datacenters/1/network/4"; />
-        <link title="PUT" rel="purchase" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/purchased/3"; />
-        <link rel="topurchase" type="application/vnd.abiquo.publicips+xml" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/topurchase"; />
-        <id>3</id>
-        <ip>8.8.8.1</ip>
-        <networkName>publi</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-    </publicip>
-    <publicip>
-        <link title="publicip" rel="edit" 
type="application/vnd.abiquo.publicips+xml" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/topurchase/4"; />
-        <link title="publi" rel="publicnetwork" 
type="application/vnd.abiquo.vlan+xml" 
href="http://localhost/api/admin/datacenters/1/network/4"; />
-        <link title="PUT" rel="purchase" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/purchased/4"; />
-        <link rel="topurchase" type="application/vnd.abiquo.publicips+xml" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/topurchase"; />
-        <id>4</id>
-        <ip>8.8.8.3</ip>
-        <networkName>publi</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-    </publicip>
-</publicips>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/publicips-available-page.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/publicips-available-page.xml 
b/abiquo/src/test/resources/payloads/publicips-available-page.xml
deleted file mode 100644
index f53c4ac..0000000
--- a/abiquo/src/test/resources/payloads/publicips-available-page.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<publicips>
-    <link rel="first" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/topurchase"; />
-    <link rel="next" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/topurchase?startwith=3";
 />
-    <link rel="last" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/topurchase?startwith=3";
 />
-    <totalSize>4</totalSize>
-    <publicip>
-        <link title="publicip" rel="edit" 
type="application/vnd.abiquo.publicips+xml" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/topurchase/1"; />
-        <link title="publi" rel="publicnetwork" 
type="application/vnd.abiquo.vlan+xml" 
href="http://localhost/api/admin/datacenters/1/network/4"; />
-        <link title="PUT" rel="purchase" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/purchased/1"; />
-        <link rel="topurchase" type="application/vnd.abiquo.publicips+xml" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/topurchase"; />
-        <id>1</id>
-        <ip>8.8.8.1</ip>
-        <networkName>publi</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-    </publicip>
-    <publicip>
-        <link title="publicip" rel="edit" 
type="application/vnd.abiquo.publicips+xml" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/topurchase/2"; />
-        <link title="publi" rel="publicnetwork" 
type="application/vnd.abiquo.vlan+xml" 
href="http://localhost/api/admin/datacenters/1/network/4"; />
-        <link title="PUT" rel="purchase" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/purchased/2"; />
-        <link rel="topurchase" type="application/vnd.abiquo.publicips+xml" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/topurchase"; />
-        <id>2</id>
-        <ip>8.8.8.3</ip>
-        <networkName>publi</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-    </publicip>
-</publicips>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/publicips-lastpage.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/publicips-lastpage.xml 
b/abiquo/src/test/resources/payloads/publicips-lastpage.xml
deleted file mode 100644
index 04741d3..0000000
--- a/abiquo/src/test/resources/payloads/publicips-lastpage.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<publicips>
-    <link href="http://localhost/api/admin/datacenters/1/network/1/ips"; 
rel="first" />
-    <link 
href="http://localhost/api/admin/datacenters/1/network/1/ips?startwith=0"; 
rel="previous" />
-    <link 
href="http://localhost/api/admin/datacenters/1/network/1/ips?startwith=3"; 
rel="last" />
-    <totalSize>4</totalSize>
-    <publicip>
-        <link href="http://localhost/api/admin/datacenters/1/network/1"; 
rel="publicnetwork" title="JC--publicnetwork-test" 
type="application/vnd.abiquo.vlan+xml" />
-        <link href="http://localhost/api/admin/datacenters/1/network/1/ips/3"; 
rel="self" title="publicip" type="application/vnd.abiquo.publicip+xml" />
-        <id>3</id>
-        <ip>80.80.80.1</ip>
-        <networkName>JC--publicnetwork-test</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-    </publicip>
-    <publicip>
-        <link href="http://localhost/api/admin/datacenters/1/network/1"; 
rel="publicnetwork" title="JC--publicnetwork-test" 
type="application/vnd.abiquo.vlan+xml" />
-        <link href="http://localhost/api/admin/datacenters/1/network/1/ips/4"; 
rel="self" title="publicip" type="application/vnd.abiquo.publicip+xml" />
-        <id>4</id>
-        <ip>80.80.80.2</ip>
-        <networkName>JC--publicnetwork-test</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-    </publicip>
-</publicips>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/publicips-page.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/publicips-page.xml 
b/abiquo/src/test/resources/payloads/publicips-page.xml
deleted file mode 100644
index 092b403..0000000
--- a/abiquo/src/test/resources/payloads/publicips-page.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<publicips>
-    <link href="http://localhost/api/admin/datacenters/1/network/1/ips"; 
rel="first" />
-    <link 
href="http://localhost/api/admin/datacenters/1/network/1/ips?startwith=3"; 
rel="next" />
-    <link 
href="http://localhost/api/admin/datacenters/1/network/1/ips?startwith=3"; 
rel="last" />
-    <totalSize>4</totalSize>
-    <publicip>
-        <link href="http://localhost/api/admin/datacenters/1/network/1"; 
rel="publicnetwork" title="JC--publicnetwork-test" 
type="application/vnd.abiquo.vlan+xml" />
-        <link href="http://localhost/api/admin/datacenters/1/network/1/ips/1"; 
rel="self" title="publicip" type="application/vnd.abiquo.publicip+xml" />
-        <id>1</id>
-        <ip>80.80.80.1</ip>
-        <networkName>JC--publicnetwork-test</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-    </publicip>
-    <publicip>
-        <link href="http://localhost/api/admin/datacenters/1/network/1"; 
rel="publicnetwork" title="JC--publicnetwork-test" 
type="application/vnd.abiquo.vlan+xml" />
-        <link href="http://localhost/api/admin/datacenters/1/network/1/ips/2"; 
rel="self" title="publicip" type="application/vnd.abiquo.publicip+xml" />
-        <id>2</id>
-        <ip>80.80.80.2</ip>
-        <networkName>JC--publicnetwork-test</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-    </publicip>
-</publicips>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/publicips-purchased-lastpage.xml
----------------------------------------------------------------------
diff --git 
a/abiquo/src/test/resources/payloads/publicips-purchased-lastpage.xml 
b/abiquo/src/test/resources/payloads/publicips-purchased-lastpage.xml
deleted file mode 100644
index 077b304..0000000
--- a/abiquo/src/test/resources/payloads/publicips-purchased-lastpage.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<publicips>
-    <link rel="first" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/purchased"; />
-    <link rel="previous" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/purchased?startwith=0";
 />
-    <link rel="last" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/purchased?startwith=3";
 />
-    <totalSize>4</totalSize>
-    <publicip>
-        <link title="publicip" rel="edit" 
type="application/vnd.abiquo.publicips+xml" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/purchased/3"; />
-        <link title="publi" rel="publicnetwork" 
type="application/vnd.abiquo.vlan+xml" 
href="http://localhost/api/admin/datacenters/1/network/4"; />
-        <link title="PUT" rel="purchase" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/purchased/3"; />
-        <link rel="topurchase" type="application/vnd.abiquo.publicips+xml" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/topurchase"; />
-        <id>3</id>
-        <ip>8.8.8.1</ip>
-        <networkName>publi</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-    </publicip>
-    <publicip>
-        <link title="publicip" rel="edit" 
type="application/vnd.abiquo.publicips+xml" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/purchased/4"; />
-        <link title="publi" rel="publicnetwork" 
type="application/vnd.abiquo.vlan+xml" 
href="http://localhost/api/admin/datacenters/1/network/4"; />
-        <link title="PUT" rel="purchase" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/purchased/4"; />
-        <link rel="topurchase" type="application/vnd.abiquo.publicips+xml" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/topurchase"; />
-        <id>4</id>
-        <ip>8.8.8.3</ip>
-        <networkName>publi</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-    </publicip>
-</publicips>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/publicips-purchased-page.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/publicips-purchased-page.xml 
b/abiquo/src/test/resources/payloads/publicips-purchased-page.xml
deleted file mode 100644
index 9456946..0000000
--- a/abiquo/src/test/resources/payloads/publicips-purchased-page.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<publicips>
-    <link rel="first" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/purchased"; />
-    <link rel="next" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/purchased?startwith=3";
 />
-    <link rel="last" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/purchased?startwith=3";
 />
-    <totalSize>4</totalSize>
-    <publicip>
-        <link title="publicip" rel="edit" 
type="application/vnd.abiquo.publicips+xml" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/purchased/1"; />
-        <link title="publi" rel="publicnetwork" 
type="application/vnd.abiquo.vlan+xml" 
href="http://localhost/api/admin/datacenters/1/network/4"; />
-        <link title="PUT" rel="purchase" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/purchased/1"; />
-        <link rel="topurchase" type="application/vnd.abiquo.publicips+xml" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/topurchase"; />
-        <id>1</id>
-        <ip>8.8.8.1</ip>
-        <networkName>publi</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-    </publicip>
-    <publicip>
-        <link title="publicip" rel="edit" 
type="application/vnd.abiquo.publicips+xml" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/purchased/2"; />
-        <link title="publi" rel="publicnetwork" 
type="application/vnd.abiquo.vlan+xml" 
href="http://localhost/api/admin/datacenters/1/network/4"; />
-        <link title="PUT" rel="purchase" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/purchased/2"; />
-        <link rel="topurchase" type="application/vnd.abiquo.publicips+xml" 
href="http://localhost/api/cloud/virtualdatacenters/1/publicips/topurchase"; />
-        <id>2</id>
-        <ip>8.8.8.3</ip>
-        <networkName>publi</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-    </publicip>
-</publicips>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/templates-lastpage.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/templates-lastpage.xml 
b/abiquo/src/test/resources/payloads/templates-lastpage.xml
deleted file mode 100644
index 63fa4cb..0000000
--- a/abiquo/src/test/resources/payloads/templates-lastpage.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<virtualMachineTemplates>
-    <link rel="first" 
href="http://localhost/api/admin/enterprises/1/datacenterrepositories/1/virtualmachinetemplates"/>
-    <link rel="previous" 
href="http://localhost/api/admin/enterprises/1/datacenterrepositories/1/virtualmachinetemplates?startwith=0"/>
-    <link rel="last" 
href="http://localhost/api/admin/enterprises/1/datacenterrepositories/1/virtualmachinetemplates?startwith=1"/>
-    <totalSize>2</totalSize>
-    <virtualMachineTemplate>
-        <link title="Web Servers" rel="category" 
type="application/vnd.abiquo.category+xml" 
href="http://localhost/api/config/categories/14"/>
-        <link rel="conversions" type="application/vnd.abiquo.conversions+xml" 
href="http://localhost/api/admin/enterprises/152/datacenterrepositories/2/virtualmachinetemplates/151/conversions"/>
-        <link rel="datacenter" type="application/vnd.abiquo.datacenter+xml" 
href="http://localhost/api/admin/datacenters/2"/>
-        <link rel="datacenterrepository" 
type="application/vnd.abiquo.datacenterrepository+xml" 
href="http://localhost/api/admin/enterprises/152/datacenterrepositories/2"/>
-        <link rel="diskfile" 
href="http://localhost/am/erepos/152/templates/apache%252Fubuntu-910-server-x86_64-vmdk5.ovf?format=diskFile"/>
-        <link title="Apache Server" rel="edit" 
type="application/vnd.abiquo.virtualmachinetemplate+xml" 
href="http://localhost/api/admin/enterprises/152/datacenterrepositories/2/virtualmachinetemplates/151"/>
-        <link rel="enterprise" type="application/vnd.abiquo.enterprise+xml" 
href="http://localhost/api/admin/enterprises/152"/>
-        <link rel="ovfdocument" 
href="http://localhost/am/erepos/152/templates/apache%252Fubuntu-910-server-x86_64-vmdk5.ovf?format=envelope"/>
-        <link rel="template" 
href="http://localhost/am/erepos/152/templates/apache%252Fubuntu-910-server-x86_64-vmdk5.ovf"/>
-        <link rel="templatedefinition" 
href="http://apache/ubuntu-910-server-x86_64-vmdk5.ovf"/>
-        <link rel="templatestatus" 
href="http://localhost/am/erepos/152/templates/apache%252Fubuntu-910-server-x86_64-vmdk5.ovf?format=status"/>
-        <id>152</id>
-        <name>Apache Server</name>
-        <description>Apache Server</description>
-        <path>1/apache/ubuntu-910-server-x86_64-vmdk5.vmdk</path>
-        <diskFormatType>VMDK_STREAM_OPTIMIZED</diskFormatType>
-        <diskFileSize>206947328</diskFileSize>
-        <cpuRequired>1</cpuRequired>
-        <ramRequired>512</ramRequired>
-        <hdRequired>734003200</hdRequired>
-        <shared>true</shared>
-        <costCode>0</costCode>
-        <creationDate>2012-04-18T17:42:42+02:00</creationDate>
-        <creationUser>SYSTEM</creationUser>
-        <chefEnabled>false</chefEnabled>
-        <iconUrl>http://icons.abiquo.com/apache.jpg</iconUrl>
-    </virtualMachineTemplate>
-</virtualMachineTemplates>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/templates-page.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/templates-page.xml 
b/abiquo/src/test/resources/payloads/templates-page.xml
deleted file mode 100644
index ec98f93..0000000
--- a/abiquo/src/test/resources/payloads/templates-page.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<virtualMachineTemplates>
-    <link rel="first" 
href="http://localhost/api/admin/enterprises/1/datacenterrepositories/1/virtualmachinetemplates"/>
-    <link rel="next" 
href="http://localhost/api/admin/enterprises/1/datacenterrepositories/1/virtualmachinetemplates?startwith=1"/>
-    <link rel="last" 
href="http://localhost/api/admin/enterprises/1/datacenterrepositories/1/virtualmachinetemplates?startwith=1"/>
-    <totalSize>2</totalSize>
-    <virtualMachineTemplate>
-        <link title="Web Servers" rel="category" 
type="application/vnd.abiquo.category+xml" 
href="http://localhost/api/config/categories/14"/>
-        <link rel="conversions" type="application/vnd.abiquo.conversions+xml" 
href="http://localhost/api/admin/enterprises/152/datacenterrepositories/2/virtualmachinetemplates/151/conversions"/>
-        <link rel="datacenter" type="application/vnd.abiquo.datacenter+xml" 
href="http://localhost/api/admin/datacenters/2"/>
-        <link rel="datacenterrepository" 
type="application/vnd.abiquo.datacenterrepository+xml" 
href="http://localhost/api/admin/enterprises/152/datacenterrepositories/2"/>
-        <link rel="diskfile" 
href="http://localhost/am/erepos/152/templates/apache%252Fubuntu-910-server-x86_64-vmdk5.ovf?format=diskFile"/>
-        <link title="Apache Server" rel="edit" 
type="application/vnd.abiquo.virtualmachinetemplate+xml" 
href="http://localhost/api/admin/enterprises/152/datacenterrepositories/2/virtualmachinetemplates/151"/>
-        <link rel="enterprise" type="application/vnd.abiquo.enterprise+xml" 
href="http://localhost/api/admin/enterprises/152"/>
-        <link rel="ovfdocument" 
href="http://localhost/am/erepos/152/templates/apache%252Fubuntu-910-server-x86_64-vmdk5.ovf?format=envelope"/>
-        <link rel="template" 
href="http://localhost/am/erepos/152/templates/apache%252Fubuntu-910-server-x86_64-vmdk5.ovf"/>
-        <link rel="templatedefinition" 
href="http://apache/ubuntu-910-server-x86_64-vmdk5.ovf"/>
-        <link rel="templatestatus" 
href="http://localhost/am/erepos/152/templates/apache%252Fubuntu-910-server-x86_64-vmdk5.ovf?format=status"/>
-        <id>151</id>
-        <name>Apache Server</name>
-        <description>Apache Server</description>
-        <path>1/apache/ubuntu-910-server-x86_64-vmdk5.vmdk</path>
-        <diskFormatType>VMDK_STREAM_OPTIMIZED</diskFormatType>
-        <diskFileSize>206947328</diskFileSize>
-        <cpuRequired>1</cpuRequired>
-        <ramRequired>512</ramRequired>
-        <hdRequired>734003200</hdRequired>
-        <shared>true</shared>
-        <costCode>0</costCode>
-        <creationDate>2012-04-18T17:42:42+02:00</creationDate>
-        <creationUser>SYSTEM</creationUser>
-        <chefEnabled>false</chefEnabled>
-        <iconUrl>http://icons.abiquo.com/apache.jpg</iconUrl>
-    </virtualMachineTemplate>
-</virtualMachineTemplates>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/unmanagedips-lastpage.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/unmanagedips-lastpage.xml 
b/abiquo/src/test/resources/payloads/unmanagedips-lastpage.xml
deleted file mode 100644
index aade3a4..0000000
--- a/abiquo/src/test/resources/payloads/unmanagedips-lastpage.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<unmanagedips>
-    <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips"; 
rel="first" />
-    <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips?startwith=0";
 rel="previous" />
-    <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips?startwith=3";
 rel="last" />
-    <totalSize>4</totalSize>
-    <unmanagedip>
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2"; 
rel="externalnetwork" title="ExternalNetwork" 
type="application/vnd.abiquo.vlan+xml" />
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips"; 
rel="ips" type="application/vnd.abiquo.externalips+xml" />
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips/3";
 rel="self" title="externalip" type="application/vnd.abiquo.externalip+xml" />
-        <id>3</id>
-        <ip>10.0.0.1</ip>
-        <networkName>UnmanagedNetwork</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-        <unmanaged>true</unmanaged>
-    </unmanagedip>
-    <unmanagedip>
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2"; 
rel="externalnetwork" title="ExternalNetwork" 
type="application/vnd.abiquo.vlan+xml" />
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips"; 
rel="ips" type="application/vnd.abiquo.externalips+xml" />
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips/4";
 rel="self" title="externalip" type="application/vnd.abiquo.externalip+xml" />
-        <id>4</id>
-        <ip>10.0.0.2</ip>
-        <networkName>UnmanagedNetwork</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-        <unmanaged>true</unmanaged>
-    </unmanagedip>
-</unmanagedips>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/unmanagedips-page.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/unmanagedips-page.xml 
b/abiquo/src/test/resources/payloads/unmanagedips-page.xml
deleted file mode 100644
index 2302218..0000000
--- a/abiquo/src/test/resources/payloads/unmanagedips-page.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<unmanagedips>
-    <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips"; 
rel="first" />
-    <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips?startwith=3";
 rel="next" />
-    <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips?startwith=3";
 rel="last" />
-    <totalSize>4</totalSize>
-    <unmanagedip>
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2"; 
rel="externalnetwork" title="ExternalNetwork" 
type="application/vnd.abiquo.vlan+xml" />
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips"; 
rel="ips" type="application/vnd.abiquo.externalips+xml" />
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips/1";
 rel="self" title="externalip" type="application/vnd.abiquo.externalip+xml" />
-        <id>1</id>
-        <ip>10.0.0.1</ip>
-        <networkName>UnmanagedNetwork</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-        <unmanaged>true</unmanaged>
-    </unmanagedip>
-    <unmanagedip>
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2"; 
rel="externalnetwork" title="ExternalNetwork" 
type="application/vnd.abiquo.vlan+xml" />
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips"; 
rel="ips" type="application/vnd.abiquo.externalips+xml" />
-        <link 
href="http://localhost/api/admin/enterprises/2/limits/2/externalnetworks/2/ips/2";
 rel="self" title="externalip" type="application/vnd.abiquo.externalip+xml" />
-        <id>2</id>
-        <ip>10.0.0.2</ip>
-        <networkName>UnmanagedNetwork</networkName>
-        <available>true</available>
-        <quarantine>false</quarantine>
-        <unmanaged>true</unmanaged>
-    </unmanagedip>
-</unmanagedips>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/users-lastpage.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/users-lastpage.xml 
b/abiquo/src/test/resources/payloads/users-lastpage.xml
deleted file mode 100644
index def0a5b..0000000
--- a/abiquo/src/test/resources/payloads/users-lastpage.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<users>
-       <link rel="first" 
href="http://10.7.3.10:80/api/admin/enterprises/1/users?limit=2"/>
-       <link rel="previous" 
href="http://10.7.3.10:80/api/admin/enterprises/1/users?startwith=0&amp;limit=2"/>
-    <link rel="next" 
href="http://10.7.3.10:80/api/admin/enterprises/1/users?startwith=3&amp;limit=2"/>
-       <link rel="last" 
href="http://10.7.3.10:80/api/admin/enterprises/1/users?startwith=1&amp;limit=2"/>
-       <totalSize>3</totalSize>
-    <user>
-               <link rel="edit" type="application/vnd.abiquo.user+xml" 
href="http://localhost/api/admin/enterprises/1/users/3"/>
-               <link rel="enterprise" 
type="application/vnd.abiquo.enterprise+xml" 
href="http://localhost/api/admin/enterprises/1"/>
-               <link rel="role" type="application/vnd.abiquo.role+xml" 
href="http://localhost/api/admin/roles/7"/>
-               <link rel="virtualmachines" 
type="application/vnd.abiquo.virtualmachines+xml" 
href="http://localhost/api/admin/enterprises/1/users/3/action/virtualmachines"/>
-               <id>3</id>
-               <nick>ron</nick>
-               <password>0371e4dce3c8804f1543c3f0f309cc10</password>
-               <name>Ron</name>
-               <surname>Weasley</surname>
-               <description/>
-               <email>[email protected]</email>
-               <locale>en_EN</locale>
-               <authType>ABIQUO</authType>
-               <active>true</active>
-    </user>
-</users>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/users-page.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/users-page.xml 
b/abiquo/src/test/resources/payloads/users-page.xml
deleted file mode 100644
index 5427878..0000000
--- a/abiquo/src/test/resources/payloads/users-page.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<users>
-       <link rel="first" 
href="http://localhost/api/admin/enterprises/1/users?limit=2"/>
-    <link rel="next" 
href="http://localhost/api/admin/enterprises/1/users?startwith=2&amp;limit=2"/>
-       <link rel="last" 
href="http://localhost/api/admin/enterprises/1/users?startwith=2&amp;limit=2"/>
-       <totalSize>3</totalSize>
-    <user>
-               <link rel="edit" type="application/vnd.abiquo.user+xml" 
href="http://localhost/api/admin/enterprises/1/users/1"/>
-               <link rel="enterprise" 
type="application/vnd.abiquo.enterprise+xml" 
href="http://localhost/api/admin/enterprises/1"/>
-               <link rel="role" type="application/vnd.abiquo.role+xml" 
href="http://localhost/api/admin/roles/7"/>
-               <link rel="virtualmachines" 
type="application/vnd.abiquo.virtualmachines+xml" 
href="http://localhost/api/admin/enterprises/1/users/1/action/virtualmachines"/>
-               <id>1</id>
-               <nick>potter</nick>
-               <password>0371e4dce3c8804f1543c3f0f309cc10</password>
-               <name>Harry</name>
-               <surname>Potter</surname>
-               <description/>
-               <email>[email protected]</email>
-               <locale>en_EN</locale>
-               <authType>ABIQUO</authType>
-               <active>true</active>
-    </user>
-    <user>
-               <link rel="edit" type="application/vnd.abiquo.user+xml" 
href="http://localhost/api/admin/enterprises/1/users/2"/>
-               <link rel="enterprise" 
type="application/vnd.abiquo.enterprise+xml" 
href="http://localhost/api/admin/enterprises/1"/>
-               <link rel="role" type="application/vnd.abiquo.role+xml" 
href="http://localhost/api/admin/roles/7"/>
-               <link rel="virtualmachines" 
type="application/vnd.abiquo.virtualmachines+xml" 
href="http://localhost/api/admin/enterprises/1/users/2/action/virtualmachines"/>
-               <id>2</id>
-               <nick>granger</nick>
-               <password>0371e4dce3c8804f1543c3f0f309cc10</password>
-               <name>Hermione</name>
-               <surname>Granger</surname>
-               <description/>
-               <email>[email protected]</email>
-               <locale>en_EN</locale>
-               <authType>ABIQUO</authType>
-               <active>true</active>
-    </user>
-</users>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/vm-accepted-request.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/vm-accepted-request.xml 
b/abiquo/src/test/resources/payloads/vm-accepted-request.xml
deleted file mode 100644
index 2efc649..0000000
--- a/abiquo/src/test/resources/payloads/vm-accepted-request.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<acceptedrequest>
-    <link rel="task" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/tasks/169f1877-5f17-4f62-9563-974001295c54";
 />
-</acceptedrequest>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/vm-snapshot.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/vm-snapshot.xml 
b/abiquo/src/test/resources/payloads/vm-snapshot.xml
deleted file mode 100644
index 7e28a7b..0000000
--- a/abiquo/src/test/resources/payloads/vm-snapshot.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<virtualmachineinstance>
-    <instanceName>foo</instanceName>
-</virtualmachineinstance>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/vms-lastpage.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/vms-lastpage.xml 
b/abiquo/src/test/resources/payloads/vms-lastpage.xml
deleted file mode 100644
index 889874f..0000000
--- a/abiquo/src/test/resources/payloads/vms-lastpage.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<virtualmachineswithnodeextended>
-    <link 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines";
 rel="first" />
-    <link 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines?startwith=0";
 rel="previous" />
-    <link 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines?startwith=2";
 rel="last" />
-    <totalSize>2</totalSize>
-    <virtualmachinewithnodeextended>
-        <link rel="deploy" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/action/deploy";
 />
-        <link rel="disks" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/storage/disks";
 />
-        <link rel="edit" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1";
 />
-        <link rel="state" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/state";
 />
-        <link rel="reset" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/action/reset";
 />
-        <link rel="tasks" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/tasks";
 />
-        <link rel="undeploy" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/action/undeploy";
 />
-        <link rel="persistent" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/action/persistent";
 />
-        <link rel="virtualappliance" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1"; />
-        <link rel="virtualmachinetemplate" 
href="/admin/enterprises/1/datacenterrepositories/1/virtualmachinetemplates/1" 
/>
-        <link rel="nics" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/network/nics";
 />
-        <link rel="volumes" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/storage/volumes";
 />
-        <link rel="configurations" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/network/configurations";
 />
-        <cpu>0</cpu>
-        <hdInBytes>0</hdInBytes>
-        <highDisponibility>0</highDisponibility>
-        <id>2</id>
-        <idState>0</idState>
-        <idType>0</idType>
-        <name>VM</name>
-        <ram>0</ram>
-        <vdrpPort>0</vdrpPort>
-    </virtualmachinewithnodeextended>
-</virtualmachineswithnodeextended>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/vms-page.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/vms-page.xml 
b/abiquo/src/test/resources/payloads/vms-page.xml
deleted file mode 100644
index 4535697..0000000
--- a/abiquo/src/test/resources/payloads/vms-page.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<virtualmachineswithnodeextended>
-    <link 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines";
 rel="first" />
-    <link 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines?startwith=2";
 rel="next" />
-    <link 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines?startwith=2";
 rel="last" />
-    <totalSize>2</totalSize>
-    <virtualmachinewithnodeextended>
-        <link rel="deploy" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/action/deploy";
 />
-        <link rel="disks" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/storage/disks";
 />
-        <link rel="edit" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1";
 />
-        <link rel="state" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/state";
 />
-        <link rel="reset" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/action/reset";
 />
-        <link rel="tasks" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/tasks";
 />
-        <link rel="undeploy" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/action/undeploy";
 />
-        <link rel="persistent" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/action/persistent";
 />
-        <link rel="virtualappliance" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1"; />
-        <link rel="virtualmachinetemplate" 
href="/admin/enterprises/1/datacenterrepositories/1/virtualmachinetemplates/1" 
/>
-        <link rel="nics" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/network/nics";
 />
-        <link rel="volumes" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/storage/volumes";
 />
-        <link rel="configurations" 
href="http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/network/configurations";
 />
-        <cpu>0</cpu>
-        <hdInBytes>0</hdInBytes>
-        <highDisponibility>0</highDisponibility>
-        <id>1</id>
-        <idState>0</idState>
-        <idType>0</idType>
-        <name>VM</name>
-        <ram>0</ram>
-        <vdrpPort>0</vdrpPort>
-    </virtualmachinewithnodeextended>
-</virtualmachineswithnodeextended>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/volumes-lastpage.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/volumes-lastpage.xml 
b/abiquo/src/test/resources/payloads/volumes-lastpage.xml
deleted file mode 100644
index 3df58b0..0000000
--- a/abiquo/src/test/resources/payloads/volumes-lastpage.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volumes>
-    <link href="http://example.com/api/cloud/virtualdatacenters/1/volumes"; 
rel="first" />
-    <link 
href="http://example.com/api/cloud/virtualdatacenters/1/volumes?startwith=0"; 
rel="previous" />
-    <link 
href="http://example.com/api/cloud/virtualdatacenters/1/volumes?startwith=1"; 
rel="last" />
-    <totalSize>2</totalSize>
-    <volume>
-        <link 
href="http://example.com/api/cloud/virtualdatacenters/1/volumes/1531"; 
rel="edit" type="application/vnd.abiquo.volume+xml" />
-        <link 
href="http://example.com/api/cloud/virtualdatacenters/1/volumes/1531/action/initiatormappings";
 rel="initiator mappings" type="application/vnd.abiquo.initiatormappings+xml" />
-        <link href="http://example.com/api/cloud/virtualdatacenters/1/tiers/1"; 
rel="tier" title="Default Tier 1" type="application/vnd.abiquo.tier+xml" />
-        <link href="http://example.com/api/cloud/virtualdatacenters/1"; 
rel="virtualdatacenter" title="Aloha updated" 
type="application/vnd.abiquo.virtualdatacenter+xml" />
-        <id>1531</id>
-        <name>Hawaian volume updated</name>
-        <state>DETACHED</state>
-        <sizeInMB>32</sizeInMB>
-        <sequence>0</sequence>
-    </volume>
-</volumes>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/resources/payloads/volumes-page.xml
----------------------------------------------------------------------
diff --git a/abiquo/src/test/resources/payloads/volumes-page.xml 
b/abiquo/src/test/resources/payloads/volumes-page.xml
deleted file mode 100644
index d069445..0000000
--- a/abiquo/src/test/resources/payloads/volumes-page.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volumes>
-    <link href="http://example.com/api/cloud/virtualdatacenters/1/volumes"; 
rel="first" />
-    <link 
href="http://example.com/api/cloud/virtualdatacenters/1/volumes?startwith=1"; 
rel="next" />
-    <link 
href="http://example.com/api/cloud/virtualdatacenters/1/volumes?startwith=1"; 
rel="last" />
-    <totalSize>2</totalSize>
-    <volume>
-        <link 
href="http://example.com/api/cloud/virtualdatacenters/1/volumes/1530"; 
rel="edit" type="application/vnd.abiquo.volume+xml" />
-        <link 
href="http://example.com/api/cloud/virtualdatacenters/1/volumes/1530/action/initiatormappings";
 rel="initiator mappings" type="application/vnd.abiquo.initiatormappings+xml" />
-        <link href="http://example.com/api/cloud/virtualdatacenters/1/tiers/1"; 
rel="tier" title="Default Tier 1" type="application/vnd.abiquo.tier+xml" />
-        <link href="http://example.com/api/cloud/virtualdatacenters/1"; 
rel="virtualdatacenter" title="Aloha updated" 
type="application/vnd.abiquo.virtualdatacenter+xml" />
-        <id>1530</id>
-        <name>Hawaian volume updated</name>
-        <state>DETACHED</state>
-        <sizeInMB>32</sizeInMB>
-        <sequence>0</sequence>
-    </volume>
-</volumes>
\ No newline at end of file

Reply via email to