summaryrefslogtreecommitdiffstats
path: root/snaps/openstack/tests/openstack_tests.py
diff options
context:
space:
mode:
authorspisarski <s.pisarski@cablelabs.com>2017-06-28 09:20:13 -0600
committerspisarski <s.pisarski@cablelabs.com>2017-07-05 08:47:29 -0600
commit139af8603aa484c1ba08997f30204fb7be146606 (patch)
treed15a7b71a1a5780e5b4447071a9fb886d38f5d5e /snaps/openstack/tests/openstack_tests.py
parent2a4dc5493763a241c9895652bf1c71ac3ef0e5b3 (diff)
Refactor OSCreds to leverage kwargs instead of named parameters.
JIRA: SNAPS-109 Change-Id: I423ede964cce9fc3b4e5b27f1e8f0dd7603d9ff1 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/tests/openstack_tests.py')
-rw-r--r--snaps/openstack/tests/openstack_tests.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/snaps/openstack/tests/openstack_tests.py b/snaps/openstack/tests/openstack_tests.py
index d0c250f..59c7395 100644
--- a/snaps/openstack/tests/openstack_tests.py
+++ b/snaps/openstack/tests/openstack_tests.py
@@ -83,7 +83,8 @@ def get_credentials(os_env_file=None, proxy_settings_str=None,
proxy_settings = None
if proxy_settings_str:
tokens = re.split(':', proxy_settings_str)
- proxy_settings = ProxySettings(tokens[0], tokens[1], ssh_proxy_cmd)
+ proxy_settings = ProxySettings(host=tokens[0], port=tokens[1],
+ ssh_proxy_cmd=ssh_proxy_cmd)
if config.get('OS_CACERT'):
https_cacert = config.get('OS_CACERT')
@@ -121,8 +122,9 @@ def get_credentials(os_env_file=None, proxy_settings_str=None,
proxy_str = config.get('http_proxy')
if proxy_str:
tokens = re.split(':', proxy_str)
- proxy_settings = ProxySettings(tokens[0], tokens[1],
- config.get('ssh_proxy_cmd'))
+ proxy_settings = ProxySettings(
+ host=tokens[0], port=tokens[1],
+ ssh_proxy_cmd=config.get('ssh_proxy_cmd'))
os_creds = OSCreds(username=config['username'],
password=config['password'],
@@ -132,7 +134,7 @@ def get_credentials(os_env_file=None, proxy_settings_str=None,
image_api_version=image_api_version,
proxy_settings=proxy_settings)
- logger.info('OS Credentials = ' + str(os_creds))
+ logger.info('OS Credentials = %s', os_creds)
return os_creds