libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthonys...@apache.org
Subject [04/11] libcloud git commit: Update existing URLs to /caas/2.1, update tests and fixtures, change capitalization of /server/server API. Added CPU specification and RAM specification to the server provisioning request
Date Wed, 09 Dec 2015 10:19:22 GMT
Update existing URLs to /caas/2.1, update tests and fixtures, change capitalization of /server/server API. Added CPU specification and RAM specification to the server provisioning request

Signed-off-by: Anthony Shaw <anthony.p.shaw@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/b806072b
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/b806072b
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/b806072b

Branch: refs/heads/trunk
Commit: b806072b88f49f1c6b45e60adaf16f43e7eec965
Parents: 914c4eb
Author: Anthony Shaw <anthony.p.shaw@gmail.com>
Authored: Tue Dec 8 20:12:47 2015 +1100
Committer: Anthony Shaw <anthony.p.shaw@gmail.com>
Committed: Wed Dec 9 21:19:11 2015 +1100

----------------------------------------------------------------------
 libcloud/common/dimensiondata.py                |  32 ++-
 libcloud/compute/drivers/dimensiondata.py       |  20 +-
 ...c_8dabe5a7d0e4_infrastructure_datacenter.xml | 188 -----------------
 ...bc_8dabe5a7d0e4_network_addPublicIpBlock.xml |   7 -
 ..._8dabe5a7d0e4_network_createFirewallRule.xml |   8 -
 ..._9cbc_8dabe5a7d0e4_network_createNatRule.xml |   9 -
 ..._8dabe5a7d0e4_network_deleteFirewallRule.xml |   8 -
 ..._9cbc_8dabe5a7d0e4_network_deleteNatRule.xml |   8 -
 ...8dabe5a7d0e4_network_deleteNetworkDomain.xml |   8 -
 ...d8a_9cbc_8dabe5a7d0e4_network_deleteVlan.xml |   8 -
 ...8dabe5a7d0e4_network_deployNetworkDomain.xml |   8 -
 ...d8a_9cbc_8dabe5a7d0e4_network_deployVlan.xml |   9 -
 ...bc_8dabe5a7d0e4_network_editFirewallRule.xml |   8 -
 ...c_8dabe5a7d0e4_network_editNetworkDomain.xml |   7 -
 ..._4d8a_9cbc_8dabe5a7d0e4_network_editVlan.xml |   7 -
 ...d8a_9cbc_8dabe5a7d0e4_network_expandVlan.xml |   8 -
 ...a_9cbc_8dabe5a7d0e4_network_firewallRule.xml | 210 -------------------
 ...ule_d0a20f59_77b9_4f28_a63b_e58496b73a6c.xml |  18 --
 ...5_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml |  21 --
 ...ule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml |   9 -
 ..._9cbc_8dabe5a7d0e4_network_networkDomain.xml |  43 ----
 ...ain_8cdfd607_f429_4df6_9352_162cfc0891be.xml |   9 -
 ..._9cbc_8dabe5a7d0e4_network_publicIpBlock.xml |  10 -
 ...ock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml |   8 -
 ...ock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml |   8 -
 ...8dabe5a7d0e4_network_removePublicIpBlock.xml |   8 -
 ...2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan.xml |  25 ---
 ...lan_0e56433f_d808_4669_821d_812769517ff8.xml |  14 --
 ...9cbc_8dabe5a7d0e4_report_usageMonitoring.xml |   8 -
 ...745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml |   9 -
 ...a7d0e4_server_changeServerMonitoringPlan.xml |   8 -
 ...8a_9cbc_8dabe5a7d0e4_server_deleteServer.xml |   9 -
 ...5a7d0e4_server_deleteServer_RESOURCEBUSY.xml |   8 -
 ...8a_9cbc_8dabe5a7d0e4_server_deployServer.xml |   9 -
 ...be5a7d0e4_server_disableServerMonitoring.xml |   8 -
 ...abe5a7d0e4_server_enableServerMonitoring.xml |   8 -
 ..._9cbc_8dabe5a7d0e4_server_powerOffServer.xml |   8 -
 ...5a7d0e4_server_powerOffServer_INPROGRESS.xml |   8 -
 ...8a_9cbc_8dabe5a7d0e4_server_rebootServer.xml |   8 -
 ...5a7d0e4_server_rebootServer_RESOURCEBUSY.xml |   7 -
 ..._4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml |   9 -
 ...d8a_9cbc_8dabe5a7d0e4_server_resetServer.xml |   8 -
 ...745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml |  81 -------
 ...ver_e75ead52_692f_4314_8725_c8a4f4d13a87.xml |  26 ---
 ..._9cbc_8dabe5a7d0e4_server_shutdownServer.xml |   8 -
 ...5a7d0e4_server_shutdownServer_INPROGRESS.xml |   8 -
 ...d8a_9cbc_8dabe5a7d0e4_server_startServer.xml |   8 -
 ...abe5a7d0e4_server_startServer_INPROGRESS.xml |   8 -
 ...bc_8dabe5a7d0e4_server_updateVmwareTools.xml |   8 -
 ...c_8dabe5a7d0e4_infrastructure_datacenter.xml | 188 +++++++++++++++++
 ...bc_8dabe5a7d0e4_network_addPublicIpBlock.xml |   7 +
 ..._8dabe5a7d0e4_network_createFirewallRule.xml |   8 +
 ..._9cbc_8dabe5a7d0e4_network_createNatRule.xml |   9 +
 ..._8dabe5a7d0e4_network_deleteFirewallRule.xml |   8 +
 ..._9cbc_8dabe5a7d0e4_network_deleteNatRule.xml |   8 +
 ...8dabe5a7d0e4_network_deleteNetworkDomain.xml |   8 +
 ...d8a_9cbc_8dabe5a7d0e4_network_deleteVlan.xml |   8 +
 ...8dabe5a7d0e4_network_deployNetworkDomain.xml |   8 +
 ...d8a_9cbc_8dabe5a7d0e4_network_deployVlan.xml |   9 +
 ...bc_8dabe5a7d0e4_network_editFirewallRule.xml |   8 +
 ...c_8dabe5a7d0e4_network_editNetworkDomain.xml |   7 +
 ..._4d8a_9cbc_8dabe5a7d0e4_network_editVlan.xml |   7 +
 ...d8a_9cbc_8dabe5a7d0e4_network_expandVlan.xml |   8 +
 ...a_9cbc_8dabe5a7d0e4_network_firewallRule.xml | 210 +++++++++++++++++++
 ...ule_d0a20f59_77b9_4f28_a63b_e58496b73a6c.xml |  18 ++
 ...5_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml |  21 ++
 ...ule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml |   9 +
 ..._9cbc_8dabe5a7d0e4_network_networkDomain.xml |  43 ++++
 ...ain_8cdfd607_f429_4df6_9352_162cfc0891be.xml |   9 +
 ..._9cbc_8dabe5a7d0e4_network_publicIpBlock.xml |  10 +
 ...ock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml |   8 +
 ...ock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml |   8 +
 ...8dabe5a7d0e4_network_removePublicIpBlock.xml |   8 +
 ...2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan.xml |  25 +++
 ...lan_0e56433f_d808_4669_821d_812769517ff8.xml |  14 ++
 ...9cbc_8dabe5a7d0e4_report_usageMonitoring.xml |   8 +
 ...745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml |   9 +
 ...a7d0e4_server_changeServerMonitoringPlan.xml |   8 +
 ...8a_9cbc_8dabe5a7d0e4_server_deleteServer.xml |   9 +
 ...5a7d0e4_server_deleteServer_RESOURCEBUSY.xml |   8 +
 ...8a_9cbc_8dabe5a7d0e4_server_deployServer.xml |   9 +
 ...be5a7d0e4_server_disableServerMonitoring.xml |   8 +
 ...abe5a7d0e4_server_enableServerMonitoring.xml |   8 +
 ..._9cbc_8dabe5a7d0e4_server_powerOffServer.xml |   8 +
 ...5a7d0e4_server_powerOffServer_INPROGRESS.xml |   8 +
 ...8a_9cbc_8dabe5a7d0e4_server_rebootServer.xml |   8 +
 ...5a7d0e4_server_rebootServer_RESOURCEBUSY.xml |   7 +
 ..._4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml |   9 +
 ...d8a_9cbc_8dabe5a7d0e4_server_resetServer.xml |   8 +
 ...745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml |  81 +++++++
 ...ver_e75ead52_692f_4314_8725_c8a4f4d13a87.xml |  26 +++
 ..._9cbc_8dabe5a7d0e4_server_shutdownServer.xml |   8 +
 ...5a7d0e4_server_shutdownServer_INPROGRESS.xml |   8 +
 ...d8a_9cbc_8dabe5a7d0e4_server_startServer.xml |   8 +
 ...abe5a7d0e4_server_startServer_INPROGRESS.xml |   8 +
 ...bc_8dabe5a7d0e4_server_updateVmwareTools.xml |   8 +
 libcloud/test/compute/test_dimensiondata.py     | 188 ++++++++---------
 ...be5a7d0e4_networkDomainVip_addPoolMember.xml |   9 -
 ...8dabe5a7d0e4_networkDomainVip_createNode.xml |   8 -
 ...8dabe5a7d0e4_networkDomainVip_createPool.xml |   9 -
 ...4_networkDomainVip_createVirtualListener.xml |  11 -
 ...e4_networkDomainVip_defaultHealthMonitor.xml |  35 ----
 ...abe5a7d0e4_networkDomainVip_defaultIrule.xml |  47 -----
 ...tworkDomainVip_defaultPersistenceProfile.xml |  47 -----
 ...8dabe5a7d0e4_networkDomainVip_deleteNode.xml |   9 -
 ...8dabe5a7d0e4_networkDomainVip_deletePool.xml |   9 -
 ...4_networkDomainVip_deleteVirtualListener.xml |   9 -
 ...c_8dabe5a7d0e4_networkDomainVip_editNode.xml |   8 -
 ...c_8dabe5a7d0e4_networkDomainVip_editPool.xml |   9 -
 ...e5a7d0e4_networkDomainVip_editPoolMember.xml |   8 -
 ..._9cbc_8dabe5a7d0e4_networkDomainVip_node.xml |  29 ---
 ...ode_34de6ed6_46a4_4dae_a753_2f8d3840c6f9.xml |  13 --
 ..._9cbc_8dabe5a7d0e4_networkDomainVip_pool.xml |  37 ----
 ...8dabe5a7d0e4_networkDomainVip_poolMember.xml |  29 ---
 ...ber_3dd806a2_c2c8_4c0c_9a4f_5219ea9266c0.xml |  13 --
 ...ool_4d360b1f_bc2c_4ab7_9884_1f03ba2768f7.xml |  17 --
 ...a7d0e4_networkDomainVip_removePoolMember.xml |   7 -
 ...5a7d0e4_networkDomainVip_virtualListener.xml |  51 -----
 ...ner_6115469d_a8bb_445b_bb23_d23b5283f2b9.xml |  44 ----
 ...be5a7d0e4_networkDomainVip_addPoolMember.xml |   9 +
 ...8dabe5a7d0e4_networkDomainVip_createNode.xml |   8 +
 ...8dabe5a7d0e4_networkDomainVip_createPool.xml |   9 +
 ...4_networkDomainVip_createVirtualListener.xml |  11 +
 ...e4_networkDomainVip_defaultHealthMonitor.xml |  35 ++++
 ...abe5a7d0e4_networkDomainVip_defaultIrule.xml |  47 +++++
 ...tworkDomainVip_defaultPersistenceProfile.xml |  47 +++++
 ...8dabe5a7d0e4_networkDomainVip_deleteNode.xml |   9 +
 ...8dabe5a7d0e4_networkDomainVip_deletePool.xml |   9 +
 ...4_networkDomainVip_deleteVirtualListener.xml |   9 +
 ...c_8dabe5a7d0e4_networkDomainVip_editNode.xml |   8 +
 ...c_8dabe5a7d0e4_networkDomainVip_editPool.xml |   9 +
 ...e5a7d0e4_networkDomainVip_editPoolMember.xml |   8 +
 ..._9cbc_8dabe5a7d0e4_networkDomainVip_node.xml |  29 +++
 ...ode_34de6ed6_46a4_4dae_a753_2f8d3840c6f9.xml |  13 ++
 ..._9cbc_8dabe5a7d0e4_networkDomainVip_pool.xml |  37 ++++
 ...8dabe5a7d0e4_networkDomainVip_poolMember.xml |  29 +++
 ...ber_3dd806a2_c2c8_4c0c_9a4f_5219ea9266c0.xml |  13 ++
 ...ool_4d360b1f_bc2c_4ab7_9884_1f03ba2768f7.xml |  17 ++
 ...a7d0e4_networkDomainVip_removePoolMember.xml |   7 +
 ...5a7d0e4_networkDomainVip_virtualListener.xml |  51 +++++
 ...ner_6115469d_a8bb_445b_bb23_d23b5283f2b9.xml |  44 ++++
 .../test/loadbalancer/test_dimensiondata.py     |  88 ++++----
 142 files changed, 1582 insertions(+), 1534 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/common/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/common/dimensiondata.py b/libcloud/common/dimensiondata.py
