From dd242552a656a3fe596adfd54cba1c3d907edb95 Mon Sep 17 00:00:00 2001 From: ghanshyam Date: Tue, 20 Dec 2016 08:59:31 +0900 Subject: [PATCH] Fix Trove tempest plugin Id518a6d87d0949737cd1c50cb6a83149b85e5f85 removes the class variable from tempest - 'default_params_with_timeout_values' This was kept in tempest only to be used for baremetal tests. Due to that, trove tempest tests are failing- http://logs.openstack.org/71/410971/3/check/gate-tempest-dsvm-trove-ubuntu-xenial/f2146d4/logs/testr_results.html.gz Each Temepst plugin should either have their own config options for builld timeout etc or use the default one. Currently this commit makes use of timeout and other values from config which are stable. Closes-Bug: #1651229 Change-Id: Id3c91f6e4228d2a3e9151b71940b9a4c94c2eb36 --- trove/tests/tempest/tests/api/database/base.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/trove/tests/tempest/tests/api/database/base.py b/trove/tests/tempest/tests/api/database/base.py index 98fe727..a0d58bd 100644 --- a/trove/tests/tempest/tests/api/database/base.py +++ b/trove/tests/tempest/tests/api/database/base.py @@ -39,22 +39,31 @@ class BaseDatabaseTest(tempest.test.BaseTestCase): @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):