Merge "Replace deprecated alias 'os' with 'os_primary'"
This commit is contained in:
commit
637cb40ae1
@ -49,18 +49,18 @@ class BaseDatabaseTest(tempest.test.BaseTestCase):
|
|||||||
}
|
}
|
||||||
default_params_with_timeout_values.update(default_params)
|
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_primary.auth_provider,
|
||||||
CONF.database.catalog_type,
|
CONF.database.catalog_type,
|
||||||
CONF.identity.region,
|
CONF.identity.region,
|
||||||
**default_params_with_timeout_values)
|
**default_params_with_timeout_values)
|
||||||
cls.os_flavors_client = cls.os.flavors_client
|
cls.os_flavors_client = cls.os_primary.flavors_client
|
||||||
cls.database_limits_client = limits_client.DatabaseLimitsClient(
|
cls.database_limits_client = limits_client.DatabaseLimitsClient(
|
||||||
cls.os.auth_provider,
|
cls.os_primary.auth_provider,
|
||||||
CONF.database.catalog_type,
|
CONF.database.catalog_type,
|
||||||
CONF.identity.region,
|
CONF.identity.region,
|
||||||
**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_primary.auth_provider,
|
||||||
CONF.database.catalog_type,
|
CONF.database.catalog_type,
|
||||||
CONF.identity.region,
|
CONF.identity.region,
|
||||||
**default_params_with_timeout_values)
|
**default_params_with_timeout_values)
|
||||||
|
Loading…
Reference in New Issue
Block a user