openstack
/
trove
Code Issues Proposed changes

Replace deprecated alias 'os' with 'os_primary' 

Tempest has deprecated the alias 'os' and will use the alias 'os_primary'
instead. The alias 'os' was deprecated in Pike and planned to be removed
in Queen.

Let's use the stable alias 'os_primary' for primary credential. This will
help Tempest to remove the deprecated alias 'os'.

Change-Id: I39c33acb6dc33d245c8452d1587c09b31178d728
This commit is contained in:
jeremy.zhang 2017-10-09 16:04:24 +08:00
parent 0fb67d459b
commit f860e06f74
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test-requirements.txt
View File

@ -28,3 +28,4 @@ couchdb>=0.8 # Apache-2.0
os-testr>=0.8.0 # Apache-2.0
astroid<1.4.0 # LGPLv2.1 # breaks pylint 1.4.4
pylint==1.4.5 # GPLv2
tempest>=16.1.0 # Apache-2.0

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

@ -49,18 +49,18 @@ class BaseDatabaseTest(tempest.test.BaseTestCase):
}
default_params_with_timeout_values.update(default_params)
cls.database_flavors_client = flavors_client.DatabaseFlavorsClient(
cls.os.auth_provider,
cls.os_primary.auth_provider,
CONF.database.catalog_type,
CONF.identity.region,
**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.os.auth_provider,
cls.os_primary.auth_provider,
CONF.database.catalog_type,
CONF.identity.region,
**default_params_with_timeout_values)
cls.database_versions_client = versions_client.DatabaseVersionsClient(
cls.os.auth_provider,
cls.os_primary.auth_provider,
CONF.database.catalog_type,
CONF.identity.region,
**default_params_with_timeout_values)