Merge "Fix Trove tempest plugin"

openstack · 6d5c082d54001b29b262c9a2a1a4d7222911f2ba · Jenkins committed with openstack-gerrit Jan 5, 2017 · Jan 5, 2017 · 6d5c082
2 parents e49f213 + ed0c41b
commit 6d5c082d54001b29b262c9a2a1a4d7222911f2ba
Unified Split

Showing with 12 additions and 3 deletions.

+12 −3 trove/tests/tempest/tests/api/database/base.py
diff --git a/trove/tests/tempest/tests/api/database/base.py b/trove/tests/tempest/tests/api/database/base.py
@@ -39,22 +39,31 @@ def skip_checks(cls):
     @classmethod
     def setup_clients(cls):
         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.os.auth_provider,
             CONF.database.catalog_type,
             CONF.identity.region,
-            **cls.os.default_params_with_timeout_values)
+            **default_params_with_timeout_values)
         cls.os_flavors_client = cls.os.flavors_client
         cls.database_limits_client = limits_client.DatabaseLimitsClient(
             cls.os.auth_provider,
             CONF.database.catalog_type,
             CONF.identity.region,
-            **cls.os.default_params_with_timeout_values)
+            **default_params_with_timeout_values)
         cls.database_versions_client = versions_client.DatabaseVersionsClient(
             cls.os.auth_provider,
             CONF.database.catalog_type,
             CONF.identity.region,
-            **cls.os.default_params_with_timeout_values)
+            **default_params_with_timeout_values)
 
     @classmethod
     def resource_setup(cls):