index 2cc2a6c..66075af 100644
--- a/libcloud/common/dimensiondata.py
+++ b/libcloud/common/dimensiondata.py
@@ -136,7 +136,7 @@ class DimensionDataConnection(ConnectionUserAndKey):
     api_path_version_1 = '/oec'
     api_path_version_2 = '/caas'
     api_version_1 = '0.9'
-    api_version_2 = '2.0'
+    api_version_2 = '2.1'
 
     _orgId = None
     responseCls = DimensionDataResponse
@@ -368,6 +368,36 @@ class DimensionDataPublicIpBlock(object):
                    self.status))
 
 
+class DimensionDataServerCpuSpecification(object):
+    """
+    A class that represents the specification of the CPU(s) for a
+    node
+    """
+    def __init__(self, cpu_count, cores_per_socket, performance):
+        """
+        Instantiate a new :class:`DimensionDataServerCpuSpecification`
+
+        :param cpu_count: The number of CPUs
+        :type  cpu_count: ``int``
+
+        :param cores_per_socket: The number of cores per socket, the
+            recommendation is 1
+        :type  cores_per_socket: ``int``
+
+        :param performance: The performance type, e.g. HIGHPERFORMANCE
+        :type  performance: ``str``
+        """
+        self.cpu_count = cpu_count
+        self.cores_per_socket = cores_per_socket
+        self.performance = performance
+
+    def __repr__(self):
+        return (('<DimensionDataServerCpuSpecification: '
+                 'cpu_count=%s, cores_per_socket=%s, '
+                 'performance=%s>')
+                % (self.cpu_count, self.cores_per_socket, self.performance))
+
+
 class DimensionDataFirewallRule(object):
     """
     DimensionData Firewall Rule for a network domain

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/compute/drivers/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/dimensiondata.py b/libcloud/compute/drivers/dimensiondata.py
index 5757418..6edf979 100644
--- a/libcloud/compute/drivers/dimensiondata.py
+++ b/libcloud/compute/drivers/dimensiondata.py
@@ -82,6 +82,8 @@ class DimensionDataNodeDriver(NodeDriver):
     def create_node(self, name, image, auth, ex_description,
                     ex_network=None, ex_network_domain=None,
                     ex_vlan=None,
+                    ex_memory_gb=None,
+                    ex_cpu_specification=None,
                     ex_is_started=True, **kwargs):
         """
         Create a new DimensionData node
