From 599aa4d480087e9ac24a67467f32431f18fe6d73 Mon Sep 17 00:00:00 2001 From: Juha Kosonen Date: Wed, 31 Jan 2018 13:54:46 +0200 Subject: Use snaps_utils to get credentials in tempest Change-Id: I1d240d5edd536d71c87a7dff4e2676715697d0e2 Signed-off-by: Juha Kosonen --- functest/opnfv_tests/openstack/tempest/tempest.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'functest/opnfv_tests') 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'): -- cgit 1.2.3-korg