openstack/octavia-tempest-plugin
Code Issues Proposed changes

Fix the load balancer service clients

Browse Source 
The load balancer service clients were not using the base
service_client_config from tempest, so they would not pick up some
base settings, such as ca_certs, disable_ssl_certificate_validation,
etc.
This patch corrects that so that the clients will get the base
settings from tempest.

Change-Id: Ic7fa0d2e32cb8ff86fe013064e1ce53d4cf0d62e
Story: 2005880
Task: 33698
This commit is contained in:
Michael Johnson 2019-06-13 11:29:29 -07:00
parent 735c71d509
commit 5099fe1cae
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
octavia_tempest_plugin/clients.py
View File

@ -41,7 +41,6 @@ from octavia_tempest_plugin.services.load_balancer.v2 import (
provider_client) provider_client)
CONF = config.CONF CONF = config.CONF
SERVICE_TYPE = 'load-balancer'
class ManagerV2(clients.Manager): class ManagerV2(clients.Manager):
@ -49,28 +48,29 @@ class ManagerV2(clients.Manager):
def __init__(self, credentials): def __init__(self, credentials):
super(ManagerV2, self).__init__(credentials) super(ManagerV2, self).__init__(credentials)
params = dict(self.default_params)
params.update({
'auth_provider': self.auth_provider,
'service': CONF.load_balancer.catalog_type,
'region': CONF.load_balancer.region,
'endpoint_type': CONF.load_balancer.endpoint_type,
'build_interval': CONF.load_balancer.build_interval,
'build_timeout': CONF.load_balancer.build_timeout
})
self.loadbalancer_client = loadbalancer_client.LoadbalancerClient( self.loadbalancer_client = loadbalancer_client.LoadbalancerClient(
self.auth_provider, SERVICE_TYPE, CONF.identity.region) **params)
self.listener_client = listener_client.ListenerClient( self.listener_client = listener_client.ListenerClient(**params)
self.auth_provider, SERVICE_TYPE, CONF.identity.region) self.pool_client = pool_client.PoolClient(**params)
self.pool_client = pool_client.PoolClient( self.member_client = member_client.MemberClient(**params)
self.auth_provider, SERVICE_TYPE, CONF.identity.region)
self.member_client = member_client.MemberClient(
self.auth_provider, SERVICE_TYPE, CONF.identity.region)
self.healthmonitor_client = healthmonitor_client.HealthMonitorClient( self.healthmonitor_client = healthmonitor_client.HealthMonitorClient(
self.auth_provider, SERVICE_TYPE, CONF.identity.region) **params)
self.l7policy_client = l7policy_client.L7PolicyClient( self.l7policy_client = l7policy_client.L7PolicyClient(**params)
self.auth_provider, SERVICE_TYPE, CONF.identity.region) self.l7rule_client = l7rule_client.L7RuleClient(**params)
self.l7rule_client = l7rule_client.L7RuleClient( self.amphora_client = amphora_client.AmphoraClient(**params)
self.auth_provider, SERVICE_TYPE, CONF.identity.region)
self.amphora_client = amphora_client.AmphoraClient(
self.auth_provider, SERVICE_TYPE, CONF.identity.region)
self.flavor_profile_client = flavor_profile_client.FlavorProfileClient( self.flavor_profile_client = flavor_profile_client.FlavorProfileClient(
self.auth_provider, SERVICE_TYPE, CONF.identity.region) **params)
self.flavor_client = flavor_client.FlavorClient( self.flavor_client = flavor_client.FlavorClient(**params)
self.auth_provider, SERVICE_TYPE, CONF.identity.region) self.provider_client = provider_client.ProviderClient(**params)
self.provider_client = provider_client.ProviderClient(
self.auth_provider, SERVICE_TYPE, CONF.identity.region)
self.flavor_capabilities_client = ( self.flavor_capabilities_client = (
flavor_capabilities_client.FlavorCapabilitiesClient( flavor_capabilities_client.FlavorCapabilitiesClient(**params))
self.auth_provider, SERVICE_TYPE, CONF.identity.region))

5
releasenotes/notes/Fix-service-client-params-41a0f7c9c6b53aac.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixed the service clients to use the tempest default service client
configuration settings.