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

1 files changed, 43 insertions, 14 deletions

diff --git a/openstackclient/tests/functional/identity/v3/test_limit.py b/openstackclient/tests/functional/identity/v3/test_limit.py
index 03bcb06e..b03f0f28 100644
--- a/openstackclient/tests/functional/identity/v3/test_limit.py
+++ b/openstackclient/tests/functional/identity/v3/test_limit.py
@@ -10,17 +10,22 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import os
+
 from tempest.lib.common.utils import data_utils
 
 from openstackclient.tests.functional.identity.v3 import common
 
+SYSTEM_CLOUD = os.environ.get('OS_SYSTEM_CLOUD', 'devstack-system-admin')
+
 
 class LimitTestCase(common.IdentityTests):
 
     def test_limit_create_with_service_name(self):
         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)
         service_id = self._extract_value_from_items('service_id', items)
@@ -46,18 +51,24 @@ class LimitTestCase(common.IdentityTests):
             ' --project %(project_id)s'
             ' --service %(service_name)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)
-        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)
 
     def test_limit_create_with_project_name(self):
         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)
         service_id = self._extract_value_from_items('service_id', items)
@@ -80,11 +91,16 @@ class LimitTestCase(common.IdentityTests):
             ' --project %(project_name)s'
             ' --service %(service_name)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)
-        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)
         registered_limit_id = self._create_dummy_registered_limit()
@@ -107,7 +123,8 @@ class LimitTestCase(common.IdentityTests):
         raw_output = self.openstack(
             'registered limit set'
             ' %(registered_limit_id)s'
-            ' --region %(region_id)s' % params
+            ' --region %(region_id)s' % params,
+            cloud=SYSTEM_CLOUD
         )
         items = self.parse_show(raw_output)
         service_id = self._extract_value_from_items('service_id', items)
@@ -134,17 +151,25 @@ class LimitTestCase(common.IdentityTests):
             ' --resource-limit %(resource_limit)s'
             ' --region %(region_id)s'
             ' --description %(description)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)
-        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)
 
     def test_limit_show(self):
         limit_id = self._create_dummy_limit()
-        raw_output = self.openstack('limit show %s' % limit_id)
+        raw_output = self.openstack(
+            'limit show %s' % limit_id,
+            cloud=SYSTEM_CLOUD
+        )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.LIMIT_FIELDS)
 
@@ -159,7 +184,8 @@ class LimitTestCase(common.IdentityTests):
         raw_output = self.openstack(
             'limit set'
             ' --description %(description)s'
-            ' %(limit_id)s' % params
+            ' %(limit_id)s' % params,
+            cloud=SYSTEM_CLOUD
         )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.LIMIT_FIELDS)
@@ -175,18 +201,21 @@ class LimitTestCase(common.IdentityTests):
         raw_output = self.openstack(
             'limit set'
             ' --resource-limit %(resource_limit)s'
-            ' %(limit_id)s' % params
+            ' %(limit_id)s' % params,
+            cloud=SYSTEM_CLOUD
         )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.LIMIT_FIELDS)
 
     def test_limit_list(self):
         self._create_dummy_limit()
-        raw_output = self.openstack('limit list')
+        raw_output = self.openstack('limit list', cloud=SYSTEM_CLOUD)
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, self.LIMIT_LIST_HEADERS)
 
     def test_limit_delete(self):
         limit_id = self._create_dummy_limit(add_clean_up=False)
-        raw_output = self.openstack('limit delete %s' % limit_id)
+        raw_output = self.openstack(
+            'limit delete %s' % limit_id,
+            cloud=SYSTEM_CLOUD)
         self.assertEqual(0, len(raw_output))