@@ -111,6 +113,13 @@ class DimensionDataNodeDriver(NodeDriver):
                                         (required unless using network)
         :type       ex_vlan: :class:`DimensionDataVlan`
 
+        :keyword    ex_memory_gb:  The amount of memory in GB for the server
+        :type       ex_memory_gb: ``int``
+
+        :keyword    ex_cpu_specification: The spec of CPU to deploy (optional)
+        :type       ex_cpu_specification:
+            :class:`DimensionDataServerCpuSpecification`
+
         :keyword    ex_is_started:  Start server after creation? default
                                    true (required)
         :type       ex_is_started:  ``bool``
@@ -136,6 +145,15 @@ class DimensionDataNodeDriver(NodeDriver):
         ET.SubElement(server_elm, "start").text = str(ex_is_started).lower()
         ET.SubElement(server_elm, "administratorPassword").text = password
 
+        if ex_memory_gb is not None:
+            ET.SubElement(server_elm, "memoryGb").text = str(ex_memory_gb)
+
+        if ex_cpu_specification is not None:
+            cpu = ET.SubElement(server_elm, "cpu")
+            cpu.set('speed', ex_cpu_specification.performance)
+            cpu.set('count', ex_cpu_specification.cpu_count)
+            cpu.set('coresPerSocket', ex_cpu_specification.core_per_socket)
+
         if ex_network is not None:
             network_elm = ET.SubElement(server_elm, "network")
             ET.SubElement(network_elm, "networkId").text = ex_network.id
@@ -1530,7 +1548,7 @@ class DimensionDataNodeDriver(NodeDriver):
         return l
 
     def _to_nodes(self, object):
