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 2015/12/09 11:19:19 UTC

[01/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

Repository: libcloud
Updated Branches:
  refs/heads/trunk 914c4eb3d -> f43570b9f


http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node_34de6ed6_46a4_4dae_a753_2f8d3840c6f9.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node_34de6ed6_46a4_4dae_a753_2f8d3840c6f9.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node_34de6ed6_46a4_4dae_a753_2f8d3840c6f9.xml
new file mode 100644
index 0000000..ace9123
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node_34de6ed6_46a4_4dae_a753_2f8d3840c6f9.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node xmlns="urn:didata.com:api:cloud:types" id="34de6ed6-46a4-4dae-a753-2f8d3840c6f9" datacenterId="NA9">
+<networkDomainId>553f26b6-2a73-42c3-a78b-6116f11291d0</networkDomainId>
+<name>ProductionNode.2</name>
+<description>Production Server 2</description>
+<ipv4Address>10.10.10.101</ipv4Address>
+<state>NORMAL</state>
+<status>ENABLED</status>
+<healthMonitor id="0168b83a-d487-11e4-811f-005056806999" name="ICMP"/>
+<connectionLimit>10000</connectionLimit>
+<connectionRateLimit>2000</connectionRateLimit>
+<createTime>2015-05-27T13:56:13.000Z</createTime>
+</node>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool.xml
new file mode 100644
index 0000000..239fe52
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pools
+xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="2"
+totalCount="2" pageSize="250">
+<pool id="4d360b1f-bc2c-4ab7-9884-1f03ba2768f7" datacenterId="NA9">
+<networkDomainId>553f26b6-2a73-42c3-a78b-
+6116f11291d0</networkDomainId>
+<name>myDevelopmentPool.1</name>
+<description>Pool for load balancing development application
+servers.</description>
+<loadBalanceMethod>ROUND_ROBIN</loadBalanceMethod>
+<healthMonitor id="01683574-d487-11e4-811f-005056806999"
+name="CCDEFAULT.Http"/>
+<healthMonitor id="0168546c-d487-11e4-811f-005056806999"
+name="CCDEFAULT.Https"/>
+<serviceDownAction>RESELECT</serviceDownAction>
+<slowRampTime>10</slowRampTime>
+<state>NORMAL</state>
+<createTime>2015-06-04T09:15:07.000Z</createTime>
+</pool>
+<pool id="afb1fb1a-eab9-43f4-95c2-36a4cdda6cb8" datacenterId="NA9">
+<networkDomainId>553f26b6-2a73-42c3-a78b-
+6116f11291d0</networkDomainId>
+<name>myProductionPool.1</name>
+<description>Pool for load balancing production application
+servers.</description>
+<loadBalanceMethod>ROUND_ROBIN</loadBalanceMethod>
+<healthMonitor id="01683574-d487-11e4-811f-005056806999"
+name="CCDEFAULT.Http"/>
+<healthMonitor id="0168546c-d487-11e4-811f-005056806999"
+name="CCDEFAULT.Https"/>
+<serviceDownAction>NONE</serviceDownAction>
+<slowRampTime>10</slowRampTime>
+<state>NORMAL</state>
+<createTime>2015-06-03T14:11:17.000Z</createTime>
+</pool>
+</pools>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember.xml
new file mode 100644
index 0000000..b36f75e
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<poolMembers
+xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="2"
+totalCount="2" pageSize="250">
+<poolMember id="3dd806a2-c2c8-4c0c-9a4f-5219ea9266c0" datacenterId="NA9">
+<networkDomainId>553f26b6-2a73-42c3-a78b-
+6116f11291d0</networkDomainId>
+<pool id="4d360b1f-bc2c-4ab7-9884-1f03ba2768f7"
+name="myDevelopmentPool.1"/>
+<node id="3c207269-e75e-11e4-811f-005056806999" name="10.0.3.13"
+ipAddress="10.0.3.13" status="ENABLED"/>
+<port>9889</port>
+<status>ENABLED</status>
+<state>NORMAL</state>
+<createTime>2015-06-09T11:02:50.000Z</createTime>
+</poolMember>
+<poolMember id="b977578b-a827-4172-b285-030c3ba15daa" datacenterId="NA9">
+<networkDomainId>553f26b6-2a73-42c3-a78b-
+6116f11291d0</networkDomainId>
+<pool id="4d360b1f-bc2c-4ab7-9884-1f03ba2768f7"
+name="myDevelopmentPool.1"/>
+<node id="3c207269-e75e-11e4-811f-005056806999" name="10.0.3.13"
+ipAddress="10.0.3.13" status="ENABLED"/>
+<port>9888</port>
+<status>ENABLED</status>
+<state>NORMAL</state>
+<createTime>2015-06-09T10:43:29.000Z</createTime>
+</poolMember>
+</poolMembers>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember_3dd806a2_c2c8_4c0c_9a4f_5219ea9266c0.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember_3dd806a2_c2c8_4c0c_9a4f_5219ea9266c0.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember_3dd806a2_c2c8_4c0c_9a4f_5219ea9266c0.xml
new file mode 100644
index 0000000..7c86d4a
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember_3dd806a2_c2c8_4c0c_9a4f_5219ea9266c0.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<poolMember
+xmlns="urn:didata.com:api:cloud:types" id="3dd806a2-c2c8-4c0c-9a4f-5219ea9266c0" datacenterId="NA9">
+<networkDomainId>553f26b6-2a73-42c3-a78b-6116f11291d0</networkDomainId>
+<pool id="6f2f5d7b-cdd9-4d84-8ad7-999b64a87978"
+name="myDevelopmentPool.1"/>
+<node id="3c207269-e75e-11e4-811f-005056806999" name="10.0.3.13"
+ipAddress="10.0.3.13" status="ENABLED"/>
+<port>9889</port>
+<status>ENABLED</status>
+<state>NORMAL</state>
+<createTime>2015-06-09T11:02:50.000Z</createTime>
+</poolMember>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool_4d360b1f_bc2c_4ab7_9884_1f03ba2768f7.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool_4d360b1f_bc2c_4ab7_9884_1f03ba2768f7.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool_4d360b1f_bc2c_4ab7_9884_1f03ba2768f7.xml
new file mode 100644
index 0000000..89d3400
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool_4d360b1f_bc2c_4ab7_9884_1f03ba2768f7.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pool
+xmlns="urn:didata.com:api:cloud:types" id="4d360b1f-bc2c-4ab7-9884-1f03ba2768f7" datacenterId="NA9">
+<networkDomainId>553f26b6-2a73-42c3-a78b-6116f11291d0</networkDomainId>
+<name>myDevelopmentPool.1</name>
+<description>Pool for load balancing development application
+servers.</description>
+<loadBalanceMethod>ROUND_ROBIN</loadBalanceMethod>
+<healthMonitor id="01683574-d487-11e4-811f-005056806999"
+name="CCDEFAULT.Http"/>
+<healthMonitor id="0168546c-d487-11e4-811f-005056806999"
+name="CCDEFAULT.Https"/>
+<serviceDownAction>RESELECT</serviceDownAction>
+<slowRampTime>10</slowRampTime>
+<state>NORMAL</state>
+<createTime>2015-06-04T09:15:07.000Z</createTime>
+</pool>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_removePoolMember.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_removePoolMember.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_removePoolMember.xml
new file mode 100644
index 0000000..bfe47bc
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_removePoolMember.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<response requestId="na9/2015-05-14T13:37:20/62f06368-c3fb-11e3-b29c-001517c4643e" xmlns="urn:didata.com:api:cloud:types">
+<operation>REMOVE_POOL_MEMBER</operation>
+<responseCode>OK</responseCode>
+<message>Pool Member (id:34de6ed6-46a4-4dae-a753-2f8d3840c6f9) has been
+removed.</message>
+</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener.xml
new file mode 100644
index 0000000..88a94fa
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<virtualListeners
+xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="5"
+totalCount="5" pageSize="250">
+<virtualListener id="6115469d-a8bb-445b-bb23-d23b5283f2b9"
+datacenterId="NA9">
+<networkDomainId>553f26b6-2a73-42c3-a78b-
+6116f11291d0</networkDomainId>
+<name>myProduction.Virtual.Listener</name>
+<state>NORMAL</state>
+<description>Virtual Listener for load balancing our test
+systems.</description>
+<createTime>2015-05-28T15:59:49.000Z</createTime>
+<type>PERFORMANCE_LAYER_4</type>
+<protocol>HTTP</protocol>
+<listenerIpAddress>165.180.12.22</listenerIpAddress>
+<port>8899</port>
+<enabled>true</enabled>
+<connectionLimit>10000</connectionLimit>
+<connectionRateLimit>400</connectionRateLimit>
+<sourcePortPreservation>PRESERVE</sourcePortPreservation>
+<pool id="afb1fb1a-eab9-43f4-95c2-36a4cdda6cb8"
+name="myProductionPool.1">
+<loadBalanceMethod>ROUND_ROBIN</loadBalanceMethod>
+<serviceDownAction>NONE</serviceDownAction>
+<slowRampTime>10</slowRampTime>
+<healthMonitor id="01683574-d487-11e4-811f-005056806999"
+name="CCDEFAULT.Http"/>
+<healthMonitor id="0168546c-d487-11e4-811f-005056806999"
+name="CCDEFAULT.Https"/>
+</pool>
+<clientClonePool id="6f2f5d7b-cdd9-4d84-8ad7-999b64a87978"
+name="myDevelopmentPool.1">
+<loadBalanceMethod>ROUND_ROBIN</loadBalanceMethod>
+<serviceDownAction>RESELECT</serviceDownAction>
+<slowRampTime>10</slowRampTime>
+<healthMonitor id="01683574-d487-11e4-811f-005056806999"
+name="CCDEFAULT.Http"/>
+<healthMonitor id="0168546c-d487-11e4-811f-005056806999"
+name="CCDEFAULT.Https"/>
+</clientClonePool>
+<persistenceProfile id="a34ca25c-f3db-11e4-b010-005056806999"
+name="CCDEFAULT.DestinationAddress"/>
+<fallbackPersistenceProfile id="a34ca3f6-f3db-11e4-b010-005056806999"
+name="CCDEFAULT.SourceAddress"/>
+<irule id="2b20abd9-ffdc-11e4-b010-005056806999"
+name="CCDEFAULT.IpProtocolTimers"/>
+<irule id="2b20e790-ffdc-11e4-b010-005056806999"
+name="CCDEFAULT.Ips"/>
+</virtualListener>
+</virtualListeners>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener_6115469d_a8bb_445b_bb23_d23b5283f2b9.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener_6115469d_a8bb_445b_bb23_d23b5283f2b9.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener_6115469d_a8bb_445b_bb23_d23b5283f2b9.xml
new file mode 100644
index 0000000..aea2f6f
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener_6115469d_a8bb_445b_bb23_d23b5283f2b9.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<virtualListener
+xmlns="urn:didata.com:api:cloud:types" id="6115469d-a8bb-445b-bb23-d23b5283f2b9" datacenterId="NA9">
+<networkDomainId>553f26b6-2a73-42c3-a78b-6116f11291d0</networkDomainId>
+<name>myProduction.Virtual.Listener</name>
+<state>NORMAL</state>
+<description>Virtual Listener for load balancing our test
+systems.</description>
+<createTime>2015-05-28T15:59:49.000Z</createTime>
+<type>PERFORMANCE_LAYER_4</type>
+<protocol>HTTP</protocol>
+<listenerIpAddress>165.180.12.22</listenerIpAddress>
+<port>8899</port>
+<enabled>true</enabled>
+<connectionLimit>10000</connectionLimit>
+<connectionRateLimit>400</connectionRateLimit>
+<sourcePortPreservation>PRESERVE</sourcePortPreservation>
+<pool id="afb1fb1a-eab9-43f4-95c2-36a4cdda6cb8" name="myProductionPool.1">
+<loadBalanceMethod>ROUND_ROBIN</loadBalanceMethod>
+<serviceDownAction>NONE</serviceDownAction>
+<slowRampTime>10</slowRampTime>
+<healthMonitor id="01683574-d487-11e4-811f-005056806999"
+name="CCDEFAULT.Http"/>
+<healthMonitor id="0168546c-d487-11e4-811f-005056806999"
+name="CCDEFAULT.Https"/>
+</pool>
+<clientClonePool id="6f2f5d7b-cdd9-4d84-8ad7-999b64a87978"
+name="myDevelopmentPool.1">
+<loadBalanceMethod>ROUND_ROBIN</loadBalanceMethod>
+<serviceDownAction>RESELECT</serviceDownAction>
+<slowRampTime>10</slowRampTime>
+<healthMonitor id="01683574-d487-11e4-811f-005056806999"
+name="CCDEFAULT.Http"/>
+<healthMonitor id="0168546c-d487-11e4-811f-005056806999"
+name="CCDEFAULT.Https"/>
+</clientClonePool>
+<persistenceProfile id="a34ca25c-f3db-11e4-b010-005056806999"
+name="CCDEFAULT.DestinationAddress"/>
+<fallbackPersistenceProfile id="a34ca3f6-f3db-11e4-b010-005056806999"
+name="CCDEFAULT.SourceAddress"/>
+<irule id="2b20abd9-ffdc-11e4-b010-005056806999"
+name="CCDEFAULT.IpProtocolTimers"/>
+<irule id="2b20e790-ffdc-11e4-b010-005056806999" name="CCDEFAULT.Ips"/>
+</virtualListener>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/test_dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/test_dimensiondata.py b/libcloud/test/loadbalancer/test_dimensiondata.py
index c5929a5..86b3a8b 100644
--- a/libcloud/test/loadbalancer/test_dimensiondata.py
+++ b/libcloud/test/loadbalancer/test_dimensiondata.py
@@ -462,114 +462,114 @@ class DimensionDataMockHttp(MockHttp):
         body = self.fixtures.load('oec_0_9_myaccount.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener_6115469d_a8bb_445b_bb23_d23b5283f2b9(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener_6115469d_a8bb_445b_bb23_d23b5283f2b9(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener_6115469d_a8bb_445b_bb23_d23b5283f2b9.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener_6115469d_a8bb_445b_bb23_d23b5283f2b9.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool_4d360b1f_bc2c_4ab7_9884_1f03ba2768f7(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool_4d360b1f_bc2c_4ab7_9884_1f03ba2768f7(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool_4d360b1f_bc2c_4ab7_9884_1f03ba2768f7.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool_4d360b1f_bc2c_4ab7_9884_1f03ba2768f7.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember_3dd806a2_c2c8_4c0c_9a4f_5219ea9266c0(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember_3dd806a2_c2c8_4c0c_9a4f_5219ea9266c0(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember_3dd806a2_c2c8_4c0c_9a4f_5219ea9266c0.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember_3dd806a2_c2c8_4c0c_9a4f_5219ea9266c0.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createPool(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createPool(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createPool.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createPool.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createNode(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createNode(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createNode.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createNode.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_addPoolMember(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_addPoolMember(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_addPoolMember.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_addPoolMember.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createVirtualListener(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createVirtualListener(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createVirtualListener.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createVirtualListener.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_removePoolMember(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_removePoolMember(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_removePoolMember.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_removePoolMember.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteVirtualListener(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteVirtualListener(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteVirtualListener.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteVirtualListener.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deletePool(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deletePool(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deletePool.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deletePool.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteNode(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteNode(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteNode.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteNode.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node_34de6ed6_46a4_4dae_a753_2f8d3840c6f9(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node_34de6ed6_46a4_4dae_a753_2f8d3840c6f9(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node_34de6ed6_46a4_4dae_a753_2f8d3840c6f9.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node_34de6ed6_46a4_4dae_a753_2f8d3840c6f9.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editNode(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editNode(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editNode.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editNode.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPool(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPool(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPool.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPool.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPoolMember(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPoolMember(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPoolMember.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPoolMember.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultHealthMonitor(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultHealthMonitor(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultHealthMonitor.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultHealthMonitor.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultPersistenceProfile(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultPersistenceProfile(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultPersistenceProfile.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultPersistenceProfile.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultIrule(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultIrule(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultIrule.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultIrule.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
 if __name__ == '__main__':


[07/11] libcloud git commit: Update field name and test to include cpu spec and memory

Posted by an...@apache.org.
Update field name and test to include cpu spec and memory

Signed-off-by: Anthony Shaw <an...@gmail.com>


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

Branch: refs/heads/trunk
Commit: 67e5694143ae5dbd857e5c73a4e6784852127df4
Parents: 41c02f5
Author: Anthony Shaw <an...@gmail.com>
Authored: Tue Dec 8 21:22:28 2015 +1100
Committer: Anthony Shaw <an...@gmail.com>
Committed: Wed Dec 9 21:19:14 2015 +1100

----------------------------------------------------------------------
 libcloud/compute/drivers/dimensiondata.py   | 5 +++--
 libcloud/test/compute/test_dimensiondata.py | 9 ++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/67e56941/libcloud/compute/drivers/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/dimensiondata.py b/libcloud/compute/drivers/dimensiondata.py
index de8384c..27f3a66 100644
--- a/libcloud/compute/drivers/dimensiondata.py
+++ b/libcloud/compute/drivers/dimensiondata.py
@@ -152,8 +152,9 @@ class DimensionDataNodeDriver(NodeDriver):
         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)
+            cpu.set('count', str(ex_cpu_specification.cpu_count))
+            cpu.set('coresPerSocket',
+                    str(ex_cpu_specification.cores_per_socket))
 
         if ex_network is not None:
             network_elm = ET.SubElement(server_elm, "network")

http://git-wip-us.apache.org/repos/asf/libcloud/blob/67e56941/libcloud/test/compute/test_dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_dimensiondata.py b/libcloud/test/compute/test_dimensiondata.py
index 6f06a0e..bbdf2b2 100644
--- a/libcloud/test/compute/test_dimensiondata.py
+++ b/libcloud/test/compute/test_dimensiondata.py
@@ -24,6 +24,7 @@ from libcloud.utils.py3 import httplib
 
 from libcloud.common.types import InvalidCredsError
 from libcloud.common.dimensiondata import DimensionDataAPIException, NetworkDomainServicePlan
+from libcloud.common.dimensiondata import DimensionDataServerCpuSpecification
 from libcloud.compute.drivers.dimensiondata import DimensionDataNodeDriver as DimensionData
 from libcloud.compute.base import Node, NodeAuthPassword, NodeLocation
 
@@ -145,11 +146,17 @@ class DimensionDataTests(unittest.TestCase, TestCaseMixin):
         image = self.driver.list_images(location=location)[0]
         network_domain = self.driver.ex_list_network_domains(location=location)[0]
         vlan = self.driver.ex_list_vlans(location=location)[0]
+        cpu = DimensionDataServerCpuSpecification(
+            cpu_count=4,
+            cores_per_socket=1,
+            performance='HIGHPERFORMANCE'
+        )
         node = self.driver.create_node(name='test2', image=image, auth=rootPw,
                                        ex_description='test2 node',
                                        ex_network_domain=network_domain,
                                        ex_vlan=vlan,
-                                       ex_is_started=False)
+                                       ex_is_started=False, ex_cpu_specification=cpu,
+                                       ex_memory_gb=4)
         self.assertEqual(node.id, 'e75ead52-692f-4314-8725-c8a4f4d13a87')
         self.assertEqual(node.extra['status'].action, 'DEPLOY_SERVER')
 


