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:09 UTC
[07/12] libcloud git commit: Update driver to use 2.2 as the API
version
Update driver to use 2.2 as the API version
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/b025cf25
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/b025cf25
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/b025cf25
Branch: refs/heads/trunk
Commit: b025cf25f242fd73ec06494250945ee1059215fa
Parents: 97e9bcc
Author: anthony-shaw <an...@apache.org>
Authored: Fri Apr 15 11:14:57 2016 +1000
Committer: anthony-shaw <an...@apache.org>
Committed: Fri Apr 15 11:48:10 2016 +1000
----------------------------------------------------------------------
libcloud/common/dimensiondata.py | 2 +-
...745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml | 49 ----
...ver_e75ead52_692f_4314_8725_c8a4f4d13a87.xml | 27 --
...ad52_692f_4314_8725_c8a4f4d13a87_DEFAULT.xml | 27 --
...745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml | 49 ++++
...ver_e75ead52_692f_4314_8725_c8a4f4d13a87.xml | 27 ++
...ad52_692f_4314_8725_c8a4f4d13a87_DEFAULT.xml | 27 ++
...8a_9cbc_8dabe5a7d0e4_image_customerImage.xml | 50 ----
...age_2ffa36c8_1848_49eb_b4fa_9d908775f68c.xml | 17 --
...age_5234e5c7_01de_4411_8b6e_baeb8d91cf5d.xml | 17 --
...e5a7d0e4_image_customerImage_BAD_REQUEST.xml | 6 -
...745_4d8a_9cbc_8dabe5a7d0e4_image_osImage.xml | 34 ---
...age_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml | 11 -
...c_8dabe5a7d0e4_image_osImage_BAD_REQUEST.xml | 6 -
...age_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml | 12 -
...c_8dabe5a7d0e4_infrastructure_datacenter.xml | 188 -------------
...abe5a7d0e4_infrastructure_datacenter_NA9.xml | 54 ----
...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 | 273 -------------------
...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 -
...dabe5a7d0e4_server_antiAffinityRule_list.xml | 42 ---
...4_server_antiAffinityRule_list_PAGINATED.xml | 42 ---
...a7d0e4_server_changeServerMonitoringPlan.xml | 8 -
...d8a_9cbc_8dabe5a7d0e4_server_cleanServer.xml | 9 -
...8a_9cbc_8dabe5a7d0e4_server_deleteServer.xml | 9 -
...5a7d0e4_server_deleteServer_RESOURCEBUSY.xml | 8 -
...8a_9cbc_8dabe5a7d0e4_server_deployServer.xml | 8 -
...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 -
...bc_8dabe5a7d0e4_server_reconfigureServer.xml | 5 -
..._4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml | 9 -
...d8a_9cbc_8dabe5a7d0e4_server_resetServer.xml | 8 -
...745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml | 176 ------------
...4d8a_9cbc_8dabe5a7d0e4_server_server_NA3.xml | 50 ----
...ver_e75ead52_692f_4314_8725_c8a4f4d13a87.xml | 27 --
...cbc_8dabe5a7d0e4_server_server_paginated.xml | 50 ----
..._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 -
...8a_9cbc_8dabe5a7d0e4_image_customerImage.xml | 50 ++++
...age_2ffa36c8_1848_49eb_b4fa_9d908775f68c.xml | 17 ++
...age_5234e5c7_01de_4411_8b6e_baeb8d91cf5d.xml | 17 ++
...e5a7d0e4_image_customerImage_BAD_REQUEST.xml | 6 +
...745_4d8a_9cbc_8dabe5a7d0e4_image_osImage.xml | 34 +++
...age_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml | 11 +
...c_8dabe5a7d0e4_image_osImage_BAD_REQUEST.xml | 6 +
...age_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml | 12 +
...c_8dabe5a7d0e4_infrastructure_datacenter.xml | 188 +++++++++++++
...abe5a7d0e4_infrastructure_datacenter_NA9.xml | 54 ++++
...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 | 273 +++++++++++++++++++
...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_262cfc0891be.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 +
...dabe5a7d0e4_server_antiAffinityRule_list.xml | 42 +++
...4_server_antiAffinityRule_list_PAGINATED.xml | 42 +++
...a7d0e4_server_changeServerMonitoringPlan.xml | 8 +
...d8a_9cbc_8dabe5a7d0e4_server_cleanServer.xml | 9 +
...8a_9cbc_8dabe5a7d0e4_server_deleteServer.xml | 9 +
...5a7d0e4_server_deleteServer_RESOURCEBUSY.xml | 8 +
...8a_9cbc_8dabe5a7d0e4_server_deployServer.xml | 8 +
...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 +
...bc_8dabe5a7d0e4_server_reconfigureServer.xml | 5 +
..._4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml | 9 +
...d8a_9cbc_8dabe5a7d0e4_server_resetServer.xml | 8 +
...745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml | 176 ++++++++++++
...4d8a_9cbc_8dabe5a7d0e4_server_server_NA3.xml | 50 ++++
...ver_e75ead52_692f_4314_8725_c8a4f4d13a87.xml | 27 ++
...cbc_8dabe5a7d0e4_server_server_paginated.xml | 50 ++++
..._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 +
...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 +++
175 files changed, 2061 insertions(+), 2061 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/b025cf25/libcloud/common/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/common/dimensiondata.py b/libcloud/common/dimensiondata.py
index 40319a2..ff4deb4 100644
--- a/libcloud/common/dimensiondata.py
+++ b/libcloud/common/dimensiondata.py
@@ -369,7 +369,7 @@ class DimensionDataConnection(ConnectionUserAndKey):
api_path_version_1 = '/oec'
api_path_version_2 = '/caas'
api_version_1 = '0.9'
- api_version_2 = '2.1'
+ api_version_2 = '2.2'
_orgId = None
responseCls = DimensionDataResponse
http://git-wip-us.apache.org/repos/asf/libcloud/blob/b025cf25/libcloud/test/backup/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/backup/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml b/libcloud/test/backup/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml
deleted file mode 100644
index c3d607f..0000000
--- a/libcloud/test/backup/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml
+++ /dev/null
@@ -1,49 +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="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/b025cf25/libcloud/test/backup/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/backup/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml b/libcloud/test/backup/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml
deleted file mode 100644
index 07b1319..0000000
--- a/libcloud/test/backup/fixtures/dimensiondata/caas_2_1_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="Essentials" 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/b025cf25/libcloud/test/backup/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87_DEFAULT.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/backup/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87_DEFAULT.xml b/libcloud/test/backup/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87_DEFAULT.xml
deleted file mode 100644
index c64c530..0000000
--- a/libcloud/test/backup/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87_DEFAULT.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="Advanced" 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/b025cf25/libcloud/test/backup/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/backup/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml b/libcloud/test/backup/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml
new file mode 100644
index 0000000..c3d607f
--- /dev/null
+++ b/libcloud/test/backup/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml
@@ -0,0 +1,49 @@
+<?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="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/b025cf25/libcloud/test/backup/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/backup/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml b/libcloud/test/backup/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml
new file mode 100644
index 0000000..07b1319
--- /dev/null
+++ b/libcloud/test/backup/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml
@@ -0,0 +1,27 @@
+<?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="Essentials" 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/b025cf25/libcloud/test/backup/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87_DEFAULT.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/backup/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87_DEFAULT.xml b/libcloud/test/backup/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87_DEFAULT.xml
new file mode 100644
index 0000000..c64c530
--- /dev/null
+++ b/libcloud/test/backup/fixtures/dimensiondata/caas_2_2_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87_DEFAULT.xml
@@ -0,0 +1,27 @@
+<?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="Advanced" 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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_customerImage.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_customerImage.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_customerImage.xml
deleted file mode 100644
index 4e59e18..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_customerImage.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_customerImage_2ffa36c8_1848_49eb_b4fa_9d908775f68c.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_customerImage_2ffa36c8_1848_49eb_b4fa_9d908775f68c.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_customerImage_2ffa36c8_1848_49eb_b4fa_9d908775f68c.xml
deleted file mode 100644
index bff6183..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_customerImage_2ffa36c8_1848_49eb_b4fa_9d908775f68c.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_customerImage_5234e5c7_01de_4411_8b6e_baeb8d91cf5d.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_customerImage_5234e5c7_01de_4411_8b6e_baeb8d91cf5d.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_customerImage_5234e5c7_01de_4411_8b6e_baeb8d91cf5d.xml
deleted file mode 100644
index db5302d..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_customerImage_5234e5c7_01de_4411_8b6e_baeb8d91cf5d.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_customerImage_BAD_REQUEST.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_customerImage_BAD_REQUEST.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_customerImage_BAD_REQUEST.xml
deleted file mode 100644
index 2579b63..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_customerImage_BAD_REQUEST.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_osImage.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_osImage.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_osImage.xml
deleted file mode 100644
index 1f884a9..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_osImage.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_osImage_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_osImage_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_osImage_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml
deleted file mode 100644
index 1631137..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_osImage_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_osImage_BAD_REQUEST.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_osImage_BAD_REQUEST.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_osImage_BAD_REQUEST.xml
deleted file mode 100644
index 0091648..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_osImage_BAD_REQUEST.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_osImage_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_osImage_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_osImage_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml
deleted file mode 100644
index 27d6c25..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_osImage_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-
http://git-wip-us.apache.org/repos/asf/libcloud/blob/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_infrastructure_datacenter.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_infrastructure_datacenter.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_infrastructure_datacenter.xml
deleted file mode 100644
index 4220600..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_infrastructure_datacenter_NA9.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_infrastructure_datacenter_NA9.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_infrastructure_datacenter_NA9.xml
deleted file mode 100644
index 396ad10..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_infrastructure_datacenter_NA9.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datacenters xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="1" totalCount="1" pageSize="250">
- <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>
- <cpuSpeed id="STANDARD" default="true" available="true">
- <displayName>Standard</displayName>
- <description>Standard CPU Speed</description>
- </cpuSpeed>
- <cpuSpeed id="HIGHPERFORMANCE" default="false" available="true">
- <displayName>High Performance</displayName>
- <description>Faster and more consistent than Standard. Suitable for applications that are more CPU intensive.</description>
- </cpuSpeed>
- <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_GB" value="1"/>
- <property name="MAX_MEMORY_GB" value="256"/>
- <property name="VMWARE_HARDWARE_VERSION" value="vmx-10"/>
- <property name="VLAN_SECURITY_GROUPS_ENABLED" value="false"/>
- </hypervisor>
- <backup type="COMMVAULT" maintenanceStatus="NORMAL"/>
- <consoleAccess maintenanceStatius="NORMAL"/>
- <monitoring maintenanceStatus="NORMAL"/>
- </datacenter>
-</datacenters>
http://git-wip-us.apache.org/repos/asf/libcloud/blob/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock.xml
deleted file mode 100644
index 5555132..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response xmlns="urn:didata.com:api:cloud:types" requestId="na/2015-12-20T16:59:48.842-05:00/28d362bb-249c-42b6-9236-ddd8729f332c">
- <operation>ADD_PUBLIC_IP_BLOCK</operation>
- <responseCode>OK</responseCode>
- <message>Public IPv4 Address Block has been added successfully to Network Domain d3320077-c2ce-4523-8c65-d417e766077b.</message>
- <info name="ipBlockId" value="4487241a-f0ca-11e3-9315-d4bed9b167ba"/>
-</response>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createFirewallRule.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createFirewallRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createFirewallRule.xml
deleted file mode 100644
index ac3162e..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createNatRule.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createNatRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createNatRule.xml
deleted file mode 100644
index ff652a4..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteFirewallRule.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteFirewallRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteFirewallRule.xml
deleted file mode 100644
index 3016297..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNatRule.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNatRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNatRule.xml
deleted file mode 100644
index 2d2cebc..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNetworkDomain.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNetworkDomain.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNetworkDomain.xml
deleted file mode 100644
index a3cca2e..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteVlan.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteVlan.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteVlan.xml
deleted file mode 100644
index 9eae809..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployNetworkDomain.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployNetworkDomain.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployNetworkDomain.xml
deleted file mode 100644
index 4269840..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployVlan.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployVlan.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployVlan.xml
deleted file mode 100644
index 946a505..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_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="0e56433f_d808_4669_821d_812769517ff8"/>
-</response>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editFirewallRule.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editFirewallRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editFirewallRule.xml
deleted file mode 100644
index eff18c4..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editNetworkDomain.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editNetworkDomain.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editNetworkDomain.xml
deleted file mode 100644
index 07d55e5..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editVlan.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editVlan.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editVlan.xml
deleted file mode 100644
index 10d0010..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_expandVlan.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_expandVlan.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_expandVlan.xml
deleted file mode 100644
index 03f9112..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule.xml
deleted file mode 100644
index 536b350..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule.xml
+++ /dev/null
@@ -1,273 +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>
- <firewallRule id="b976e0e6-4fb2-4f3e-a016-652e02d211b4" datacenterId="NA9" ruleType="CLIENT_RULE">
- <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
- <name>SpecificSourceIP</name>
- <action>ACCEPT_DECISIVELY</action>
- <ipVersion>IPV6</ipVersion>
- <protocol>TCP</protocol>
- <source>
- <ip address="2607:f480:111:1336:6503:544c:74a6:3a28"/>
- </source>
- <destination>
- <ip address="ANY"/>
- </destination>
- <enabled>true</enabled>
- <state>NORMAL</state>
- </firewallRule>
- <firewallRule id="ce250bd3-0e45-4c13-a6d2-74e0657ef699" datacenterId="NA9" ruleType="CLIENT_RULE">
- <networkDomainId>423c4386-87b4-43c4-9604-88ae237bfc7f</networkDomainId>
- <name>RULE_WITH_SOURCE_AND_DEST_IP_ONLY</name>
- <action>ACCEPT_DECISIVELY</action>
- <ipVersion>IPV4</ipVersion>
- <protocol>TCP</protocol>
- <source>
- <ip address="10.10.10.15"/>
- </source>
- <destination>
- <ip address="10.10.10.14"/>
- </destination>
- <enabled>true</enabled>
- <state>NORMAL</state>
- </firewallRule>
- <firewallRule id="ce250bd3-0e45-4c13-a6d2-74e0657ef699" datacenterId="NA9" ruleType="CLIENT_RULE">
- <networkDomainId>423c4386-87b4-43c4-9604-88ae237bfc7f</networkDomainId>
- <name>RULE_WITH_DEST_IP_NO_PORT</name>
- <action>ACCEPT_DECISIVELY</action>
- <ipVersion>IPV4</ipVersion>
- <protocol>TCP</protocol>
- <source>
- <ip address="10.10.10.15"/>
- </source>
- <destination>
- <ip address="10.10.10.14"/>
- <port begin="40000" end="40005"/>
- </destination>
- <enabled>true</enabled>
- <state>NORMAL</state>
- </firewallRule>
- <firewallRule id="ce250bd3-0e45-4c13-a6d2-74e0657ef700" datacenterId="NA9" ruleType="CLIENT_RULE">
- <networkDomainId>423c4386-87b4-43c4-9604-88ae237bfc7f</networkDomainId>
- <name>RULE_WITH_SOURCE_AND_DEST</name>
- <action>ACCEPT_DECISIVELY</action>
- <ipVersion>IPV4</ipVersion>
- <protocol>TCP</protocol>
- <source>
- <ip address="10.10.10.0" prefixSize="24"/>
- <port begin="40000" end="40005"/>
- </source>
- <destination>
- <ip address="10.10.10.0" prefixSize="24"/>
- <port begin="40000"/>
- </destination>
- <enabled>true</enabled>
- <state>NORMAL</state>
- </firewallRule>
-</firewallRules>
http://git-wip-us.apache.org/repos/asf/libcloud/blob/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule_d0a20f59_77b9_4f28_a63b_e58496b73a6c.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule_d0a20f59_77b9_4f28_a63b_e58496b73a6c.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_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_1_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/b025cf25/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml
deleted file mode 100644
index 7478df6..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_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