openstack/neutron-lbaas
Code Issues Proposed changes

Merge "Pass config info in neutron-lbaas api v2 tempest tests"

Browse Source
This commit is contained in:
Jenkins 2016-01-10 05:39:10 +00:00 committed by Gerrit Code Review
commit 384c28ee57
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
neutron_lbaas/tests/tempest/v2/api/base.py
View File

@ -37,6 +37,28 @@ if os.path.exists('./tests/tempest/etc/dev_tempest.conf'):
CONF.set_config_path('./tests/tempest/etc/dev_tempest.conf') CONF.set_config_path('./tests/tempest/etc/dev_tempest.conf')
def _setup_client_args(auth_provider):
"""Set up ServiceClient arguments using config settings. """
service = CONF.network.catalog_type or 'network'
region = CONF.network.region or 'regionOne'
endpoint_type = CONF.network.endpoint_type
build_interval = CONF.network.build_interval
build_timeout = CONF.network.build_timeout
# The disable_ssl appears in identity
disable_ssl_certificate_validation = (
CONF.identity.disable_ssl_certificate_validation)
ca_certs = None
# Trace in debug section
trace_requests = CONF.debug.trace_requests
return [auth_provider, service, region, endpoint_type,
build_interval, build_timeout,
disable_ssl_certificate_validation, ca_certs,
trace_requests]
class BaseTestCase(base.BaseNetworkTest): class BaseTestCase(base.BaseNetworkTest):
# This class picks non-admin credentials and run the tempest tests # This class picks non-admin credentials and run the tempest tests
@ -47,12 +69,9 @@ class BaseTestCase(base.BaseNetworkTest):
def resource_setup(cls): def resource_setup(cls):
super(BaseTestCase, cls).resource_setup() super(BaseTestCase, cls).resource_setup()
# credentials = cls.isolated_creds.get_primary_creds()
# mgr = tempest_clients.Manager(credentials=credentials)
mgr = cls.get_client_manager() mgr = cls.get_client_manager()
# auth_provider = mgr.get_auth_provider(credentials)
auth_provider = mgr.auth_provider auth_provider = mgr.auth_provider
client_args = [auth_provider, 'network', 'regionOne'] client_args = _setup_client_args(auth_provider)
cls.load_balancers_client = ( cls.load_balancers_client = (
load_balancers_client.LoadBalancersClientJSON(*client_args)) load_balancers_client.LoadBalancersClientJSON(*client_args))
@ -344,16 +363,9 @@ class BaseAdminTestCase(BaseTestCase):
super(BaseAdminTestCase, cls).resource_setup() super(BaseAdminTestCase, cls).resource_setup()
# credentials = cls.isolated_creds.get_primary_creds()
# mgr = tempest_clients.Manager(credentials=credentials)
mgr = cls.get_client_manager(credential_type='admin') mgr = cls.get_client_manager(credential_type='admin')
# auth_provider = mgr.get_auth_provider(credentials)
auth_provider_admin = mgr.auth_provider auth_provider_admin = mgr.auth_provider
client_args = _setup_client_args(auth_provider_admin)
# credentials_admin = cls.isolated_creds.get_admin_creds()
# mgr_admin = tempest_clients.Manager(credentials=credentials_admin)
# auth_provider_admin = mgr_admin.get_auth_provider(credentials_admin)
client_args = [auth_provider_admin, 'network', 'regionOne']
cls.load_balancers_client = ( cls.load_balancers_client = (
load_balancers_client.LoadBalancersClientJSON(*client_args)) load_balancers_client.LoadBalancersClientJSON(*client_args))