[09/11] libcloud git commit: Fix linting errors

Posted by an...@apache.org.
Fix linting errors

Signed-off-by: Anthony Shaw <an...@gmail.com>


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

Branch: refs/heads/trunk
Commit: 325f52e7cdf4aff135ec68a71e4fa451fb888312
Parents: 67e5694
Author: Anthony Shaw <an...@gmail.com>
Authored: Tue Dec 8 21:34:11 2015 +1100
Committer: Anthony Shaw <an...@gmail.com>
Committed: Wed Dec 9 21:19:15 2015 +1100

----------------------------------------------------------------------
 libcloud/test/compute/test_dimensiondata.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/325f52e7/libcloud/test/compute/test_dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_dimensiondata.py b/libcloud/test/compute/test_dimensiondata.py
index bbdf2b2..ad93b7d 100644
--- a/libcloud/test/compute/test_dimensiondata.py
+++ b/libcloud/test/compute/test_dimensiondata.py
@@ -480,9 +480,9 @@ class DimensionDataTests(unittest.TestCase, TestCaseMixin):
 
     def test_ex_reconfigure_node(self):
         node = self.driver.list_nodes()[0]
-        result = self.driver.ex_reconfigure_node(node, 4, 4, 1,'HIGHPERFORMANCE')
+        result = self.driver.ex_reconfigure_node(node, 4, 4, 1, 'HIGHPERFORMANCE')
         self.assertTrue(result)
-    
+
 
 class InvalidRequestError(Exception):
     def __init__(self, tag):
@@ -967,7 +967,5 @@ class DimensionDataMockHttp(MockHttp):
             'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_reconfigureServer.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-
-
 if __name__ == '__main__':
     sys.exit(unittest.main())


