Support Abiquo 3.4, remove deprecated attrs from VM model
Closes #840
diff --git a/libcloud/compute/drivers/abiquo.py b/libcloud/compute/drivers/abiquo.py
index 12097f3..c3b6311 100644
--- a/libcloud/compute/drivers/abiquo.py
+++ b/libcloud/compute/drivers/abiquo.py
@@ -18,7 +18,7 @@
The driver implements the compute Abiquo functionality for the Abiquo API.
This version is compatible with the following versions of Abiquo:
- * Abiquo 3.1 (http://wiki.abiquo.com/display/ABI31/The+Abiquo+API)
+ * Abiquo 3.4 (http://wiki.abiquo.com/display/ABI34/The+Abiquo+API)
"""
try:
from lxml import etree as ET
@@ -749,8 +749,6 @@
# Override the 'NodeSize' data
ram = ET.SubElement(vm, 'ram')
ram.text = str(kwargs['size'].ram)
- hd = ET.SubElement(vm, 'hdInBytes')
- hd.text = str(int(kwargs['size'].disk) * self.GIGABYTE)
# Create the virtual machine
nodes_link = group.uri + '/virtualmachines'
diff --git a/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_5_vm_3_not_allocated.xml b/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_5_vm_3_not_allocated.xml
index dc28342..5511ee7 100644
--- a/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_5_vm_3_not_allocated.xml
+++ b/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_5_vm_3_not_allocated.xml
@@ -21,7 +21,6 @@
<link href="http://10.60.12.7:80/api/admin/enterprises/1/datacenterrepositories/2/virtualmachinetemplates/11" type="application/vnd.abiquo.virtualmachinetemplate+xml" rel="virtualmachinetemplate"/>
<link href="http://10.60.12.7:80/api/cloud/virtualdatacenters/4/virtualappliances/6/virtualmachines/3/storage/volumes" type="application/vnd.abiquo.iscsivolumes+xml" rel="volumes"/>
<cpu>1</cpu>
- <hdInBytes>27262976</hdInBytes>
<highDisponibility>0</highDisponibility>
<id>3</id>
<idState>1</idState>
diff --git a/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_5_vms.xml b/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_5_vms.xml
index ecb7303..a1ee8e9 100644
--- a/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_5_vms.xml
+++ b/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_5_vms.xml
@@ -19,5 +19,5 @@
<link href="http://10.60.12.7:80/api/cloud/virtualdatacenters/4/virtualappliances/6/virtualmachines/3" type="application/vnd.abiquo.virtualmachine+xml" rel="virtualmachine"/>
<link href="http://10.60.12.7:80/api/admin/enterprises/1/datacenterrepositories/2/virtualmachinetemplates/11" type="application/vnd.abiquo.virtualmachinetemplate+xml" rel="virtualmachinetemplate"/>
<link href="http://10.60.12.7:80/api/cloud/virtualdatacenters/4/virtualappliances/6/virtualmachines/3/storage/volumes" type="application/vnd.abiquo.iscsivolumes+xml" rel="volumes"/>
- <cpu>1</cpu><hdInBytes>27262976</hdInBytes><highDisponibility>0</highDisponibility><id>3</id><idState>1</idState><idType>1</idType><name>ABQ_914f8125-33d3-4fe3-a162-5d6f5bf32614</name><ram>128</ram><state>NOT_ALLOCATED</state><uuid>914f8125-33d3-4fe3-a162-5d6f5bf32614</uuid><vdrpPort>0</vdrpPort><nodeId>3</nodeId><label>node-name</label><x>0</x><y>0</y></virtualMachine>
+ <cpu>1</cpu><highDisponibility>0</highDisponibility><id>3</id><idState>1</idState><idType>1</idType><name>ABQ_914f8125-33d3-4fe3-a162-5d6f5bf32614</name><ram>128</ram><state>NOT_ALLOCATED</state><uuid>914f8125-33d3-4fe3-a162-5d6f5bf32614</uuid><vdrpPort>0</vdrpPort><nodeId>3</nodeId><label>node-name</label><x>0</x><y>0</y></virtualMachine>
</virtualMachines>
diff --git a/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vm_3.xml b/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vm_3.xml
index 75b1e68..5e7dd6e 100644
--- a/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vm_3.xml
+++ b/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vm_3.xml
@@ -19,4 +19,4 @@
<link href="http://10.60.12.7:80/api/cloud/virtualdatacenters/4/virtualappliances/6/virtualmachines/3" type="application/vnd.abiquo.virtualmachine+xml" rel="virtualmachine"/>
<link href="http://10.60.12.7:80/api/admin/enterprises/1/datacenterrepositories/2/virtualmachinetemplates/11" type="application/vnd.abiquo.virtualmachinetemplate+xml" rel="virtualmachinetemplate"/>
<link href="http://10.60.12.7:80/api/cloud/virtualdatacenters/4/virtualappliances/6/virtualmachines/3/storage/volumes" type="application/vnd.abiquo.iscsivolumes+xml" rel="volumes"/>
- <cpu>1</cpu><hdInBytes>27262976</hdInBytes><highDisponibility>0</highDisponibility><id>3</id><idState>1</idState><idType>1</idType><name>ABQ_914f8125-33d3-4fe3-a162-5d6f5bf32614</name><ram>128</ram><state>NOT_ALLOCATED</state><uuid>914f8125-33d3-4fe3-a162-5d6f5bf32614</uuid><vdrpPort>5901</vdrpPort><nodeId>3</nodeId><label>node-name</label><x>0</x><y>0</y><vdrpIp>80.12.23.43</vdrpIp></virtualMachine>
+ <cpu>1</cpu><highDisponibility>0</highDisponibility><id>3</id><idState>1</idState><idType>1</idType><name>ABQ_914f8125-33d3-4fe3-a162-5d6f5bf32614</name><ram>128</ram><state>NOT_ALLOCATED</state><uuid>914f8125-33d3-4fe3-a162-5d6f5bf32614</uuid><vdrpPort>5901</vdrpPort><nodeId>3</nodeId><label>node-name</label><x>0</x><y>0</y><vdrpIp>80.12.23.43</vdrpIp></virtualMachine>
diff --git a/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vm_3_allocated.xml b/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vm_3_allocated.xml
index 4c8d4d6..254544f 100644
--- a/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vm_3_allocated.xml
+++ b/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vm_3_allocated.xml
@@ -19,4 +19,4 @@
<link href="http://10.60.12.7:80/api/cloud/virtualdatacenters/4/virtualappliances/6/virtualmachines/3" type="application/vnd.abiquo.virtualmachine+xml" rel="virtualmachine"/>
<link href="http://10.60.12.7:80/api/admin/enterprises/1/datacenterrepositories/2/virtualmachinetemplates/11" type="application/vnd.abiquo.virtualmachinetemplate+xml" rel="virtualmachinetemplate"/>
<link href="http://10.60.12.7:80/api/cloud/virtualdatacenters/4/virtualappliances/6/virtualmachines/3/storage/volumes" type="application/vnd.abiquo.iscsivolumes+xml" rel="volumes"/>
- <cpu>1</cpu><hdInBytes>27262976</hdInBytes><highDisponibility>0</highDisponibility><id>3</id><idState>1</idState><idType>1</idType><name>ABQ_914f8125-33d3-4fe3-a162-5d6f5bf32614</name><ram>128</ram><state>ALLOCATED</state><uuid>914f8125-33d3-4fe3-a162-5d6f5bf32614</uuid><vdrpPort>5901</vdrpPort><nodeId>3</nodeId><label>node-name</label><x>0</x><y>0</y><vdrpIp>80.12.23.43</vdrpIp></virtualMachine>
+ <cpu>1</cpu><highDisponibility>0</highDisponibility><id>3</id><idState>1</idState><idType>1</idType><name>ABQ_914f8125-33d3-4fe3-a162-5d6f5bf32614</name><ram>128</ram><state>ALLOCATED</state><uuid>914f8125-33d3-4fe3-a162-5d6f5bf32614</uuid><vdrpPort>5901</vdrpPort><nodeId>3</nodeId><label>node-name</label><x>0</x><y>0</y><vdrpIp>80.12.23.43</vdrpIp></virtualMachine>
diff --git a/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vm_3_deployed.xml b/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vm_3_deployed.xml
index fb94d0c..2efd32c 100644
--- a/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vm_3_deployed.xml
+++ b/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vm_3_deployed.xml
@@ -19,4 +19,4 @@
<link href="http://10.60.12.7:80/api/cloud/virtualdatacenters/4/virtualappliances/6/virtualmachines/3" type="application/vnd.abiquo.virtualmachine+xml" rel="virtualmachine"/>
<link href="http://10.60.12.7:80/api/admin/enterprises/1/datacenterrepositories/2/virtualmachinetemplates/11" type="application/vnd.abiquo.virtualmachinetemplate+xml" rel="virtualmachinetemplate"/>
<link href="http://10.60.12.7:80/api/cloud/virtualdatacenters/4/virtualappliances/6/virtualmachines/3/storage/volumes" type="application/vnd.abiquo.iscsivolumes+xml" rel="volumes"/>
- <cpu>1</cpu><hdInBytes>27262976</hdInBytes><highDisponibility>0</highDisponibility><id>3</id><idState>1</idState><idType>1</idType><name>ABQ_914f8125-33d3-4fe3-a162-5d6f5bf32614</name><ram>128</ram><state>ON</state><uuid>914f8125-33d3-4fe3-a162-5d6f5bf32614</uuid><vdrpPort>5901</vdrpPort><nodeId>3</nodeId><label>node-name</label><x>0</x><y>0</y><vdrpIp>80.12.23.43</vdrpIp></virtualMachine>
+ <cpu>1</cpu><highDisponibility>0</highDisponibility><id>3</id><idState>1</idState><idType>1</idType><name>ABQ_914f8125-33d3-4fe3-a162-5d6f5bf32614</name><ram>128</ram><state>ON</state><uuid>914f8125-33d3-4fe3-a162-5d6f5bf32614</uuid><vdrpPort>5901</vdrpPort><nodeId>3</nodeId><label>node-name</label><x>0</x><y>0</y><vdrpIp>80.12.23.43</vdrpIp></virtualMachine>
diff --git a/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vm_creation_ok.xml b/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vm_creation_ok.xml
index 3bc9f0b..068026e 100644
--- a/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vm_creation_ok.xml
+++ b/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vm_creation_ok.xml
@@ -17,4 +17,4 @@
<link href="http://10.60.12.7:80/api/cloud/virtualdatacenters/4/virtualappliances/6/virtualmachines/3" type="application/vnd.abiquo.virtualmachine+xml" rel="edit"/>
<link href="http://10.60.12.7:80/api/cloud/virtualdatacenters/4/virtualappliances/6/virtualmachines/3/storage/volumes" type="application/vnd.abiquo.iscsivolumes+xml" rel="volumes"/>
<link href="http://10.60.12.7:80/api/admin/enterprises/1/datacenterrepositories/2/virtualmachinetemplates/11" type="application/vnd.abiquo.virtualmachinetemplate+xml" rel="virtualmachinetemplate"/>
-<cpu>1</cpu><hdInBytes>27262976</hdInBytes><highDisponibility>0</highDisponibility><id>3</id><idState>1</idState><idType>1</idType><name>ABQ_914f8125-33d3-4fe3-a162-5d6f5bf32614</name><ram>128</ram><state>NOT_ALLOCATED</state><uuid>914f8125-33d3-4fe3-a162-5d6f5bf32614</uuid><vdrpPort>0</vdrpPort></virtualMachine>
+<cpu>1</cpu><highDisponibility>0</highDisponibility><id>3</id><idState>1</idState><idType>1</idType><name>ABQ_914f8125-33d3-4fe3-a162-5d6f5bf32614</name><ram>128</ram><state>NOT_ALLOCATED</state><uuid>914f8125-33d3-4fe3-a162-5d6f5bf32614</uuid><vdrpPort>0</vdrpPort></virtualMachine>
diff --git a/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vms.xml b/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vms.xml
index ecb7303..a1ee8e9 100644
--- a/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vms.xml
+++ b/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vms.xml
@@ -19,5 +19,5 @@
<link href="http://10.60.12.7:80/api/cloud/virtualdatacenters/4/virtualappliances/6/virtualmachines/3" type="application/vnd.abiquo.virtualmachine+xml" rel="virtualmachine"/>
<link href="http://10.60.12.7:80/api/admin/enterprises/1/datacenterrepositories/2/virtualmachinetemplates/11" type="application/vnd.abiquo.virtualmachinetemplate+xml" rel="virtualmachinetemplate"/>
<link href="http://10.60.12.7:80/api/cloud/virtualdatacenters/4/virtualappliances/6/virtualmachines/3/storage/volumes" type="application/vnd.abiquo.iscsivolumes+xml" rel="volumes"/>
- <cpu>1</cpu><hdInBytes>27262976</hdInBytes><highDisponibility>0</highDisponibility><id>3</id><idState>1</idState><idType>1</idType><name>ABQ_914f8125-33d3-4fe3-a162-5d6f5bf32614</name><ram>128</ram><state>NOT_ALLOCATED</state><uuid>914f8125-33d3-4fe3-a162-5d6f5bf32614</uuid><vdrpPort>0</vdrpPort><nodeId>3</nodeId><label>node-name</label><x>0</x><y>0</y></virtualMachine>
+ <cpu>1</cpu><highDisponibility>0</highDisponibility><id>3</id><idState>1</idState><idType>1</idType><name>ABQ_914f8125-33d3-4fe3-a162-5d6f5bf32614</name><ram>128</ram><state>NOT_ALLOCATED</state><uuid>914f8125-33d3-4fe3-a162-5d6f5bf32614</uuid><vdrpPort>0</vdrpPort><nodeId>3</nodeId><label>node-name</label><x>0</x><y>0</y></virtualMachine>
</virtualMachines>
diff --git a/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vms_allocated.xml b/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vms_allocated.xml
index c5d9589..ce8b8ed 100644
--- a/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vms_allocated.xml
+++ b/libcloud/test/compute/fixtures/abiquo/vdc_4_vapp_6_vms_allocated.xml
@@ -19,5 +19,5 @@
<link href="http://10.60.12.7:80/api/cloud/virtualdatacenters/4/virtualappliances/6/virtualmachines/3" type="application/vnd.abiquo.virtualmachine+xml" rel="virtualmachine"/>
<link href="http://10.60.12.7:80/api/admin/enterprises/1/datacenterrepositories/2/virtualmachinetemplates/11" type="application/vnd.abiquo.virtualmachinetemplate+xml" rel="virtualmachinetemplate"/>
<link href="http://10.60.12.7:80/api/cloud/virtualdatacenters/4/virtualappliances/6/virtualmachines/3/storage/volumes" type="application/vnd.abiquo.iscsivolumes+xml" rel="volumes"/>
- <cpu>1</cpu><hdInBytes>27262976</hdInBytes><highDisponibility>0</highDisponibility><id>3</id><idState>1</idState><idType>1</idType><name>ABQ_914f8125-33d3-4fe3-a162-5d6f5bf32614</name><ram>128</ram><state>ALLOCATED</state><uuid>914f8125-33d3-4fe3-a162-5d6f5bf32614</uuid><vdrpPort>0</vdrpPort><nodeId>3</nodeId><label>node-name</label><x>0</x><y>0</y></virtualMachine>
+ <cpu>1</cpu><highDisponibility>0</highDisponibility><id>3</id><idState>1</idState><idType>1</idType><name>ABQ_914f8125-33d3-4fe3-a162-5d6f5bf32614</name><ram>128</ram><state>ALLOCATED</state><uuid>914f8125-33d3-4fe3-a162-5d6f5bf32614</uuid><vdrpPort>0</vdrpPort><nodeId>3</nodeId><label>node-name</label><x>0</x><y>0</y></virtualMachine>
</virtualMachines>
