From notifications-return-15024-apmail-libcloud-notifications-archive=libcloud.apache.org@libcloud.apache.org Thu Dec 13 11:26:11 2018 Return-Path: X-Original-To: apmail-libcloud-notifications-archive@www.apache.org Delivered-To: apmail-libcloud-notifications-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2D58D18E14 for ; Thu, 13 Dec 2018 11:26:11 +0000 (UTC) Received: (qmail 73087 invoked by uid 500); 13 Dec 2018 11:26:11 -0000 Delivered-To: apmail-libcloud-notifications-archive@libcloud.apache.org Received: (qmail 72918 invoked by uid 500); 13 Dec 2018 11:26:10 -0000 Mailing-List: contact notifications-help@libcloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@libcloud.apache.org Delivered-To: mailing list notifications@libcloud.apache.org Received: (qmail 72831 invoked by uid 500); 13 Dec 2018 11:26:10 -0000 Delivered-To: apmail-libcloud-commits@libcloud.apache.org Received: (qmail 72813 invoked by uid 99); 13 Dec 2018 11:26:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Dec 2018 11:26:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 597B9E1458; Thu, 13 Dec 2018 11:26:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anthonyshaw@apache.org To: commits@libcloud.apache.org Date: Thu, 13 Dec 2018 11:26:16 -0000 Message-Id: <22526ae85f434cb69e50bd5d8eaa2936@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/45] libcloud git commit: removed dd prefix from region on tests files 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 Authored: Fri Oct 26 22:19:28 2018 -0400 Committer: mitch 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 ('' % (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()