diff options
Diffstat (limited to 'tempest/api/image/base.py')
-rw-r--r-- | tempest/api/image/base.py | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/tempest/api/image/base.py b/tempest/api/image/base.py index 74044dc50..acf8272dc 100644 --- a/tempest/api/image/base.py +++ b/tempest/api/image/base.py @@ -17,8 +17,6 @@ from six import moves from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc -from tempest import clients -from tempest.common import credentials from tempest import config import tempest.test @@ -30,6 +28,8 @@ LOG = logging.getLogger(__name__) class BaseImageTest(tempest.test.BaseTestCase): """Base test class for Image API tests.""" + credentials = ['primary'] + @classmethod def skip_checks(cls): super(BaseImageTest, cls).skip_checks() @@ -39,14 +39,11 @@ class BaseImageTest(tempest.test.BaseTestCase): @classmethod def setup_credentials(cls): + cls.set_network_resources() super(BaseImageTest, cls).setup_credentials() - cls.isolated_creds = credentials.get_isolated_credentials( - cls.__name__, network_resources=cls.network_resources) - cls.os = clients.Manager(cls.isolated_creds.get_primary_creds()) @classmethod def resource_setup(cls): - cls.set_network_resources() super(BaseImageTest, cls).resource_setup() cls.created_images = [] @@ -96,10 +93,7 @@ class BaseV1ImageTest(BaseImageTest): class BaseV1ImageMembersTest(BaseV1ImageTest): - @classmethod - def setup_credentials(cls): - super(BaseV1ImageMembersTest, cls).setup_credentials() - cls.os_alt = clients.Manager(cls.isolated_creds.get_alt_creds()) + credentials = ['primary', 'alt'] @classmethod def setup_clients(cls): @@ -138,11 +132,7 @@ class BaseV2ImageTest(BaseImageTest): class BaseV2MemberImageTest(BaseV2ImageTest): - @classmethod - def setup_credentials(cls): - super(BaseV2MemberImageTest, cls).setup_credentials() - creds = cls.isolated_creds.get_alt_creds() - cls.os_alt = clients.Manager(creds) + credentials = ['primary', 'alt'] @classmethod def setup_clients(cls): |