diff options
| author | Monty Taylor <mordred@inaugust.com> | 2019-01-08 15:39:58 +0000 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2019-01-10 14:21:03 +0000 |
| commit | 2dd5393167119c043ae125fead9f8ed9ba84241d (patch) | |
| tree | eab196b97e3cc159048048286fdf4c273e8072e9 /openstackclient/tests/functional/identity/v3/common.py | |
| parent | 2ab3396f19796935ddcb281b865d37839a4f84f7 (diff) | |
| download | python-openstackclient-2dd5393167119c043ae125fead9f8ed9ba84241d.tar.gz | |
Use os-cloud instead of OS env vars for functional tests
In order to support switching auth contexts, such as for registered_limits
which take a system scoped token, switch the functional tests to using
the --os-cloud command line parameter. However, honor the OS_CLOUD env var
as a way that someone can select a different cloud, including 'envvars',
to use.
Use devstack-system-admin cloud for limit tests
Keystone requires these to have system scope now.
Change-Id: Ia81eebd3e00ae986cf3ba7e3d98f3e8a1647b622
Diffstat (limited to 'openstackclient/tests/functional/identity/v3/common.py')
| -rw-r--r-- | openstackclient/tests/functional/identity/v3/common.py | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/openstackclient/tests/functional/identity/v3/common.py b/openstackclient/tests/functional/identity/v3/common.py index 58468bc7..43b416aa 100644 --- a/openstackclient/tests/functional/identity/v3/common.py +++ b/openstackclient/tests/functional/identity/v3/common.py @@ -19,6 +19,7 @@ from openstackclient.tests.functional import base BASIC_LIST_HEADERS = ['ID', 'Name'] +SYSTEM_CLOUD = os.environ.get('OS_SYSTEM_CLOUD', 'devstack-system-admin') class IdentityTests(base.TestCase): @@ -341,7 +342,8 @@ class IdentityTests(base.TestCase): 'registered limit create' ' --service %(service_name)s' ' --default-limit %(default_limit)s' - ' %(resource_name)s' % params + ' %(resource_name)s' % params, + cloud=SYSTEM_CLOUD ) items = self.parse_show(raw_output) registered_limit_id = self._extract_value_from_items('id', items) @@ -349,7 +351,8 @@ class IdentityTests(base.TestCase): if add_clean_up: self.addCleanup( self.openstack, - 'registered limit delete %s' % registered_limit_id + 'registered limit delete %s' % registered_limit_id, + cloud=SYSTEM_CLOUD ) self.assert_show_fields(items, self.REGISTERED_LIMIT_FIELDS) @@ -365,7 +368,8 @@ class IdentityTests(base.TestCase): registered_limit_id = self._create_dummy_registered_limit() raw_output = self.openstack( - 'registered limit show %s' % registered_limit_id + 'registered limit show %s' % registered_limit_id, + cloud=SYSTEM_CLOUD ) items = self.parse_show(raw_output) resource_name = self._extract_value_from_items('resource_name', items) @@ -389,13 +393,17 @@ class IdentityTests(base.TestCase): ' --project %(project_id)s' ' --service %(service_id)s' ' --resource-limit %(resource_limit)s' - ' %(resource_name)s' % params + ' %(resource_name)s' % params, + cloud=SYSTEM_CLOUD ) items = self.parse_show(raw_output) limit_id = self._extract_value_from_items('id', items) if add_clean_up: - self.addCleanup(self.openstack, 'limit delete %s' % limit_id) + self.addCleanup( + self.openstack, 'limit delete %s' % limit_id, + cloud=SYSTEM_CLOUD + ) self.assert_show_fields(items, self.LIMIT_FIELDS) return limit_id |