fixed failed tox tests. Added NTTCIS_PARAMS to secrets.py-dist, removed type hints from drivers/nttcis.py, and one type hint accidentally in drivers/dimenstiondata.p;y
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/6c50be1a Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/6c50be1a Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/6c50be1a Branch: refs/heads/trunk Commit: 6c50be1a4aa512b953184936c74ae4db6118446b Parents: aaae8ba Author: mitch <[email protected]> Authored: Wed Oct 24 16:38:21 2018 -0400 Committer: mitch <[email protected]> Committed: Wed Oct 24 16:38:21 2018 -0400 ---------------------------------------------------------------------- libcloud/compute/drivers/dimensiondata.py | 2 +- libcloud/compute/drivers/nttcis.py | 12 ++++++------ libcloud/test/secrets.py-dist | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/6c50be1a/libcloud/compute/drivers/dimensiondata.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/dimensiondata.py b/libcloud/compute/drivers/dimensiondata.py index 66969fb..cc223c5 100644 --- a/libcloud/compute/drivers/dimensiondata.py +++ b/libcloud/compute/drivers/dimensiondata.py @@ -3067,7 +3067,7 @@ class DimensionDataNodeDriver(NodeDriver): % (datacenter_id, start_date, end_date)) return self._format_csv(result.response) - def ex_list_ip_address_list(self, ex_network_domain: object) -> object: + def ex_list_ip_address_list(self, ex_network_domain): """ List IP Address List by network domain ID specified http://git-wip-us.apache.org/repos/asf/libcloud/blob/6c50be1a/libcloud/compute/drivers/nttcis.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/nttcis.py b/libcloud/compute/drivers/nttcis.py index 20e5504..a45f487 100644 --- a/libcloud/compute/drivers/nttcis.py +++ b/libcloud/compute/drivers/nttcis.py @@ -15,6 +15,8 @@ """ NTT CIS Driver """ +import sys +import re from libcloud.utils.py3 import ET from libcloud.common.nttcis import LooseVersion @@ -50,13 +52,12 @@ from libcloud.common.nttcis import NttCisTagKey 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 SERVER_NS, NETWORK_NS, GENERAL_NS +from libcloud.common.nttcis import NETWORK_NS, GENERAL_NS from libcloud.utils.py3 import urlencode, ensure_string from libcloud.utils.xml import fixxpath, findtext, findall, return_all from libcloud.utils.py3 import basestring from libcloud.compute.types import NodeState, Provider -import sys -import re + # Node state map is a dictionary with the keys as tuples # These tuples represent: # (<state_of_node_from_didata>, <is node started?>, <action happening>) @@ -2888,7 +2889,7 @@ class NttCisNodeDriver(NodeDriver): response_code = findtext(result, 'responseCode', TYPES_URN) return response_code in ['IN_PROGRESS', 'OK'] - def ex_remove_scsi_controller(self, controller_id: str) -> bool: + def ex_remove_scsi_controller(self, controller_id): """ Added 8/27/18: Adds a SCSI Controller by node id :param controller_id: Scsi controller's id @@ -3646,8 +3647,7 @@ class NttCisNodeDriver(NodeDriver): % (datacenter_id, start_date, end_date)) return self._format_csv(result.response) - def ex_list_ip_address_list( - self, ex_network_domain: NttCisIpAddressList) -> object: + def ex_list_ip_address_list(self, ex_network_domain): """ List IP Address List by network domain ID specified http://git-wip-us.apache.org/repos/asf/libcloud/blob/6c50be1a/libcloud/test/secrets.py-dist ---------------------------------------------------------------------- diff --git a/libcloud/test/secrets.py-dist b/libcloud/test/secrets.py-dist index 7076a6c..7bbcf6a 100644 --- a/libcloud/test/secrets.py-dist +++ b/libcloud/test/secrets.py-dist @@ -36,6 +36,7 @@ ONEANDONE_PARAMS = ('token') OPENSTACK_PARAMS = ('user_name', 'api_key', False, 'host', 8774) OPENNEBULA_PARAMS = ('user', 'key') DIMENSIONDATA_PARAMS = ('user', 'password') +NTTCIS_PARAMS = ('user', 'password') OPSOURCE_PARAMS = ('user', 'password') OVH_PARAMS = ('application_key', 'application_secret', 'project_id', 'consumer_key') RACKSPACE_PARAMS = ('user', 'key')
