diff options
Diffstat (limited to 'tempest/api/network/base.py')
| -rw-r--r-- | tempest/api/network/base.py | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/tempest/api/network/base.py b/tempest/api/network/base.py index 26a31cb84..1cd138699 100644 --- a/tempest/api/network/base.py +++ b/tempest/api/network/base.py @@ -18,8 +18,6 @@ from oslo_log import log as logging 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 from tempest import exceptions import tempest.test @@ -52,6 +50,7 @@ class BaseNetworkTest(tempest.test.BaseTestCase): """ force_tenant_isolation = False + credentials = ['primary'] # Default to ipv4. _ip_version = 4 @@ -69,7 +68,6 @@ class BaseNetworkTest(tempest.test.BaseTestCase): # Create no network resources for these test. cls.set_network_resources() super(BaseNetworkTest, cls).setup_credentials() - cls.os = cls.get_client_manager() @classmethod def setup_clients(cls): @@ -79,7 +77,6 @@ class BaseNetworkTest(tempest.test.BaseTestCase): @classmethod def resource_setup(cls): super(BaseNetworkTest, cls).resource_setup() - cls.network_cfg = CONF.network cls.networks = [] cls.subnets = [] @@ -426,19 +423,7 @@ class BaseNetworkTest(tempest.test.BaseTestCase): class BaseAdminNetworkTest(BaseNetworkTest): - @classmethod - def skip_checks(cls): - super(BaseAdminNetworkTest, cls).skip_checks() - if not credentials.is_admin_available(): - msg = ("Missing Administrative Network API credentials " - "in configuration.") - raise cls.skipException(msg) - - @classmethod - def setup_credentials(cls): - super(BaseAdminNetworkTest, cls).setup_credentials() - creds = cls.isolated_creds.get_admin_creds() - cls.os_adm = clients.Manager(credentials=creds) + credentials = ['primary', 'admin'] @classmethod def setup_clients(cls): |