openstack/trove-tempest-plugin
Code Issues Proposed changes

Merge "Fix Trove tempest plugin"

Browse Source
This commit is contained in:
Jenkins 2017-01-05 05:51:51 +00:00 committed by Gerrit Code Review
commit a75be5ef8b
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
trove/tests/tempest/tests/api/database/base.py
View File

@ -39,22 +39,31 @@ class BaseDatabaseTest(tempest.test.BaseTestCase):
@classmethod @classmethod
def setup_clients(cls): def setup_clients(cls):
super(BaseDatabaseTest, cls).setup_clients() super(BaseDatabaseTest, cls).setup_clients()
default_params = config.service_client_config()
# 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)
cls.database_flavors_client = flavors_client.DatabaseFlavorsClient( cls.database_flavors_client = flavors_client.DatabaseFlavorsClient(
cls.os.auth_provider, cls.os.auth_provider,
CONF.database.catalog_type, CONF.database.catalog_type,
CONF.identity.region, CONF.identity.region,
**cls.os.default_params_with_timeout_values) **default_params_with_timeout_values)
cls.os_flavors_client = cls.os.flavors_client cls.os_flavors_client = cls.os.flavors_client
cls.database_limits_client = limits_client.DatabaseLimitsClient( cls.database_limits_client = limits_client.DatabaseLimitsClient(
cls.os.auth_provider, cls.os.auth_provider,
CONF.database.catalog_type, CONF.database.catalog_type,
CONF.identity.region, CONF.identity.region,
**cls.os.default_params_with_timeout_values) **default_params_with_timeout_values)
cls.database_versions_client = versions_client.DatabaseVersionsClient( cls.database_versions_client = versions_client.DatabaseVersionsClient(
cls.os.auth_provider, cls.os.auth_provider,
CONF.database.catalog_type, CONF.database.catalog_type,
CONF.identity.region, CONF.identity.region,
**cls.os.default_params_with_timeout_values) **default_params_with_timeout_values)
@classmethod @classmethod
def resource_setup(cls): def resource_setup(cls):