Merge "use env vars to specify OS_IDENTITY_API_VERSION"

Author: Jenkins

…ional/tests/identity/v2/test_identity.py functional/tests/identity/v2/common.pyfunctional/tests/identity/v2/test_identity.py renamed to functional/tests/identity/v2/common.py functional/tests/identity/v2/test_identity.py renamed to functional/tests/identity/v2/common.py

@@ -10,6 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import os
+
 from tempest.lib.common.utils import data_utils
 
 from functional.common import test
@@ -39,8 +41,11 @@ class IdentityTests(test.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        if hasattr(super(IdentityTests, cls), 'setUpClass'):
-            super(IdentityTests, cls).setUpClass()
+        # prepare v2 env
+        os.environ['OS_IDENTITY_API_VERSION'] = '2.0'
+        auth_url = os.environ.get('OS_AUTH_URL')
+        auth_url = auth_url.replace('v3', 'v2.0')
+        os.environ['OS_AUTH_URL'] = auth_url
 
         # create dummy project
         cls.project_name = data_utils.rand_name('TestProject')

functional/tests/identity/v2/test_catalog.py

@@ -10,10 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from functional.tests.identity.v2 import test_identity
+from functional.tests.identity.v2 import common
 
 
-class CatalogTests(test_identity.IdentityTests):
+class CatalogTests(common.IdentityTests):
 
     def test_catalog_list(self):
         raw_output = self.openstack('catalog list')

functional/tests/identity/v2/test_ec2_credentials.py

@@ -10,10 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from functional.tests.identity.v2 import test_identity
+from functional.tests.identity.v2 import common
 
 
-class EC2CredentialsTests(test_identity.IdentityTests):
+class EC2CredentialsTests(common.IdentityTests):
 
     def test_ec2_credentials_create(self):
         self._create_dummy_ec2_credentials()

functional/tests/identity/v2/test_endpoint.py

@@ -10,10 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from functional.tests.identity.v2 import test_identity
+from functional.tests.identity.v2 import common
 
 
-class EndpointTests(test_identity.IdentityTests):
+class EndpointTests(common.IdentityTests):
 
     def test_endpoint_create(self):
         self._create_dummy_endpoint()

functional/tests/identity/v2/test_project.py

@@ -12,10 +12,10 @@
 
 from tempest.lib.common.utils import data_utils
 
-from functional.tests.identity.v2 import test_identity
+from functional.tests.identity.v2 import common
 
 
-class ProjectTests(test_identity.IdentityTests):
+class ProjectTests(common.IdentityTests):
 
     def test_project_create(self):
         project_name = data_utils.rand_name('TestProject')
@@ -49,7 +49,7 @@ def test_project_delete(self):
     def test_project_list(self):
         raw_output = self.openstack('project list')
         items = self.parse_listing(raw_output)
-        self.assert_table_structure(items, test_identity.BASIC_LIST_HEADERS)
+        self.assert_table_structure(items, common.BASIC_LIST_HEADERS)
 
     def test_project_set(self):
         project_name = self._create_dummy_project()

functional/tests/identity/v2/test_role.py

@@ -10,10 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from functional.tests.identity.v2 import test_identity
+from functional.tests.identity.v2 import common
 
 
-class RoleTests(test_identity.IdentityTests):
+class RoleTests(common.IdentityTests):
 
     def test_role_create(self):
         self._create_dummy_role()
@@ -27,7 +27,7 @@ def test_role_list(self):
         self._create_dummy_role()
         raw_output = self.openstack('role list')
         items = self.parse_listing(raw_output)
-        self.assert_table_structure(items, test_identity.BASIC_LIST_HEADERS)
+        self.assert_table_structure(items, common.BASIC_LIST_HEADERS)
 
     def test_role_list_with_user_project(self):
         project_name = self._create_dummy_project()
@@ -58,7 +58,7 @@ def test_role_list_with_user_project(self):
             '' % {'project': project_name,
                   'user': username})
         items = self.parse_listing(raw_output)
-        self.assert_table_structure(items, test_identity.BASIC_LIST_HEADERS)
+        self.assert_table_structure(items, common.BASIC_LIST_HEADERS)
         self.assertEqual(1, len(items))
 
     def test_role_show(self):

functional/tests/identity/v2/test_service.py

@@ -10,10 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from functional.tests.identity.v2 import test_identity
+from functional.tests.identity.v2 import common
 
 
-class ServiceTests(test_identity.IdentityTests):
+class ServiceTests(common.IdentityTests):
 
     def test_service_create(self):
         self._create_dummy_service()
@@ -27,7 +27,7 @@ def test_service_list(self):
         self._create_dummy_service()
         raw_output = self.openstack('service list')
         items = self.parse_listing(raw_output)
-        self.assert_table_structure(items, test_identity.BASIC_LIST_HEADERS)
+        self.assert_table_structure(items, common.BASIC_LIST_HEADERS)
 
     def test_service_show(self):
         service_name = self._create_dummy_service()

functional/tests/identity/v2/test_token.py

@@ -10,10 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from functional.tests.identity.v2 import test_identity
+from functional.tests.identity.v2 import common
 
 
-class TokenTests(test_identity.IdentityTests):
+class TokenTests(common.IdentityTests):
 
     def test_token_issue(self):
         self._create_dummy_token()

functional/tests/identity/v2/test_user.py

@@ -13,10 +13,10 @@
 from tempest.lib.common.utils import data_utils
 from tempest.lib import exceptions
 
-from functional.tests.identity.v2 import test_identity
+from functional.tests.identity.v2 import common
 
 
-class UserTests(test_identity.IdentityTests):
+class UserTests(common.IdentityTests):
 
     def test_user_create(self):
         self._create_dummy_user()
@@ -29,7 +29,7 @@ def test_user_delete(self):
     def test_user_list(self):
         raw_output = self.openstack('user list')
         items = self.parse_listing(raw_output)
-        self.assert_table_structure(items, test_identity.BASIC_LIST_HEADERS)
+        self.assert_table_structure(items, common.BASIC_LIST_HEADERS)
 
     def test_user_set(self):
         username = self._create_dummy_user()

…ional/tests/identity/v3/test_identity.py functional/tests/identity/v3/common.pyfunctional/tests/identity/v3/test_identity.py renamed to functional/tests/identity/v3/common.py functional/tests/identity/v3/test_identity.py renamed to functional/tests/identity/v3/common.py

@@ -51,15 +51,11 @@ class IdentityTests(test.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        if hasattr(super(IdentityTests, cls), 'setUpClass'):
-            super(IdentityTests, cls).setUpClass()
-
         # prepare v3 env
+        os.environ['OS_IDENTITY_API_VERSION'] = '3'
         auth_url = os.environ.get('OS_AUTH_URL')
         auth_url = auth_url.replace('v2.0', 'v3')
         os.environ['OS_AUTH_URL'] = auth_url
-        os.environ['OS_IDENTITY_API_VERSION'] = '3'
-        os.environ['OS_AUTH_TYPE'] = 'v3password'
 
         # create dummy domain
         cls.domain_name = data_utils.rand_name('TestDomain')