From ffe8afe6ee64940bb366f0f43025954b825f0b5a Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Wed, 23 Oct 2013 15:28:00 -0400 Subject: [PATCH] Revert "Use isolation credentials for neutron api tests" This reverts commit 07c92e1bf3013b949804e5b0020677843a640441. This currently locks up the neutron gate because of ip exhaustion. Change-Id: Ia441e854e0d3e1da1c55a685045d935da3dc3c64 --- tempest/api/network/base.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/tempest/api/network/base.py b/tempest/api/network/base.py index cdb8e17790..b6c2679ad2 100644 --- a/tempest/api/network/base.py +++ b/tempest/api/network/base.py @@ -18,7 +18,6 @@ import netaddr from tempest import clients -from tempest.common import isolated_creds from tempest.common.utils.data_utils import rand_name from tempest import exceptions from tempest.openstack.common import log as logging @@ -52,19 +51,10 @@ class BaseNetworkTest(tempest.test.BaseTestCase): @classmethod def setUpClass(cls): super(BaseNetworkTest, cls).setUpClass() - cls.isolated_creds = isolated_creds.IsolatedCreds(cls.__name__) + os = clients.Manager(interface=cls._interface) + cls.network_cfg = os.config.network if not cls.config.service_available.neutron: raise cls.skipException("Neutron support is required") - if cls.config.compute.allow_tenant_isolation: - creds = cls.isolated_creds.get_primary_creds() - username, tenant_name, password = creds - os = clients.Manager(username=username, - password=password, - tenant_name=tenant_name, - interface=cls._interface) - else: - os = clients.Manager(interface=cls._interface) - cls.network_cfg = os.config.network cls.client = os.network_client cls.networks = [] cls.subnets = []