You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by an...@apache.org on 2016/04/15 03:49:13 UTC

[11/12] libcloud git commit: Rename all fixtures to not have account name in filename, shortens path and stops issues on Windows file path name limit Closes #750

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml
deleted file mode 100644
index 7478df6..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<natRules
-xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="2"
-totalCount="2" pageSize="250">
-<natRule id="2187a636-7ebb-49a1-a2ff-5d617f496dce" datacenterId="NA9">
-<networkDomainId>484174a2-ae74-4658-9e56-
-50fc90e086cf</networkDomainId>
-<internalIp>10.0.0.15</internalIp>
-<externalIp>165.180.12.18</externalIp>
-<createTime>2015-03-06T13:43:45.000Z</createTime>
-<state>NORMAL</state>
-</natRule>
-<natRule id="2169a38e-5692-497e-a22a-701a838a6539" datacenterId="NA9">
-<networkDomainId>484174a2-ae74-4658-9e56-
-50fc90e086cf</networkDomainId>
-<internalIp>10.0.0.16</internalIp>
-<externalIp>165.180.12.19</externalIp>
-<createTime>2015-03-06T13:45:10.000Z</createTime>
-<state>NORMAL</state>
-</natRule>
-</natRules>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml
deleted file mode 100644
index 6bf447d..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<natRule
-xmlns="urn:didata.com:api:cloud:types" id="2187a636-7ebb-49a1-a2ff-5d617f496dce" datacenterId="NA9">
-<networkDomainId>484174a2-ae74-4658-9e56-50fc90e086cf</networkDomainId>
-<internalIp>10.0.0.16</internalIp>
-<externalIp>165.180.12.19</externalIp>
-<createTime>2015-03-06T13:45:10.000Z</createTime>
-<state>NORMAL</state>
-</natRule>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain.xml
deleted file mode 100644
index cb7a078..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<networkDomains xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="5" totalCount="5" pageSize="250">
-    <networkDomain id="b30c224c-c95b-4cd9-bb8b-bfdfb5486abf" datacenterId="NA9">
-        <name>Aurora</name>
-        <description>Project Aurora Demo Environments</description>
-        <type>ADVANCED</type>
-        <snatIpv4Address>168.128.2.136</snatIpv4Address>
-        <createTime>2015-07-13T03:52:16.000Z</createTime>
-        <state>NORMAL</state>
-    </networkDomain>
-    <networkDomain id="b74444b5-ad7d-4ed1-a9e0-02aab80f7858" datacenterId="NA12">
-        <name>Test net domain</name>
-        <description>description of my network</description>
-        <type>ESSENTIALS</type>
-        <snatIpv4Address>168.128.26.20</snatIpv4Address>
-        <createTime>2015-07-15T03:36:00.000Z</createTime>
-        <state>NORMAL</state>
-    </networkDomain>
-    <networkDomain id="2122a8c3-cefe-4a3d-afb4-44bc159266c7" datacenterId="NA12">
-        <name>another networkj</name>
-        <description>net network netowkrm</description>
-        <type>ESSENTIALS</type>
-        <snatIpv4Address>168.128.26.22</snatIpv4Address>
-        <createTime>2015-07-15T03:40:09.000Z</createTime>
-        <state>NORMAL</state>
-    </networkDomain>
-    <networkDomain id="d3320077-c2ce-4523-8c65-d417e766077b" datacenterId="NA9">
-        <name>Imports</name>
-        <description>Imported servers</description>
-        <type>ADVANCED</type>
-        <snatIpv4Address>168.128.2.69</snatIpv4Address>
-        <createTime>2015-08-18T03:53:02.000Z</createTime>
-        <state>NORMAL</state>
-    </networkDomain>
-    <networkDomain id="68a60a3c-030d-4d4b-a8fd-4a6991afc27b" datacenterId="NA9">
-        <name>Platform R2.0 Lab (MCP 2.0)</name>
-        <description>This is the R2.0 lab for Platform on MCP 2.0</description>
-        <type>ESSENTIALS</type>
-        <snatIpv4Address>168.128.2.149</snatIpv4Address>
-        <createTime>2015-08-25T01:39:22.000Z</createTime>
-        <state>NORMAL</state>
-    </networkDomain>
-</networkDomains>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_262cfc0891be.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_262cfc0891be.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_262cfc0891be.xml
deleted file mode 100644
index bdd1c6b..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_262cfc0891be.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<networkDomain xmlns="urn:didata.com:api:cloud:types" id="8cdfd607-f429-4df6-9352-162cfc0891be" datacenterId="NA12">
-    <name>test</name>
-    <description>test2</description>
-    <type>ESSENTIALS</type>
-    <snatIpv4Address>168.128.26.20</snatIpv4Address>
-    <createTime>2015-07-15T03:36:00.000Z</createTime>
-    <state>NORMAL</state>
-</networkDomain>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock.xml
deleted file mode 100644
index 3a1c1b3..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<publicIpBlocks xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="1" totalCount="1" pageSize="250">
-    <publicIpBlock id="9945dc4a-bdce-11e4-8c14-b8ca3a5d9ef8" datacenterId="NA9">
-        <networkDomainId>8cdfd607-f429-4df6-9352-162cfc0891be</networkDomainId>
-        <baseIp>168.128.4.18</baseIp>
-        <size>2</size>
-        <createTime>2015-07-13T04:07:37.000Z</createTime>
-        <state>NORMAL</state>
-    </publicIpBlock>
-</publicIpBlocks>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml
deleted file mode 100644
index dc8814b..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<publicIpBlock xmlns="urn:didata.com:api:cloud:types" id="9945dc4a-bdce-11e4-8c14-b8ca3a5d9ef8" datacenterId="NA9">
-    <networkDomainId>8cdfd607-f429-4df6-9352-162cfc0891be</networkDomainId>
-    <baseIp>168.128.4.18</baseIp>
-    <size>2</size>
-    <createTime>2015-07-13T04:07:37.000Z</createTime>
-    <state>NORMAL</state>
-</publicIpBlock>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml
deleted file mode 100644
index dc8814b..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<publicIpBlock xmlns="urn:didata.com:api:cloud:types" id="9945dc4a-bdce-11e4-8c14-b8ca3a5d9ef8" datacenterId="NA9">
-    <networkDomainId>8cdfd607-f429-4df6-9352-162cfc0891be</networkDomainId>
-    <baseIp>168.128.4.18</baseIp>
-    <size>2</size>
-    <createTime>2015-07-13T04:07:37.000Z</createTime>
-    <state>NORMAL</state>
-</publicIpBlock>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock.xml
deleted file mode 100644
index 8b6fe34..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<response
-xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-02-27T09:31:34.239-05:00/3e762559-c7f5-4d2b-abab-63306d406aa1">
-<operation>REMOVE_PUBLIC_IP_BLOCK</operation>
-<responseCode>OK</responseCode>
-<message>Public Ip Block bef4334a-844b-11e4-a91c-0030487e0302 has been
-removed successfully</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan.xml
deleted file mode 100644
index 4575d83..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vlans xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="4" totalCount="4" pageSize="250">
-    <vlan id="55b236ad-9119-4b48-a1bb-cf5c76a7ac0f" datacenterId="NA9">
-        <networkDomain id="8cdfd607-f429-4df6-9352-162cfc0891be" name="Aurora"/>
-        <name>Primary</name>
-        <description></description>
-        <privateIpv4Range address="10.0.0.0" prefixSize="24"/>
-        <ipv4GatewayAddress>10.0.0.1</ipv4GatewayAddress>
-        <ipv6Range address="2607:f480:111:1336:0:0:0:0" prefixSize="64"/>
-        <ipv6GatewayAddress>2607:f480:111:1336:0:0:0:1</ipv6GatewayAddress>
-        <createTime>2015-07-13T03:52:45.000Z</createTime>
-        <state>NORMAL</state>
-    </vlan>
-    <vlan id="7ede3b25-2222-4285-ab61-21ffb137a763" datacenterId="NA9">
-        <networkDomain id="8cdfd607-f429-4df6-9352-162cfc0891be" name="Imports"/>
-        <name>Wi-Fi</name>
-        <description>Wi-Fi</description>
-        <privateIpv4Range address="10.230.98.0" prefixSize="24"/>
-        <ipv4GatewayAddress>10.230.98.1</ipv4GatewayAddress>
-        <ipv6Range address="2607:f480:111:1199:0:0:0:0" prefixSize="64"/>
-        <ipv6GatewayAddress>2607:f480:111:1199:0:0:0:1</ipv6GatewayAddress>
-        <createTime>2015-08-18T23:47:04.000Z</createTime>
-        <state>NORMAL</state>
-    </vlan>
-</vlans>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan_0e56433f_d808_4669_821d_812769517ff8.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan_0e56433f_d808_4669_821d_812769517ff8.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan_0e56433f_d808_4669_821d_812769517ff8.xml
deleted file mode 100644
index 7dcd5cc..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan_0e56433f_d808_4669_821d_812769517ff8.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<vlan
-xmlns="urn:didata.com:api:cloud:types" id="0e56433f-d808-4669-821d-812769517ff8" datacenterId="NA9">
-<networkDomain id="8cdfd607-f429-4df6-9352-162cfc0891be" name="Production
-Network Domain"/>
-<name>Production VLAN</name>
-<description>test2</description>
-<privateIpv4Range address="10.0.3.0" prefixSize="24"/>
-<ipv4GatewayAddress>10.0.3.1</ipv4GatewayAddress>
-<ipv6Range address="2607:f480:1111:1153:0:0:0:0" prefixSize="64"/>
-<ipv6GatewayAddress>2607:f480:1111:1153:0:0:0:1</ipv6GatewayAddress>
-<createTime>2015-02-13T10:56:44.000Z</createTime>
-<state>NORMAL</state>
-</vlan>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_report_usageMonitoring.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_report_usageMonitoring.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_report_usageMonitoring.xml
deleted file mode 100644
index dc32d95..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_report_usageMonitoring.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-Date,Location,Server,Server ID,Essentials Monitoring Hours,Advanced Monitoring
-Hours
-2/24/15,NA5,Server A,5a2378ba-11de-11e5-ad2a-ca9798323470,14.25,0
-2/24/15,NA5,Server B,6330a644-11de-11e5-ad2a-ca9798323470,0,8.64
-2/25/15,NA5,Server A,5a2378ba-11de-11e5-ad2a-ca9798323470,24,0
-2/25/15,NA5,Server B,6330a644-11de-11e5-ad2a-ca9798323470,0,24
-2/26/15,NA5,Server A,5a2378ba-11de-11e5-ad2a-ca9798323470,17.59,6.41
-2/26/15,NA5,Server B,6330a644-11de-11e5-ad2a-ca9798323470,2.11,21.89
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml
deleted file mode 100644
index 56eeb02..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<response
-xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-03-08T06:17:52.133-04:00/70e7458c-038c-4819-a1de-90d15007c2f5">
-<operation>ADD_NIC</operation>
-<responseCode>IN_PROGRESS</responseCode>
-<message>The request to add NIC for VLAN 'Subsystem VLAN' on Server
-'Production Mail Server' has been accepted and is being processed..</message>
-<info name="nicId" value="a202e51b-41c0-4cfc-add0-b1c62fc0ecf6"/>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_antiAffinityRule_list.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_antiAffinityRule_list.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_antiAffinityRule_list.xml
deleted file mode 100644
index 290b7e4..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_antiAffinityRule_list.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<antiAffinityRules xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="2" totalCount="2" pageSize="250">
-  <antiAffinityRule id="07e3621a-a920-4a9a-943c-d8021f27f418" state="NORMAL" created="2016-03-24T00:03:27.000Z" datacenterId="NA9">
-    <serverSummary id="22f3544a-c874-4930-a31c-e9e513e51114">
-      <name>ansible-test-image-rhel6</name>
-      <description>my new node</description>
-      <networkingDetails>
-        <networkInfo networkDomainId="423c4386-87b4-43c4-9604-88ae237bfc7f" networkDomainName="Jeff Test">
-          <primaryNic id="aafffb27-f16b-4757-9b63-ef7d8acd9c7f" privateIpv4="172.16.1.8" ipv6="2607:f480:111:1423:1b57:e47a:c212:257d" vlanId="bd6fbee5-17db-49f8-b1f5-3b213cea3061" vlanName="jeff-test"/>        </networkInfo>
-      </networkingDetails>
-    </serverSummary>
-    <serverSummary id="5718d174-31d4-4d49-b1c6-fcb0d782f233">
-      <name>ansible-custom-image-test-UAT</name>
-      <description>my new node</description>
-      <networkingDetails>
-        <networkInfo networkDomainId="423c4386-87b4-43c4-9604-88ae237bfc7f" networkDomainName="Jeff Test">
-          <primaryNic id="b359cea3-4452-46fe-b30b-b3ce839cde9b" privateIpv4="172.16.1.9" ipv6="2607:f480:111:1423:7fa7:9a9b:ecb9:882e" vlanId="bd6fbee5-17db-49f8-b1f5-3b213cea3061" vlanName="jeff-test"/>
-        </networkInfo>
-      </networkingDetails>
-    </serverSummary>
-  </antiAffinityRule>
-  <antiAffinityRule id="5e10b1ab-68f2-4a8b-a49c-d88d623db665" state="NORMAL" created="2016-03-24T00:07:39.000Z" datacenterId="NA9">
-    <serverSummary id="9f8b5428-bac3-4cf9-adda-62f57fb38671">
-      <name>rhel-ansible-full-test</name>
-      <description>RHEL Ansible Test</description>
-      <networkingDetails>
-        <networkInfo networkDomainId="423c4386-87b4-43c4-9604-88ae237bfc7f" networkDomainName="Jeff Test">
-          <primaryNic id="e081e784-5768-472c-b7f3-353e1646edc8" privateIpv4="172.16.1.15" ipv6="2607:f480:111:1423:70c9:9216:f7bf:dcf6" vlanId="bd6fbee5-17db-49f8-b1f5-3b213cea3061" vlanName="jeff-test"/>
-        </networkInfo>
-      </networkingDetails>
-    </serverSummary>
-    <serverSummary id="feee5cd2-d83b-4b80-913d-0bf26c838a33">
-      <name>rhel-ansible-full-test</name>
-      <description>RHEL Ansible Test</description>
-      <networkingDetails>
-        <networkInfo networkDomainId="423c4386-87b4-43c4-9604-88ae237bfc7f" networkDomainName="Jeff Test">
-          <primaryNic id="3278f833-9535-405c-91b8-0a0470f58aae" privateIpv4="172.16.1.17" ipv6="2607:f480:111:1423:3081:71a8:4c52:a8a" vlanId="bd6fbee5-17db-49f8-b1f5-3b213cea3061" vlanName="jeff-test"/>
-        </networkInfo>
-      </networkingDetails>
-    </serverSummary>
-  </antiAffinityRule>
-</antiAffinityRules>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_antiAffinityRule_list_PAGINATED.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_antiAffinityRule_list_PAGINATED.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_antiAffinityRule_list_PAGINATED.xml
deleted file mode 100644
index fdd5e01..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_antiAffinityRule_list_PAGINATED.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<antiAffinityRules xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="2" totalCount="2" pageSize="2">
-  <antiAffinityRule id="07e3621a-a920-4a9a-943c-d8021f27f418" state="NORMAL" created="2016-03-24T00:03:27.000Z" datacenterId="NA9">
-    <serverSummary id="22f3544a-c874-4930-a31c-e9e513e51114">
-      <name>ansible-test-image-rhel6</name>
-      <description>my new node</description>
-      <networkingDetails>
-        <networkInfo networkDomainId="423c4386-87b4-43c4-9604-88ae237bfc7f" networkDomainName="Jeff Test">
-          <primaryNic id="aafffb27-f16b-4757-9b63-ef7d8acd9c7f" privateIpv4="172.16.1.8" ipv6="2607:f480:111:1423:1b57:e47a:c212:257d" vlanId="bd6fbee5-17db-49f8-b1f5-3b213cea3061" vlanName="jeff-test"/>        </networkInfo>
-      </networkingDetails>
-    </serverSummary>
-    <serverSummary id="5718d174-31d4-4d49-b1c6-fcb0d782f233">
-      <name>ansible-custom-image-test-UAT</name>
-      <description>my new node</description>
-      <networkingDetails>
-        <networkInfo networkDomainId="423c4386-87b4-43c4-9604-88ae237bfc7f" networkDomainName="Jeff Test">
-          <primaryNic id="b359cea3-4452-46fe-b30b-b3ce839cde9b" privateIpv4="172.16.1.9" ipv6="2607:f480:111:1423:7fa7:9a9b:ecb9:882e" vlanId="bd6fbee5-17db-49f8-b1f5-3b213cea3061" vlanName="jeff-test"/>
-        </networkInfo>
-      </networkingDetails>
-    </serverSummary>
-  </antiAffinityRule>
-  <antiAffinityRule id="5e10b1ab-68f2-4a8b-a49c-d88d623db665" state="NORMAL" created="2016-03-24T00:07:39.000Z" datacenterId="NA9">
-    <serverSummary id="9f8b5428-bac3-4cf9-adda-62f57fb38671">
-      <name>rhel-ansible-full-test</name>
-      <description>RHEL Ansible Test</description>
-      <networkingDetails>
-        <networkInfo networkDomainId="423c4386-87b4-43c4-9604-88ae237bfc7f" networkDomainName="Jeff Test">
-          <primaryNic id="e081e784-5768-472c-b7f3-353e1646edc8" privateIpv4="172.16.1.15" ipv6="2607:f480:111:1423:70c9:9216:f7bf:dcf6" vlanId="bd6fbee5-17db-49f8-b1f5-3b213cea3061" vlanName="jeff-test"/>
-        </networkInfo>
-      </networkingDetails>
-    </serverSummary>
-    <serverSummary id="feee5cd2-d83b-4b80-913d-0bf26c838a33">
-      <name>rhel-ansible-full-test</name>
-      <description>RHEL Ansible Test</description>
-      <networkingDetails>
-        <networkInfo networkDomainId="423c4386-87b4-43c4-9604-88ae237bfc7f" networkDomainName="Jeff Test">
-          <primaryNic id="3278f833-9535-405c-91b8-0a0470f58aae" privateIpv4="172.16.1.17" ipv6="2607:f480:111:1423:3081:71a8:4c52:a8a" vlanId="bd6fbee5-17db-49f8-b1f5-3b213cea3061" vlanName="jeff-test"/>
-        </networkInfo>
-      </networkingDetails>
-    </serverSummary>
-  </antiAffinityRule>
-</antiAffinityRules>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_changeServerMonitoringPlan.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_changeServerMonitoringPlan.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_changeServerMonitoringPlan.xml
deleted file mode 100644
index 654097d..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_changeServerMonitoringPlan.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response
-xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-08-10T09:22:40.684-04:00/c0ca4a5d-3611-417e-8209-fd3046cff1d5">
-<operation>CHANGE_SERVER_MONITORING_PLAN</operation>
-<responseCode>OK</responseCode>
-<message>Monitoring on Server 'Production Server' has been changed to
-Service Plan 'ADVANCED'.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_cleanServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_cleanServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_cleanServer.xml
deleted file mode 100644
index 011dfd4..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_cleanServer.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response
-xmlns="urn:didata.com:api:cloud:types" requestId="au/2016-04-
-14T10:08:07.701+10:00/1cc24d5e-4612-499b-a5d4-8fd5dbb511f0">
-<operation>CLEAN_SERVER</operation>
-<responseCode>IN_PROGRESS</responseCode>
-<message>The request to clean a failed Server deployment for Server
-e75ead52-692f-4314-8725-c8a4f4d13a87 has been accepted and is being processed.</message>
-</response>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer.xml
deleted file mode 100644
index c8e70da..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<response
-xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-03-
-08T05:49:07.774-04:00/f0a53414-e991-4c9b-b52f-5770ff5b606b">
-<operation>DELETE_SERVER</operation>
-<responseCode>IN_PROGRESS</responseCode>
-<message>Request to Delete Server (Id:d577a691-e116-4913-a440-
-022d2729fc84) has been accepted and is being processed</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer_RESOURCEBUSY.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer_RESOURCEBUSY.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer_RESOURCEBUSY.xml
deleted file mode 100644
index 2df9e07..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer_RESOURCEBUSY.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<response
-xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-03-
-08T05:49:07.774-04:00/f0a53414-e991-4c9b-b52f-5770ff5b606b">
-<operation>DELETE_SERVER</operation>
-<responseCode>RESOURCE_BUSY</responseCode>
-<message>Server is already busy</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployServer.xml
deleted file mode 100644
index 05108c5..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployServer.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<response xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-03-08T10:43:34.168-04:00/7c4ea967-1723-4a06-80e2-fcdf50f3fa82">
-<operation>DEPLOY</operation>
-<responseCode>IN_PROGRESS</responseCode>
-<message>Request to deploy Server 'Production FTPS Server' has been
-accepted and is being processed.</message>
-<info name="serverId" value="e75ead52-692f-4314-8725-c8a4f4d13a87"/>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_disableServerMonitoring.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_disableServerMonitoring.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_disableServerMonitoring.xml
deleted file mode 100644
index 63609de..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_disableServerMonitoring.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response
-xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-06-10T09:19:48.692-04:00/929c91ac-5377-4dcf-aac6-a89610971139">
-<operation>DISABLE_SERVER_MONITORING</operation>
-<responseCode>OK</responseCode>
-<message>Monitoring on Server 5783e93f-5370-44fc-a772-cd3c29a2ecaa has
-been disabled.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_enableServerMonitoring.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_enableServerMonitoring.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_enableServerMonitoring.xml
deleted file mode 100644
index 9b1b555..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_enableServerMonitoring.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response
-xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-06-10T09:22:40.684-04:00/c0ca4a5d-3611-417e-8209-fd3046cff1d5">
-<operation>ENABLE_SERVER_MONITORING</operation>
-<responseCode>OK</responseCode>
-<message>Monitoring on Server 'Production Server' has been
-enabled.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer.xml
deleted file mode 100644
index 549ea79..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-08-
-12T11:49:17.375-04:00/d5bb0975-1ade-4350-aaec-24807bdf7038">
-<operation>POWER_OFF_SERVER</operation>
-<responseCode>IN_PROGRESS</responseCode>
-<message>Request to power off Server 'Production Server' has been accepted
-and is being processed.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer_INPROGRESS.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer_INPROGRESS.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer_INPROGRESS.xml
deleted file mode 100644
index 8ddcca9..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer_INPROGRESS.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-08-
-12T11:49:17.375-04:00/d5bb0975-1ade-4350-aaec-24807bdf7038">
-<operation>POWER_OFF_SERVER</operation>
-<responseCode>RESOURCE_BUSY</responseCode>
-<message>Request to power off Server 'Production Server' has been accepted
-and is being processed.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer.xml
deleted file mode 100644
index 38f098a..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-08-
-12T09:52:43.365-04:00/5260a4e5-ea21-49f4-909a-22341d8c39cb">
-<operation>REBOOT_SERVER</operation>
-<responseCode>IN_PROGRESS</responseCode>
-<message>Request to reboot Server 'Production Server' has been accepted
-and is being processed.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer_RESOURCEBUSY.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer_RESOURCEBUSY.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer_RESOURCEBUSY.xml
deleted file mode 100644
index 3defba4..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer_RESOURCEBUSY.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-08-
-12T09:52:43.365-04:00/5260a4e5-ea21-49f4-909a-22341d8c39cb">
-<operation>REBOOT_SERVER</operation>
-<responseCode>RESOURCE_BUSY</responseCode>
-<message>Request to reboot Server 'Production Server' did not work, server is busy.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_reconfigureServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_reconfigureServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_reconfigureServer.xml
deleted file mode 100644
index e28e8d7..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_reconfigureServer.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<response xmlns="urn:didata.com:api:cloud:types" requestId="na9/2015-1130T12:07:27.838-05:00/1e22a049-d772-4c39-943c-5c773a7ac9ae">
-    <operation>RECONFIGURE_SERVER</operation>
-    <responseCode>OK</responseCode>
-    <message>Request to reconfigure Server 'Production Server' has been accepted and is being processed.</message>
-</response>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml
deleted file mode 100644
index 61be4e3..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<response
-xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-03-08T06:57:51.297-04:00/6857b7e6-e3a9-438c-87fe-ed2248c65c55">
-<operation>REMOVE_NIC</operation>
-<responseCode>IN_PROGRESS</responseCode>
-<message>Request to Remove NIC 5999db1d-725c-46ba-9d4e-d33991e61ab1 for
-VLAN 'Subsystem VLAN' from Server 'Production Mail Server' has been accepted
-and is being processed.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_resetServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_resetServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_resetServer.xml
deleted file mode 100644
index ece1a8b..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_resetServer.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-08-
-12T11:37:13.823-04:00/7b264a73-d73b-424c-bec8-5debba8b4626">
-<operation>RESET_SERVER</operation>
-<responseCode>IN_PROGRESS</responseCode>
-<message>Request to reset Server 'Production Server' has been accepted and
-is being processed.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml
deleted file mode 100644
index f134822..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<servers xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="2" totalCount="2" pageSize="250">
-    <!-- MCP 1.0 Server State: RUNNING-->
-    <server id="e75ead52-692f-4314-8725-c8a4f4d13a87" datacenterId="NA1">
-        <name>Production Web Server MCP 1</name>
-        <description>nopassword0</description>
-        <operatingSystem id="REDHAT632" displayName="REDHAT6/32" family="UNIX" />
-        <cpu count="4" speed="STANDARD" coresPerSocket="1" />
-        <memoryGb>2</memoryGb>
-        <disk id="74f81c56-96cc-4cca-b4d7-a88f641a6ea2" scsiId="0" sizeGb="10" speed="STANDARD" state="NORMAL" />
-        <nic id="43b24e9e-c1c9-4d53-965b-89bcaa725103" privateIpv4="10.160.117.25" networkId="c550be0e-65c1-11e4-811f-005056806999" networkName="Test1" state="NORMAL" />
-        <backup assetId="5579f3a7-4c32-4cf5-8a7e-b45c36a35c10" servicePlan="Enterprise" state="NORMAL" />
-        <monitoring monitoringId="11049" servicePlan="ESSENTIALS" state="NORMAL" />
-        <sourceImageId>e9ec6eb4-4634-49de-b914-01eb74da5fb9</sourceImageId>
-        <createTime>2015-08-11T16:51:05.000Z</createTime>
-        <deployed>true</deployed>
-        <started>true</started>
-        <state>NORMAL</state>
-        <vmwareTools versionStatus="NEED_UPGRADE" runningStatus="RUNNING" apiVersion="8389" />
-        <virtualHardware version="vmx-08" upToDate="false" />
-    </server>
-    <!-- MCP 1.0 Server State: STARTING-->
-    <server id="e75ead52-692f-4314-8725-c8a4f4d13a88" datacenterId="NA1">
-        <name>Production Web Server MCP 1</name>
-        <description>nopassword0</description>
-        <operatingSystem id="REDHAT632" displayName="REDHAT6/32" family="UNIX" />
-        <cpu count="4" speed="STANDARD" coresPerSocket="1" />
-        <memoryGb>2</memoryGb>
-        <disk id="74f81c56-96cc-4cca-b4d7-a88f641a6ea2" scsiId="0" sizeGb="10" speed="STANDARD" state="NORMAL" />
-        <nic id="43b24e9e-c1c9-4d53-965b-89bcaa725103" privateIpv4="10.160.117.25" networkId="c550be0e-65c1-11e4-811f-005056806999" networkName="Test1" state="NORMAL" />
-        <backup assetId="5579f3a7-4c32-4cf5-8a7e-b45c36a35c10" servicePlan="Enterprise" state="NORMAL" />
-        <monitoring monitoringId="11049" servicePlan="ESSENTIALS" state="NORMAL" />
-        <sourceImageId>e9ec6eb4-4634-49de-b914-01eb74da5fb9</sourceImageId>
-        <createTime>2015-08-11T16:51:05.000Z</createTime>
-        <deployed>true</deployed>
-        <started>true</started>
-        <state>PENDING_ADD</state>
-        <progress>
-            <action>DEPLOY_SERVER_WITH_DISK_SPEED</action>
-            <requestTime>2015-12-02T11:07:40.000Z</requestTime>
-            <userName>devuser1</userName>
-        </progress>
-        <vmwareTools versionStatus="NEED_UPGRADE" runningStatus="RUNNING" apiVersion="8389" />
-        <virtualHardware version="vmx-08" upToDate="false" />
-    </server>
-    <!-- MCP 2.0 Server State: SHUTTING_DOWN-->
-    <server id="5a32d6e4-9707-4813-a269-56ab4d989f4d" datacenterId="NA9">
-        <name>Production Web Server MCP 2</name>
-        <description>Server to host our main web application.</description>
-        <operatingSystem id="WIN2008S32" displayName="WIN2008S/32" family="WINDOWS" />
-        <cpu count="2" speed="STANDARD" coresPerSocket="1" />
-        <memoryGb>4</memoryGb>
-        <disk id="c2e1f199-116e-4dbc-9960-68720b832b0a" scsiId="0" sizeGb="50" speed="STANDARD" state="NORMAL" />
-        <networkInfo networkDomainId="553f26b6-2a73-42c3-a78b-6116f11291d0">
-            <primaryNic id="5e869800-df7b-4626-bcbf-8643b8be11fd" privateIpv4="10.0.4.8" ipv6="2607:f480:1111:1282:2960:fb72:7154:6160" vlanId="bc529e20-dc6f-42ba-be20-0ffe44d1993f" vlanName="Production VLAN" state="NORMAL" />
-        </networkInfo>
-        <backup assetId="91002e08-8dc1-47a1-ad33-04f501c06f87" servicePlan="Advanced" state="NORMAL" />
-        <monitoring monitoringId="11039" servicePlan="ESSENTIALS" state="NORMAL" />
-        <softwareLabel>MSSQL2008R2S</softwareLabel>
-        <sourceImageId>3ebf3c0f-90fe-4a8b-8585-6e65b316592c</sourceImageId>
-        <createTime>2015-12-02T10:31:33.000Z</createTime>
-        <deployed>true</deployed>
-        <started>true</started>
-        <state>PENDING_CHANGE</state>
-        <progress>
-            <action>SHUTDOWN_SERVER</action>
-            <requestTime>2015-12-02T11:07:40.000Z</requestTime>
-            <userName>devuser1</userName>
-        </progress>
-        <vmwareTools versionStatus="CURRENT" runningStatus="RUNNING" apiVersion="9354" />
-        <virtualHardware version="vmx-08" upToDate="false" />
-    </server>
-    <!-- MCP 2.0 Server State: RECONFIGURING-->
-    <server id="5a32d6e4-9707-4813-a269-56ab4d989f4d" datacenterId="NA9">
-        <name>Production Web Server MCP 2</name>
-        <description>Server to host our main web application.</description>
-        <operatingSystem id="WIN2008S32" displayName="WIN2008S/32" family="WINDOWS" />
-        <cpu count="2" speed="STANDARD" coresPerSocket="1" />
-        <memoryGb>4</memoryGb>
-        <disk id="c2e1f199-116e-4dbc-9960-68720b832b0a" scsiId="0" sizeGb="50" speed="STANDARD" state="NORMAL" />
-        <networkInfo networkDomainId="553f26b6-2a73-42c3-a78b-6116f11291d0">
-            <primaryNic id="5e869800-df7b-4626-bcbf-8643b8be11fd" privateIpv4="10.0.4.8" ipv6="2607:f480:1111:1282:2960:fb72:7154:6160" vlanId="bc529e20-dc6f-42ba-be20-0ffe44d1993f" vlanName="Production VLAN" state="NORMAL" />
-        </networkInfo>
-        <backup assetId="91002e08-8dc1-47a1-ad33-04f501c06f87" servicePlan="Advanced" state="NORMAL" />
-        <monitoring monitoringId="11039" servicePlan="ESSENTIALS" state="NORMAL" />
-        <softwareLabel>MSSQL2008R2S</softwareLabel>
-        <sourceImageId>3ebf3c0f-90fe-4a8b-8585-6e65b316592c</sourceImageId>
-        <createTime>2015-12-02T10:31:33.000Z</createTime>
-        <deployed>true</deployed>
-        <started>true</started>
-        <state>PENDING_CHANGE</state>
-        <progress>
-            <action>RECONFIGURE_SERVER</action>
-            <requestTime>2015-12-02T11:07:40.000Z</requestTime>
-            <userName>devuser1</userName>
-        </progress>
-        <vmwareTools versionStatus="CURRENT" runningStatus="RUNNING" apiVersion="9354" />
-        <virtualHardware version="vmx-08" upToDate="false" />
-    </server>
-    <!-- MCP 2.0 Server State: UNKNOWN - running-->
-    <server id="5a32d6e4-9707-4813-a269-56ab4d989f4d" datacenterId="NA9">
-        <name>Production Web Server MCP 2</name>
-        <description>Server to host our main web application.</description>
-        <operatingSystem id="WIN2008S32" displayName="WIN2008S/32" family="WINDOWS" />
-        <cpu count="2" speed="STANDARD" coresPerSocket="1" />
-        <memoryGb>4</memoryGb>
-        <disk id="c2e1f199-116e-4dbc-9960-68720b832b0a" scsiId="0" sizeGb="50" speed="STANDARD" state="NORMAL" />
-        <networkInfo networkDomainId="553f26b6-2a73-42c3-a78b-6116f11291d0">
-            <primaryNic id="5e869800-df7b-4626-bcbf-8643b8be11fd" privateIpv4="10.0.4.8" ipv6="2607:f480:1111:1282:2960:fb72:7154:6160" vlanId="bc529e20-dc6f-42ba-be20-0ffe44d1993f" vlanName="Production VLAN" state="NORMAL" />
-        </networkInfo>
-        <backup assetId="91002e08-8dc1-47a1-ad33-04f501c06f87" servicePlan="Advanced" state="NORMAL" />
-        <monitoring monitoringId="11039" servicePlan="ESSENTIALS" state="NORMAL" />
-        <softwareLabel>MSSQL2008R2S</softwareLabel>
-        <sourceImageId>3ebf3c0f-90fe-4a8b-8585-6e65b316592c</sourceImageId>
-        <createTime>2015-12-02T10:31:33.000Z</createTime>
-        <deployed>true</deployed>
-        <started>true</started>
-        <state>UNKNOWN</state>
-        <progress>
-            <action>SHUTDOWN_SERVER</action>
-            <requestTime>2015-12-02T11:07:40.000Z</requestTime>
-            <userName>devuser1</userName>
-        </progress>
-        <vmwareTools versionStatus="CURRENT" runningStatus="RUNNING" apiVersion="9354" />
-        <virtualHardware version="vmx-08" upToDate="false" />
-    </server>
-    <!-- MCP 2.0 Server State: UNKNOWN-terminated-->
-    <server id="5a32d6e4-9707-4813-a269-56ab4d989f4d" datacenterId="NA9">
-        <name>Production Web Server MCP 21</name>
-        <description>Server to host our main web application.</description>
-        <operatingSystem id="WIN2008S32" displayName="WIN2008S/32" family="WINDOWS" />
-        <cpu count="2" speed="STANDARD" coresPerSocket="1" />
-        <memoryGb>4</memoryGb>
-        <disk id="c2e1f199-116e-4dbc-9960-68720b832b0a" scsiId="0" sizeGb="50" speed="STANDARD" state="NORMAL" />
-        <networkInfo networkDomainId="553f26b6-2a73-42c3-a78b-6116f11291d0">
-            <primaryNic id="5e869800-df7b-4626-bcbf-8643b8be11fd" privateIpv4="10.0.4.8" ipv6="2607:f480:1111:1282:2960:fb72:7154:6160" vlanId="bc529e20-dc6f-42ba-be20-0ffe44d1993f" vlanName="Production VLAN" state="NORMAL" />
-        </networkInfo>
-        <backup assetId="91002e08-8dc1-47a1-ad33-04f501c06f87" servicePlan="Advanced" state="NORMAL" />
-        <monitoring monitoringId="11039" servicePlan="ESSENTIALS" state="NORMAL" />
-        <softwareLabel>MSSQL2008R2S</softwareLabel>
-        <sourceImageId>3ebf3c0f-90fe-4a8b-8585-6e65b316592c</sourceImageId>
-        <createTime>2015-12-02T10:31:33.000Z</createTime>
-        <deployed>true</deployed>
-        <started>false</started>
-        <state>UNKNOWN</state>
-        <progress>
-            <action>SHUTDOWN_SERVER</action>
-            <requestTime>2015-12-02T11:07:40.000Z</requestTime>
-            <userName>devuser1</userName>
-        </progress>
-        <vmwareTools versionStatus="CURRENT" runningStatus="RUNNING" apiVersion="9354" />
-        <virtualHardware version="vmx-08" upToDate="false" />
-    </server>
-    <!-- MCP 2.0 Server State: STOPPED-->
-    <server id="5a32d6e4-9707-4813-a269-56ab4d989f4d" datacenterId="NA9">
-        <name>Production Web Server MCP 2</name>
-        <description>Server to host our main web application.</description>
-        <operatingSystem id="WIN2008S32" displayName="WIN2008S/32" family="WINDOWS" />
-        <cpu count="2" speed="STANDARD" coresPerSocket="1" />
-        <memoryGb>4</memoryGb>
-        <disk id="c2e1f199-116e-4dbc-9960-68720b832b0a" scsiId="0" sizeGb="50" speed="STANDARD" state="NORMAL" />
-        <networkInfo networkDomainId="553f26b6-2a73-42c3-a78b-6116f11291d0">
-            <primaryNic id="5e869800-df7b-4626-bcbf-8643b8be11fd" privateIpv4="10.0.4.8" ipv6="2607:f480:1111:1282:2960:fb72:7154:6160" vlanId="bc529e20-dc6f-42ba-be20-0ffe44d1993f" vlanName="Production VLAN" state="NORMAL" />
-        </networkInfo>
-        <backup assetId="91002e08-8dc1-47a1-ad33-04f501c06f87" servicePlan="Advanced" state="NORMAL" />
-        <monitoring monitoringId="11039" servicePlan="ESSENTIALS" state="NORMAL" />
-        <softwareLabel>MSSQL2008R2S</softwareLabel>
-        <sourceImageId>3ebf3c0f-90fe-4a8b-8585-6e65b316592c</sourceImageId>
-        <createTime>2015-12-02T10:31:33.000Z</createTime>
-        <deployed>true</deployed>
-        <started>false</started>
-        <state>NORMAL</state>
-        <vmwareTools versionStatus="CURRENT" runningStatus="RUNNING" apiVersion="9354" />
-        <virtualHardware version="vmx-08" upToDate="false" />
-    </server>
-</servers>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_NA3.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_NA3.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_NA3.xml
deleted file mode 100644
index 80b6273..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_NA3.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<servers xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="2" totalCount="2" pageSize="250">
-    <!-- MCP 1.0 Server -->
-    <server id="e75ead52-692f-4314-8725-c8a4f4d13a87" datacenterId="NA3">
-        <name>Production Web Server MCP 1</name>
-        <description>nopassword0</description>
-        <operatingSystem id="REDHAT632" displayName="REDHAT6/32" family="UNIX" />
-        <cpu count="4" speed="STANDARD" coresPerSocket="1" />
-        <memoryGb>2</memoryGb>
-        <disk id="74f81c56-96cc-4cca-b4d7-a88f641a6ea2" scsiId="0" sizeGb="10" speed="STANDARD" state="NORMAL" />
-        <nic id="43b24e9e-c1c9-4d53-965b-89bcaa725103" privateIpv4="10.160.117.25" networkId="c550be0e-65c1-11e4-811f-005056806999" networkName="Test1" state="NORMAL" />
-        <backup assetId="5579f3a7-4c32-4cf5-8a7e-b45c36a35c10" servicePlan="Enterprise" state="NORMAL" />
-        <monitoring monitoringId="11049" servicePlan="ESSENTIALS" state="NORMAL" />
-        <sourceImageId>e9ec6eb4-4634-49de-b914-01eb74da5fb9</sourceImageId>
-        <createTime>2015-08-11T16:51:05.000Z</createTime>
-        <deployed>true</deployed>
-        <started>true</started>
-        <state>NORMAL</state>
-        <vmwareTools versionStatus="NEED_UPGRADE" runningStatus="RUNNING" apiVersion="8389" />
-        <virtualHardware version="vmx-08" upToDate="false" />
-    </server>
-    <!-- MCP 2.0 Server -->
-    <server id="5a32d6e4-9707-4813-a269-56ab4d989f4d" datacenterId="NA3">
-        <name>Production Web Server MCP 2</name>
-        <description>Server to host our main web application.</description>
-        <operatingSystem id="WIN2008S32" displayName="WIN2008S/32" family="WINDOWS" />
-        <cpu count="2" speed="STANDARD" coresPerSocket="1" />
-        <memoryGb>4</memoryGb>
-        <disk id="c2e1f199-116e-4dbc-9960-68720b832b0a" scsiId="0" sizeGb="50" speed="STANDARD" state="NORMAL" />
-        <networkInfo networkDomainId="553f26b6-2a73-42c3-a78b-6116f11291d0">
-            <primaryNic id="5e869800-df7b-4626-bcbf-8643b8be11fd" privateIpv4="10.0.4.8" ipv6="2607:f480:1111:1282:2960:fb72:7154:6160" vlanId="bc529e20-dc6f-42ba-be20-0ffe44d1993f" vlanName="Production VLAN" state="NORMAL" />
-        </networkInfo>
-        <backup assetId="91002e08-8dc1-47a1-ad33-04f501c06f87" servicePlan="Advanced" state="NORMAL" />
-        <monitoring monitoringId="11039" servicePlan="ESSENTIALS" state="NORMAL" />
-        <softwareLabel>MSSQL2008R2S</softwareLabel>
-        <sourceImageId>3ebf3c0f-90fe-4a8b-8585-6e65b316592c</sourceImageId>
-        <createTime>2015-12-02T10:31:33.000Z</createTime>
-        <deployed>true</deployed>
-        <started>true</started>
-        <state>PENDING_CHANGE</state>
-        <progress>
-            <action>SHUTDOWN_SERVER</action>
-            <requestTime>2015-12-02T11:07:40.000Z</requestTime>
-            <userName>devuser1</userName>
-        </progress>
-        <vmwareTools versionStatus="CURRENT" runningStatus="RUNNING" apiVersion="9354" />
-        <virtualHardware version="vmx-08" upToDate="false" />
-    </server>
-</servers>
-

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml
deleted file mode 100644
index 813c43f..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<server xmlns="urn:didata.com:api:cloud:types" id="e75ead52-692f-4314-8725-c8a4f4d13a87" datacenterId="NA9">
-        <name>Production Web Server</name>
-        <description>Server to host our main web application.</description>
-        <operatingSystem id="WIN2008S32" displayName="WIN2008S/32" family="WINDOWS" />
-        <cpu count="2" speed="STANDARD" coresPerSocket="1" />
-        <memoryGb>4</memoryGb>
-        <disk id="c2e1f199-116e-4dbc-9960-68720b832b0a" scsiId="0" sizeGb="50" speed="STANDARD" state="NORMAL" />
-        <networkInfo networkDomainId="553f26b6-2a73-42c3-a78b-6116f11291d0">
-            <primaryNic id="5e869800-df7b-4626-bcbf-8643b8be11fd" privateIpv4="10.0.4.8" ipv6="2607:f480:1111:1282:2960:fb72:7154:6160" vlanId="bc529e20-dc6f-42ba-be20-0ffe44d1993f" vlanName="Production VLAN" state="NORMAL" />
-        </networkInfo>
-        <backup assetId="5579f3a7-4c32-4cf5-8a7e-b45c36a35c10" servicePlan="Enterprise" state="NORMAL" />
-        <monitoring monitoringId="11049" servicePlan="ESSENTIALS" state="NORMAL" />
-        <softwareLabel>MSSQL2008R2S</softwareLabel>
-        <sourceImageId>3ebf3c0f-90fe-4a8b-8585-6e65b316592c</sourceImageId>
-        <createTime>2015-12-02T10:31:33.000Z</createTime>
-        <deployed>true</deployed>
-        <started>true</started>
-        <state>PENDING_CHANGE</state>
-        <progress>
-            <action>DEPLOY_SERVER</action>
-            <requestTime>2015-12-02T11:07:40.000Z</requestTime>
-            <userName>devuser1</userName>
-        </progress>
-        <vmwareTools versionStatus="CURRENT" runningStatus="RUNNING" apiVersion="9354" />
-        <virtualHardware version="vmx-08" upToDate="false" />
-    </server>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_paginated.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_paginated.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_paginated.xml
deleted file mode 100644
index 027c9c0..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_paginated.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<servers xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="2" totalCount="2" pageSize="2">
-    <!-- MCP 1.0 Server -->
-    <server id="e75ead52-692f-4314-8725-c8a4f4d13a87" datacenterId="NA1">
-        <name>Production Web Server MCP 1</name>
-        <description>nopassword0</description>
-        <operatingSystem id="REDHAT632" displayName="REDHAT6/32" family="UNIX" />
-        <cpu count="4" speed="STANDARD" coresPerSocket="1" />
-        <memoryGb>2</memoryGb>
-        <disk id="74f81c56-96cc-4cca-b4d7-a88f641a6ea2" scsiId="0" sizeGb="10" speed="STANDARD" state="NORMAL" />
-        <nic id="43b24e9e-c1c9-4d53-965b-89bcaa725103" privateIpv4="10.160.117.25" networkId="c550be0e-65c1-11e4-811f-005056806999" networkName="Test1" state="NORMAL" />
-        <backup assetId="5579f3a7-4c32-4cf5-8a7e-b45c36a35c10" servicePlan="Enterprise" state="NORMAL" />
-        <monitoring monitoringId="11049" servicePlan="ESSENTIALS" state="NORMAL" />
-        <sourceImageId>e9ec6eb4-4634-49de-b914-01eb74da5fb9</sourceImageId>
-        <createTime>2015-08-11T16:51:05.000Z</createTime>
-        <deployed>true</deployed>
-        <started>true</started>
-        <state>NORMAL</state>
-        <vmwareTools versionStatus="NEED_UPGRADE" runningStatus="RUNNING" apiVersion="8389" />
-        <virtualHardware version="vmx-08" upToDate="false" />
-    </server>
-    <!-- MCP 2.0 Server -->
-    <server id="5a32d6e4-9707-4813-a269-56ab4d989f4d" datacenterId="NA9">
-        <name>Production Web Server MCP 2</name>
-        <description>Server to host our main web application.</description>
-        <operatingSystem id="WIN2008S32" displayName="WIN2008S/32" family="WINDOWS" />
-        <cpu count="2" speed="STANDARD" coresPerSocket="1" />
-        <memoryGb>4</memoryGb>
-        <disk id="c2e1f199-116e-4dbc-9960-68720b832b0a" scsiId="0" sizeGb="50" speed="STANDARD" state="NORMAL" />
-        <networkInfo networkDomainId="553f26b6-2a73-42c3-a78b-6116f11291d0">
-            <primaryNic id="5e869800-df7b-4626-bcbf-8643b8be11fd" privateIpv4="10.0.4.8" ipv6="2607:f480:1111:1282:2960:fb72:7154:6160" vlanId="bc529e20-dc6f-42ba-be20-0ffe44d1993f" vlanName="Production VLAN" state="NORMAL" />
-        </networkInfo>
-        <backup assetId="91002e08-8dc1-47a1-ad33-04f501c06f87" servicePlan="Advanced" state="NORMAL" />
-        <monitoring monitoringId="11039" servicePlan="ESSENTIALS" state="NORMAL" />
-        <softwareLabel>MSSQL2008R2S</softwareLabel>
-        <sourceImageId>3ebf3c0f-90fe-4a8b-8585-6e65b316592c</sourceImageId>
-        <createTime>2015-12-02T10:31:33.000Z</createTime>
-        <deployed>true</deployed>
-        <started>true</started>
-        <state>PENDING_CHANGE</state>
-        <progress>
-            <action>SHUTDOWN_SERVER</action>
-            <requestTime>2015-12-02T11:07:40.000Z</requestTime>
-            <userName>devuser1</userName>
-        </progress>
-        <vmwareTools versionStatus="CURRENT" runningStatus="RUNNING" apiVersion="9354" />
-        <virtualHardware version="vmx-08" upToDate="false" />
-    </server>
-</servers>
-

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer.xml
deleted file mode 100644
index 937cb0d..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-08-
-12T09:06:01.949-04:00/fd2650a9-3473-41eb-9c6e-1eef29c0bb27">
-<operation>SHUTDOWN_SERVER</operation>
-<responseCode>IN_PROGRESS</responseCode>
-<message>Request to shutdown Server 'Production Server' has been accepted
-and is being processed.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer_INPROGRESS.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer_INPROGRESS.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer_INPROGRESS.xml
deleted file mode 100644
index 386489c..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer_INPROGRESS.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-08-
-12T09:06:01.949-04:00/fd2650a9-3473-41eb-9c6e-1eef29c0bb27">
-<operation>SHUTDOWN_SERVER</operation>
-<responseCode>RESOURCE_BUSY</responseCode>
-<message>Request to shutdown Server 'Production Server' has been accepted
-and is being processed.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_startServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_startServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_startServer.xml
deleted file mode 100644
index 4fb4589..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_startServer.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-08-
-12T08:27:00.176-04:00/14b0a61f-7e85-49c9-8e7e-146fa3e562b7">
-<operation>START_SERVER</operation>
-<responseCode>IN_PROGRESS</responseCode>
-<message>Request to start Server 'Production Server' has been accepted and
-is being processed.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_startServer_INPROGRESS.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_startServer_INPROGRESS.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_startServer_INPROGRESS.xml
deleted file mode 100644
index f5c3070..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_startServer_INPROGRESS.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-08-
-12T08:27:00.176-04:00/14b0a61f-7e85-49c9-8e7e-146fa3e562b7">
-<operation>START_SERVER</operation>
-<responseCode>RESOURCE_BUSY</responseCode>
-<message>Request to start Server 'Production Server' has been accepted and
-is being processed.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_updateVmwareTools.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_updateVmwareTools.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_updateVmwareTools.xml
deleted file mode 100644
index 549ea79..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_updateVmwareTools.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-08-
-12T11:49:17.375-04:00/d5bb0975-1ade-4350-aaec-24807bdf7038">
-<operation>POWER_OFF_SERVER</operation>
-<responseCode>IN_PROGRESS</responseCode>
-<message>Request to power off Server 'Production Server' has been accepted
-and is being processed.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/image_customerImage.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/image_customerImage.xml b/libcloud/test/compute/fixtures/dimensiondata/image_customerImage.xml
new file mode 100644
index 0000000..4e59e18
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/image_customerImage.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<customerImages xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="35" totalCount="35" pageSize="250">
+    <customerImage id="5234e5c7-01de-4411-8b6e-baeb8d91cf5d" datacenterId="NA9">
+        <name>ImportedCustomerImage</name>
+        <description />
+        <operatingSystem id="REDHAT664" displayName="REDHAT6/64" family="UNIX" />
+        <cpu count="4" speed="STANDARD" coresPerSocket="1" />
+        <memoryGb>2</memoryGb>
+        <disk id="1a82316f-23ed-4fe9-b6d8-6b92ac467423" scsiId="0" sizeGb="12" speed="STANDARD" />
+        <createTime>2015-11-19T14:29:02.000Z</createTime>
+        <source type="IMPORT">
+        <artifact type="MF" value="ImportedCustomerImage.mf" date="2015-1119T14:28:54.000Z" />
+        <artifact type="OVF" value="ImportedCustomerImage.ovf" date="2015-1119T14:28:05.000Z" />
+        <artifact type="VMDK" value="ImportedCustomerImage-disk1.vmdk" date="2015-11-19T12:22:31.000Z" /></source>
+        <state>NORMAL</state>
+        <vmwareTools versionStatus="NEED_UPGRADE" runningStatus="NOT_RUNNING" apiVersion="8389" />
+        <virtualHardware version="vmx-10" upToDate="true" />
+    </customerImage>
+    <customerImage id="2ffa36c8-1848-49eb-b4fa-9d908775f68c" datacenterId="NA9">
+        <name>CustomerImageWithPricedSoftwareLabels</name>
+        <description />
+        <operatingSystem id="WIN2008S32" displayName="WIN2008S/32" family="WINDOWS" />
+        <cpu count="1" speed="STANDARD" coresPerSocket="1" />
+        <memoryGb>1</memoryGb>
+        <disk id="29455efc-51af-4b4d-91b3-d81ca0dff7d8" scsiId="0" sizeGb="50" speed="STANDARD" />
+        <softwareLabel>MSSQL2008R2S</softwareLabel>
+        <createTime>2015-11-03T15:25:34.000Z</createTime>
+        <source type="CLONE">
+            <artifact type="SERVER_ID" value="7c9c2551-269d-4274-a247126ba7c6215c" />
+        </source>
+        <state>NORMAL</state>
+        <vmwareTools versionStatus="CURRENT" runningStatus="NOT_RUNNING" />
+        <virtualHardware version="vmx-08" upToDate="false" />
+    </customerImage>
+    <customerImage id="1fc1844f-45d6-4364-b447-f7c7645b47de" datacenterId="NA9">
+        <name>CopiedCustomerImage</name>
+        <description />
+        <operatingSystem id="REDHAT664" displayName="REDHAT6/64" family="UNIX" />
+        <cpu count="1" speed="STANDARD" coresPerSocket="1" />
+        <memoryGb>2</memoryGb>
+        <disk id="42b20819-c161-4dec-aa94-73ec370a6e37" scsiId="0" sizeGb="10" speed="STANDARD" />
+        <createTime>2015-11-11T17:17:00.000Z</createTime>
+        <source type="COPY">
+            <artifact type="IMAGE_ID" value="0b8357b6-f156-4b27-b4fd-b81d09c15efc" />
+        </source>
+        <state>NORMAL</state>
+        <vmwareTools versionStatus="NEED_UPGRADE" runningStatus="NOT_RUNNING" apiVersion="9355" />
+        <virtualHardware version="vmx-10" upToDate="true" />
+    </customerImage>
+</customerImages>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_2ffa36c8_1848_49eb_b4fa_9d908775f68c.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_2ffa36c8_1848_49eb_b4fa_9d908775f68c.xml b/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_2ffa36c8_1848_49eb_b4fa_9d908775f68c.xml
new file mode 100644
index 0000000..bff6183
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_2ffa36c8_1848_49eb_b4fa_9d908775f68c.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <customerImage xmlns="urn:didata.com:api:cloud:types" id="2ffa36c8-1848-49eb-b4fa-9d908775f68c" datacenterId="NA9">
+        <name>CustomerImageWithPricedSoftwareLabels</name>
+        <description />
+        <operatingSystem id="WIN2008S32" displayName="WIN2008S/32" family="WINDOWS" />
+        <cpu count="1" speed="STANDARD" coresPerSocket="1" />
+        <memoryGb>1</memoryGb>
+        <disk id="29455efc-51af-4b4d-91b3-d81ca0dff7d8" scsiId="0" sizeGb="50" speed="STANDARD" />
+        <softwareLabel>MSSQL2008R2S</softwareLabel>
+        <createTime>2015-11-03T15:25:34.000Z</createTime>
+        <source type="CLONE">
+            <artifact type="SERVER_ID" value="7c9c2551-269d-4274-a247126ba7c6215c" />
+        </source>
+        <state>NORMAL</state>
+        <vmwareTools versionStatus="CURRENT" runningStatus="NOT_RUNNING" />
+        <virtualHardware version="vmx-08" upToDate="false" />
+    </customerImage>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_5234e5c7_01de_4411_8b6e_baeb8d91cf5d.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_5234e5c7_01de_4411_8b6e_baeb8d91cf5d.xml b/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_5234e5c7_01de_4411_8b6e_baeb8d91cf5d.xml
new file mode 100644
index 0000000..db5302d
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_5234e5c7_01de_4411_8b6e_baeb8d91cf5d.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <customerImage xmlns="urn:didata.com:api:cloud:types" id="5234e5c7-01de-4411-8b6e-baeb8d91cf5d" datacenterId="NA9">
+        <name>ImportedCustomerImage</name>
+        <description />
+        <operatingSystem id="REDHAT664" displayName="REDHAT6/64" family="UNIX" />
+        <cpu count="4" speed="STANDARD" coresPerSocket="1" />
+        <memoryGb>2</memoryGb>
+        <disk id="1a82316f-23ed-4fe9-b6d8-6b92ac467423" scsiId="0" sizeGb="12" speed="STANDARD" />
+        <createTime>2015-11-19T14:29:02.000Z</createTime>
+        <source type="IMPORT">
+        <artifact type="MF" value="ImportedCustomerImage.mf" date="2015-1119T14:28:54.000Z" />
+        <artifact type="OVF" value="ImportedCustomerImage.ovf" date="2015-1119T14:28:05.000Z" />
+        <artifact type="VMDK" value="ImportedCustomerImage-disk1.vmdk" date="2015-11-19T12:22:31.000Z" /></source>
+        <state>NORMAL</state>
+        <vmwareTools versionStatus="NEED_UPGRADE" runningStatus="NOT_RUNNING" apiVersion="8389" />
+        <virtualHardware version="vmx-10" upToDate="true" />
+    </customerImage>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_BAD_REQUEST.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_BAD_REQUEST.xml b/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_BAD_REQUEST.xml
new file mode 100644
index 0000000..2579b63
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_BAD_REQUEST.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<response xmlns="urn:didata.com:api:cloud:types" requestId="na/2016-03-15T12:38:27.999-04:00/e9e8370d-d4d4-4725-afae-77e7832bacbd">
+  <operation>GET_CUSTOMER_IMAGE</operation>
+  <responseCode>RESOURCE_NOT_FOUND</responseCode>
+  <message>Server Image 2ffa36c8-1848-49eb-b4fa-9d908775f68c not found.</message>
+</response>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/image_osImage.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/image_osImage.xml b/libcloud/test/compute/fixtures/dimensiondata/image_osImage.xml
new file mode 100644
index 0000000..1f884a9
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/image_osImage.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<osImages xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="47" totalCount="47" pageSize="250">
+    <osImage id="c14b1a46-2428-44c1-9c1a-b20e6418d08c" datacenterId="NA9">
+        <name>RedHat 6 64-bit 2 CPU</name>
+        <description>RedHat 6.6 Enterprise (Santiago) 64-bit</description>
+        <operatingSystem id="REDHAT664" displayName="REDHAT6/64" family="UNIX" />
+        <cpu count="2" speed="STANDARD" coresPerSocket="1" />
+        <memoryGb>4</memoryGb>
+        <disk id="a02b7244-99d8-4889-84a5-5e4373c1bb26" scsiId="0" sizeGb="10" speed="STANDARD" />
+        <createTime>2015-09-17T11:23:48.000Z</createTime>
+        <osImageKey>T-RHEL-6-64-2-4-10</osImageKey>
+    </osImage>
+    <osImage id="6b4fb0c7-a57b-4f58-b59c-9958f94f971a" datacenterId="NA9">
+        <name>Win2012 DC 2 CPU</name>
+        <description>Windows 2012 Datacenter</description>
+        <operatingSystem id="WIN2012DC64" displayName="WIN2012DC/64" family="WINDOWS" />
+        <cpu count="2" speed="STANDARD" coresPerSocket="1" />
+        <memoryGb>4</memoryGb>
+        <disk id="f5e01854-a211-4ec6-96d6-2753b6d47877" scsiId="0" sizeGb="50" speed="STANDARD" />
+        <createTime>2015-09-17T11:44:43.000Z</createTime>
+        <osImageKey>T-WIN-2012-DATACTR-64-2-4-50</osImageKey>
+    </osImage>
+    <osImage id="3ebf3c0f-90fe-4a8b-8585-6e65b316592c" datacenterId="NA9">
+        <name>Win2008 Std 32-bit 2 CPU</name>
+        <description>Windows 2008 Enterprise R2 32-bit installed with Microsoft SQL Server 2012 Standard Edition</description>
+        <operatingSystem id="WIN2008S32" displayName="WIN2008S/32" family="WINDOWS" />
+        <cpu count="2" speed="STANDARD" coresPerSocket="1" />
+        <memoryGb>4</memoryGb>
+        <disk id="6e5b5112-0eae-44eb-83cd-1bd0d58fbeab" scsiId="0" sizeGb="50" speed="STANDARD" />
+        <softwareLabel>MSSQL2008R2S</softwareLabel>
+        <createTime>2014-11-20T12:54:22.000Z</createTime>
+        <osImageKey>T-WIN-2008-ENT-32-2-4-50</osImageKey>
+    </osImage>
+</osImages>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/image_osImage_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/image_osImage_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml b/libcloud/test/compute/fixtures/dimensiondata/image_osImage_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml
new file mode 100644
index 0000000..1631137
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/image_osImage_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+  <osImage xmlns="urn:didata.com:api:cloud:types" id="6b4fb0c7-a57b-4f58-b59c-9958f94f971a" datacenterId="NA9">
+    <name>Win2012 DC 2 CPU</name>
+    <description>Windows 2012 Datacenter</description>
+    <operatingSystem id="WIN2012DC64" displayName="WIN2012DC/64" family="WINDOWS" />
+    <cpu count="2" speed="STANDARD" coresPerSocket="1" />
+    <memoryGb>4</memoryGb>
+    <disk id="f5e01854-a211-4ec6-96d6-2753b6d47877" scsiId="0" sizeGb="50" speed="STANDARD" />
+    <createTime>2015-09-17T11:44:43.000Z</createTime>
+    <osImageKey>T-WIN-2012-DATACTR-64-2-4-50</osImageKey>
+  </osImage>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/image_osImage_BAD_REQUEST.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/image_osImage_BAD_REQUEST.xml b/libcloud/test/compute/fixtures/dimensiondata/image_osImage_BAD_REQUEST.xml
new file mode 100644
index 0000000..0091648
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/image_osImage_BAD_REQUEST.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<response xmlns="urn:didata.com:api:cloud:types" requestId="na/2016-03-15T12:38:27.999-04:00/e9e8370d-d4d4-4725-afae-77e7832bacbd">
+  <operation>GET_OS_IMAGE</operation>
+  <responseCode>RESOURCE_NOT_FOUND</responseCode>
+  <message>Server Image 2ffa36c8-1848-49eb-b4fa-9d908775f68c not found.</message>
+</response>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d559c58a/libcloud/test/compute/fixtures/dimensiondata/image_osImage_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/image_osImage_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml b/libcloud/test/compute/fixtures/dimensiondata/image_osImage_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml
new file mode 100644
index 0000000..27d6c25
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/image_osImage_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+  <osImage xmlns="urn:didata.com:api:cloud:types" id="c14b1a46-2428-44c1-9c1a-b20e6418d08c" datacenterId="NA9">
+    <name>RedHat 6 64-bit 2 CPU</name>
+    <description>RedHat 6.6 Enterprise (Santiago) 64-bit</description>
+    <operatingSystem id="REDHAT664" displayName="REDHAT6/64" family="UNIX" />
+    <cpu count="2" speed="STANDARD" coresPerSocket="1" />
+    <memoryGb>4</memoryGb>
+    <disk id="a02b7244-99d8-4889-84a5-5e4373c1bb26" scsiId="0" sizeGb="10" speed="STANDARD" />
+    <createTime>2015-09-17T11:23:48.000Z</createTime>
+    <osImageKey>T-RHEL-6-64-2-4-10</osImageKey>
+  </osImage>
+