From cb28fb55884a9be7cd70c37343181116cf000a42 Mon Sep 17 00:00:00 2001 From: Steve Martinelli Date: Mon, 20 Jun 2016 17:12:44 -0400 Subject: [PATCH] use env vars to specify OS_IDENTITY_API_VERSION If the default identity API version were to change in devstack, the v2.0 tests would fail today, resulting in a broken OSC gate. Change-Id: Id634ea7e0fab9f3772383b5512ccac19f5119ac0 --- .../tests/identity/v2/{test_identity.py => common.py} | 9 +++++++-- functional/tests/identity/v2/test_catalog.py | 4 ++-- functional/tests/identity/v2/test_ec2_credentials.py | 4 ++-- functional/tests/identity/v2/test_endpoint.py | 4 ++-- functional/tests/identity/v2/test_project.py | 6 +++--- functional/tests/identity/v2/test_role.py | 8 ++++---- functional/tests/identity/v2/test_service.py | 6 +++--- functional/tests/identity/v2/test_token.py | 4 ++-- functional/tests/identity/v2/test_user.py | 6 +++--- .../tests/identity/v3/{test_identity.py => common.py} | 6 +----- functional/tests/identity/v3/test_catalog.py | 4 ++-- functional/tests/identity/v3/test_domain.py | 6 +++--- functional/tests/identity/v3/test_endpoint.py | 4 ++-- functional/tests/identity/v3/test_group.py | 8 ++++---- functional/tests/identity/v3/test_idp.py | 4 ++-- functional/tests/identity/v3/test_project.py | 8 ++++---- functional/tests/identity/v3/test_region.py | 4 ++-- functional/tests/identity/v3/test_role.py | 8 ++++---- functional/tests/identity/v3/test_service.py | 6 +++--- functional/tests/identity/v3/test_service_provider.py | 4 ++-- functional/tests/identity/v3/test_token.py | 4 ++-- functional/tests/identity/v3/test_user.py | 6 +++--- 22 files changed, 62 insertions(+), 61 deletions(-) rename functional/tests/identity/v2/{test_identity.py => common.py} (96%) rename functional/tests/identity/v3/{test_identity.py => common.py} (98%) diff --git a/functional/tests/identity/v2/test_identity.py b/functional/tests/identity/v2/common.py similarity index 96% rename from functional/tests/identity/v2/test_identity.py rename to functional/tests/identity/v2/common.py index 9adbe49f4f..9d6a7bb5b0 100644 --- a/functional/tests/identity/v2/test_identity.py +++ b/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') diff --git a/functional/tests/identity/v2/test_catalog.py b/functional/tests/identity/v2/test_catalog.py index 3a1f7e112a..b6291e05d1 100644 --- a/functional/tests/identity/v2/test_catalog.py +++ b/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') diff --git a/functional/tests/identity/v2/test_ec2_credentials.py b/functional/tests/identity/v2/test_ec2_credentials.py index 86702c0c6f..319bd11a64 100644 --- a/functional/tests/identity/v2/test_ec2_credentials.py +++ b/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() diff --git a/functional/tests/identity/v2/test_endpoint.py b/functional/tests/identity/v2/test_endpoint.py index 8064365e01..0682e6b476 100644 --- a/functional/tests/identity/v2/test_endpoint.py +++ b/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() diff --git a/functional/tests/identity/v2/test_project.py b/functional/tests/identity/v2/test_project.py index e9580ecfb6..7fb1a98de0 100644 --- a/functional/tests/identity/v2/test_project.py +++ b/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 @@ class ProjectTests(test_identity.IdentityTests): 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() diff --git a/functional/tests/identity/v2/test_role.py b/functional/tests/identity/v2/test_role.py index 9ee60069bc..0f8d5ed4b8 100644 --- a/functional/tests/identity/v2/test_role.py +++ b/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 @@ class RoleTests(test_identity.IdentityTests): 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 @@ class RoleTests(test_identity.IdentityTests): '' % {'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): diff --git a/functional/tests/identity/v2/test_service.py b/functional/tests/identity/v2/test_service.py index bd982be1bd..219ed33f07 100644 --- a/functional/tests/identity/v2/test_service.py +++ b/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 @@ class ServiceTests(test_identity.IdentityTests): 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() diff --git a/functional/tests/identity/v2/test_token.py b/functional/tests/identity/v2/test_token.py index bac2b0ac9c..ca9b7d683b 100644 --- a/functional/tests/identity/v2/test_token.py +++ b/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() diff --git a/functional/tests/identity/v2/test_user.py b/functional/tests/identity/v2/test_user.py index 34cabf7bf4..ef4deface2 100644 --- a/functional/tests/identity/v2/test_user.py +++ b/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 @@ class UserTests(test_identity.IdentityTests): 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() diff --git a/functional/tests/identity/v3/test_identity.py b/functional/tests/identity/v3/common.py similarity index 98% rename from functional/tests/identity/v3/test_identity.py rename to functional/tests/identity/v3/common.py index 3f9887428b..a7cddfc2c9 100644 --- a/functional/tests/identity/v3/test_identity.py +++ b/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') diff --git a/functional/tests/identity/v3/test_catalog.py b/functional/tests/identity/v3/test_catalog.py index 6836452954..e33876b083 100644 --- a/functional/tests/identity/v3/test_catalog.py +++ b/functional/tests/identity/v3/test_catalog.py @@ -10,10 +10,10 @@ # License for the specific language governing permissions and limitations # under the License. -from functional.tests.identity.v3 import test_identity +from functional.tests.identity.v3 import common -class CatalogTests(test_identity.IdentityTests): +class CatalogTests(common.IdentityTests): def test_catalog_list(self): raw_output = self.openstack('catalog list') diff --git a/functional/tests/identity/v3/test_domain.py b/functional/tests/identity/v3/test_domain.py index 0708e4200d..305ed58da5 100644 --- a/functional/tests/identity/v3/test_domain.py +++ b/functional/tests/identity/v3/test_domain.py @@ -13,10 +13,10 @@ from tempest.lib.common.utils import data_utils from tempest.lib import exceptions -from functional.tests.identity.v3 import test_identity +from functional.tests.identity.v3 import common -class DomainTests(test_identity.IdentityTests): +class DomainTests(common.IdentityTests): def test_domain_create(self): domain_name = data_utils.rand_name('TestDomain') @@ -33,7 +33,7 @@ class DomainTests(test_identity.IdentityTests): self._create_dummy_domain() raw_output = self.openstack('domain 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_domain_delete(self): domain_name = self._create_dummy_domain(add_clean_up=False) diff --git a/functional/tests/identity/v3/test_endpoint.py b/functional/tests/identity/v3/test_endpoint.py index ec11deab30..162c9e58cd 100644 --- a/functional/tests/identity/v3/test_endpoint.py +++ b/functional/tests/identity/v3/test_endpoint.py @@ -12,10 +12,10 @@ from tempest.lib.common.utils import data_utils -from functional.tests.identity.v3 import test_identity +from functional.tests.identity.v3 import common -class EndpointTests(test_identity.IdentityTests): +class EndpointTests(common.IdentityTests): def test_endpoint_create(self): self._create_dummy_endpoint(interface='public') diff --git a/functional/tests/identity/v3/test_group.py b/functional/tests/identity/v3/test_group.py index 3f58864dc2..350756989f 100644 --- a/functional/tests/identity/v3/test_group.py +++ b/functional/tests/identity/v3/test_group.py @@ -12,10 +12,10 @@ from tempest.lib.common.utils import data_utils -from functional.tests.identity.v3 import test_identity +from functional.tests.identity.v3 import common -class GroupTests(test_identity.IdentityTests): +class GroupTests(common.IdentityTests): def test_group_create(self): self._create_dummy_group() @@ -24,7 +24,7 @@ class GroupTests(test_identity.IdentityTests): group_name = self._create_dummy_group() raw_output = self.openstack('group 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) self.assertIn(group_name, raw_output) def test_group_list_with_domain(self): @@ -32,7 +32,7 @@ class GroupTests(test_identity.IdentityTests): raw_output = self.openstack( 'group list --domain %s' % self.domain_name) 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.assertIn(group_name, raw_output) def test_group_delete(self): diff --git a/functional/tests/identity/v3/test_idp.py b/functional/tests/identity/v3/test_idp.py index 08f660f66d..8d86471245 100644 --- a/functional/tests/identity/v3/test_idp.py +++ b/functional/tests/identity/v3/test_idp.py @@ -10,11 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. -from functional.tests.identity.v3 import test_identity +from functional.tests.identity.v3 import common from tempest.lib.common.utils import data_utils -class IdentityProviderTests(test_identity.IdentityTests): +class IdentityProviderTests(common.IdentityTests): # Introduce functional test case for command 'Identity Provider' def test_idp_create(self): diff --git a/functional/tests/identity/v3/test_project.py b/functional/tests/identity/v3/test_project.py index d060c7b1a1..a27c58fb49 100644 --- a/functional/tests/identity/v3/test_project.py +++ b/functional/tests/identity/v3/test_project.py @@ -12,10 +12,10 @@ from tempest.lib.common.utils import data_utils -from functional.tests.identity.v3 import test_identity +from functional.tests.identity.v3 import common -class ProjectTests(test_identity.IdentityTests): +class ProjectTests(common.IdentityTests): def test_project_create(self): project_name = data_utils.rand_name('TestProject') @@ -57,14 +57,14 @@ class ProjectTests(test_identity.IdentityTests): 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_list_with_domain(self): project_name = self._create_dummy_project() raw_output = self.openstack( 'project list --domain %s' % self.domain_name) 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.assertIn(project_name, raw_output) self.assertTrue(len(items) > 0) diff --git a/functional/tests/identity/v3/test_region.py b/functional/tests/identity/v3/test_region.py index be6ef1cb68..5ba0c231c6 100644 --- a/functional/tests/identity/v3/test_region.py +++ b/functional/tests/identity/v3/test_region.py @@ -10,10 +10,10 @@ # License for the specific language governing permissions and limitations # under the License. -from functional.tests.identity.v3 import test_identity +from functional.tests.identity.v3 import common -class RegionTests(test_identity.IdentityTests): +class RegionTests(common.IdentityTests): def test_region_create(self): self._create_dummy_region() diff --git a/functional/tests/identity/v3/test_role.py b/functional/tests/identity/v3/test_role.py index 29dc4b2005..60aaf3f457 100644 --- a/functional/tests/identity/v3/test_role.py +++ b/functional/tests/identity/v3/test_role.py @@ -12,10 +12,10 @@ from tempest.lib.common.utils import data_utils -from functional.tests.identity.v3 import test_identity +from functional.tests.identity.v3 import common -class RoleTests(test_identity.IdentityTests): +class RoleTests(common.IdentityTests): def test_role_create(self): self._create_dummy_role() @@ -29,7 +29,7 @@ class RoleTests(test_identity.IdentityTests): 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): role_name = self._create_dummy_role() @@ -69,7 +69,7 @@ class RoleTests(test_identity.IdentityTests): 'user': username, 'user_domain': self.domain_name}) 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): diff --git a/functional/tests/identity/v3/test_service.py b/functional/tests/identity/v3/test_service.py index 684fa5fea8..c757d914ee 100644 --- a/functional/tests/identity/v3/test_service.py +++ b/functional/tests/identity/v3/test_service.py @@ -12,10 +12,10 @@ from tempest.lib.common.utils import data_utils -from functional.tests.identity.v3 import test_identity +from functional.tests.identity.v3 import common -class ServiceTests(test_identity.IdentityTests): +class ServiceTests(common.IdentityTests): def test_service_create(self): self._create_dummy_service() @@ -29,7 +29,7 @@ class ServiceTests(test_identity.IdentityTests): 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_set(self): service_name = self._create_dummy_service() diff --git a/functional/tests/identity/v3/test_service_provider.py b/functional/tests/identity/v3/test_service_provider.py index 936c6620d6..6cfa7e56db 100644 --- a/functional/tests/identity/v3/test_service_provider.py +++ b/functional/tests/identity/v3/test_service_provider.py @@ -10,11 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. -from functional.tests.identity.v3 import test_identity +from functional.tests.identity.v3 import common from tempest.lib.common.utils import data_utils -class ServiceProviderTests(test_identity.IdentityTests): +class ServiceProviderTests(common.IdentityTests): # Introduce functional test cases for command 'Service Provider' def test_sp_create(self): diff --git a/functional/tests/identity/v3/test_token.py b/functional/tests/identity/v3/test_token.py index 67fddccf68..d8d3f43d66 100644 --- a/functional/tests/identity/v3/test_token.py +++ b/functional/tests/identity/v3/test_token.py @@ -10,10 +10,10 @@ # License for the specific language governing permissions and limitations # under the License. -from functional.tests.identity.v3 import test_identity +from functional.tests.identity.v3 import common -class TokenTests(test_identity.IdentityTests): +class TokenTests(common.IdentityTests): def test_token_issue(self): raw_output = self.openstack('token issue') diff --git a/functional/tests/identity/v3/test_user.py b/functional/tests/identity/v3/test_user.py index cc3e08a0b3..f3657064c9 100644 --- a/functional/tests/identity/v3/test_user.py +++ b/functional/tests/identity/v3/test_user.py @@ -12,10 +12,10 @@ from tempest.lib.common.utils import data_utils -from functional.tests.identity.v3 import test_identity +from functional.tests.identity.v3 import common -class UserTests(test_identity.IdentityTests): +class UserTests(common.IdentityTests): def test_user_create(self): self._create_dummy_user() @@ -31,7 +31,7 @@ class UserTests(test_identity.IdentityTests): 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()