Revert "Use isolation credentials for neutron api tests"

This reverts commit 07c92e1bf3.

This currently locks up the neutron gate because of ip exhaustion.

Change-Id: Ia441e854e0d3e1da1c55a685045d935da3dc3c64
This commit is contained in:
Sean Dague 2013-10-23 15:28:00 -04:00
parent 0fba9391f8
commit ffe8afe6ee

View File

@ -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 = []