Remove CONF values from messaging client
To move messaging client to tempest-lib, this patch moves
CONF values from messaging client to the client setting.
Change-Id: Iedda3da7074e9db6759f2b32bb905cf3d83baf52
diff --git a/tempest/services/messaging/json/messaging_client.py b/tempest/services/messaging/json/messaging_client.py
index c4c9f09..229dea1 100644
--- a/tempest/services/messaging/json/messaging_client.py
+++ b/tempest/services/messaging/json/messaging_client.py
@@ -19,19 +19,24 @@
from tempest.api_schema.response.messaging.v1 import queues as queues_schema
from tempest.common import service_client
from tempest.common.utils import data_utils
-from tempest import config
-
-
-CONF = config.CONF
class MessagingClientJSON(service_client.ServiceClient):
- def __init__(self, auth_provider):
+ def __init__(self, auth_provider, service, region,
+ endpoint_type=None, build_interval=None, build_timeout=None,
+ disable_ssl_certificate_validation=None, ca_certs=None,
+ trace_requests=None):
+ dscv = disable_ssl_certificate_validation
super(MessagingClientJSON, self).__init__(
- auth_provider,
- CONF.messaging.catalog_type,
- CONF.identity.region)
+ auth_provider, service, region,
+ endpoint_type=endpoint_type,
+ build_interval=build_interval,
+ build_timeout=build_timeout,
+ disable_ssl_certificate_validation=dscv,
+ ca_certs=ca_certs,
+ trace_requests=trace_requests)
+
self.version = '1'
self.uri_prefix = 'v{0}'.format(self.version)