diff options
author | Juha Kosonen <juha.kosonen@nokia.com> | 2018-08-24 10:41:49 +0300 |
---|---|---|
committer | Juha Kosonen <juha.kosonen@nokia.com> | 2018-08-24 14:12:44 +0300 |
commit | 5d9acb84f492dca4da863c60e30a5463fe165cb5 (patch) | |
tree | 32dfab27ae776b39dc1b96aa96fd7ded3c0cdda8 /functest/opnfv_tests/openstack/snaps/snaps_utils.py | |
parent | 1da4b519f8e73d3be9e37f9d72367654bf662e63 (diff) |
Create new project/user for snaps tests
JIRA: FUNCTEST-1003
Change-Id: Ic55998977386f95f619a355d22bd285782fe81f0
Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/snaps/snaps_utils.py')
-rw-r--r-- | functest/opnfv_tests/openstack/snaps/snaps_utils.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/functest/opnfv_tests/openstack/snaps/snaps_utils.py b/functest/opnfv_tests/openstack/snaps/snaps_utils.py index 21d1dd60d..f4a6e2ea0 100644 --- a/functest/opnfv_tests/openstack/snaps/snaps_utils.py +++ b/functest/opnfv_tests/openstack/snaps/snaps_utils.py @@ -46,16 +46,20 @@ def get_active_compute_cnt(os_creds): return len(computes) -def get_credentials(proxy_settings_str=None, ssh_proxy_cmd=None): +def get_credentials(proxy_settings_str=None, ssh_proxy_cmd=None, + overrides=None): """ Returns snaps OSCreds object instance :param: proxy_settings_str: proxy settings string <host>:<port> :param: ssh_proxy_cmd: the SSH proxy command for the environment + :param overrides: dict() values to override in credentials :return: an instance of snaps OSCreds object """ - creds_override = None + creds_override = {} if hasattr(config.CONF, 'snaps_os_creds_override'): - creds_override = getattr(config.CONF, 'snaps_os_creds_override') + creds_override.update(getattr(config.CONF, 'snaps_os_creds_override')) + if overrides: + creds_override.update(overrides) os_creds = openstack_tests.get_credentials( os_env_file=constants.ENV_FILE, proxy_settings_str=proxy_settings_str, ssh_proxy_cmd=ssh_proxy_cmd, overrides=creds_override) |