Skip to content

Libcloud 736 update dimension data driver api 2 0 #564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tonybaloney wants to merge 6 commits into from
Closed

Libcloud 736 update dimension data driver api 2 0 #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9a9fafe
Merge pull request #1 from apache/trunk
tonybaloney Aug 24, 2015
0ba9ae4
[LIBCLOUD-736] Updated driver to use 2.0 for all new API calls, start…
tonybaloney Aug 25, 2015
fd43de2
[LIBCLOUD-736] Updated fixtures to match deploy and list tests.
tonybaloney Aug 25, 2015
02ee35a
[LIBCLOUD-736] updated code in line with pep8 style req's
tonybaloney Aug 25, 2015
8e062c0
[LIBCLOUD-736] Updated missing errors from flake
tonybaloney Aug 25, 2015
fbd02da
[LIBCLOUD-736] Fixed up whitespace in empty lines inside the unit tests
tonybaloney Aug 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
379 changes: 287 additions & 92 deletions libcloud/compute/drivers/dimensiondata.py
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 44 additions & 0 deletions ...dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_infrastructure_datacenter.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?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>
</datacenters>
13 changes: 13 additions & 0 deletions ...res/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?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>
</networkDomains>
17 changes: 17 additions & 0 deletions ...ute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?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>
</vlans>
9 changes: 9 additions & 0 deletions ...tures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 8 additions & 0 deletions ...ondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deleteServer_RESOURCEBUSY.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 8 additions & 0 deletions ...res/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 8 additions & 0 deletions ...ondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_powerOffServer_INPROGRESS.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 8 additions & 0 deletions ...tures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
7 changes: 7 additions & 0 deletions ...ondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_rebootServer_RESOURCEBUSY.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 8 additions & 0 deletions ...xtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_resetServer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
64 changes: 64 additions & 0 deletions ...te/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
<?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>
</servers>
8 changes: 8 additions & 0 deletions ...res/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 8 additions & 0 deletions ...ondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_shutdownServer_INPROGRESS.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 8 additions & 0 deletions ...xtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_startServer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 8 additions & 0 deletions ...nsiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_startServer_INPROGRESS.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion ...xtures/dimensiondata/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkWithLocation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ns4:id>53b4c05b-341e-4ac3-b688-bdd74e53ca9b</ns4:id>
<ns4:name>test-net1</ns4:name>
<ns4:description>test-net1 description</ns4:description>
<ns4:location>NA1</ns4:location>
<ns4:location>NA10</ns4:location>
<ns4:privateNet>10.162.1.0</ns4:privateNet>
<ns4:multicast>false</ns4:multicast>
</ns4:network>
Expand Down
Loading