aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests
diff options
context:
space:
mode:
authorSerena Feng <feng.xiaowei@zte.com.cn>2018-02-01 13:52:46 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-01 13:52:46 +0000
commit416461c30d5a9a0df38e6c1bdef7061fce2c7eaf (patch)
tree7c6b5625b9179f7a1d87429e57f1d3cbe803496b /functest/opnfv_tests
parent834c2cd75b7af478e7456f9fd7a344b5ccf92665 (diff)
parent599aa4d480087e9ac24a67467f32431f18fe6d73 (diff)
Merge "Use snaps_utils to get credentials in tempest"
Diffstat (limited to 'functest/opnfv_tests')
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 4361784b..29fcb48e 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -311,15 +311,8 @@ class TempestDefcore(TempestCommon):
class TempestResourcesManager(object):
def __init__(self, **kwargs):
- self.os_creds = None
- if 'os_creds' in kwargs:
- self.os_creds = kwargs['os_creds']
- else:
- self.os_creds = openstack_tests.get_credentials(
- os_env_file=CONST.__getattribute__('openstack_creds'))
-
+ self.os_creds = kwargs.get('os_creds') or snaps_utils.get_credentials()
self.guid = '-' + str(uuid.uuid4())
-
self.creators = list()
if hasattr(CONST, 'snaps_images_cirros'):