Code Review
/
snaps.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Refactor OSCreds to leverage kwargs instead of named parameters.
[snaps.git]
/
snaps
/
openstack
/
tests
/
openstack_tests.py
diff --git
a/snaps/openstack/tests/openstack_tests.py
b/snaps/openstack/tests/openstack_tests.py
index
d0c250f
..
59c7395
100644
(file)
--- 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 = 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')
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_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'],
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)
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
return os_creds