-        node_elements = object.findall(fixxpath('Server', TYPES_URN))
+        node_elements = object.findall(fixxpath('server', TYPES_URN))
 
         return [self._to_node(el) for el in node_elements]
 

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_infrastructure_datacenter.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_infrastructure_datacenter.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_infrastructure_datacenter.xml
deleted file mode 100644
index 4220600..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_infrastructure_datacenter.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datacenters xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="5" totalCount="5" pageSize="250">
-    <datacenter id="NA3" type="MCP 1.0">
-        <displayName>US - West</displayName>
-        <city>Santa Clara</city>
-        <state>California</state>
-        <country>US</country>
-        <vpnUrl>https://na3.cloud-vpn.net</vpnUrl>
-        <ftpsHost>ftps-na.cloud-vpn.net</ftpsHost>
-        <networking type="1" maintenanceStatus="NORMAL">
-            <property name="MAX_SERVER_TO_VIP_CONNECTIONS" value="20"/>
-        </networking>
-        <hypervisor type="VMWARE" maintenanceStatus="NORMAL">
-            <diskSpeed id="HIGHPERFORMANCE" default="false" available="true">
-                <displayName>High Performance</displayName>
-                <abbreviation>HPF</abbreviation>
-                <description>Faster than Standard. Uses 15000 RPM disk with Fast Cache.</description>
-            </diskSpeed>
-            <diskSpeed id="STANDARD" default="true" available="true">
-                <displayName>Standard</displayName>
-                <abbreviation>STD</abbreviation>
-                <description>Standard Disk Speed</description>
-            </diskSpeed>
-            <diskSpeed id="ECONOMY" default="false" available="true">
-                <displayName>Economy</displayName>
-                <abbreviation>ECN</abbreviation>
-                <description>Slower than Standard. Uses 7200 RPM disk without Fast Cache.</description>
-            </diskSpeed>
-            <property name="MIN_DISK_SIZE_GB" value="10"/>
-            <property name="MAX_DISK_SIZE_GB" value="1000"/>
-            <property name="MAX_TOTAL_ADDITIONAL_STORAGE_GB" value="10000"/>
-            <property name="MAX_TOTAL_IMAGE_STORAGE_GB" value="2600"/>
-            <property name="MAX_CPU_COUNT" value="16"/>
-            <property name="MIN_MEMORY_MB" value="1024"/>
-            <property name="MAX_MEMORY_MB" value="131072"/>
-        </hypervisor>
-        <backup type="COMMVAULT" maintenanceStatus="NORMAL"/>
-        <consoleAccess maintenanceStatus="NORMAL"/>
-        <monitoring maintenanceStatus="NORMAL"/>
-    </datacenter>
-    <datacenter id="NA1" type="MCP 1.0">
-        <displayName>US - East</displayName>
-        <city>Ashburn</city>
-        <state>Virginia</state>
-        <country>US</country>
-        <vpnUrl>https://na1.cloud-vpn.net</vpnUrl>
-        <ftpsHost>ftps-na.cloud-vpn.net</ftpsHost>
-        <networking type="1" maintenanceStatus="NORMAL">
-            <property name="MAX_SERVER_TO_VIP_CONNECTIONS" value="20"/>
-        </networking>
-        <hypervisor type="VMWARE" maintenanceStatus="NORMAL">
-            <diskSpeed id="STANDARD" default="true" available="true">
-                <displayName>Standard</displayName>
-                <abbreviation>STD</abbreviation>
-                <description>Standard Disk Speed</description>
-            </diskSpeed>
-            <property name="MIN_DISK_SIZE_GB" value="10"/>
-            <property name="MAX_DISK_SIZE_GB" value="1000"/>
-            <property name="MAX_TOTAL_ADDITIONAL_STORAGE_GB" value="10000"/>
-            <property name="MAX_TOTAL_IMAGE_STORAGE_GB" value="2600"/>
-            <property name="MAX_CPU_COUNT" value="8"/>
-            <property name="MIN_MEMORY_MB" value="1024"/>
-            <property name="MAX_MEMORY_MB" value="65536"/>
-        </hypervisor>
-        <backup type="COMMVAULT" maintenanceStatus="NORMAL"/>
-        <consoleAccess maintenanceStatus="NORMAL"/>
-        <monitoring maintenanceStatus="NORMAL"/>
-    </datacenter>
-    <datacenter id="NA5" type="MCP 1.0">
-        <displayName>US - East 2</displayName>
-        <city>Ashburn</city>
-        <state>Virginia</state>
-        <country>US</country>
-        <vpnUrl>https://na5.cloud-vpn.net</vpnUrl>
-        <ftpsHost>ftps-na.cloud-vpn.net</ftpsHost>
-        <networking type="1" maintenanceStatus="NORMAL">
-            <property name="MAX_SERVER_TO_VIP_CONNECTIONS" value="20"/>
-        </networking>
-        <hypervisor type="VMWARE" maintenanceStatus="NORMAL">
-            <diskSpeed id="HIGHPERFORMANCE" default="false" available="true">
-                <displayName>High Performance</displayName>
-                <abbreviation>HPF</abbreviation>
-                <description>Faster than Standard. Uses 15000 RPM disk with Fast Cache.</description>
-            </diskSpeed>
-            <diskSpeed id="STANDARD" default="true" available="true">
-                <displayName>Standard</displayName>
-                <abbreviation>STD</abbreviation>
-                <description>Standard Disk Speed</description>
-            </diskSpeed>
-            <diskSpeed id="ECONOMY" default="false" available="true">
-                <displayName>Economy</displayName>
-                <abbreviation>ECN</abbreviation>
-                <description>Slower than Standard. Uses 7200 RPM disk without Fast Cache.</description>
-            </diskSpeed>
-            <property name="MIN_DISK_SIZE_GB" value="10"/>
-            <property name="MAX_DISK_SIZE_GB" value="1000"/>
-            <property name="MAX_TOTAL_ADDITIONAL_STORAGE_GB" value="10000"/>
-            <property name="MAX_TOTAL_IMAGE_STORAGE_GB" value="2600"/>
-            <property name="MAX_CPU_COUNT" value="16"/>
-            <property name="MIN_MEMORY_MB" value="1024"/>
-            <property name="MAX_MEMORY_MB" value="131072"/>
-        </hypervisor>
-        <backup type="COMMVAULT" maintenanceStatus="NORMAL"/>
-        <consoleAccess maintenanceStatus="NORMAL"/>
-        <monitoring maintenanceStatus="NORMAL"/>
-    </datacenter>
-    <datacenter id="NA9" type="MCP 2.0">
-        <displayName>US - East 3 - MCP 2.0</displayName>
-        <city>Ashburn</city>
-        <state>Virginia</state>
-        <country>US</country>
-        <vpnUrl>https://na9.cloud-vpn.net</vpnUrl>
-        <ftpsHost>ftps-na.cloud-vpn.net</ftpsHost>
-        <networking type="2" maintenanceStatus="NORMAL">
-            <property name="MAX_NODE_CONNECTION_LIMIT" value="100000"/>
-            <property name="MAX_NODE_CONNECTION_RATE_LIMIT" value="4000"/>
-            <property name="MAX_VIRTUAL_LISTENER_CONNECTION_LIMIT" value="100000"/>
-            <property name="MAX_VIRTUAL_LISTENER_CONNECTION_RATE_LIMIT" value="4000"/>
-        </networking>
-        <hypervisor type="VMWARE" maintenanceStatus="NORMAL">
-            <diskSpeed id="STANDARD" default="true" available="true">
-                <displayName>Standard</displayName>
-                <abbreviation>STD</abbreviation>
-                <description>Standard Disk Speed</description>
-            </diskSpeed>
-            <diskSpeed id="HIGHPERFORMANCE" default="false" available="true">
-                <displayName>High Performance</displayName>
-                <abbreviation>HPF</abbreviation>
-                <description>Faster than Standard. Uses 15000 RPM disk with Fast Cache.</description>
-            </diskSpeed>
-            <diskSpeed id="ECONOMY" default="false" available="true">
-                <displayName>Economy</displayName>
-                <abbreviation>ECN</abbreviation>
-                <description>Slower than Standard. Uses 7200 RPM disk without Fast Cache.</description>
-            </diskSpeed>
-            <property name="MIN_DISK_SIZE_GB" value="10"/>
-            <property name="MAX_DISK_SIZE_GB" value="1000"/>
-            <property name="MAX_TOTAL_ADDITIONAL_STORAGE_GB" value="14000"/>
-            <property name="MAX_TOTAL_IMAGE_STORAGE_GB" value="2600"/>
-            <property name="MAX_CPU_COUNT" value="32"/>
-            <property name="MIN_MEMORY_MB" value="1024"/>
-            <property name="MAX_MEMORY_MB" value="262144"/>
-        </hypervisor>
-        <backup type="COMMVAULT" maintenanceStatus="NORMAL"/>
-        <consoleAccess maintenanceStatus="NORMAL"/>
-        <monitoring maintenanceStatus="NORMAL"/>
-    </datacenter>
-    <datacenter id="NA12" type="MCP 2.0">
-        <displayName>US - West - MCP 2.0</displayName>
-        <city>Santa Clara</city>
-        <state>California</state>
-        <country>US</country>
-        <vpnUrl>https://na12.cloud-vpn.net</vpnUrl>
-        <ftpsHost>ftps-na.cloud-vpn.net</ftpsHost>
-        <networking type="2" maintenanceStatus="NORMAL">
-            <property name="MAX_NODE_CONNECTION_LIMIT" value="100000"/>
-            <property name="MAX_NODE_CONNECTION_RATE_LIMIT" value="4000"/>
-            <property name="MAX_VIRTUAL_LISTENER_CONNECTION_LIMIT" value="100000"/>
-            <property name="MAX_VIRTUAL_LISTENER_CONNECTION_RATE_LIMIT" value="4000"/>
-        </networking>
-        <hypervisor type="VMWARE" maintenanceStatus="NORMAL">
-            <diskSpeed id="STANDARD" default="true" available="true">
-                <displayName>Standard</displayName>
-                <abbreviation>STD</abbreviation>
-                <description>Standard Disk Speed</description>
-            </diskSpeed>
-            <diskSpeed id="HIGHPERFORMANCE" default="false" available="true">
-                <displayName>High Performance</displayName>
-                <abbreviation>HPF</abbreviation>
-                <description>Faster than Standard. Uses 15000 RPM disk with Fast Cache.</description>
-            </diskSpeed>
-            <diskSpeed id="ECONOMY" default="false" available="true">
-                <displayName>Economy</displayName>
-                <abbreviation>ECN</abbreviation>
-                <description>Slower than Standard. Uses 7200 RPM disk without Fast Cache.</description>
-            </diskSpeed>
-            <property name="MIN_DISK_SIZE_GB" value="10"/>
-            <property name="MAX_DISK_SIZE_GB" value="1000"/>
-            <property name="MAX_TOTAL_ADDITIONAL_STORAGE_GB" value="14000"/>
-            <property name="MAX_TOTAL_IMAGE_STORAGE_GB" value="2600"/>
-            <property name="MAX_CPU_COUNT" value="32"/>
-            <property name="MIN_MEMORY_MB" value="1024"/>
-            <property name="MAX_MEMORY_MB" value="262144"/>
-        </hypervisor>
-        <consoleAccess maintenanceStatus="NORMAL"/>
-        <monitoring maintenanceStatus="NORMAL"/>
-    </datacenter>
-</datacenters>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock.xml
deleted file mode 100644
index 1fcb8d3..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<response requestId="na/2014-04-14T13:37:20/62f06368-c3fb-11e3-b29c-001517c4643e" xmlns="urn:didata.com:api:cloud:types">
-<operation>ADD_PUBLIC_IP_BLOCK</operation>
-<responseCode>OK</responseCode>
-<message>Public IPv4 Address Block has been added successfully to Network Domain.</message>
-<info name="publicIpBlockId" value="4487241a-f0ca-11e3-9315-d4bed9b167ba"/>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createFirewallRule.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createFirewallRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createFirewallRule.xml
deleted file mode 100644
index ac3162e..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createFirewallRule.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-06T02:28:56.679-05:00/1003070b-dea9-41bd-9f0c-5c24086589b8">
-<operation>CREATE_FIREWALL_RULE</operation>
-<responseCode>OK</responseCode>
-<message>Request create Firewall Rule 'My.Rule.2' successful</message>
-<info name="firewallRuleId" value="d0a20f59-77b9-4f28-a63b-e58496b73a6c"/>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createNatRule.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createNatRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createNatRule.xml
deleted file mode 100644
index ff652a4..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createNatRule.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-06T05:53:37.334-05:00/fb842265-fa06-4ca9-a2af-a8a6815735fc">
-<operation>CREATE_NAT_RULE</operation>
-<responseCode>OK</responseCode>
-<message>NAT Rule with Id d31c2db0-be6b-4d50-8744-9a7a534b5fba has been
-created.</message>
-<info name="natRuleId" value="d31c2db0-be6b-4d50-8744-9a7a534b5fba"/>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteFirewallRule.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteFirewallRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteFirewallRule.xml
deleted file mode 100644
index 3016297..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteFirewallRule.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<response requestId="NA9/2015-03-06T04:49:42.721-05:00/f69f1106-0df7-4614-b517-844ce29013e4"
-xmlns="urn:didata.com:api:cloud:types">
-<operation>DELETE_FIREWALL_RULE</operation>
-<responseCode>OK</responseCode>
-<message>Firewall Rule (Id:84e34850-595d-436e-a885-7cd37edb24a4) has been
-deleted</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNatRule.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNatRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNatRule.xml
deleted file mode 100644
index 2d2cebc..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNatRule.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-06T12:24:57.820-05:00/5974fe37-bac5-4345-8a88-4c93a874bf4a">
-<operation>DELETE_NAT_RULE</operation>
-<responseCode>OK</responseCode>
-<message>NAT Rule with Id 2187a636-7ebb-49a1-a2ff-5d617f496dce has been
-deleted.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNetworkDomain.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNetworkDomain.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNetworkDomain.xml
deleted file mode 100644
index a3cca2e..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNetworkDomain.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-24T10:19:41.471-05:00/27083502-a2ea-4331-b0cb-c2a11bb044b0">
-<operation>DELETE_NETWORK_DOMAIN</operation>
-<responseCode>IN_PROGRESS</responseCode>
-<message>Request to Delete Network Domain (Id: 8cdfd607-f429-4df6-9352-
-162cfc0891be) 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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteVlan.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteVlan.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteVlan.xml
deleted file mode 100644
index 9eae809..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteVlan.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<response requestId="NA9/2014-04-14T13:37:20/62f06368-c3fb-11e3-b29c-001517c4643e"
-xmlns="urn:didata.com:api:cloud:types">
-<operation>DELETE_VLAN</operation>
-<responseCode>IN_PROGRESS</responseCode>
-<message>Request to Delete VLAN (Id:0e56433f-d808-4669-821d-812769517ff8)
-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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployNetworkDomain.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployNetworkDomain.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployNetworkDomain.xml
deleted file mode 100644
index 4269840..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployNetworkDomain.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<response requestId="na/2015-01-14T13:37:20/62f06368-c3fb-11e3-b29c-001517c4643e" xmlns="urn:didata.com:api:cloud:types">
-<operation>DEPLOY_NETWORK_DOMAIN</operation>
-<responseCode>IN_PROGRESS</responseCode>
-<message>Request to Deploy Network Domain 'A Network Domain' has been
-accepted and is being processed</message>
-<info name="networkDomainId" value="f14a871f-9a25-470c-aef8-51e13202e1aa"/>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployVlan.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployVlan.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployVlan.xml
deleted file mode 100644
index eb37402..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployVlan.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-02-13T05:58:00.905-05:00/04a82e12-2d51-420e-84f5-bf2630c5a5e5">
-<operation>DEPLOY_VLAN</operation>
-<responseCode>IN_PROGRESS</responseCode>
-<message>Request to deploy VLAN 'Production VLAN' has been accepted and is
-being processed.</message>
-<info name="vlanId" value="cee8df03-9117-44cc-baaa-631ffa099683"/>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editFirewallRule.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editFirewallRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editFirewallRule.xml
deleted file mode 100644
index eff18c4..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editFirewallRule.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-06T03:34:21.951-05:00/d7e37b41-ceff-4a8c-992d-a0220b8ebd76">
-<operation>EDIT_FIREWALL_RULE</operation>
-<responseCode>OK</responseCode>
-<message>Firewall Rule with id 1aa3d0ce-d95d-4296-8338-9717e0d37ff9 has
-been edited</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editNetworkDomain.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editNetworkDomain.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editNetworkDomain.xml
deleted file mode 100644
index 07d55e5..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editNetworkDomain.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<response xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-02-24T09:05:41.790-05:00/b24cbc7d-0648-4070-889f-7ab97bf21941">
-<operation>EDIT_NETWORK_DOMAIN</operation>
-<responseCode>OK</responseCode>
-<message>Network Domain 'Development Network Domain' was edited
-successfully.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editVlan.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editVlan.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editVlan.xml
deleted file mode 100644
index 10d0010..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editVlan.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<response
-xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-02-25T06:55:10.939-05:00/0593b9af-6b0c-4e5b-8e74-57b0e752f2bf">
-<operation>EDIT_VLAN</operation>
-<responseCode>OK</responseCode>
-<message>VLAN 'test' was edited successfully</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_expandVlan.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_expandVlan.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_expandVlan.xml
deleted file mode 100644
index 03f9112..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_expandVlan.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-13T05:58:00.905-05:00/04a82e12-2d51-420e-84f5-bf2630c5a5e5">
-<operation>EXPAND_VLAN</operation>
-<responseCode>IN_PROGRESS</responseCode>
-<message>Request to expand VLAN 'Production VLAN' 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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule.xml
deleted file mode 100644
index b09d963..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<firewallRules xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="13" totalCount="13" pageSize="50">
-    <firewallRule id="756cba02-b0bc-48f4-aea5-9445870b6148" datacenterId="NA9" ruleType="DEFAULT_RULE">
-        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
-        <name>CCDEFAULT.BlockOutboundMailIPv4</name>
-        <action>DROP</action>
-        <ipVersion>IPV4</ipVersion>
-        <protocol>TCP</protocol>
-        <source>
-            <ip address="ANY"/>
-        </source>
-        <destination>
-            <ip address="ANY"/>
-            <port begin="25"/>
-        </destination>
-        <enabled>true</enabled>
-        <state>NORMAL</state>
-    </firewallRule>
-    <firewallRule id="8ffbe8c1-e545-424b-bfcc-e25c2017537d" datacenterId="NA9" ruleType="DEFAULT_RULE">
-        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
-        <name>CCDEFAULT.BlockOutboundMailIPv4Secure</name>
-        <action>DROP</action>
-        <ipVersion>IPV4</ipVersion>
-        <protocol>TCP</protocol>
-        <source>
-            <ip address="ANY"/>
-        </source>
-        <destination>
-            <ip address="ANY"/>
-            <port begin="587"/>
-        </destination>
-        <enabled>true</enabled>
-        <state>NORMAL</state>
-    </firewallRule>
-    <firewallRule id="f93b5139-402b-45c5-af80-aa00e311572e" datacenterId="NA9" ruleType="DEFAULT_RULE">
-        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
-        <name>CCDEFAULT.BlockOutboundMailIPv6</name>
-        <action>DROP</action>
-        <ipVersion>IPV6</ipVersion>
-        <protocol>TCP</protocol>
-        <source>
-            <ip address="ANY"/>
-        </source>
-        <destination>
-            <ip address="ANY"/>
-            <port begin="25"/>
-        </destination>
-        <enabled>true</enabled>
-        <state>NORMAL</state>
-    </firewallRule>
-    <firewallRule id="83ade810-3983-4009-a250-155c5ab47f54" datacenterId="NA9" ruleType="DEFAULT_RULE">
-        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
-        <name>CCDEFAULT.BlockOutboundMailIPv6Secure</name>
-        <action>DROP</action>
-        <ipVersion>IPV6</ipVersion>
-        <protocol>TCP</protocol>
-        <source>
-            <ip address="ANY"/>
-        </source>
-        <destination>
-            <ip address="ANY"/>
-            <port begin="587"/>
-        </destination>
-        <enabled>true</enabled>
-        <state>NORMAL</state>
-    </firewallRule>
-    <firewallRule id="cc9e1475-9218-484d-af5f-aba5c9a37c2d" datacenterId="NA9" ruleType="DEFAULT_RULE">
-        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
-        <name>CCDEFAULT.DenyExternalInboundIPv6</name>
-        <action>DROP</action>
-        <ipVersion>IPV6</ipVersion>
-        <protocol>IP</protocol>
-        <source>
-            <ip address="EXTERNAL_IPV6"/>
-        </source>
-        <destination>
-            <ip address="ANY"/>
-        </destination>
-        <enabled>true</enabled>
-        <state>NORMAL</state>
-    </firewallRule>
-    <firewallRule id="a23db203-99c9-42de-9dce-3a97724b7d4d" datacenterId="NA9" ruleType="CLIENT_RULE">
-        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
-        <name>AllowOctopusTentacleComms6</name>
-        <action>ACCEPT_DECISIVELY</action>
-        <ipVersion>IPV6</ipVersion>
-        <protocol>TCP</protocol>
-        <source>
-            <ip address="ANY"/>
-        </source>
-        <destination>
-            <ip address="2607:f480:111:1336:6503:544c:74a6:3a28"/>
-            <port begin="10933"/>
-        </destination>
-        <enabled>true</enabled>
-        <state>NORMAL</state>
-    </firewallRule>
-    <firewallRule id="bc26b74f-9b52-4923-8eda-7fc434759611" datacenterId="NA9" ruleType="CLIENT_RULE">
-        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
-        <name>AllowOctopusComms4</name>
-        <action>ACCEPT_DECISIVELY</action>
-        <ipVersion>IPV4</ipVersion>
-        <protocol>TCP</protocol>
-        <source>
-            <ip address="ANY"/>
-        </source>
-        <destination>
-            <ip address="ANY"/>
-            <port begin="10933"/>
-        </destination>
-        <enabled>true</enabled>
-        <state>NORMAL</state>
-    </firewallRule>
-    <firewallRule id="0bb8cc91-75fd-48a1-b9f8-1d728dabbca1" datacenterId="NA9" ruleType="CLIENT_RULE">
-        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
-        <name>AllowHTTPSinbound</name>
-        <action>ACCEPT_DECISIVELY</action>
-        <ipVersion>IPV4</ipVersion>
-        <protocol>TCP</protocol>
-        <source>
-            <ip address="ANY"/>
-        </source>
-        <destination>
-            <ip address="ANY"/>
-            <port begin="443"/>
-        </destination>
-        <enabled>true</enabled>
-        <state>NORMAL</state>
-    </firewallRule>
-    <firewallRule id="38ff959f-58c5-47b9-af6b-568a23e3c299" datacenterId="NA9" ruleType="CLIENT_RULE">
-        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
-        <name>AllowHTTPSinbound6</name>
-        <action>ACCEPT_DECISIVELY</action>
-        <ipVersion>IPV6</ipVersion>
-        <protocol>TCP</protocol>
-        <source>
-            <ip address="ANY"/>
-        </source>
-        <destination>
-            <ip address="2607:f480:111:1336:6503:544c:74a6:3a28"/>
-            <port begin="443"/>
-        </destination>
-        <enabled>true</enabled>
-        <state>NORMAL</state>
-    </firewallRule>
-    <firewallRule id="04159804-e48c-40b5-80f5-48c40d1b7f2f" datacenterId="NA9" ruleType="CLIENT_RULE">
-        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
-        <name>Allow8843Inbound</name>
-        <action>ACCEPT_DECISIVELY</action>
-        <ipVersion>IPV4</ipVersion>
-        <protocol>TCP</protocol>
-        <source>
-            <ip address="ANY"/>
-        </source>
-        <destination>
-            <ip address="ANY"/>
-            <port begin="8443"/>
-        </destination>
-        <enabled>true</enabled>
-        <state>NORMAL</state>
-    </firewallRule>
-    <firewallRule id="4250d8db-db42-4e40-acb0-672ec1a1af1b" datacenterId="NA9" ruleType="CLIENT_RULE">
-        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
-        <name>Allow9443Inbound</name>
-        <action>ACCEPT_DECISIVELY</action>
-        <ipVersion>IPV4</ipVersion>
-        <protocol>TCP</protocol>
-        <source>
-            <ip address="ANY"/>
-        </source>
-        <destination>
-            <ip address="ANY"/>
-            <port begin="9443"/>
-        </destination>
-        <enabled>true</enabled>
-        <state>NORMAL</state>
-    </firewallRule>
-    <firewallRule id="f0119d2f-e891-44ee-af89-76122b4be219" datacenterId="NA9" ruleType="CLIENT_RULE">
-        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
-        <name>Allow9443Inbound6</name>
-        <action>ACCEPT_DECISIVELY</action>
-        <ipVersion>IPV6</ipVersion>
-        <protocol>TCP</protocol>
-        <source>
-            <ip address="ANY"/>
-        </source>
-        <destination>
-            <ip address="2607:f480:111:1336:6503:544c:74a6:3a28"/>
-            <port begin="8443"/>
-        </destination>
-        <enabled>true</enabled>
-        <state>NORMAL</state>
-    </firewallRule>
-    <firewallRule id="b976e0e6-4fb2-4f3e-a016-652e02d191b4" datacenterId="NA9" ruleType="CLIENT_RULE">
-        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
-        <name>AllowSTSInbound6</name>
-        <action>ACCEPT_DECISIVELY</action>
-        <ipVersion>IPV6</ipVersion>
-        <protocol>TCP</protocol>
-        <source>
-            <ip address="ANY"/>
-        </source>
-        <destination>
-            <ip address="2607:f480:111:1336:6503:544c:74a6:3a28"/>
-            <port begin="9443"/>
-        </destination>
-        <enabled>true</enabled>
-        <state>NORMAL</state>
-    </firewallRule>
-</firewallRules>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule_d0a20f59_77b9_4f28_a63b_e58496b73a6c.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule_d0a20f59_77b9_4f28_a63b_e58496b73a6c.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule_d0a20f59_77b9_4f28_a63b_e58496b73a6c.xml
deleted file mode 100644
index 876f37d..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule_d0a20f59_77b9_4f28_a63b_e58496b73a6c.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<firewallRule
-xmlns="urn:didata.com:api:cloud:types" id="d0a20f59-77b9-4f28-a63b-e58496b73a6c" datacenterId="NA9" ruleType="DEFAULT_RULE">
-<networkDomainId>8cdfd607-f429-4df6-9352-162cfc0891be</networkDomainId>
-<name>CCDEFAULT.BlockOutboundMailIPv4</name>
-<action>DROP</action>
-<ipVersion>IPV4</ipVersion>
-<protocol>TCP</protocol>
-<source>
-<ip address="ANY"/>
-</source>
-<destination>
-<ip address="ANY"/>
-<port begin="25"/>
-</destination>
-<enabled>true</enabled>
-<state>NORMAL</state>
-</firewallRule>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml
deleted file mode 100644
index 7478df6..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain.xml
deleted file mode 100644
index cb7a078..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_162cfc0891be.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_162cfc0891be.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_162cfc0891be.xml
deleted file mode 100644
index bdd1c6b..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_162cfc0891be.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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock.xml
deleted file mode 100644
index 3a1c1b3..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock.xml
deleted file mode 100644
index 8b6fe34..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan.xml
deleted file mode 100644
index 4575d83..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan_0e56433f_d808_4669_821d_812769517ff8.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan_0e56433f_d808_4669_821d_812769517ff8.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_report_usageMonitoring.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_report_usageMonitoring.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_report_usageMonitoring.xml
deleted file mode 100644
index dc32d95..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml
deleted file mode 100644
index 56eeb02..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_changeServerMonitoringPlan.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_changeServerMonitoringPlan.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_changeServerMonitoringPlan.xml
deleted file mode 100644
index 654097d..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer.xml
deleted file mode 100644
index c8e70da..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer_RESOURCEBUSY.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer_RESOURCEBUSY.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer_RESOURCEBUSY.xml
deleted file mode 100644
index 2df9e07..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployServer.xml
deleted file mode 100644
index 74077be..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployServer.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-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>
-© 2015 Dimension Data Cloud Solutions 162
-<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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_disableServerMonitoring.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_disableServerMonitoring.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_disableServerMonitoring.xml
deleted file mode 100644
index 63609de..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_enableServerMonitoring.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_enableServerMonitoring.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_enableServerMonitoring.xml
deleted file mode 100644
index 9b1b555..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer.xml
deleted file mode 100644
index 549ea79..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer_INPROGRESS.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer_INPROGRESS.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer_INPROGRESS.xml
deleted file mode 100644
index 8ddcca9..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer.xml
deleted file mode 100644
index 38f098a..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer_RESOURCEBUSY.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer_RESOURCEBUSY.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer_RESOURCEBUSY.xml
deleted file mode 100644
index 3defba4..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml
deleted file mode 100644
index 61be4e3..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_resetServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_resetServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_resetServer.xml
deleted file mode 100644
index ece1a8b..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml
deleted file mode 100644
index 7c189c9..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<servers
-xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="1"
-totalCount="2" pageSize="250">
-<Server id="e75ead52-692f-4314-8725-c8a4f4d13a87" datacenterId="NA9">
-<name>test2</name>
-<description>Test Description</description>
-<operatingSystem id="REDHAT664" displayName="REDHAT6/64"
-family="UNIX"/>
-<cpuCount>1</cpuCount>
-<memoryGb>2</memoryGb>
-<disk id="338c1163-5348-4572-962d-185c97bd0d65" scsiId="0" sizeGb="10"
-speed="STANDARD" state="NORMAL"/>
-<networkInfo networkDomainId="484174a2-ae74-4658-9e56-50fc90e086cf">
-<primaryNic id="4c8d5f67-c6df-421d-b8ac-45dd1b141334"
-privateIpv4="10.0.3.11" ipv6="2607:f480:1111:1153:dee:4666:1130:7484"
-vlanId="0e56433f-d808-4669-821d-812769517ff8" vlanName="Production VLAN"
-state="NORMAL"/>
-</networkInfo>
-<sourceImageId>02250336-de2b-4e99-ab96-78511b7f8f4b</sourceImageId>
-<createTime>2015-02-17T10:59:18.000Z</createTime>
-<deployed>true</deployed>
-<started>true</started>
-<state>NORMAL</state>
-<progress>
-<action>DEPLOY_SERVER</action>
-<requestTime>2015-03-06T18:05:33.000Z</requestTime>
-<userName>myuser</userName>
-</progress>
-<machineStatus name="vmwareToolsVersionStatus" value="CURRENT"/>
-<machineStatus name="vmwareToolsRunningStatus" value="RUNNING"/>
-<machineStatus name="vmwareToolsApiVersion" value="9354"/>
-</Server>
-<Server id="abadbc7e-9e10-46ca-9d4a-194bcc6b6c16" datacenterId="NA9">
-<name>Production Web Server 2</name>
-<description>This server hosts our production web
-applications.</description>
-<operatingSystem id="REDHAT664" displayName="REDHAT6/64"
-family="UNIX"/>
-<cpuCount>1</cpuCount>
-<memoryGb>2</memoryGb>
-<disk id="338c1163-5348-4572-962d-185c97bd0d65" scsiId="0" sizeGb="10"
-speed="STANDARD" state="NORMAL"/>
-<networkInfo networkDomainId="484174a2-ae74-4658-9e56-50fc90e086cf">
-<primaryNic id="4c8d5f67-c6df-421d-b8ac-45dd1b141334"
-privateIpv4="10.0.3.11" ipv6="2607:f480:1111:1153:dee:4666:1130:7484"
-vlanId="0e56433f-d808-4669-821d-812769517ff8" vlanName="Production VLAN"
-state="NORMAL"/>
-</networkInfo>
-<sourceImageId>02250336-de2b-4e99-ab96-78511b7f8f4b</sourceImageId>
-<createTime>2015-02-17T10:59:18.000Z</createTime>
-<deployed>true</deployed>
-<started>true</started>
-<state>PENDING_CHANGE</state>
-<progress>
-<action>SHUTDOWN_SERVER</action>
-<requestTime>2015-03-06T18:05:33.000Z</requestTime>
-<userName>myuser</userName>
-</progress>
-<machineStatus name="vmwareToolsVersionStatus" value="CURRENT"/>
-<machineStatus name="vmwareToolsRunningStatus" value="RUNNING"/>
-<machineStatus name="vmwareToolsApiVersion" value="9354"/>
-</Server>
-<Server id="f07445f8-8ba3-4066-86c1-d6d0dd5518a1" datacenterId="NA5">
-        <name>us-dc1.us.aperture.cloud</name>
-        <description>Domain Controller 1 for us.aperture.cloud</description>
-        <operatingSystem id="WIN2012S64" displayName="WIN2012S/64" family="WINDOWS"/>
-        <cpuCount>2</cpuCount>
-        <memoryGb>2</memoryGb>
-        <disk id="628a8134-8ebf-420d-afc2-08af0c402f4e" scsiId="0" sizeGb="50" speed="STANDARD" state="NORMAL"/>
-        <nic id="fe72eebe-7b9d-11e4-8c14-b8ca3a5d9ef8" privateIpv4="10.192.176.11" networkId="4bba37be-506f-11e3-b29c-001517c4643e" networkName="Aperture US1" state="NORMAL"/>
-        <sourceImageId>4787337e-0f31-11e3-b29c-001517c4643e</sourceImageId>
-        <createTime>2013-12-03T07:16:44.000Z</createTime>
-        <deployed>true</deployed>
-        <started>false</started>
-        <state>NORMAL</state>
-        <machineStatus name="vmwareToolsVersionStatus" value="NEED_UPGRADE"/>
-        <machineStatus name="vmwareToolsRunningStatus" value="NOT_RUNNING"/>
-        <machineStatus name="vmwareToolsApiVersion" value="9221"/>
-    </Server>
-</servers>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml
deleted file mode 100644
index dcdb1ae..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="urn:didata.com:api:cloud:types" id="e75ead52-692f-4314-8725-c8a4f4d13a87" datacenterId="NA5">
-    <name>us-dc2.us.aperture.cloud</name>
-    <description>Domain Controller 2 for us.aperture.cloud.</description>
-    <operatingSystem id="WIN2012S64" displayName="WIN2012S/64" family="WINDOWS"/>
-    <cpuCount>2</cpuCount>
-    <memoryGb>2</memoryGb>
-    <disk id="931d9035-251d-432c-8f52-8e9e3e15cbbb" scsiId="0" sizeGb="50" speed="STANDARD" state="NORMAL"/>
-    <disk id="f28de371-2b30-46d1-935d-913e1594c91c" scsiId="1" sizeGb="10" speed="STANDARD" state="NORMAL"/>
-    <disk id="0033b75f-fb0d-4068-aa21-8fb814587ce2" scsiId="2" sizeGb="10" speed="STANDARD" state="NORMAL"/>
-    <disk id="f0c0dacf-33e4-42d4-9d80-3ebf3c899a37" scsiId="3" sizeGb="10" speed="STANDARD" state="NORMAL"/>
-    <nic id="fe72ee32-7b9d-11e4-8c14-b8ca3a5d9ef8" privateIpv4="10.192.176.12" networkId="4bba37be-506f-11e3-b29c-001517c4643e" networkName="Aperture US1" state="NORMAL"/>
-    <sourceImageId>4787337e-0f31-11e3-b29c-001517c4643e</sourceImageId>
-    <createTime>2013-11-29T23:17:09.000Z</createTime>
-    <deployed>true</deployed>
-    <started>false</started>
-    <state>NORMAL</state>
-    <progress>
-    <action>DEPLOY_SERVER</action>
-    <requestTime>2015-03-06T18:05:33.000Z</requestTime>
-    <userName>myuser</userName>
-    </progress>
-    <machineStatus name="vmwareToolsVersionStatus" value="NEED_UPGRADE"/>
-    <machineStatus name="vmwareToolsRunningStatus" value="NOT_RUNNING"/>
-    <machineStatus name="vmwareToolsApiVersion" value="9221"/>
-</server>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer.xml
deleted file mode 100644
index 937cb0d..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_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


Mime
View raw message