Remove CONF values from database client
To move database client to tempest-lib, this patch moves
CONF values from database client to the client setting.
Change-Id: I00c96c15c47280cc4134b2de93ef2c9aa01447ca
diff --git a/tempest/clients.py b/tempest/clients.py
index 7679b4b..e362ac0 100644
--- a/tempest/clients.py
+++ b/tempest/clients.py
@@ -142,6 +142,14 @@
'trace_requests': CONF.debug.trace_requests
}
+ # NOTE: Tempest uses timeout values of compute API if project specific
+ # timeout values don't exist.
+ default_params_with_timeout_values = {
+ 'build_interval': CONF.compute.build_interval,
+ 'build_timeout': CONF.compute.build_timeout
+ }
+ default_params_with_timeout_values.update(default_params)
+
def __init__(self, credentials=None, interface='json', service=None):
# Set interface and client type first
self.interface = interface
@@ -162,9 +170,15 @@
build_timeout=CONF.network.build_timeout,
**self.default_params)
self.database_flavors_client = DatabaseFlavorsClientJSON(
- self.auth_provider)
+ self.auth_provider,
+ CONF.database.catalog_type,
+ CONF.identity.region,
+ **self.default_params_with_timeout_values)
self.database_versions_client = DatabaseVersionsClientJSON(
- self.auth_provider)
+ self.auth_provider,
+ CONF.database.catalog_type,
+ CONF.identity.region,
+ **self.default_params_with_timeout_values)
self.messaging_client = MessagingClientJSON(self.auth_provider)
if CONF.service_available.ceilometer:
self.telemetry_client = TelemetryClientJSON(
diff --git a/tempest/services/database/json/flavors_client.py b/tempest/services/database/json/flavors_client.py
index 9a27443..dfb2eb3 100644
--- a/tempest/services/database/json/flavors_client.py
+++ b/tempest/services/database/json/flavors_client.py
@@ -16,19 +16,10 @@
import urllib
from tempest.common import service_client
-from tempest import config
-
-CONF = config.CONF
class DatabaseFlavorsClientJSON(service_client.ServiceClient):
- def __init__(self, auth_provider):
- super(DatabaseFlavorsClientJSON, self).__init__(
- auth_provider,
- CONF.database.catalog_type,
- CONF.identity.region)
-
def list_db_flavors(self, params=None):
url = 'flavors'
if params:
diff --git a/tempest/services/database/json/versions_client.py b/tempest/services/database/json/versions_client.py
index f5c5217..c3388bb 100644
--- a/tempest/services/database/json/versions_client.py
+++ b/tempest/services/database/json/versions_client.py
@@ -16,18 +16,23 @@
import urllib
from tempest.common import service_client
-from tempest import config
-
-CONF = config.CONF
class DatabaseVersionsClientJSON(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(DatabaseVersionsClientJSON, self).__init__(
- auth_provider,
- CONF.database.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.skip_path()
def list_db_versions(self, params=None):