You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2015/08/30 14:32:51 UTC
[03/21] libcloud git commit: [LIBCLOUD-736] Updated fixtures to match
deploy and list tests.
[LIBCLOUD-736] Updated fixtures to match deploy and list tests.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/fd43de26
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/fd43de26
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/fd43de26
Branch: refs/heads/trunk
Commit: fd43de26b423ab9c59622dfc8f7d2cbedc923459
Parents: 0ba9ae4
Author: Anthony Shaw <an...@gmail.com>
Authored: Tue Aug 25 16:42:37 2015 +1000
Committer: Anthony Shaw <an...@gmail.com>
Committed: Tue Aug 25 16:42:37 2015 +1000
----------------------------------------------------------------------
libcloud/compute/drivers/dimensiondata.py | 20 ++++++++++----------
...745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml | 9 +++++++--
2 files changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/fd43de26/libcloud/compute/drivers/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/dimensiondata.py b/libcloud/compute/drivers/dimensiondata.py
index 9819111..8ccfc8f 100644
--- a/libcloud/compute/drivers/dimensiondata.py
+++ b/libcloud/compute/drivers/dimensiondata.py
@@ -755,7 +755,7 @@ class DimensionDataNodeDriver(NodeDriver):
else:
state = NodeState.TERMINATED
- status = self._to_status(element.find(fixxpath('state', TYPES_URN)))
+ status = self._to_status(element.find(fixxpath('progress', TYPES_URN)))
extra = {
'description': findtext(element, 'description', TYPES_URN),
@@ -775,7 +775,7 @@ class DimensionDataNodeDriver(NodeDriver):
.get('family'),
'OS_displayName': element.find(fixxpath('operatingSystem', TYPES_URN))
.get('displayName'),
- 'status': status,
+ 'status': status
}
public_ip = findtext(element, 'publicIpAddress', TYPES_URN)
@@ -795,33 +795,33 @@ class DimensionDataNodeDriver(NodeDriver):
def _to_status(self, element):
if element is None:
return DimensionDataStatus()
- s = DimensionDataStatus(action=findtext(element, 'action', SERVER_NS),
+ s = DimensionDataStatus(action=findtext(element, 'action', TYPES_URN),
request_time=findtext(
element,
'requestTime',
- SERVER_NS),
+ TYPES_URN),
user_name=findtext(
element,
'userName',
- SERVER_NS),
+ TYPES_URN),
number_of_steps=findtext(
element,
'numberOfSteps',
- SERVER_NS),
+ TYPES_URN),
step_name=findtext(
element,
'step/name',
- SERVER_NS),
+ TYPES_URN),
step_number=findtext(
element,
'step_number',
- SERVER_NS),
+ TYPES_URN),
step_percent_complete=findtext(
element,
'step/percentComplete',
- SERVER_NS),
+ TYPES_URN),
failure_reason=findtext(
element,
'failureReason',
- SERVER_NS))
+ TYPES_URN))
return s
http://git-wip-us.apache.org/repos/asf/libcloud/blob/fd43de26/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
index bc98272..64c691a 100644
--- 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
@@ -2,8 +2,8 @@
<servers
xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="1"
totalCount="2" pageSize="250">
-<Server id="d577a691-e116-4913-a440-022d2729fc84" datacenterId="NA9">
-<name>Test Server</name>
+<Server id="e75ead52-692f-4314-8725-c8a4f4d13a87" datacenterId="NA9">
+<name>test2</name>
<description>Test Description</description>
<operatingSystem id="REDHAT664" displayName="REDHAT6/64"
family="UNIX"/>
@@ -22,6 +22,11 @@ state="NORMAL"/>
<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"/>