aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/tempest/tempest.py
diff options
context:
space:
mode:
authorJuha Kosonen <juha.kosonen@nokia.com>2018-01-31 13:54:46 +0200
committerJuha Kosonen <juha.kosonen@nokia.com>2018-01-31 14:56:35 +0200
commit599aa4d480087e9ac24a67467f32431f18fe6d73 (patch)
treec746898ef8272773d4ce9759d0feb8efb78699ee /functest/opnfv_tests/openstack/tempest/tempest.py
parentbad712f34309cf4cf09701e900b832b2503761f6 (diff)
Use snaps_utils to get credentials in tempest
Change-Id: I1d240d5edd536d71c87a7dff4e2676715697d0e2 Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest/tempest.py')
-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'):