Updated the test fixtures with actual responses (since the schema has changed), updated tests.
Closes #587 Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/96df087d Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/96df087d Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/96df087d Branch: refs/heads/trunk Commit: 96df087d5984410988d77ba45ee28bc1a8480d4b Parents: ee1be17 Author: Anthony Shaw <[email protected]> Authored: Thu Sep 24 09:18:15 2015 +1000 Committer: Tomaz Muraus <[email protected]> Committed: Sat Sep 26 22:37:16 2015 +0200 ---------------------------------------------------------------------- libcloud/compute/drivers/dimensiondata.py | 2 +- ...c_8dabe5a7d0e4_infrastructure_datacenter.xml | 230 +- ..._9cbc_8dabe5a7d0e4_network_networkDomain.xml | 54 +- ...2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan.xml | 62 +- ...c_2745_4d8a_9cbc_8dabe5a7d0e4_datacenter.xml | 9 + ...8a_9cbc_8dabe5a7d0e4_networkWithLocation.xml | 28 +- .../oec_0_9_base_imageWithDiskSpeed.xml | 2475 ++++++++++++++++++ libcloud/test/compute/test_dimensiondata.py | 19 +- 8 files changed, 2790 insertions(+), 89 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/96df087d/libcloud/compute/drivers/dimensiondata.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/dimensiondata.py b/libcloud/compute/drivers/dimensiondata.py index 01bdae4..de12b8d 100644 --- a/libcloud/compute/drivers/dimensiondata.py +++ b/libcloud/compute/drivers/dimensiondata.py @@ -255,7 +255,7 @@ class DimensionDataNodeDriver(NodeDriver): def _to_base_images(self, object): images = [] locations = self.list_locations() - print(locations) + for element in object.findall(fixxpath("image", SERVER_NS)): images.append(self._to_base_image(element, locations)) http://git-wip-us.apache.org/repos/asf/libcloud/blob/96df087d/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 index 66ae1db..4220600 100644 --- 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 @@ -1,44 +1,188 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<datacenters pageNumber="1" pageCount="1" totalCount="2" pageSize="50" -xmlns="urn:didata.com:api:cloud:types"> -<datacenter id="NA10" type="MCP 2.0"> -<displayName>US - West</displayName> -<city>Santa Clara</city> -<state>California</state> -<country>US</country> -<vpnUrl>https://na10.cloud-vpn.net</vpnUrl> -<ftpsHost>ftps-na.cloud-vpn.net</ftpsHost> -<networking type="2" maintenanceStatus="NORMAL"> -<!-- 0-to-many optional property elements --> -<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="PENDING_MAINTENANCE"> -<diskSpeed available="false" default="false" id="ARCHIVE"> -<displayName>Archive Speed</displayName> -<abbreviation>ARCH</abbreviation> -<description>Archive Disk Speed</description> -<unavailableReason>Replaced with HPF and ECN</unavailableReason> -</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="2500"/> -<property name="MAX_CPU_COUNT" value="8"/> -<property name="MIN_MEMORY_MB" value="1024"/> -<property name="MAX_MEMORY_MB" value="65536"/> -</hypervisor> -<!-- Optional: if Cloud Backup is enabled at the Data Center it will be returned --> -<backup type="COMMVAULT" maintenanceStatus="IN_MAINTENANCE"> -<!-- 0-to-many optional property elements --> -</backup> -<consoleAccess maintenanceStatus="IN_MAINTENANCE"> -<!-- 0-to-many optional property elements --> -</consoleAccess> -<monitoring maintenanceStatus="IN_MAINTENANCE"> -<!-- 0-to-many optional property elements --> -</monitoring> -</datacenter> +<?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/96df087d/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 index 22680d1..cb7a078 100644 --- 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 @@ -1,13 +1,43 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<networkDomains -xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="1" -totalCount="1" pageSize="250"> -<networkDomain id="484174a2-ae74-4658-9e56-50fc90e086cf" datacenter="NA10"> -<name>Production Network Domain</name> -<description></description> -<type>ESSENTIALS</type> -<snatIpv4Address>165.180.8.8</snatIpv4Address> -<createTime>2015-02-12T18:18:14.000Z</createTime> -<state>NORMAL</state> -</networkDomain> +<?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/96df087d/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 index b489284..9099fc4 100644 --- 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 @@ -1,17 +1,47 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<vlans -xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="1" -totalCount="1" pageSize="250"> -<vlan id="0e56433f-d808-4669-821d-812769517ff8" location="NA10"> -<networkDomain id="484174a2-ae74-4658-9e56-50fc90e086cf" -name="Production Network Domain"/> -<name>Production VLAN</name> -<description>For hosting our Production Cloud Servers</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> +<?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="b30c224c-c95b-4cd9-bb8b-bfdfb5486abf" 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="d3320077-c2ce-4523-8c65-d417e766077b" 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> + <vlan id="ab2f6a8b-333e-4b73-8e55-390f0460b739" datacenterId="NA9"> + <networkDomain id="68a60a3c-030d-4d4b-a8fd-4a6991afc27b" name="Platform R2.0 Lab (MCP 2.0)"/> + <name>Platform R2 Development</name> + <description>Development lab network for Platform R2.0.</description> + <privateIpv4Range address="10.0.1.0" prefixSize="24"/> + <ipv4GatewayAddress>10.0.1.1</ipv4GatewayAddress> + <ipv6Range address="2607:f480:111:1343:0:0:0:0" prefixSize="64"/> + <ipv6GatewayAddress>2607:f480:111:1343:0:0:0:1</ipv6GatewayAddress> + <createTime>2015-08-25T01:41:37.000Z</createTime> + <state>NORMAL</state> + </vlan> + <vlan id="b82803ce-eb6c-4059-961c-8727031d3ab7" datacenterId="NA9"> + <networkDomain id="68a60a3c-030d-4d4b-a8fd-4a6991afc27b" name="Platform R2.0 Lab (MCP 2.0)"/> + <name>Lab Infrastructure</name> + <description>Lab infrastructure network for Platform R2.0.</description> + <privateIpv4Range address="10.0.0.0" prefixSize="24"/> + <ipv4GatewayAddress>10.0.0.1</ipv4GatewayAddress> + <ipv6Range address="2607:f480:111:1347:0:0:0:0" prefixSize="64"/> + <ipv6GatewayAddress>2607:f480:111:1347:0:0:0:1</ipv6GatewayAddress> + <createTime>2015-08-25T01:42:56.000Z</createTime> + <state>NORMAL</state> + </vlan> </vlans> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/libcloud/blob/96df087d/libcloud/test/compute/fixtures/dimensiondata/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_datacenter.xml ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/dimensiondata/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_datacenter.xml b/libcloud/test/compute/fixtures/dimensiondata/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_datacenter.xml index 4870ee1..f7fa850 100644 --- a/libcloud/test/compute/fixtures/dimensiondata/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_datacenter.xml +++ b/libcloud/test/compute/fixtures/dimensiondata/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_datacenter.xml @@ -9,4 +9,13 @@ <ns8:vpnUrl>https://opsource-na1.cloud-vpn.net/</ns8:vpnUrl> <ns8:default>true</ns8:default> </ns8:datacenter> + <ns8:datacenter> + <ns8:location>NA10</ns8:location> + <ns8:displayName>US - East3</ns8:displayName> + <ns8:city>Ashburn</ns8:city> + <ns8:state>Virginia</ns8:state> + <ns8:country>US</ns8:country> + <ns8:vpnUrl>https://opsource-na1.cloud-vpn.net/</ns8:vpnUrl> + <ns8:default>true</ns8:default> + </ns8:datacenter> </ns8:Datacenters> http://git-wip-us.apache.org/repos/asf/libcloud/blob/96df087d/libcloud/test/compute/fixtures/dimensiondata/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkWithLocation.xml ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/dimensiondata/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkWithLocation.xml b/libcloud/test/compute/fixtures/dimensiondata/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkWithLocation.xml index 88364b6..5a8dfee 100644 --- a/libcloud/test/compute/fixtures/dimensiondata/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkWithLocation.xml +++ b/libcloud/test/compute/fixtures/dimensiondata/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkWithLocation.xml @@ -1,11 +1,19 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<ns4:NetworkWithLocations xmlns="http://oec.api.opsource.net/schemas/server"; xmlns:ns9="http://oec.api.opsource.net/schemas/reset"; xmlns:ns5="http://oec.api.opsource.net/schemas/vip"; xmlns:ns12="http://oec.api.opsource.net/schemas/general"; xmlns:ns6="http://oec.api.opsource.net/schemas/imageimportexport"; xmlns:ns13="http://oec.api.opsource.net/schemas/support"; xmlns:ns7="http://oec.api.opsource.net/schemas/whitelabel"; xmlns:ns10="http://oec.api.opsource.net/schemas/ipplan"; xmlns:ns8="http://oec.api.opsource.net/schemas/datacenter"; xmlns:ns11="http://oec.api.opsource.net/schemas/storage"; xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; xmlns:ns4="http://oec.api.opsource.net/schemas/network"; xmlns:ns3="http://oec.api.opsource.net/schemas/directory";> - <ns4:network> - <ns4:id>53b4c05b-341e-4ac3-b688-bdd74e53ca9b</ns4:id> - <ns4:name>test-net1</ns4:name> - <ns4:description>test-net1 description</ns4:description> - <ns4:location>NA10</ns4:location> - <ns4:privateNet>10.162.1.0</ns4:privateNet> - <ns4:multicast>false</ns4:multicast> - </ns4:network> -</ns4:NetworkWithLocations> +<ns3:NetworkWithLocations xmlns:ns16="http://oec.api.opsource.net/schemas/reset"; xmlns:ns14="http://oec.api.opsource.net/schemas/multigeo"; xmlns:ns15="http://oec.api.opsource.net/schemas/support"; xmlns:ns9="http://oec.api.opsource.net/schemas/directory"; xmlns:ns5="http://oec.api.opsource.net/schemas/vip"; xmlns:ns12="http://oec.api.opsource.net/schemas/admin"; xmlns:ns13="http://oec.api.opsource.net/schemas/general"; xmlns:ns6="http://oec.api.opsource.net/schemas/organization"; xmlns:ns7="http://oec.api.opsource.net/schemas/whitelabel"; xmlns:ns10="http://oec.api.opsource.net/schemas/storage"; xmlns:ns8="http://oec.api.opsource.net/schemas/backup"; xmlns:ns11="http://oec.api.opsource.net/schemas/serverbootstrap"; xmlns:ns2="http://oec.api.opsource.net/schemas/server"; xmlns:ns1="http://oec.api.opsource.net/schemas/datacenter"; xmlns:ns4="http://oec.api.opsource.net/schemas/manualimport"; xmlns:ns3="http://oec.api.opsource.net/schemas/network";> + <ns3:network> + <ns3:id>4bba37be-506f-11e3-b29c-001517c4643e</ns3:id> + <ns3:name>test-net1</ns3:name> + <ns3:description>Test Network.</ns3:description> + <ns3:location>NA5</ns3:location> + <ns3:privateNet>10.192.176.0</ns3:privateNet> + <ns3:multicast>false</ns3:multicast> + </ns3:network> + <ns3:network> + <ns3:id>208e3a8e-9d2f-11e2-b29c-001517c4643e</ns3:id> + <ns3:name>Test Network</ns3:name> + <ns3:description>Network description</ns3:description> + <ns3:location>NA1</ns3:location> + <ns3:privateNet>10.172.74.0</ns3:privateNet> + <ns3:multicast>false</ns3:multicast> + </ns3:network> +</ns3:NetworkWithLocations>
