diff options
author | Steven Pisarski <s.pisarski@cablelabs.com> | 2017-07-27 15:21:30 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-07-27 15:21:30 +0000 |
commit | fdcd5600bade294ae2a2207ef01da92f22f64327 (patch) | |
tree | 39900e03361f904ba0b16b15481685c18399ecfa /snaps/openstack/tests | |
parent | 80b70bdcc7a73e0050dae87e4d86159f2fd9b785 (diff) | |
parent | 8f164f7b703c10bcb48b09ba15a2e0e37104becc (diff) |
Merge "Changes to enable overriding the OSCreds for tests."
Diffstat (limited to 'snaps/openstack/tests')
-rw-r--r-- | snaps/openstack/tests/openstack_tests.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/snaps/openstack/tests/openstack_tests.py b/snaps/openstack/tests/openstack_tests.py index 67269c6..927b5b3 100644 --- a/snaps/openstack/tests/openstack_tests.py +++ b/snaps/openstack/tests/openstack_tests.py @@ -48,7 +48,7 @@ DEFAULT_IMAGE_FORMAT = 'qcow2' def get_credentials(os_env_file=None, proxy_settings_str=None, - ssh_proxy_cmd=None, dev_os_env_file=None): + ssh_proxy_cmd=None, dev_os_env_file=None, overrides=None): """ Returns the OpenStack credentials object. It first attempts to retrieve them from a standard OpenStack source file. If that file is None, it will @@ -58,6 +58,8 @@ def get_credentials(os_env_file=None, proxy_settings_str=None, :param ssh_proxy_cmd: the SSH proxy command for your environment (optional) :param dev_os_env_file: the YAML file to retrieve both the OS credentials and proxy settings + :param overrides: dict() containing values to override the credentials + found and passed in. :return: the SNAPS credentials object """ if os_env_file: @@ -130,6 +132,9 @@ def get_credentials(os_env_file=None, proxy_settings_str=None, 'cacert': config.get('cacert'), 'region_name': config.get('region_name')} + if overrides and isinstance(overrides, dict): + creds_dict.update(overrides) + os_creds = OSCreds(**creds_dict) logger.info('OS Credentials = %s', os_creds) return os_creds |