removed dd prefix from region on tests files
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/a88fb2fc Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/a88fb2fc Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/a88fb2fc Branch: refs/heads/trunk Commit: a88fb2fc13487b11949e6cf58a20073bb0d7eec6 Parents: 14a69ee Author: mitch <[email protected]> Authored: Fri Oct 26 22:19:28 2018 -0400 Committer: mitch <[email protected]> Committed: Fri Oct 26 22:19:28 2018 -0400 ---------------------------------------------------------------------- libcloud/common/nttcis.py | 5 +++-- libcloud/compute/drivers/nttcis.py | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/a88fb2fc/libcloud/common/nttcis.py ---------------------------------------------------------------------- diff --git a/libcloud/common/nttcis.py b/libcloud/common/nttcis.py index fd1976d..019aead 100644 --- a/libcloud/common/nttcis.py +++ b/libcloud/common/nttcis.py @@ -15,7 +15,8 @@ """ NTTCIS Common Components """ - +from copy import deepcopy +from collections.abc import MutableSequence, Mapping from base64 import b64encode from time import sleep from lxml import etree @@ -1926,7 +1927,7 @@ class NttCisNic(object): return ('<NttCisNic: private_ip_v4=%s, vlan=%s,' 'network_adapter_name=%s>' % (self.private_ip_v4, self.vlan, self.network_adapter_name)) -<<<<<<< HEAD + ##### Testing new concept below this line http://git-wip-us.apache.org/repos/asf/libcloud/blob/a88fb2fc/libcloud/compute/drivers/nttcis.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/nttcis.py b/libcloud/compute/drivers/nttcis.py index 3a615f8..c1266d9 100644 --- a/libcloud/compute/drivers/nttcis.py +++ b/libcloud/compute/drivers/nttcis.py @@ -53,6 +53,7 @@ from libcloud.common.nttcis import NttCisTag from libcloud.common.nttcis import API_ENDPOINTS, DEFAULT_REGION from libcloud.common.nttcis import TYPES_URN from libcloud.common.nttcis import NETWORK_NS, GENERAL_NS +from libcloud.common.nttcis import process_xml from libcloud.utils.py3 import urlencode, ensure_string from libcloud.utils.xml import fixxpath, findtext, findall from libcloud.utils.py3 import basestring @@ -5122,6 +5123,8 @@ class NttCisNodeDriver(NodeDriver): return [self._to_node(el) for el in node_elements] def _to_node(self, element): + return process_xml(element) + """ started = findtext(element, 'started', TYPES_URN) status = self._to_status(element.find(fixxpath('progress', TYPES_URN))) dd_state = findtext(element, 'state', TYPES_URN) @@ -5227,7 +5230,7 @@ class NttCisNodeDriver(NodeDriver): driver=self.connection.driver, extra=extra) return n - + """ def _to_status(self, element): if element is None: return NttCisStatus()
