Skip to content

Commit

Permalink
Fix the load balancer service clients
Browse files Browse the repository at this point in the history
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
  • Loading branch information
johnsom committed Jun 13, 2019
1 parent 735c71d commit 5099fe1
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 22 deletions.
44 changes: 22 additions & 22 deletions octavia_tempest_plugin/clients.py
Expand Up @@ -41,36 +41,36 @@
provider_client)

CONF = config.CONF
SERVICE_TYPE = 'load-balancer'


class ManagerV2(clients.Manager):

def __init__(self, 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.auth_provider, SERVICE_TYPE, CONF.identity.region)
self.listener_client = listener_client.ListenerClient(
self.auth_provider, SERVICE_TYPE, CONF.identity.region)
self.pool_client = pool_client.PoolClient(
self.auth_provider, SERVICE_TYPE, CONF.identity.region)
self.member_client = member_client.MemberClient(
self.auth_provider, SERVICE_TYPE, CONF.identity.region)
**params)
self.listener_client = listener_client.ListenerClient(**params)
self.pool_client = pool_client.PoolClient(**params)
self.member_client = member_client.MemberClient(**params)
self.healthmonitor_client = healthmonitor_client.HealthMonitorClient(
self.auth_provider, SERVICE_TYPE, CONF.identity.region)
self.l7policy_client = l7policy_client.L7PolicyClient(
self.auth_provider, SERVICE_TYPE, CONF.identity.region)
self.l7rule_client = l7rule_client.L7RuleClient(
self.auth_provider, SERVICE_TYPE, CONF.identity.region)
self.amphora_client = amphora_client.AmphoraClient(
self.auth_provider, SERVICE_TYPE, CONF.identity.region)
**params)
self.l7policy_client = l7policy_client.L7PolicyClient(**params)
self.l7rule_client = l7rule_client.L7RuleClient(**params)
self.amphora_client = amphora_client.AmphoraClient(**params)
self.flavor_profile_client = flavor_profile_client.FlavorProfileClient(
self.auth_provider, SERVICE_TYPE, CONF.identity.region)
self.flavor_client = flavor_client.FlavorClient(
self.auth_provider, SERVICE_TYPE, CONF.identity.region)
self.provider_client = provider_client.ProviderClient(
self.auth_provider, SERVICE_TYPE, CONF.identity.region)
**params)
self.flavor_client = flavor_client.FlavorClient(**params)
self.provider_client = provider_client.ProviderClient(**params)
self.flavor_capabilities_client = (
flavor_capabilities_client.FlavorCapabilitiesClient(
self.auth_provider, SERVICE_TYPE, CONF.identity.region))
flavor_capabilities_client.FlavorCapabilitiesClient(**params))
@@ -0,0 +1,5 @@
---
fixes:
- |
Fixed the service clients to use the tempest default service client
configuration settings.

0 comments on commit 5099fe1

Please sign in to comment.