Updated fixtures to match deploy and list tests. Signed-off-by: Tomaz Muraus <to...@tomaz.me>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/8662e8eb Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/8662e8eb Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/8662e8eb Branch: refs/heads/trunk Commit: 8662e8eb0d7453d568f6a6e99c7f96b38ae0b6a2 Parents: e01e6e3 Author: Anthony Shaw <anthony.p.s...@gmail.com> Authored: Tue Aug 25 16:42:37 2015 +1000 Committer: Tomaz Muraus <to...@tomaz.me> Committed: Thu Aug 27 23:03:15 2015 +0200 ---------------------------------------------------------------------- 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/8662e8eb/libcloud/compute/drivers/dimensiondata.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/dimensiondata.py b/libcloud/compute/drivers/dimensiondata.py index 90f95ab..c76da17 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/8662e8eb/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"/>
