commit 250745d1c4fe676797beae0bad5230aefd90a187
author Jenkins <jenkins@review.openstack.org> Tue Feb 03 05:33:33 2015 +0000
committer Gerrit Code Review <review@openstack.org> Tue Feb 03 05:33:33 2015 +0000
tree ed94e4250a7e5ee33bf4273ae144a83fbd19aaf1
parent 199e44e6ce25fa5b4bc18c8bd9da5f11cad2a163
parent 2183a65887d6ff0b23d0d7d77bf2440e66420a4c

Merge "Remove CONF values from messaging client"

tempest/clients.py

diff --git a/tempest/clients.py b/tempest/clients.py
index aa6d3ed..f484d70 100644
--- a/tempest/clients.py
+++ b/tempest/clients.py
@@ -180,7 +180,11 @@
             CONF.database.catalog_type,
             CONF.identity.region,
             **self.default_params_with_timeout_values)
-        self.messaging_client = MessagingClientJSON(self.auth_provider)
+        self.messaging_client = MessagingClientJSON(
+            self.auth_provider,
+            CONF.messaging.catalog_type,
+            CONF.identity.region,
+            **self.default_params_with_timeout_values)
         if CONF.service_available.ceilometer:
             self.telemetry_client = TelemetryClientJSON(
                 self.auth_provider)

tempest/services/messaging/json/messaging_client.py

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)
 

tempest/tests/common/test_service_clients.py

diff --git a/tempest/tests/common/test_service_clients.py b/tempest/tests/common/test_service_clients.py
index c8fe7b7..d8a5ec5 100644
--- a/tempest/tests/common/test_service_clients.py
+++ b/tempest/tests/common/test_service_clients.py
@@ -43,6 +43,7 @@
 from tempest.services.compute.json import volumes_extensions_client
 from tempest.services.database.json import flavors_client as db_flavor_client
 from tempest.services.database.json import versions_client as db_version_client
+from tempest.services.messaging.json import messaging_client
 from tempest.services.network.json import network_client
 from tempest.services.object_storage import account_client
 from tempest.services.object_storage import container_client
@@ -83,6 +84,7 @@
             volumes_extensions_client.VolumesExtensionsClientJSON,
             db_flavor_client.DatabaseFlavorsClientJSON,
             db_version_client.DatabaseVersionsClientJSON,
+            messaging_client.MessagingClientJSON,
             network_client.NetworkClientJSON,
             account_client.AccountClient,
             container_client.ContainerClient,