[02/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

Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/compute/test_dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_dimensiondata.py b/libcloud/test/compute/test_dimensiondata.py
index f78f5d7..f8527b1 100644
--- a/libcloud/test/compute/test_dimensiondata.py
+++ b/libcloud/test/compute/test_dimensiondata.py
@@ -588,335 +588,335 @@ class DimensionDataMockHttp(MockHttp):
                 'oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_e75ead52_692f_4314_8725_c8a4f4d13a87_POST.xml')
             return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}deleteServer":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer_INPROGRESS(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer_INPROGRESS(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}deleteServer":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer_RESOURCEBUSY.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer_RESOURCEBUSY.xml')
         return (httplib.BAD_REQUEST, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}rebootServer":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer_INPROGRESS(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer_INPROGRESS(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}rebootServer":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer_RESOURCEBUSY.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer_RESOURCEBUSY.xml')
         return (httplib.BAD_REQUEST, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_infrastructure_datacenter(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_infrastructure_datacenter(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_infrastructure_datacenter.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_infrastructure_datacenter.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_updateVmwareTools(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_updateVmwareTools(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}updateVmwareTools":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_updateVmwareTools.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_updateVmwareTools.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_startServer(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_startServer(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}startServer":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_startServer.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_startServer.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_startServer_INPROGRESS(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_startServer_INPROGRESS(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}startServer":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_startServer_INPROGRESS.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_startServer_INPROGRESS.xml')
         return (httplib.BAD_REQUEST, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}shutdownServer":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer_INPROGRESS(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer_INPROGRESS(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}shutdownServer":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer_INPROGRESS.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer_INPROGRESS.xml')
         return (httplib.BAD_REQUEST, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_resetServer(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_resetServer(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}resetServer":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_resetServer.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_resetServer.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}powerOffServer":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer_INPROGRESS(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer_INPROGRESS(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}powerOffServer":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer_INPROGRESS.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer_INPROGRESS.xml')
         return (httplib.BAD_REQUEST, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployServer(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployServer(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}deployServer":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployServer.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployServer.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployNetworkDomain(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployNetworkDomain(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}deployNetworkDomain":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployNetworkDomain.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployNetworkDomain.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_162cfc0891be(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_162cfc0891be(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_162cfc0891be.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_162cfc0891be.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editNetworkDomain(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editNetworkDomain(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}editNetworkDomain":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editNetworkDomain.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editNetworkDomain.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNetworkDomain(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNetworkDomain(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}deleteNetworkDomain":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNetworkDomain.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNetworkDomain.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployVlan(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployVlan(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}deployVlan":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployVlan.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployVlan.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan_0e56433f_d808_4669_821d_812769517ff8(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan_0e56433f_d808_4669_821d_812769517ff8(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan_0e56433f_d808_4669_821d_812769517ff8.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan_0e56433f_d808_4669_821d_812769517ff8.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editVlan(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editVlan(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}editVlan":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editVlan.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editVlan.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteVlan(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteVlan(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}deleteVlan":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteVlan.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteVlan.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_expandVlan(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_expandVlan(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}expandVlan":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_expandVlan.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_expandVlan.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}addPublicIpBlock":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_4487241a_f0ca_11e3_9315_d4bed9b167ba(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_4487241a_f0ca_11e3_9315_d4bed9b167ba(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}removePublicIpBlock":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createFirewallRule(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createFirewallRule(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}createFirewallRule":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createFirewallRule.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createFirewallRule.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule_d0a20f59_77b9_4f28_a63b_e58496b73a6c(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule_d0a20f59_77b9_4f28_a63b_e58496b73a6c(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule_d0a20f59_77b9_4f28_a63b_e58496b73a6c.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule_d0a20f59_77b9_4f28_a63b_e58496b73a6c.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editFirewallRule(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editFirewallRule(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}editFirewallRule":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editFirewallRule.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editFirewallRule.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteFirewallRule(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteFirewallRule(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}deleteFirewallRule":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteFirewallRule.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteFirewallRule.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createNatRule(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createNatRule(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}createNatRule":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createNatRule.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createNatRule.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule_2187a636_7ebb_49a1_a2ff_5d617f496dce(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule_2187a636_7ebb_49a1_a2ff_5d617f496dce(self, method, url, body, headers):
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNatRule(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNatRule(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}deleteNatRule":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNatRule.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNatRule.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}addNic":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}removeNic":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_disableServerMonitoring(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_disableServerMonitoring(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}disableServerMonitoring":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_disableServerMonitoring.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_disableServerMonitoring.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_enableServerMonitoring(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_enableServerMonitoring(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}enableServerMonitoring":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_enableServerMonitoring.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_enableServerMonitoring.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_changeServerMonitoringPlan(self, method, url, body, headers):
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_changeServerMonitoringPlan(self, method, url, body, headers):
         request = ET.fromstring(body)
         if request.tag != "{urn:didata.com:api:cloud:types}changeServerMonitoringPlan":
             raise InvalidRequestError(request.tag)
         body = self.fixtures.load(
-            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_changeServerMonitoringPlan.xml')
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_changeServerMonitoringPlan.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
 if __name__ == '__main__':

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_addPoolMember.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_addPoolMember.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_addPoolMember.xml
deleted file mode 100644
index e4cba7a..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_addPoolMember.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response
-xmlns="urn:didata.com:api:cloud:types" requestId="na9/2015-06-09T07:02:49.563-04:00/40653bb1-cf55-4ba8-ba00-121c19c50a54">
-<operation>ADD_POOL_MEMBER</operation>
-<responseCode>OK</responseCode>
-<message>Pool Member '10.0.3.13:9888' has been added.</message>
-<info name="poolMemberId" value="3dd806a2-c2c8-4c0c-9a4f-5219ea9266c0"/>
-<info name="nodeName" value="10.0.3.13"/>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createNode.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createNode.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createNode.xml
deleted file mode 100644
index 696525c..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createNode.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<response requestId="na/2015-04-14T13:37:20/62f06368-c3fb-11e3-b29c-001517c4643e" xmlns="urn:didata.com:api:cloud:types">
-<operation>CREATE_NODE</operation>
-<responseCode>OK</responseCode>
-<message>Node 'myProductionNode.1' has been created.</message>
-<info name="nodeId" value="9e6b496d-5261-4542-91aa-b50c7f569c54"/>
-<info name="name" value="myProductionNode.1"/>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createPool.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createPool.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createPool.xml
deleted file mode 100644
index 28302d5..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createPool.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<response requestId="na/2015-04-14T13:37:20/62f06368-c3fb-11e3-b29c-
-001517c4643e" xmlns="urn:didata.com:api:cloud:types">
-<operation>CREATE_POOL</operation>
-<responseCode>OK</responseCode>
-<message>Pool 'myProductionPool.1' has been created.</message>
-<info name="poolId" value="9e6b496d-5261-4542-91aa-b50c7f569c54"/>
-<info name="name" value="myProductionPool.1"/>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createVirtualListener.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createVirtualListener.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createVirtualListener.xml
deleted file mode 100644
index 5cf1f5a..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createVirtualListener.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response
-xmlns="urn:didata.com:api:cloud:types" requestId="na9/2015-06-11T05:45:22.833-04:00/0dc58e64-6e05-4de2-98d6-70bee28cba97">
-<operation>CREATE_VIRTUAL_LISTENER</operation>
-<responseCode>OK</responseCode>
-<message>Virtual Listener 'Production.Load.Balancer' has been created on
-IP 165.180.12.22.</message>
-<info name="virtualListenerId" value="8334f461-0df0-42d5-97eb-f4678eb26bea"/>
-<info name="name" value="Production.Load.Balancer"/>
-<info name="listenerIpAddress" value="165.180.12.22"/>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultHealthMonitor.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultHealthMonitor.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultHealthMonitor.xml
deleted file mode 100644
index b24f006..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultHealthMonitor.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<defaultHealthMonitors
- xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="6"
-totalCount="6" pageSize="250">
- <defaultHealthMonitor id="01683574-d487-11e4-811f-005056806999">
- <name>CCDEFAULT.Http</name>
- <nodeCompatible>false</nodeCompatible>
- <poolCompatible>true</poolCompatible>
- </defaultHealthMonitor>
- <defaultHealthMonitor id="0168546c-d487-11e4-811f-005056806999">
- <name>CCDEFAULT.Https</name>
- <nodeCompatible>false</nodeCompatible>
- <poolCompatible>true</poolCompatible>
- </defaultHealthMonitor>
- <defaultHealthMonitor id="0168b83a-d487-11e4-811f-005056806999">
- <name>CCDEFAULT.Icmp</name>
- <nodeCompatible>true</nodeCompatible>
- <poolCompatible>false</poolCompatible>
- </defaultHealthMonitor>
- <defaultHealthMonitor id="01686f4b-d487-11e4-811f-005056806999">
- <name>CCDEFAULT.Tcp</name>
- <nodeCompatible>false</nodeCompatible>
- <poolCompatible>true</poolCompatible>
- </defaultHealthMonitor>
- <defaultHealthMonitor id="0168a2f9-d487-11e4-811f-005056806999">
- <name>CCDEFAULT.TcpHalfOpen</name>
- <nodeCompatible>false</nodeCompatible>
- <poolCompatible>true</poolCompatible>
- </defaultHealthMonitor>
- <defaultHealthMonitor id="01688878-d487-11e4-811f-005056806999">
- <name>CCDEFAULT.Udp</name>
- <nodeCompatible>false</nodeCompatible>
- <poolCompatible>true</poolCompatible>
- </defaultHealthMonitor>
-</defaultHealthMonitors>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultIrule.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultIrule.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultIrule.xml
deleted file mode 100644
index d2005a3..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultIrule.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<defaultIrules
- xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="5"
-totalCount="5" pageSize="250">
- <defaultIrule>
- <irule id="2b20cb2c-ffdc-11e4-b010-005056806999"
-name="CCDEFAULT.HttpsRedirect"/>
- <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
-protocol="HTTP"/>
- </defaultIrule>
- <defaultIrule>
- <irule id="2b20abd9-ffdc-11e4-b010-005056806999"
-name="CCDEFAULT.IpProtocolTimers"/>
- <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
-protocol="HTTP"/>
- <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
-protocol="TCP"/>
- <virtualListenerCompatibility type="STANDARD" protocol="UDP"/>
- <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
-protocol="UDP"/>
- <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
-protocol="ANY"/>
- <virtualListenerCompatibility type="STANDARD" protocol="TCP"/>
- <virtualListenerCompatibility type="STANDARD" protocol="ANY"/>
- </defaultIrule>
- <defaultIrule>
- <irule id="2b20e790-ffdc-11e4-b010-005056806999"
-name="CCDEFAULT.Ips"/>
- <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
-protocol="HTTP"/>
- <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
-protocol="TCP"/>
- <virtualListenerCompatibility type="STANDARD" protocol="UDP"/>
- <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
-protocol="UDP"/>
- <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
-protocol="ANY"/>
- <virtualListenerCompatibility type="STANDARD" protocol="TCP"/>
- <virtualListenerCompatibility type="STANDARD" protocol="ANY"/>
- </defaultIrule>
- <defaultIrule>
- <irule id="2b210846-ffdc-11e4-b010-005056806999"
-name="CCDEFAULT.IpsHttp"/>
- <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
-protocol="HTTP"/>
- </defaultIrule>
- </defaultIrules>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultPersistenceProfile.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultPersistenceProfile.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultPersistenceProfile.xml
deleted file mode 100644
index cd6b5a5..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultPersistenceProfile.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<defaultPersistenceProfiles
- xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="4"
-totalCount="4" pageSize="250">
- <defaultPersistenceProfile id="a34ca024-f3db-11e4-b010-005056806999"
-fallbackCompatible="false">
- <name>CCDEFAULT.Cookie</name>
- <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
-protocol="HTTP"/>
- </defaultPersistenceProfile>
- <defaultPersistenceProfile id="a34ca25c-f3db-11e4-b010-005056806999"
-fallbackCompatible="true">
- <name>CCDEFAULT.DestinationAddress</name>
- <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
-protocol="HTTP"/>
- <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
-protocol="TCP"/>
- <virtualListenerCompatibility type="STANDARD" protocol="UDP"/>
- <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
-protocol="UDP"/>
- <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
-protocol="ANY"/>
- <virtualListenerCompatibility type="STANDARD" protocol="TCP"/>
- <virtualListenerCompatibility type="STANDARD" protocol="ANY"/>
- </defaultPersistenceProfile>
- <defaultPersistenceProfile id="a34ca4b7-f3db-11e4-b010-005056806999"
-fallbackCompatible="false">
- <name>CCDEFAULT.Sip</name>
- <virtualListenerCompatibility type="STANDARD" protocol="UDP"/>
- <virtualListenerCompatibility type="STANDARD" protocol="TCP"/>
- </defaultPersistenceProfile>
- <defaultPersistenceProfile id="a34ca3f6-f3db-11e4-b010-005056806999"
-fallbackCompatible="true">
- <name>CCDEFAULT.SourceAddress</name>
- <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
-protocol="HTTP"/>
- <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
-protocol="TCP"/>
- <virtualListenerCompatibility type="STANDARD" protocol="UDP"/>
- <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
-protocol="UDP"/>
- <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
-protocol="ANY"/>
- <virtualListenerCompatibility type="STANDARD" protocol="TCP"/>
- <virtualListenerCompatibility type="STANDARD" protocol="ANY"/>
- </defaultPersistenceProfile>
-</defaultPersistenceProfiles>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteNode.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteNode.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteNode.xml
deleted file mode 100644
index cd5177f..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteNode.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response requestId="na9/2015-05-14T13:37:20/62f06368-c3fb-11e3-b29c-
-001517c4643e"
-xmlns="urn:didata.com:api:cloud:types">
-<operation>DELETE_NODE</operation>
-<responseCode>OK</responseCode>
-<message>Node (id:34de6ed6-46a4-4dae-a753-2f8d3840c6f9) has been
-deleted.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deletePool.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deletePool.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deletePool.xml
deleted file mode 100644
index 3883b55..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deletePool.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response requestId="na9/2015-05-14T13:37:20/62f06368-c3fb-11e3-b29c-
-001517c4643e"
-xmlns="urn:didata.com:api:cloud:types">
-<operation>DELETE_POOL</operation>
-<responseCode>OK</responseCode>
-<message>Pool (id:4d360b1f-bc2c-4ab7-9884-1f03ba2768f7) has been
-deleted.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteVirtualListener.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteVirtualListener.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteVirtualListener.xml
deleted file mode 100644
index 3504ce9..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteVirtualListener.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response requestId="na9/2015-05-14T13:37:20/62f06368-c3fb-11e3-b29c-
-001517c4643e"
-xmlns="urn:didata.com:api:cloud:types">
-<operation>DELETE_VIRTUAL_LISTENER</operation>
-<responseCode>OK</responseCode>
-<message>Virtual Listener (id:6115469d-a8bb-445b-bb23-d23b5283f2b9) has been
-deleted.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editNode.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editNode.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editNode.xml
deleted file mode 100644
index ae3e2af..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editNode.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-05-29T11:57:29.793-04:00/9f7191df-de3a-4cf3-a0a1-6321e88b5af5">
-<operation>EDIT_NODE</operation>
-<responseCode>OK</responseCode>
-<message>Node 'ProductionNode.2' has been edited successfully.</message>
-<info name="nodeId" value="34de6ed6-46a4-4dae-a753-2f8d3840c6f9"/>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPool.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPool.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPool.xml
deleted file mode 100644
index 78eb686..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPool.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response
-xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-05-29T11:57:29.793-04:00/9f7191df-de3a-4cf3-a0a1-6321e88b5af5">
-<operation>EDIT_POOL</operation>
-<responseCode>OK</responseCode>
-<message>Pool 'ProductionPool.2' has been updated.</message>
-<info name="name" value="ProductionPool.2"/>
-<info name="poolId" value="4d360b1f-bc2c-4ab7-9884-1f03ba2768f7"/>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPoolMember.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPoolMember.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPoolMember.xml
deleted file mode 100644
index 89ce41d..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPoolMember.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-09T09:29:46.249-04:00/c128c717-b3b4-480a-ba93-e3fb2e32a9be">
-<operation>EDIT_POOL_MEMBER</operation>
-<responseCode>OK</responseCode>
-<message>Pool Member (10.0.3.13:9889) has been edited.</message>
-<info name="poolMemberId" value="3dd806a2-c2c8-4c0c-9a4f-5219ea9266c0"/>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node.xml
deleted file mode 100644
index b58e58f..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<nodes xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="1"
-totalCount="2" pageSize="250">
-<node id="34de6ed6-46a4-4dae-a753-2f8d3840c6f9" datacenterId="NA9">
-<networkDomainId>553f26b6-2a73-42c3-a78b-
-6116f11291d0</networkDomainId>
-<name>ProductionNode.1</name>
-<description>Production Server 1</description>
-<ipv4Address>10.10.10.101</ipv4Address>
-<state>NORMAL</state>
-<status>ENABLED</status>
-<healthMonitor id="0168b83a-d487-11e4-811f-005056806999" name="ICMP"/>
-<connectionLimit>10000</connectionLimit>
-<connectionRateLimit>2000</connectionRateLimit>
-<createTime>2015-05-29T13:56:13.000Z</createTime>
-</node>
-<node id="78d2437e-36e1-4dd5-9bfd-582a85d207ad" datacenterId="NA9">
-<networkDomainId>553f26b6-2a73-42c3-a78b-
-6116f11291d0</networkDomainId>
-<name>ProductionNode.2</name>
-<description>Production Server 2</description>
-<ipv4Address>10.5.2.15</ipv4Address>
-<state>NORMAL</state>
-<status>ENABLED</status>
-<connectionLimit>10000</connectionLimit>
-<connectionRateLimit>2000</connectionRateLimit>
-<createTime>2015-05-29T11:46:55.000Z</createTime>
-</node>
-</nodes>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node_34de6ed6_46a4_4dae_a753_2f8d3840c6f9.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node_34de6ed6_46a4_4dae_a753_2f8d3840c6f9.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node_34de6ed6_46a4_4dae_a753_2f8d3840c6f9.xml
deleted file mode 100644
index ace9123..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node_34de6ed6_46a4_4dae_a753_2f8d3840c6f9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<node xmlns="urn:didata.com:api:cloud:types" id="34de6ed6-46a4-4dae-a753-2f8d3840c6f9" datacenterId="NA9">
-<networkDomainId>553f26b6-2a73-42c3-a78b-6116f11291d0</networkDomainId>
-<name>ProductionNode.2</name>
-<description>Production Server 2</description>
-<ipv4Address>10.10.10.101</ipv4Address>
-<state>NORMAL</state>
-<status>ENABLED</status>
-<healthMonitor id="0168b83a-d487-11e4-811f-005056806999" name="ICMP"/>
-<connectionLimit>10000</connectionLimit>
-<connectionRateLimit>2000</connectionRateLimit>
-<createTime>2015-05-27T13:56:13.000Z</createTime>
-</node>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool.xml
deleted file mode 100644
index 239fe52..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pools
-xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="2"
-totalCount="2" pageSize="250">
-<pool id="4d360b1f-bc2c-4ab7-9884-1f03ba2768f7" datacenterId="NA9">
-<networkDomainId>553f26b6-2a73-42c3-a78b-
-6116f11291d0</networkDomainId>
-<name>myDevelopmentPool.1</name>
-<description>Pool for load balancing development application
-servers.</description>
-<loadBalanceMethod>ROUND_ROBIN</loadBalanceMethod>
-<healthMonitor id="01683574-d487-11e4-811f-005056806999"
-name="CCDEFAULT.Http"/>
-<healthMonitor id="0168546c-d487-11e4-811f-005056806999"
-name="CCDEFAULT.Https"/>
-<serviceDownAction>RESELECT</serviceDownAction>
-<slowRampTime>10</slowRampTime>
-<state>NORMAL</state>
-<createTime>2015-06-04T09:15:07.000Z</createTime>
-</pool>
-<pool id="afb1fb1a-eab9-43f4-95c2-36a4cdda6cb8" datacenterId="NA9">
-<networkDomainId>553f26b6-2a73-42c3-a78b-
-6116f11291d0</networkDomainId>
-<name>myProductionPool.1</name>
-<description>Pool for load balancing production application
-servers.</description>
-<loadBalanceMethod>ROUND_ROBIN</loadBalanceMethod>
-<healthMonitor id="01683574-d487-11e4-811f-005056806999"
-name="CCDEFAULT.Http"/>
-<healthMonitor id="0168546c-d487-11e4-811f-005056806999"
-name="CCDEFAULT.Https"/>
-<serviceDownAction>NONE</serviceDownAction>
-<slowRampTime>10</slowRampTime>
-<state>NORMAL</state>
-<createTime>2015-06-03T14:11:17.000Z</createTime>
-</pool>
-</pools>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember.xml
deleted file mode 100644
index b36f75e..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<poolMembers
-xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="2"
-totalCount="2" pageSize="250">
-<poolMember id="3dd806a2-c2c8-4c0c-9a4f-5219ea9266c0" datacenterId="NA9">
-<networkDomainId>553f26b6-2a73-42c3-a78b-
-6116f11291d0</networkDomainId>
-<pool id="4d360b1f-bc2c-4ab7-9884-1f03ba2768f7"
-name="myDevelopmentPool.1"/>
-<node id="3c207269-e75e-11e4-811f-005056806999" name="10.0.3.13"
-ipAddress="10.0.3.13" status="ENABLED"/>
-<port>9889</port>
-<status>ENABLED</status>
-<state>NORMAL</state>
-<createTime>2015-06-09T11:02:50.000Z</createTime>
-</poolMember>
-<poolMember id="b977578b-a827-4172-b285-030c3ba15daa" datacenterId="NA9">
-<networkDomainId>553f26b6-2a73-42c3-a78b-
-6116f11291d0</networkDomainId>
-<pool id="4d360b1f-bc2c-4ab7-9884-1f03ba2768f7"
-name="myDevelopmentPool.1"/>
-<node id="3c207269-e75e-11e4-811f-005056806999" name="10.0.3.13"
-ipAddress="10.0.3.13" status="ENABLED"/>
-<port>9888</port>
-<status>ENABLED</status>
-<state>NORMAL</state>
-<createTime>2015-06-09T10:43:29.000Z</createTime>
-</poolMember>
-</poolMembers>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember_3dd806a2_c2c8_4c0c_9a4f_5219ea9266c0.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember_3dd806a2_c2c8_4c0c_9a4f_5219ea9266c0.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember_3dd806a2_c2c8_4c0c_9a4f_5219ea9266c0.xml
deleted file mode 100644
index 7c86d4a..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_poolMember_3dd806a2_c2c8_4c0c_9a4f_5219ea9266c0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<poolMember
-xmlns="urn:didata.com:api:cloud:types" id="3dd806a2-c2c8-4c0c-9a4f-5219ea9266c0" datacenterId="NA9">
-<networkDomainId>553f26b6-2a73-42c3-a78b-6116f11291d0</networkDomainId>
-<pool id="6f2f5d7b-cdd9-4d84-8ad7-999b64a87978"
-name="myDevelopmentPool.1"/>
-<node id="3c207269-e75e-11e4-811f-005056806999" name="10.0.3.13"
-ipAddress="10.0.3.13" status="ENABLED"/>
-<port>9889</port>
-<status>ENABLED</status>
-<state>NORMAL</state>
-<createTime>2015-06-09T11:02:50.000Z</createTime>
-</poolMember>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool_4d360b1f_bc2c_4ab7_9884_1f03ba2768f7.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool_4d360b1f_bc2c_4ab7_9884_1f03ba2768f7.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool_4d360b1f_bc2c_4ab7_9884_1f03ba2768f7.xml
deleted file mode 100644
index 89d3400..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_pool_4d360b1f_bc2c_4ab7_9884_1f03ba2768f7.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pool
-xmlns="urn:didata.com:api:cloud:types" id="4d360b1f-bc2c-4ab7-9884-1f03ba2768f7" datacenterId="NA9">
-<networkDomainId>553f26b6-2a73-42c3-a78b-6116f11291d0</networkDomainId>
-<name>myDevelopmentPool.1</name>
-<description>Pool for load balancing development application
-servers.</description>
-<loadBalanceMethod>ROUND_ROBIN</loadBalanceMethod>
-<healthMonitor id="01683574-d487-11e4-811f-005056806999"
-name="CCDEFAULT.Http"/>
-<healthMonitor id="0168546c-d487-11e4-811f-005056806999"
-name="CCDEFAULT.Https"/>
-<serviceDownAction>RESELECT</serviceDownAction>
-<slowRampTime>10</slowRampTime>
-<state>NORMAL</state>
-<createTime>2015-06-04T09:15:07.000Z</createTime>
-</pool>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_removePoolMember.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_removePoolMember.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_removePoolMember.xml
deleted file mode 100644
index bfe47bc..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_removePoolMember.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response requestId="na9/2015-05-14T13:37:20/62f06368-c3fb-11e3-b29c-001517c4643e" xmlns="urn:didata.com:api:cloud:types">
-<operation>REMOVE_POOL_MEMBER</operation>
-<responseCode>OK</responseCode>
-<message>Pool Member (id:34de6ed6-46a4-4dae-a753-2f8d3840c6f9) has been
-removed.</message>
-</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener.xml
deleted file mode 100644
index 88a94fa..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<virtualListeners
-xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="5"
-totalCount="5" pageSize="250">
-<virtualListener id="6115469d-a8bb-445b-bb23-d23b5283f2b9"
-datacenterId="NA9">
-<networkDomainId>553f26b6-2a73-42c3-a78b-
-6116f11291d0</networkDomainId>
-<name>myProduction.Virtual.Listener</name>
-<state>NORMAL</state>
-<description>Virtual Listener for load balancing our test
-systems.</description>
-<createTime>2015-05-28T15:59:49.000Z</createTime>
-<type>PERFORMANCE_LAYER_4</type>
-<protocol>HTTP</protocol>
-<listenerIpAddress>165.180.12.22</listenerIpAddress>
-<port>8899</port>
-<enabled>true</enabled>
-<connectionLimit>10000</connectionLimit>
-<connectionRateLimit>400</connectionRateLimit>
-<sourcePortPreservation>PRESERVE</sourcePortPreservation>
-<pool id="afb1fb1a-eab9-43f4-95c2-36a4cdda6cb8"
-name="myProductionPool.1">
-<loadBalanceMethod>ROUND_ROBIN</loadBalanceMethod>
-<serviceDownAction>NONE</serviceDownAction>
-<slowRampTime>10</slowRampTime>
-<healthMonitor id="01683574-d487-11e4-811f-005056806999"
-name="CCDEFAULT.Http"/>
-<healthMonitor id="0168546c-d487-11e4-811f-005056806999"
-name="CCDEFAULT.Https"/>
-</pool>
-<clientClonePool id="6f2f5d7b-cdd9-4d84-8ad7-999b64a87978"
-name="myDevelopmentPool.1">
-<loadBalanceMethod>ROUND_ROBIN</loadBalanceMethod>
-<serviceDownAction>RESELECT</serviceDownAction>
-<slowRampTime>10</slowRampTime>
-<healthMonitor id="01683574-d487-11e4-811f-005056806999"
-name="CCDEFAULT.Http"/>
-<healthMonitor id="0168546c-d487-11e4-811f-005056806999"
-name="CCDEFAULT.Https"/>
-</clientClonePool>
-<persistenceProfile id="a34ca25c-f3db-11e4-b010-005056806999"
-name="CCDEFAULT.DestinationAddress"/>
-<fallbackPersistenceProfile id="a34ca3f6-f3db-11e4-b010-005056806999"
-name="CCDEFAULT.SourceAddress"/>
-<irule id="2b20abd9-ffdc-11e4-b010-005056806999"
-name="CCDEFAULT.IpProtocolTimers"/>
-<irule id="2b20e790-ffdc-11e4-b010-005056806999"
-name="CCDEFAULT.Ips"/>
-</virtualListener>
-</virtualListeners>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener_6115469d_a8bb_445b_bb23_d23b5283f2b9.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener_6115469d_a8bb_445b_bb23_d23b5283f2b9.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener_6115469d_a8bb_445b_bb23_d23b5283f2b9.xml
deleted file mode 100644
index aea2f6f..0000000
--- a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_virtualListener_6115469d_a8bb_445b_bb23_d23b5283f2b9.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<virtualListener
-xmlns="urn:didata.com:api:cloud:types" id="6115469d-a8bb-445b-bb23-d23b5283f2b9" datacenterId="NA9">
-<networkDomainId>553f26b6-2a73-42c3-a78b-6116f11291d0</networkDomainId>
-<name>myProduction.Virtual.Listener</name>
-<state>NORMAL</state>
-<description>Virtual Listener for load balancing our test
-systems.</description>
-<createTime>2015-05-28T15:59:49.000Z</createTime>
-<type>PERFORMANCE_LAYER_4</type>
-<protocol>HTTP</protocol>
-<listenerIpAddress>165.180.12.22</listenerIpAddress>
-<port>8899</port>
-<enabled>true</enabled>
-<connectionLimit>10000</connectionLimit>
-<connectionRateLimit>400</connectionRateLimit>
-<sourcePortPreservation>PRESERVE</sourcePortPreservation>
-<pool id="afb1fb1a-eab9-43f4-95c2-36a4cdda6cb8" name="myProductionPool.1">
-<loadBalanceMethod>ROUND_ROBIN</loadBalanceMethod>
-<serviceDownAction>NONE</serviceDownAction>
-<slowRampTime>10</slowRampTime>
-<healthMonitor id="01683574-d487-11e4-811f-005056806999"
-name="CCDEFAULT.Http"/>
-<healthMonitor id="0168546c-d487-11e4-811f-005056806999"
-name="CCDEFAULT.Https"/>
-</pool>
-<clientClonePool id="6f2f5d7b-cdd9-4d84-8ad7-999b64a87978"
-name="myDevelopmentPool.1">
-<loadBalanceMethod>ROUND_ROBIN</loadBalanceMethod>
-<serviceDownAction>RESELECT</serviceDownAction>
-<slowRampTime>10</slowRampTime>
-<healthMonitor id="01683574-d487-11e4-811f-005056806999"
-name="CCDEFAULT.Http"/>
-<healthMonitor id="0168546c-d487-11e4-811f-005056806999"
-name="CCDEFAULT.Https"/>
-</clientClonePool>
-<persistenceProfile id="a34ca25c-f3db-11e4-b010-005056806999"
-name="CCDEFAULT.DestinationAddress"/>
-<fallbackPersistenceProfile id="a34ca3f6-f3db-11e4-b010-005056806999"
-name="CCDEFAULT.SourceAddress"/>
-<irule id="2b20abd9-ffdc-11e4-b010-005056806999"
-name="CCDEFAULT.IpProtocolTimers"/>
-<irule id="2b20e790-ffdc-11e4-b010-005056806999" name="CCDEFAULT.Ips"/>
-</virtualListener>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_addPoolMember.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_addPoolMember.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_addPoolMember.xml
new file mode 100644
index 0000000..e4cba7a
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_addPoolMember.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<response
+xmlns="urn:didata.com:api:cloud:types" requestId="na9/2015-06-09T07:02:49.563-04:00/40653bb1-cf55-4ba8-ba00-121c19c50a54">
+<operation>ADD_POOL_MEMBER</operation>
+<responseCode>OK</responseCode>
+<message>Pool Member '10.0.3.13:9888' has been added.</message>
+<info name="poolMemberId" value="3dd806a2-c2c8-4c0c-9a4f-5219ea9266c0"/>
+<info name="nodeName" value="10.0.3.13"/>
+</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createNode.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createNode.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createNode.xml
new file mode 100644
index 0000000..696525c
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createNode.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<response requestId="na/2015-04-14T13:37:20/62f06368-c3fb-11e3-b29c-001517c4643e" xmlns="urn:didata.com:api:cloud:types">
+<operation>CREATE_NODE</operation>
+<responseCode>OK</responseCode>
+<message>Node 'myProductionNode.1' has been created.</message>
+<info name="nodeId" value="9e6b496d-5261-4542-91aa-b50c7f569c54"/>
+<info name="name" value="myProductionNode.1"/>
+</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createPool.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createPool.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createPool.xml
new file mode 100644
index 0000000..28302d5
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createPool.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<response requestId="na/2015-04-14T13:37:20/62f06368-c3fb-11e3-b29c-
+001517c4643e" xmlns="urn:didata.com:api:cloud:types">
+<operation>CREATE_POOL</operation>
+<responseCode>OK</responseCode>
+<message>Pool 'myProductionPool.1' has been created.</message>
+<info name="poolId" value="9e6b496d-5261-4542-91aa-b50c7f569c54"/>
+<info name="name" value="myProductionPool.1"/>
+</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createVirtualListener.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createVirtualListener.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createVirtualListener.xml
new file mode 100644
index 0000000..5cf1f5a
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_createVirtualListener.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<response
+xmlns="urn:didata.com:api:cloud:types" requestId="na9/2015-06-11T05:45:22.833-04:00/0dc58e64-6e05-4de2-98d6-70bee28cba97">
+<operation>CREATE_VIRTUAL_LISTENER</operation>
+<responseCode>OK</responseCode>
+<message>Virtual Listener 'Production.Load.Balancer' has been created on
+IP 165.180.12.22.</message>
+<info name="virtualListenerId" value="8334f461-0df0-42d5-97eb-f4678eb26bea"/>
+<info name="name" value="Production.Load.Balancer"/>
+<info name="listenerIpAddress" value="165.180.12.22"/>
+</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultHealthMonitor.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultHealthMonitor.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultHealthMonitor.xml
new file mode 100644
index 0000000..b24f006
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultHealthMonitor.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<defaultHealthMonitors
+ xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="6"
+totalCount="6" pageSize="250">
+ <defaultHealthMonitor id="01683574-d487-11e4-811f-005056806999">
+ <name>CCDEFAULT.Http</name>
+ <nodeCompatible>false</nodeCompatible>
+ <poolCompatible>true</poolCompatible>
+ </defaultHealthMonitor>
+ <defaultHealthMonitor id="0168546c-d487-11e4-811f-005056806999">
+ <name>CCDEFAULT.Https</name>
+ <nodeCompatible>false</nodeCompatible>
+ <poolCompatible>true</poolCompatible>
+ </defaultHealthMonitor>
+ <defaultHealthMonitor id="0168b83a-d487-11e4-811f-005056806999">
+ <name>CCDEFAULT.Icmp</name>
+ <nodeCompatible>true</nodeCompatible>
+ <poolCompatible>false</poolCompatible>
+ </defaultHealthMonitor>
+ <defaultHealthMonitor id="01686f4b-d487-11e4-811f-005056806999">
+ <name>CCDEFAULT.Tcp</name>
+ <nodeCompatible>false</nodeCompatible>
+ <poolCompatible>true</poolCompatible>
+ </defaultHealthMonitor>
+ <defaultHealthMonitor id="0168a2f9-d487-11e4-811f-005056806999">
+ <name>CCDEFAULT.TcpHalfOpen</name>
+ <nodeCompatible>false</nodeCompatible>
+ <poolCompatible>true</poolCompatible>
+ </defaultHealthMonitor>
+ <defaultHealthMonitor id="01688878-d487-11e4-811f-005056806999">
+ <name>CCDEFAULT.Udp</name>
+ <nodeCompatible>false</nodeCompatible>
+ <poolCompatible>true</poolCompatible>
+ </defaultHealthMonitor>
+</defaultHealthMonitors>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultIrule.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultIrule.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultIrule.xml
new file mode 100644
index 0000000..d2005a3
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultIrule.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<defaultIrules
+ xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="5"
+totalCount="5" pageSize="250">
+ <defaultIrule>
+ <irule id="2b20cb2c-ffdc-11e4-b010-005056806999"
+name="CCDEFAULT.HttpsRedirect"/>
+ <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
+protocol="HTTP"/>
+ </defaultIrule>
+ <defaultIrule>
+ <irule id="2b20abd9-ffdc-11e4-b010-005056806999"
+name="CCDEFAULT.IpProtocolTimers"/>
+ <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
+protocol="HTTP"/>
+ <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
+protocol="TCP"/>
+ <virtualListenerCompatibility type="STANDARD" protocol="UDP"/>
+ <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
+protocol="UDP"/>
+ <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
+protocol="ANY"/>
+ <virtualListenerCompatibility type="STANDARD" protocol="TCP"/>
+ <virtualListenerCompatibility type="STANDARD" protocol="ANY"/>
+ </defaultIrule>
+ <defaultIrule>
+ <irule id="2b20e790-ffdc-11e4-b010-005056806999"
+name="CCDEFAULT.Ips"/>
+ <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
+protocol="HTTP"/>
+ <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
+protocol="TCP"/>
+ <virtualListenerCompatibility type="STANDARD" protocol="UDP"/>
+ <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
+protocol="UDP"/>
+ <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
+protocol="ANY"/>
+ <virtualListenerCompatibility type="STANDARD" protocol="TCP"/>
+ <virtualListenerCompatibility type="STANDARD" protocol="ANY"/>
+ </defaultIrule>
+ <defaultIrule>
+ <irule id="2b210846-ffdc-11e4-b010-005056806999"
+name="CCDEFAULT.IpsHttp"/>
+ <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
+protocol="HTTP"/>
+ </defaultIrule>
+ </defaultIrules>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultPersistenceProfile.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultPersistenceProfile.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultPersistenceProfile.xml
new file mode 100644
index 0000000..cd6b5a5
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_defaultPersistenceProfile.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<defaultPersistenceProfiles
+ xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="4"
+totalCount="4" pageSize="250">
+ <defaultPersistenceProfile id="a34ca024-f3db-11e4-b010-005056806999"
+fallbackCompatible="false">
+ <name>CCDEFAULT.Cookie</name>
+ <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
+protocol="HTTP"/>
+ </defaultPersistenceProfile>
+ <defaultPersistenceProfile id="a34ca25c-f3db-11e4-b010-005056806999"
+fallbackCompatible="true">
+ <name>CCDEFAULT.DestinationAddress</name>
+ <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
+protocol="HTTP"/>
+ <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
+protocol="TCP"/>
+ <virtualListenerCompatibility type="STANDARD" protocol="UDP"/>
+ <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
+protocol="UDP"/>
+ <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
+protocol="ANY"/>
+ <virtualListenerCompatibility type="STANDARD" protocol="TCP"/>
+ <virtualListenerCompatibility type="STANDARD" protocol="ANY"/>
+ </defaultPersistenceProfile>
+ <defaultPersistenceProfile id="a34ca4b7-f3db-11e4-b010-005056806999"
+fallbackCompatible="false">
+ <name>CCDEFAULT.Sip</name>
+ <virtualListenerCompatibility type="STANDARD" protocol="UDP"/>
+ <virtualListenerCompatibility type="STANDARD" protocol="TCP"/>
+ </defaultPersistenceProfile>
+ <defaultPersistenceProfile id="a34ca3f6-f3db-11e4-b010-005056806999"
+fallbackCompatible="true">
+ <name>CCDEFAULT.SourceAddress</name>
+ <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
+protocol="HTTP"/>
+ <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
+protocol="TCP"/>
+ <virtualListenerCompatibility type="STANDARD" protocol="UDP"/>
+ <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
+protocol="UDP"/>
+ <virtualListenerCompatibility type="PERFORMANCE_LAYER_4"
+protocol="ANY"/>
+ <virtualListenerCompatibility type="STANDARD" protocol="TCP"/>
+ <virtualListenerCompatibility type="STANDARD" protocol="ANY"/>
+ </defaultPersistenceProfile>
+</defaultPersistenceProfiles>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteNode.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteNode.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteNode.xml
new file mode 100644
index 0000000..cd5177f
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteNode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<response requestId="na9/2015-05-14T13:37:20/62f06368-c3fb-11e3-b29c-
+001517c4643e"
+xmlns="urn:didata.com:api:cloud:types">
+<operation>DELETE_NODE</operation>
+<responseCode>OK</responseCode>
+<message>Node (id:34de6ed6-46a4-4dae-a753-2f8d3840c6f9) has been
+deleted.</message>
+</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deletePool.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deletePool.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deletePool.xml
new file mode 100644
index 0000000..3883b55
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deletePool.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<response requestId="na9/2015-05-14T13:37:20/62f06368-c3fb-11e3-b29c-
+001517c4643e"
+xmlns="urn:didata.com:api:cloud:types">
+<operation>DELETE_POOL</operation>
+<responseCode>OK</responseCode>
+<message>Pool (id:4d360b1f-bc2c-4ab7-9884-1f03ba2768f7) has been
+deleted.</message>
+</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteVirtualListener.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteVirtualListener.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteVirtualListener.xml
new file mode 100644
index 0000000..3504ce9
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_deleteVirtualListener.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<response requestId="na9/2015-05-14T13:37:20/62f06368-c3fb-11e3-b29c-
+001517c4643e"
+xmlns="urn:didata.com:api:cloud:types">
+<operation>DELETE_VIRTUAL_LISTENER</operation>
+<responseCode>OK</responseCode>
+<message>Virtual Listener (id:6115469d-a8bb-445b-bb23-d23b5283f2b9) has been
+deleted.</message>
+</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editNode.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editNode.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editNode.xml
new file mode 100644
index 0000000..ae3e2af
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editNode.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<response
+xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-05-29T11:57:29.793-04:00/9f7191df-de3a-4cf3-a0a1-6321e88b5af5">
+<operation>EDIT_NODE</operation>
+<responseCode>OK</responseCode>
+<message>Node 'ProductionNode.2' has been edited successfully.</message>
+<info name="nodeId" value="34de6ed6-46a4-4dae-a753-2f8d3840c6f9"/>
+</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPool.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPool.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPool.xml
new file mode 100644
index 0000000..78eb686
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPool.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<response
+xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-05-29T11:57:29.793-04:00/9f7191df-de3a-4cf3-a0a1-6321e88b5af5">
+<operation>EDIT_POOL</operation>
+<responseCode>OK</responseCode>
+<message>Pool 'ProductionPool.2' has been updated.</message>
+<info name="name" value="ProductionPool.2"/>
+<info name="poolId" value="4d360b1f-bc2c-4ab7-9884-1f03ba2768f7"/>
+</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPoolMember.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPoolMember.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPoolMember.xml
new file mode 100644
index 0000000..89ce41d
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPoolMember.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<response
+xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-06-09T09:29:46.249-04:00/c128c717-b3b4-480a-ba93-e3fb2e32a9be">
+<operation>EDIT_POOL_MEMBER</operation>
+<responseCode>OK</responseCode>
+<message>Pool Member (10.0.3.13:9889) has been edited.</message>
+<info name="poolMemberId" value="3dd806a2-c2c8-4c0c-9a4f-5219ea9266c0"/>
+</response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node.xml
new file mode 100644
index 0000000..b58e58f
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<nodes xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="1"
+totalCount="2" pageSize="250">
+<node id="34de6ed6-46a4-4dae-a753-2f8d3840c6f9" datacenterId="NA9">
+<networkDomainId>553f26b6-2a73-42c3-a78b-
+6116f11291d0</networkDomainId>
+<name>ProductionNode.1</name>
+<description>Production Server 1</description>
+<ipv4Address>10.10.10.101</ipv4Address>
+<state>NORMAL</state>
+<status>ENABLED</status>
+<healthMonitor id="0168b83a-d487-11e4-811f-005056806999" name="ICMP"/>
+<connectionLimit>10000</connectionLimit>
+<connectionRateLimit>2000</connectionRateLimit>
+<createTime>2015-05-29T13:56:13.000Z</createTime>
+</node>
+<node id="78d2437e-36e1-4dd5-9bfd-582a85d207ad" datacenterId="NA9">
+<networkDomainId>553f26b6-2a73-42c3-a78b-
+6116f11291d0</networkDomainId>
+<name>ProductionNode.2</name>
+<description>Production Server 2</description>
+<ipv4Address>10.5.2.15</ipv4Address>
+<state>NORMAL</state>
+<status>ENABLED</status>
+<connectionLimit>10000</connectionLimit>
+<connectionRateLimit>2000</connectionRateLimit>
+<createTime>2015-05-29T11:46:55.000Z</createTime>
+</node>
+</nodes>
\ No newline at end of file


[10/11] libcloud git commit: Update the test to check gateway addresses, added ipv6 details to the VLAN object. changed the ex_create_vlan to return the VLAN object on response. Check for begin_port when establishing firewall rules.

Posted by an...@apache.org.
Update the test to check gateway addresses, added ipv6 details to the VLAN object. changed the ex_create_vlan to return the VLAN object on response. Check for begin_port when establishing firewall rules.

Signed-off-by: Anthony Shaw <an...@gmail.com>


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

Branch: refs/heads/trunk
Commit: 5d6907686e3e324b42cb907d8c33236051b23652
Parents: 325f52e
Author: Anthony Shaw <an...@gmail.com>
Authored: Wed Dec 9 09:43:53 2015 +1100
Committer: Anthony Shaw <an...@gmail.com>
Committed: Wed Dec 9 21:19:16 2015 +1100

----------------------------------------------------------------------
 libcloud/common/dimensiondata.py                | 26 +++++++++++++--
 libcloud/compute/drivers/dimensiondata.py       | 34 +++++++++++---------
 ...d8a_9cbc_8dabe5a7d0e4_network_deployVlan.xml |  2 +-
 libcloud/test/compute/test_dimensiondata.py     |  8 +++--
 4 files changed, 49 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/5d690768/libcloud/common/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/common/dimensiondata.py b/libcloud/common/dimensiondata.py
index 66075af..c734b75 100644
--- a/libcloud/common/dimensiondata.py
+++ b/libcloud/common/dimensiondata.py
@@ -460,7 +460,9 @@ class DimensionDataVlan(object):
     """
 
     def __init__(self, id, name, description, location, network_domain,
-                 status, private_ipv4_range_address, private_ipv4_range_size):
+                 status, private_ipv4_range_address, private_ipv4_range_size,
+                 ipv6_range_address, ipv6_range_size, ipv4_gateway,
+                 ipv6_gateway):
         """
         Initialize an instance of ``DimensionDataVlan``
 
@@ -486,9 +488,23 @@ class DimensionDataVlan(object):
                                             IP space
         :type  private_ipv4_range_address: ``str``
 
-        :param private_ipv4_range_address: The size (e.g. '24') of the VLAN
+        :param private_ipv4_range_size: The size (e.g. '24') of the VLAN
                                             as a CIDR range size
-        :type  private_ipv4_range_address: ``str``
+        :type  private_ipv4_range_size: ``int``
+
+        :param ipv6_range_address: The host address of the VLAN
+                                            IP space
+        :type  ipv6_range_address: ``str``
+
+        :param ipv6_range_size: The size (e.g. '32') of the VLAN
+                                            as a CIDR range size
+        :type  ipv6_range_size: ``int``
+
+        :param ipv4_gateway: The IPv4 default gateway addres
+        :type  ipv4_gateway: ``str``
+
+        :param ipv6_gateway: The IPv6 default gateway addres
+        :type  ipv6_gateway: ``str``
         """
         self.id = str(id)
         self.name = name
@@ -498,6 +514,10 @@ class DimensionDataVlan(object):
         self.status = status
         self.private_ipv4_range_address = private_ipv4_range_address
         self.private_ipv4_range_size = private_ipv4_range_size
+        self.ipv6_range_address = ipv6_range_address
+        self.ipv6_range_size = ipv6_range_size
+        self.ipv4_gateway = ipv4_gateway
+        self.ipv6_gateway = ipv6_gateway
 
     def __repr__(self):
         return (('<DimensionDataVlan: id=%s, name=%s, '

http://git-wip-us.apache.org/repos/asf/libcloud/blob/5d690768/libcloud/compute/drivers/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/dimensiondata.py b/libcloud/compute/drivers/dimensiondata.py
index 27f3a66..8440baf 100644
--- a/libcloud/compute/drivers/dimensiondata.py
+++ b/libcloud/compute/drivers/dimensiondata.py
@@ -751,16 +751,7 @@ class DimensionDataNodeDriver(NodeDriver):
             if info.get('name') == 'vlanId':
                 vlan_id = info.get('value')
 
-        return DimensionDataVlan(
-            id=vlan_id,
-            name=name,
-            description=description,
-            network_domain=network_domain,
-            location=network_domain.location,
-            status=NodeState.RUNNING,
-            private_ipv4_range_address=private_ipv4_base_address,
-            private_ipv4_range_size=private_ipv4_prefix_size
-        )
+        return self.ex_get_vlan(vlan_id)
 
     def ex_get_vlan(self, vlan_id):
         """
@@ -941,8 +932,9 @@ class DimensionDataNodeDriver(NodeDriver):
         else:
             source_ip.set('address', rule.source.ip_address)
             source_ip.set('prefixSize', rule.source.ip_prefix_size)
-            source_port = ET.SubElement(source, 'port')
-            source_port.set('begin', rule.source.port_begin)
+            if rule.source.port_begin is not None:
+                source_port = ET.SubElement(source, 'port')
+                source_port.set('begin', rule.source.port_begin)
             if rule.source.port_end is not None:
                 source_port.set('end', rule.source.port_end)
         # Setup destination port rule
@@ -953,8 +945,9 @@ class DimensionDataNodeDriver(NodeDriver):
         else:
             dest_ip.set('address', rule.destination.ip_address)
             dest_ip.set('prefixSize', rule.destination.ip_prefix_size)
-            dest_port = ET.SubElement(dest, 'port')
-            dest_port.set('begin', rule.destination.port_begin)
+            if rule.destination.port_begin is not None:
+                dest_port = ET.SubElement(dest, 'port')
+                dest_port.set('begin', rule.destination.port_begin)
             if rule.destination.port_end is not None:
                 dest_port.set('end', rule.destination.port_end)
         ET.SubElement(create_node, "enabled").text = 'true'
@@ -1577,6 +1570,7 @@ class DimensionDataNodeDriver(NodeDriver):
         location = list(filter(lambda x: x.id == location_id,
                                locations))[0]
         ip_range = element.find(fixxpath('privateIpv4Range', TYPES_URN))
+        ip6_range = element.find(fixxpath('ipv6Range', TYPES_URN))
         network_domain_el = element.find(
             fixxpath('networkDomain', TYPES_URN))
         network_domain = self.ex_get_network_domain(
@@ -1588,7 +1582,17 @@ class DimensionDataNodeDriver(NodeDriver):
                                  TYPES_URN),
             network_domain=network_domain,
             private_ipv4_range_address=ip_range.get('address'),
-            private_ipv4_range_size=ip_range.get('prefixSize'),
+            private_ipv4_range_size=int(ip_range.get('prefixSize')),
+            ipv6_range_address=ip6_range.get('address'),
+            ipv6_range_size=int(ip6_range.get('prefixSize')),
+            ipv4_gateway=findtext(
+                element,
+                'ipv4GatewayAddress',
+                TYPES_URN),
+            ipv6_gateway=findtext(
+                element,
+                'ipv6GatewayAddress',
+                TYPES_URN),
             location=location,
             status=findtext(element, 'state', TYPES_URN))
 

http://git-wip-us.apache.org/repos/asf/libcloud/blob/5d690768/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
index eb37402..946a505 100644
--- 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
@@ -5,5 +5,5 @@ xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-02-13T05:58:00.905-05
 <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"/>
+<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/5d690768/libcloud/test/compute/test_dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_dimensiondata.py b/libcloud/test/compute/test_dimensiondata.py
index ad93b7d..02eb663 100644
--- a/libcloud/test/compute/test_dimensiondata.py
+++ b/libcloud/test/compute/test_dimensiondata.py
@@ -311,7 +311,7 @@ class DimensionDataTests(unittest.TestCase, TestCaseMixin):
                                           name='test',
                                           private_ipv4_base_address='10.3.4.0',
                                           private_ipv4_prefix_size='24')
-        self.assertEqual(vlan.id, 'cee8df03-9117-44cc-baaa-631ffa099683')
+        self.assertEqual(vlan.id, '0e56433f-d808-4669-821d-812769517ff8')
 
     def test_ex_get_vlan(self):
         vlan = self.driver.ex_get_vlan('0e56433f-d808-4669-821d-812769517ff8')
@@ -320,7 +320,11 @@ class DimensionDataTests(unittest.TestCase, TestCaseMixin):
         self.assertEqual(vlan.status, 'NORMAL')
         self.assertEqual(vlan.name, 'Production VLAN')
         self.assertEqual(vlan.private_ipv4_range_address, '10.0.3.0')
-        self.assertEqual(vlan.private_ipv4_range_size, '24')
+        self.assertEqual(vlan.private_ipv4_range_size, 24)
+        self.assertEqual(vlan.ipv6_range_size, 64)
+        self.assertEqual(vlan.ipv6_range_address, '2607:f480:1111:1153:0:0:0:0')
+        self.assertEqual(vlan.ipv4_gateway, '10.0.3.1')
+        self.assertEqual(vlan.ipv6_gateway, '2607:f480:1111:1153:0:0:0:1')
 
     def test_ex_wait_for_state(self):
         self.driver.ex_wait_for_state('NORMAL',


[11/11] libcloud git commit: When creating node, cpu element must go before memoryGb.

Posted by an...@apache.org.
When creating node, cpu element must go before memoryGb.

Signed-off-by: Anthony Shaw <an...@gmail.com>
Closes #656


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

Branch: refs/heads/trunk
Commit: f43570b9fd4536b8e8d8085c1eac457cad8900e6
Parents: 5d69076
Author: Anthony Shaw <an...@gmail.com>
Authored: Wed Dec 9 20:49:18 2015 +1100
Committer: Anthony Shaw <an...@gmail.com>
Committed: Wed Dec 9 21:19:24 2015 +1100

----------------------------------------------------------------------
 libcloud/compute/drivers/dimensiondata.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/f43570b9/libcloud/compute/drivers/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/dimensiondata.py b/libcloud/compute/drivers/dimensiondata.py
index 8440baf..e195045 100644
--- a/libcloud/compute/drivers/dimensiondata.py
+++ b/libcloud/compute/drivers/dimensiondata.py
@@ -146,9 +146,6 @@ 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)
@@ -156,6 +153,9 @@ class DimensionDataNodeDriver(NodeDriver):
             cpu.set('coresPerSocket',
                     str(ex_cpu_specification.cores_per_socket))
 
+        if ex_memory_gb is not None:
+            ET.SubElement(server_elm, "memoryGb").text = str(ex_memory_gb)
+
         if ex_network is not None:
             network_elm = ET.SubElement(server_elm, "network")
             ET.SubElement(network_elm, "networkId").text = ex_network.id


[06/11] libcloud git commit: Get customer images and tests

Posted by an...@apache.org.
Get customer images and tests

Signed-off-by: Anthony Shaw <an...@gmail.com>


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

Branch: refs/heads/trunk
Commit: a543be04859640035d922e95a03347c73c39cfa0
Parents: 7235ccf
Author: Anthony Shaw <an...@gmail.com>
Authored: Tue Dec 8 20:57:15 2015 +1100
Committer: Anthony Shaw <an...@gmail.com>
Committed: Wed Dec 9 21:19:13 2015 +1100

----------------------------------------------------------------------
 libcloud/compute/drivers/dimensiondata.py       | 90 ++++++++++++--------
 ...8a_9cbc_8dabe5a7d0e4_image_customerImage.xml | 50 +++++++++++
 libcloud/test/compute/test_dimensiondata.py     | 14 +++
 3 files changed, 118 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/a543be04/libcloud/compute/drivers/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/dimensiondata.py b/libcloud/compute/drivers/dimensiondata.py
index 464e8f4..1221f71 100644
--- a/libcloud/compute/drivers/dimensiondata.py
+++ b/libcloud/compute/drivers/dimensiondata.py
@@ -301,42 +301,6 @@ class DimensionDataNodeDriver(NodeDriver):
             .request_with_orgId_api_1('networkWithLocation%s' % url_ext)
             .object)
 
-    def _to_base_images(self, object):
-        images = []
-        locations = self.list_locations()
-
-        for element in object.findall(fixxpath("osImage", TYPES_URN)):
-            images.append(self._to_base_image(element, locations))
-
-        return images
-
-    def _to_base_image(self, element, locations):
-        # Eventually we will probably need multiple _to_image() functions
-        # that parse <ServerImage> differently than <DeployedImage>.
-        # DeployedImages are customer snapshot images, and ServerImages are
-        # 'base' images provided by DimensionData
-        location_id = element.get('datacenterId')
-        location = list(filter(lambda x: x.id == location_id,
-                               locations))[0]
-        cpu_spec = self._to_cpu_spec(element.find(fixxpath('cpu', TYPES_URN)))
-
-        extra = {
-            'description': findtext(element, 'description', TYPES_URN),
-            'OS_type': findtext(element, 'operatingSystem/type', TYPES_URN),
-            'OS_displayName': findtext(element, 'operatingSystem/displayName',
-                                       TYPES_URN),
-            'cpu': cpu_spec,
-            'memoryGb': findtext(element, 'memoryGb', TYPES_URN),
-            'osImageKey': findtext(element, 'osImageKey', TYPES_URN),
-            'created': findtext(element, 'createTime', TYPES_URN),
-            'location': location,
-        }
-
-        return NodeImage(id=element.get('id'),
-                         name=str(findtext(element, 'name', TYPES_URN)),
-                         extra=extra,
-                         driver=self.connection.driver)
-
     def ex_start_node(self, node):
         """
         Powers on an existing deployed server
@@ -1371,6 +1335,60 @@ class DimensionDataNodeDriver(NodeDriver):
         response_code = findtext(result, 'result', GENERAL_NS)
         return response_code in ['IN_PROGRESS', 'SUCCESS']
 
+    def ex_list_customer_images(self, location=None):
+        """
+        Return a list of customer imported images
+
+        :param location: The target location
+        :type  location: :class:`NodeLocation`
+
+        :rtype: ``list`` of :class:`NodeImage`
+        """
+        params = {}
+        if location is not None:
+            params['datacenterId'] = location.id
+
+        return self._to_base_images(
+            self.connection.request_with_orgId_api_2(
+                'image/customerImage',
+                params=params)
+            .object, 'customerImage')
+
+    def _to_base_images(self, object, el_name='osImage'):
+        images = []
+        locations = self.list_locations()
+
+        for element in object.findall(fixxpath(el_name, TYPES_URN)):
+            images.append(self._to_base_image(element, locations))
+
+        return images
+
+    def _to_base_image(self, element, locations):
+        # Eventually we will probably need multiple _to_image() functions
+        # that parse <ServerImage> differently than <DeployedImage>.
+        # DeployedImages are customer snapshot images, and ServerImages are
+        # 'base' images provided by DimensionData
+        location_id = element.get('datacenterId')
+        location = list(filter(lambda x: x.id == location_id,
+                               locations))[0]
+        cpu_spec = self._to_cpu_spec(element.find(fixxpath('cpu', TYPES_URN)))
+        os_el = element.find(fixxpath('operatingSystem', TYPES_URN))
+        extra = {
+            'description': findtext(element, 'description', TYPES_URN),
+            'OS_type': os_el.get('type'),
+            'OS_displayName': os_el.get('displayName'),
+            'cpu': cpu_spec,
+            'memoryGb': findtext(element, 'memoryGb', TYPES_URN),
+            'osImageKey': findtext(element, 'osImageKey', TYPES_URN),
+            'created': findtext(element, 'createTime', TYPES_URN),
+            'location': location,
+        }
+
+        return NodeImage(id=element.get('id'),
+                         name=str(findtext(element, 'name', TYPES_URN)),
+                         extra=extra,
+                         driver=self.connection.driver)
+
     def _to_nat_rules(self, object, network_domain):
         rules = []
         for element in findall(object, 'natRule', TYPES_URN):

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

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a543be04/libcloud/test/compute/test_dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_dimensiondata.py b/libcloud/test/compute/test_dimensiondata.py
index 49fdc82..f8f3f44 100644
--- a/libcloud/test/compute/test_dimensiondata.py
+++ b/libcloud/test/compute/test_dimensiondata.py
@@ -120,6 +120,15 @@ class DimensionDataTests(unittest.TestCase, TestCaseMixin):
         self.assertEqual(images[0].extra['cpu'].cpu_count, 2)
         self.assertEqual(images[0].extra['OS_displayName'], 'REDHAT6/64')
 
+    def test_ex_list_customer_images(self):
+        images = self.driver.ex_list_customer_images()
+        self.assertEqual(len(images), 3)
+        self.assertEqual(images[0].name, 'ImportedCustomerImage')
+        self.assertEqual(images[0].id, '5234e5c7-01de-4411-8b6e-baeb8d91cf5d')
+        self.assertEqual(images[0].extra['location'].id, 'NA9')
+        self.assertEqual(images[0].extra['cpu'].cpu_count, 4)
+        self.assertEqual(images[0].extra['OS_displayName'], 'REDHAT6/64')
+
     def test_create_node_response(self):
         rootPw = NodeAuthPassword('pass123')
         image = self.driver.list_images()[0]
@@ -933,5 +942,10 @@ class DimensionDataMockHttp(MockHttp):
             'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_osImage.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_customerImage(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_customerImage.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
 if __name__ == '__main__':
     sys.exit(unittest.main())


[08/11] libcloud git commit: Added support for reconfiguring a live node

Posted by an...@apache.org.
Added support for reconfiguring a live node

Signed-off-by: Anthony Shaw <an...@gmail.com>


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

Branch: refs/heads/trunk
Commit: 41c02f5109a31bd98ab80729d8e3d6a1a02476c6
Parents: a543be0
Author: Anthony Shaw <an...@gmail.com>
Authored: Tue Dec 8 21:14:13 2015 +1100
Committer: Anthony Shaw <an...@gmail.com>
Committed: Wed Dec 9 21:19:14 2015 +1100

----------------------------------------------------------------------
 libcloud/compute/drivers/dimensiondata.py       | 40 ++++++++++++++++++++
 ...bc_8dabe5a7d0e4_server_reconfigureServer.xml |  5 +++
 libcloud/test/compute/test_dimensiondata.py     | 15 ++++++++
 3 files changed, 60 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/41c02f51/libcloud/compute/drivers/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/dimensiondata.py b/libcloud/compute/drivers/dimensiondata.py
index 1221f71..de8384c 100644
--- a/libcloud/compute/drivers/dimensiondata.py
+++ b/libcloud/compute/drivers/dimensiondata.py
@@ -1312,6 +1312,46 @@ class DimensionDataNodeDriver(NodeDriver):
         response_code = findtext(result, 'result', GENERAL_NS)
         return response_code in ['IN_PROGRESS', 'SUCCESS']
 
+    def ex_reconfigure_node(self, node, memory_gb, cpu_count, cores_per_socket,
+                            cpu_performance):
+        """
+        Reconfigure the virtual hardware specification of a node
+
+        :param  node: The server to change
+        :type   node: :class:`Node`
+
+        :param  memory_gb: The amount of memory in GB (optional)
+        :type   memory_gb: ``int``
+
+        :param  cpu_count: The number of CPU (optional)
+        :type   cpu_count: ``int``
+
+        :param  cores_per_socket: Number of CPU cores per socket (optional)
+        :type   cores_per_socket: ``int``
+
+        :param  cpu_performance: CPU Performance type (optional)
+        :type   cpu_performance: ``str``
+
+        :rtype: ``bool``
+        """
+        update = ET.Element('reconfigureServer', {'xmlns': TYPES_URN})
+        update.set('id', node.id)
+        if memory_gb is not None:
+            ET.SubElement(update, 'memoryGb').text = str(memory_gb)
+        if cpu_count is not None:
+            ET.SubElement(update, 'cpuCount').text = str(cpu_count)
+        if cpu_performance is not None:
+            ET.SubElement(update, 'cpuSpeed').text = cpu_performance
+        if cores_per_socket is not None:
+            ET.SubElement(update, 'coresPerSocket').text = \
+                str(cores_per_socket)
+        result = self.connection.request_with_orgId_api_2(
+            'server/reconfigureServer',
+            method='POST',
+            data=ET.tostring(update)).object
+        response_code = findtext(result, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
+
     def ex_clone_node_to_image(self, node, image_name, image_description=None):
         """
         Clone a server into a customer image.

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

http://git-wip-us.apache.org/repos/asf/libcloud/blob/41c02f51/libcloud/test/compute/test_dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_dimensiondata.py b/libcloud/test/compute/test_dimensiondata.py
index f8f3f44..6f06a0e 100644
--- a/libcloud/test/compute/test_dimensiondata.py
+++ b/libcloud/test/compute/test_dimensiondata.py
@@ -471,6 +471,11 @@ class DimensionDataTests(unittest.TestCase, TestCaseMixin):
         result = self.driver.ex_update_node(node, 'my new name', 'a description', 2, 4048)
         self.assertTrue(result)
 
+    def test_ex_reconfigure_node(self):
+        node = self.driver.list_nodes()[0]
+        result = self.driver.ex_reconfigure_node(node, 4, 4, 1,'HIGHPERFORMANCE')
+        self.assertTrue(result)
+    
 
 class InvalidRequestError(Exception):
     def __init__(self, tag):
@@ -947,5 +952,15 @@ class DimensionDataMockHttp(MockHttp):
             'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_customerImage.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_reconfigureServer(self, method, url, body, headers):
+        request = ET.fromstring(body)
+        if request.tag != "{urn:didata.com:api:cloud:types}reconfigureServer":
+            raise InvalidRequestError(request.tag)
+        body = self.fixtures.load(
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_reconfigureServer.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+
+
 if __name__ == '__main__':
     sys.exit(unittest.main())


[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

Posted by an...@apache.org.
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 <an...@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 <an...@gmail.com>
Authored: Tue Dec 8 20:12:47 2015 +1100
Committer: Anthony Shaw <an...@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


[05/11] libcloud git commit: Update list images functions to use the 2.1 API functionality

Posted by an...@apache.org.
Update list images functions to use the 2.1 API functionality

Signed-off-by: Anthony Shaw <an...@gmail.com>


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

Branch: refs/heads/trunk
Commit: 7235ccf10580144e3f6c3a0922c29a26ccec4e22
Parents: b806072
Author: Anthony Shaw <an...@gmail.com>
Authored: Tue Dec 8 20:46:36 2015 +1100
Committer: Anthony Shaw <an...@gmail.com>
Committed: Wed Dec 9 21:19:12 2015 +1100

----------------------------------------------------------------------
 libcloud/compute/drivers/dimensiondata.py       |  45 ++++---
 ...745_4d8a_9cbc_8dabe5a7d0e4_image_osImage.xml |  34 ++++++
 ...8a_9cbc_8dabe5a7d0e4_server_deployServer.xml |   1 -
 ...745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml | 122 +++++++------------
 ...ver_e75ead52_692f_4314_8725_c8a4f4d13a87.xml |  53 ++++----
 libcloud/test/compute/test_dimensiondata.py     |  16 ++-
 6 files changed, 146 insertions(+), 125 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/7235ccf1/libcloud/compute/drivers/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/dimensiondata.py b/libcloud/compute/drivers/dimensiondata.py
index 6edf979..464e8f4 100644
--- a/libcloud/compute/drivers/dimensiondata.py
+++ b/libcloud/compute/drivers/dimensiondata.py
@@ -28,6 +28,7 @@ from libcloud.common.dimensiondata import (DimensionDataConnection,
 from libcloud.common.dimensiondata import DimensionDataNetwork
 from libcloud.common.dimensiondata import DimensionDataNetworkDomain
 from libcloud.common.dimensiondata import DimensionDataVlan
+from libcloud.common.dimensiondata import DimensionDataServerCpuSpecification
 from libcloud.common.dimensiondata import DimensionDataPublicIpBlock
 from libcloud.common.dimensiondata import DimensionDataFirewallRule
 from libcloud.common.dimensiondata import DimensionDataFirewallAddress
@@ -242,11 +243,12 @@ class DimensionDataNodeDriver(NodeDriver):
         """
         params = {}
         if location is not None:
-            params['location'] = location.id
+            params['datacenterId'] = location.id
 
         return self._to_base_images(
-            self.connection.request_api_1('base/imageWithDiskSpeed',
-                                          params=params)
+            self.connection.request_with_orgId_api_2(
+                'image/osImage',
+                params=params)
             .object)
 
     def list_sizes(self, location=None):
@@ -303,7 +305,7 @@ class DimensionDataNodeDriver(NodeDriver):
         images = []
         locations = self.list_locations()
 
-        for element in object.findall(fixxpath("image", SERVER_NS)):
+        for element in object.findall(fixxpath("osImage", TYPES_URN)):
             images.append(self._to_base_image(element, locations))
 
         return images
@@ -313,27 +315,25 @@ class DimensionDataNodeDriver(NodeDriver):
         # that parse <ServerImage> differently than <DeployedImage>.
         # DeployedImages are customer snapshot images, and ServerImages are
         # 'base' images provided by DimensionData
-        location_id = element.get('location')
+        location_id = element.get('datacenterId')
         location = list(filter(lambda x: x.id == location_id,
                                locations))[0]
+        cpu_spec = self._to_cpu_spec(element.find(fixxpath('cpu', TYPES_URN)))
 
         extra = {
-            'description': findtext(element, 'description', SERVER_NS),
-            'OS_type': findtext(element, 'operatingSystem/type', SERVER_NS),
+            'description': findtext(element, 'description', TYPES_URN),
+            'OS_type': findtext(element, 'operatingSystem/type', TYPES_URN),
             'OS_displayName': findtext(element, 'operatingSystem/displayName',
-                                       SERVER_NS),
-            'cpuCount': findtext(element, 'cpuCount', SERVER_NS),
-            'resourcePath': findtext(element, 'resourcePath', SERVER_NS),
-            'memory': findtext(element, 'memory', SERVER_NS),
-            'osStorage': findtext(element, 'osStorage', SERVER_NS),
-            'additionalStorage': findtext(element, 'additionalStorage',
-                                          SERVER_NS),
-            'created': findtext(element, 'created', SERVER_NS),
+                                       TYPES_URN),
+            'cpu': cpu_spec,
+            'memoryGb': findtext(element, 'memoryGb', TYPES_URN),
+            'osImageKey': findtext(element, 'osImageKey', TYPES_URN),
+            'created': findtext(element, 'createTime', TYPES_URN),
             'location': location,
         }
 
         return NodeImage(id=element.get('id'),
-                         name=str(findtext(element, 'name', SERVER_NS)),
+                         name=str(findtext(element, 'name', TYPES_URN)),
                          extra=extra,
                          driver=self.connection.driver)
 
@@ -1547,6 +1547,12 @@ class DimensionDataNodeDriver(NodeDriver):
                          driver=self)
         return l
 
+    def _to_cpu_spec(self, element):
+        return DimensionDataServerCpuSpecification(
+            cpu_count=int(element.get('count')),
+            cores_per_socket=int(element.get('coresPerSocket')),
+            performance=element.get('speed'))
+
     def _to_nodes(self, object):
         node_elements = object.findall(fixxpath('server', TYPES_URN))
 
@@ -1563,6 +1569,8 @@ class DimensionDataNodeDriver(NodeDriver):
         has_network_info \
             = element.find(fixxpath('networkInfo', TYPES_URN)) is not None
 
+        cpu_spec = self._to_cpu_spec(element.find(fixxpath('cpu', TYPES_URN)))
+
         extra = {
             'description': findtext(element, 'description', TYPES_URN),
             'sourceImageId': findtext(element, 'sourceImageId', TYPES_URN),
@@ -1573,10 +1581,7 @@ class DimensionDataNodeDriver(NodeDriver):
                 if has_network_info else None,
             'datacenterId': element.get('datacenterId'),
             'deployedTime': findtext(element, 'createTime', TYPES_URN),
-            'cpuCount': int(findtext(
-                element,
-                'cpuCount',
-                TYPES_URN)),
+            'cpu': cpu_spec,
             'memoryMb': int(findtext(
                 element,
                 'memoryGb',

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

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

http://git-wip-us.apache.org/repos/asf/libcloud/blob/7235ccf1/libcloud/test/compute/test_dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_dimensiondata.py b/libcloud/test/compute/test_dimensiondata.py
index f8527b1..49fdc82 100644
--- a/libcloud/test/compute/test_dimensiondata.py
+++ b/libcloud/test/compute/test_dimensiondata.py
@@ -68,7 +68,7 @@ class DimensionDataTests(unittest.TestCase, TestCaseMixin):
     def test_list_nodes_response(self):
         DimensionDataMockHttp.type = None
         ret = self.driver.list_nodes()
-        self.assertEqual(len(ret), 3)
+        self.assertEqual(len(ret), 2)
 
     def test_list_sizes_response(self):
         DimensionDataMockHttp.type = None
@@ -111,6 +111,15 @@ class DimensionDataTests(unittest.TestCase, TestCaseMixin):
         except DimensionDataAPIException:
             pass
 
+    def test_list_images(self):
+        images = self.driver.list_images()
+        self.assertEqual(len(images), 3)
+        self.assertEqual(images[0].name, 'RedHat 6 64-bit 2 CPU')
+        self.assertEqual(images[0].id, 'c14b1a46-2428-44c1-9c1a-b20e6418d08c')
+        self.assertEqual(images[0].extra['location'].id, 'NA9')
+        self.assertEqual(images[0].extra['cpu'].cpu_count, 2)
+        self.assertEqual(images[0].extra['OS_displayName'], 'REDHAT6/64')
+
     def test_create_node_response(self):
         rootPw = NodeAuthPassword('pass123')
         image = self.driver.list_images()[0]
@@ -919,5 +928,10 @@ class DimensionDataMockHttp(MockHttp):
             'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_changeServerMonitoringPlan.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
+    def _caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_osImage(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_image_osImage.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
 if __name__ == '__main__':
     sys.exit(unittest.main())


[03/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

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

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

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

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

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/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
new file mode 100644
index 0000000..4220600
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_infrastructure_datacenter.xml
@@ -0,0 +1,188 @@
+<?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_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
new file mode 100644
index 0000000..1fcb8d3
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock.xml
@@ -0,0 +1,7 @@
+<?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_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
new file mode 100644
index 0000000..ac3162e
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createFirewallRule.xml
@@ -0,0 +1,8 @@
+<?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_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
new file mode 100644
index 0000000..ff652a4
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createNatRule.xml
@@ -0,0 +1,9 @@
+<?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_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
new file mode 100644
index 0000000..3016297
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteFirewallRule.xml
@@ -0,0 +1,8 @@
+<?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_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
new file mode 100644
index 0000000..2d2cebc
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNatRule.xml
@@ -0,0 +1,8 @@
+<?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_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
new file mode 100644
index 0000000..a3cca2e
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNetworkDomain.xml
@@ -0,0 +1,8 @@
+<?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_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
new file mode 100644
index 0000000..9eae809
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteVlan.xml
@@ -0,0 +1,8 @@
+<?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_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
new file mode 100644
index 0000000..4269840
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployNetworkDomain.xml
@@ -0,0 +1,8 @@
+<?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_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
new file mode 100644
index 0000000..eb37402
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployVlan.xml
@@ -0,0 +1,9 @@
+<?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_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
new file mode 100644
index 0000000..eff18c4
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editFirewallRule.xml
@@ -0,0 +1,8 @@
+<?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_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
new file mode 100644
index 0000000..07d55e5
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editNetworkDomain.xml
@@ -0,0 +1,7 @@
+<?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_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
new file mode 100644
index 0000000..10d0010
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editVlan.xml
@@ -0,0 +1,7 @@
+<?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_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
new file mode 100644
index 0000000..03f9112
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_expandVlan.xml
@@ -0,0 +1,8 @@
+<?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_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
new file mode 100644
index 0000000..b09d963
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule.xml
@@ -0,0 +1,210 @@
+<?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_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
new file mode 100644
index 0000000..876f37d
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule_d0a20f59_77b9_4f28_a63b_e58496b73a6c.xml
@@ -0,0 +1,18 @@
+<?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_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
new file mode 100644
index 0000000..7478df6
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml
@@ -0,0 +1,21 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml
new file mode 100644
index 0000000..6bf447d
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml
@@ -0,0 +1,9 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain.xml
new file mode 100644
index 0000000..cb7a078
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain.xml
@@ -0,0 +1,43 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_162cfc0891be.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_162cfc0891be.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_162cfc0891be.xml
new file mode 100644
index 0000000..bdd1c6b
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_162cfc0891be.xml
@@ -0,0 +1,9 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock.xml
new file mode 100644
index 0000000..3a1c1b3
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock.xml
@@ -0,0 +1,10 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml
new file mode 100644
index 0000000..dc8814b
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml
@@ -0,0 +1,8 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml
new file mode 100644
index 0000000..dc8814b
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml
@@ -0,0 +1,8 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock.xml
new file mode 100644
index 0000000..8b6fe34
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock.xml
@@ -0,0 +1,8 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan.xml
new file mode 100644
index 0000000..4575d83
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan.xml
@@ -0,0 +1,25 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan_0e56433f_d808_4669_821d_812769517ff8.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan_0e56433f_d808_4669_821d_812769517ff8.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan_0e56433f_d808_4669_821d_812769517ff8.xml
new file mode 100644
index 0000000..7dcd5cc
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan_0e56433f_d808_4669_821d_812769517ff8.xml
@@ -0,0 +1,14 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_report_usageMonitoring.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_report_usageMonitoring.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_report_usageMonitoring.xml
new file mode 100644
index 0000000..dc32d95
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_report_usageMonitoring.xml
@@ -0,0 +1,8 @@
+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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml
new file mode 100644
index 0000000..56eeb02
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml
@@ -0,0 +1,9 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_changeServerMonitoringPlan.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_changeServerMonitoringPlan.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_changeServerMonitoringPlan.xml
new file mode 100644
index 0000000..654097d
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_changeServerMonitoringPlan.xml
@@ -0,0 +1,8 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer.xml
new file mode 100644
index 0000000..c8e70da
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer.xml
@@ -0,0 +1,9 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer_RESOURCEBUSY.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer_RESOURCEBUSY.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer_RESOURCEBUSY.xml
new file mode 100644
index 0000000..2df9e07
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer_RESOURCEBUSY.xml
@@ -0,0 +1,8 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployServer.xml
new file mode 100644
index 0000000..74077be
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployServer.xml
@@ -0,0 +1,9 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_disableServerMonitoring.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_disableServerMonitoring.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_disableServerMonitoring.xml
new file mode 100644
index 0000000..63609de
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_disableServerMonitoring.xml
@@ -0,0 +1,8 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_enableServerMonitoring.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_enableServerMonitoring.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_enableServerMonitoring.xml
new file mode 100644
index 0000000..9b1b555
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_enableServerMonitoring.xml
@@ -0,0 +1,8 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer.xml
new file mode 100644
index 0000000..549ea79
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer.xml
@@ -0,0 +1,8 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer_INPROGRESS.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer_INPROGRESS.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer_INPROGRESS.xml
new file mode 100644
index 0000000..8ddcca9
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer_INPROGRESS.xml
@@ -0,0 +1,8 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer.xml
new file mode 100644
index 0000000..38f098a
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer.xml
@@ -0,0 +1,8 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer_RESOURCEBUSY.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer_RESOURCEBUSY.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer_RESOURCEBUSY.xml
new file mode 100644
index 0000000..3defba4
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer_RESOURCEBUSY.xml
@@ -0,0 +1,7 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml
new file mode 100644
index 0000000..61be4e3
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml
@@ -0,0 +1,9 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_resetServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_resetServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_resetServer.xml
new file mode 100644
index 0000000..ece1a8b
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_resetServer.xml
@@ -0,0 +1,8 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml
new file mode 100644
index 0000000..47d75cf
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml
@@ -0,0 +1,81 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml
new file mode 100644
index 0000000..dcdb1ae
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml
@@ -0,0 +1,26 @@
+<?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_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer.xml
new file mode 100644
index 0000000..937cb0d
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<response xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-08-
+12T09:06:01.949-04:00/fd2650a9-3473-41eb-9c6e-1eef29c0bb27">
+<operation>SHUTDOWN_SERVER</operation>
+<responseCode>IN_PROGRESS</responseCode>
+<message>Request to shutdown Server 'Production Server' has been accepted
+and is being processed.</message>
+</response>
\ No newline at end of file

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

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

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

http://git-wip-us.apache.org/repos/asf/libcloud/blob/b806072b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_updateVmwareTools.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_updateVmwareTools.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_updateVmwareTools.xml
new file mode 100644
index 0000000..549ea79
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_updateVmwareTools.xml
@@ -0,0 +1,8 @@
+<?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