python-openstackclient 10.0.0__py3-none-any.whl → 10.1.0__py3-none-any.whl

openstackclient/tests/unit/identity/v3/test_mappings.py

@@ -12,109 +12,189 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-import copy
 from unittest import mock
 
 from osc_lib import exceptions
 
+from openstack.identity.v3 import mapping as _mapping
+from openstack.test import fakes as sdk_fakes
 from openstackclient.identity.v3 import mapping
-from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 
-class TestMapping(identity_fakes.TestFederatedIdentity):
+MAPPING_RULES_FILE_PATH = '/tmp/path/to/file'
+# Copied from
+# https://opendev.org/openstack/keystone/src/branch/stable/2026.1/keystone/tests/unit/mapping_fixtures.py
+EMPLOYEE_GROUP_ID = "0cd5e9"
+CONTRACTOR_GROUP_ID = "85a868"
+TESTER_GROUP_ID = "123"
+DEVELOPER_GROUP_ID = "xyz"
+MAPPING_RULES = [
+    {
+        "local": [
+            {"group": {"id": EMPLOYEE_GROUP_ID}},
+            {"user": {"name": "{0}"}},
+        ],
+        "remote": [
+            {"type": "UserName"},
+            {
+                "type": "orgPersonType",
+                "not_any_of": ["Contractor", "SubContractor"],
+            },
+            {"type": "LastName", "any_one_of": ["Bo"]},
+        ],
+    },
+    {
+        "local": [
+            {"group": {"id": CONTRACTOR_GROUP_ID}},
+            {"user": {"name": "{0}"}},
+        ],
+        "remote": [
+            {"type": "UserName"},
+            {
+                "type": "orgPersonType",
+                "any_one_of": ["Contractor", "SubContractor"],
+            },
+            {"type": "FirstName", "any_one_of": ["Jill"]},
+        ],
+    },
+]
+MAPPING_RULES_2 = {
+    "rules": [
+        {
+            "local": [
+                {
+                    "user": {"name": "{0} {1}", "email": "{2}"},
+                    "group": {"id": EMPLOYEE_GROUP_ID},
+                }
+            ],
+            "remote": [
+                {"type": "FirstName"},
+                {"type": "LastName"},
+                {"type": "Email"},
+                {
+                    "type": "orgPersonType",
+                    "any_one_of": ["Admin", "Big Cheese"],
+                },
+            ],
+        },
+        {
+            "local": [{"user": {"name": "{0}", "email": "{1}"}}],
+            "remote": [
+                {"type": "UserName"},
+                {"type": "Email"},
+                {
+                    "type": "orgPersonType",
+                    "not_any_of": [
+                        "Admin",
+                        "Employee",
+                        "Contractor",
+                        "Tester",
+                    ],
+                },
+            ],
+        },
+        {
+            "local": [
+                {"group": {"id": TESTER_GROUP_ID}},
+                {"group": {"id": DEVELOPER_GROUP_ID}},
+                {"user": {"name": "{0}"}},
+            ],
+            "remote": [
+                {"type": "UserName"},
+                {"type": "orgPersonType", "any_one_of": ["Tester"]},
+                {
+                    "type": "Email",
+                    "any_one_of": [".*@example.com$"],
+                    "regex": True,
+                },
+            ],
+        },
+    ]
+}
+
+
+class TestMappingCreate(identity_fakes.TestFederatedIdentity):
     def setUp(self):
         super().setUp()
 
-        federation_lib = self.identity_client.federation
-        self.mapping_mock = federation_lib.mappings
-        self.mapping_mock.reset_mock()
-
-
-class TestMappingCreate(TestMapping):
-    def setUp(self):
-        super().setUp()
-        self.mapping_mock.create.return_value = fakes.FakeResource(
-            None, copy.deepcopy(identity_fakes.MAPPING_RESPONSE), loaded=True
+        self.mapping = sdk_fakes.generate_fake_resource(
+            _mapping.Mapping, rules=MAPPING_RULES, schema_version=None
         )
+        self.identity_sdk_client.create_mapping.return_value = self.mapping
+
         self.cmd = mapping.CreateMapping(self.app, None)
 
     def test_create_mapping(self):
         arglist = [
             '--rules',
-            identity_fakes.mapping_rules_file_path,
-            identity_fakes.mapping_id,
+            MAPPING_RULES_FILE_PATH,
+            self.mapping.id,
         ]
         verifylist = [
-            ('mapping', identity_fakes.mapping_id),
-            ('rules', identity_fakes.mapping_rules_file_path),
+            ('mapping', self.mapping.id),
+            ('rules', MAPPING_RULES_FILE_PATH),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         mocker = mock.Mock()
-        mocker.return_value = identity_fakes.MAPPING_RULES
+        mocker.return_value = MAPPING_RULES
         with mock.patch(
             "openstackclient.identity.v3.mapping.CreateMapping._read_rules",
             mocker,
         ):
             columns, data = self.cmd.take_action(parsed_args)
 
-        self.mapping_mock.create.assert_called_with(
-            mapping_id=identity_fakes.mapping_id,
-            rules=identity_fakes.MAPPING_RULES,
-            schema_version=None,
+        self.identity_sdk_client.create_mapping.assert_called_with(
+            id=self.mapping.id, rules=MAPPING_RULES, schema_version=None
         )
 
-        collist = ('id', 'rules')
+        collist = ('id', 'rules', 'schema_version')
         self.assertEqual(collist, columns)
 
-        datalist = (identity_fakes.mapping_id, identity_fakes.MAPPING_RULES)
+        datalist = (self.mapping.id, MAPPING_RULES, None)
         self.assertEqual(datalist, data)
 
 
-class TestMappingDelete(TestMapping):
+class TestMappingDelete(identity_fakes.TestFederatedIdentity):
     def setUp(self):
         super().setUp()
-        self.mapping_mock.get.return_value = fakes.FakeResource(
-            None, copy.deepcopy(identity_fakes.MAPPING_RESPONSE), loaded=True
-        )
 
-        self.mapping_mock.delete.return_value = None
+        self.mapping = sdk_fakes.generate_fake_resource(
+            _mapping.Mapping, rules=MAPPING_RULES, schema_version=None
+        )
+        self.identity_sdk_client.delete_mapping.return_value = None
         self.cmd = mapping.DeleteMapping(self.app, None)
 
     def test_delete_mapping(self):
-        arglist = [identity_fakes.mapping_id]
-        verifylist = [('mapping', [identity_fakes.mapping_id])]
+        arglist = [self.mapping.id]
+        verifylist = [('mapping', [self.mapping.id])]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
 
-        self.mapping_mock.delete.assert_called_with(identity_fakes.mapping_id)
+        self.identity_sdk_client.delete_mapping.assert_called_with(
+            self.mapping.id, ignore_missing=False
+        )
         self.assertIsNone(result)
 
 
-class TestMappingList(TestMapping):
+class TestMappingList(identity_fakes.TestFederatedIdentity):
     def setUp(self):
         super().setUp()
-        self.mapping_mock.get.return_value = fakes.FakeResource(
-            None, {'id': identity_fakes.mapping_id}, loaded=True
+
+        self.mapping = sdk_fakes.generate_fake_resource(
+            _mapping.Mapping, rules=MAPPING_RULES, schema_version='1.0'
+        )
+
+        self.extra_mapping = sdk_fakes.generate_fake_resource(
+            _mapping.Mapping, rules=MAPPING_RULES_2, schema_version='2.0'
         )
-        # Pretend list command returns list of two mappings.
-        # NOTE(marek-denis): We are returning FakeResources with mapping id
-        # only as ShowMapping class is implemented in a way where rules will
-        # not be displayed, only mapping ids.
-        self.mapping_mock.list.return_value = [
-            fakes.FakeResource(
-                None,
-                {'id': identity_fakes.mapping_id, 'schema_version': '1.0'},
-                loaded=True,
-            ),
-            fakes.FakeResource(
-                None,
-                {'id': 'extra_mapping', 'schema_version': '2.0'},
-                loaded=True,
-            ),
+
+        self.identity_sdk_client.mappings.return_value = [
+            self.mapping,
+            self.extra_mapping,
         ]
 
         # Get the command object to test
@@ -127,29 +207,30 @@ class TestMappingList(TestMapping):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.mapping_mock.list.assert_called_with()
+        self.identity_sdk_client.mappings.assert_called_with()
 
         collist = ('ID', 'schema_version')
         self.assertEqual(collist, columns)
 
         datalist = [
-            (identity_fakes.mapping_id, '1.0'),
-            ('extra_mapping', '2.0'),
+            (self.mapping.id, '1.0'),
+            (self.extra_mapping.id, '2.0'),
         ]
         self.assertEqual(datalist, data)
 
 
-class TestMappingSet(TestMapping):
+class TestMappingSet(identity_fakes.TestFederatedIdentity):
     def setUp(self):
         super().setUp()
 
-        self.mapping_mock.get.return_value = fakes.FakeResource(
-            None, copy.deepcopy(identity_fakes.MAPPING_RESPONSE), loaded=True
+        self.mapping = sdk_fakes.generate_fake_resource(
+            _mapping.Mapping, rules=MAPPING_RULES, schema_version='1.0'
         )
-
-        self.mapping_mock.update.return_value = fakes.FakeResource(
-            None, identity_fakes.MAPPING_RESPONSE_2, loaded=True
+        self.mapping_2 = sdk_fakes.generate_fake_resource(
+            _mapping.Mapping, rules=MAPPING_RULES_2, schema_version='2.0'
         )
+        self.identity_sdk_client.get_mapping.return_value = self.mapping
+        self.identity_sdk_client.update_mapping.return_value = self.mapping_2
 
         # Get the command object to test
         self.cmd = mapping.SetMapping(self.app, None)
@@ -157,26 +238,26 @@ class TestMappingSet(TestMapping):
     def test_set_new_rules(self):
         arglist = [
             '--rules',
-            identity_fakes.mapping_rules_file_path,
-            identity_fakes.mapping_id,
+            MAPPING_RULES_FILE_PATH,
+            self.mapping.id,
         ]
         verifylist = [
-            ('mapping', identity_fakes.mapping_id),
-            ('rules', identity_fakes.mapping_rules_file_path),
+            ('mapping', self.mapping.id),
+            ('rules', MAPPING_RULES_FILE_PATH),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         mocker = mock.Mock()
-        mocker.return_value = identity_fakes.MAPPING_RULES_2
+        mocker.return_value = MAPPING_RULES_2
         with mock.patch(
             "openstackclient.identity.v3.mapping.SetMapping._read_rules",
             mocker,
         ):
             result = self.cmd.take_action(parsed_args)
-        self.mapping_mock.update.assert_called_with(
-            mapping=identity_fakes.mapping_id,
-            rules=identity_fakes.MAPPING_RULES_2,
+        self.identity_sdk_client.update_mapping.assert_called_with(
+            mapping=self.mapping.id,
+            rules=MAPPING_RULES_2,
             schema_version=None,
         )
 
@@ -185,12 +266,12 @@ class TestMappingSet(TestMapping):
     def test_set_rules_wrong_file_path(self):
         arglist = [
             '--rules',
-            identity_fakes.mapping_rules_file_path,
-            identity_fakes.mapping_id,
+            MAPPING_RULES_FILE_PATH,
+            self.mapping.id,
         ]
         verifylist = [
-            ('mapping', identity_fakes.mapping_id),
-            ('rules', identity_fakes.mapping_rules_file_path),
+            ('mapping', self.mapping.id),
+            ('rules', MAPPING_RULES_FILE_PATH),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -199,27 +280,30 @@ class TestMappingSet(TestMapping):
         )
 
 
-class TestMappingShow(TestMapping):
+class TestMappingShow(identity_fakes.TestFederatedIdentity):
     def setUp(self):
         super().setUp()
 
-        self.mapping_mock.get.return_value = fakes.FakeResource(
-            None, copy.deepcopy(identity_fakes.MAPPING_RESPONSE), loaded=True
+        self.mapping = sdk_fakes.generate_fake_resource(
+            _mapping.Mapping, rules=MAPPING_RULES, schema_version=None
         )
+        self.identity_sdk_client.get_mapping.return_value = self.mapping
 
         self.cmd = mapping.ShowMapping(self.app, None)
 
     def test_mapping_show(self):
-        arglist = [identity_fakes.mapping_id]
-        verifylist = [('mapping', identity_fakes.mapping_id)]
+        arglist = [self.mapping.id]
+        verifylist = [('mapping', self.mapping.id)]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.mapping_mock.get.assert_called_with(identity_fakes.mapping_id)
+        self.identity_sdk_client.get_mapping.assert_called_with(
+            self.mapping.id
+        )
 
-        collist = ('id', 'rules')
+        collist = ('id', 'rules', 'schema_version')
         self.assertEqual(collist, columns)
 
-        datalist = (identity_fakes.mapping_id, identity_fakes.MAPPING_RULES)
+        datalist = (self.mapping.id, MAPPING_RULES, None)
         self.assertEqual(datalist, data)

openstackclient/tests/unit/identity/v3/test_project.py

@@ -25,7 +25,7 @@ from openstackclient.identity.v3 import project
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 
-class TestProjectCreate(identity_fakes.TestIdentityv3):
+class TestProjectCreate(identity_fakes.TestIdentity):
     domain = sdk_fakes.generate_fake_resource(_domain.Domain)
 
     columns = (
@@ -863,7 +863,7 @@ class TestProjectCreate(identity_fakes.TestIdentityv3):
         )
 
 
-class TestProjectDelete(identity_fakes.TestIdentityv3):
+class TestProjectDelete(identity_fakes.TestIdentity):
     domain = sdk_fakes.generate_fake_resource(_domain.Domain)
 
     def setUp(self):
@@ -992,7 +992,7 @@ class TestProjectDelete(identity_fakes.TestIdentityv3):
         )
 
 
-class TestProjectList(identity_fakes.TestIdentityv3):
+class TestProjectList(identity_fakes.TestIdentity):
     domain = sdk_fakes.generate_fake_resource(_domain.Domain)
     project = sdk_fakes.generate_fake_resource(
         _project.Project, domain_id=domain.id
@@ -1273,8 +1273,31 @@ class TestProjectList(identity_fakes.TestIdentityv3):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.datalist, tuple(data))
 
+    def test_project_list_with_pagination(self):
+        self.identity_sdk_client.projects.return_value = [self.project]
+
+        arglist = [
+            '--limit',
+            '2',
+            '--marker',
+            'some-marker',
+        ]
+        verifylist = [
+            ('limit', 2),
+            ('marker', 'some-marker'),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        kwargs = {'limit': 2, 'marker': 'some-marker'}
+        self.identity_sdk_client.projects.assert_called_with(**kwargs)
+
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, tuple(data))
+
 
-class TestProjectSet(identity_fakes.TestIdentityv3):
+class TestProjectSet(identity_fakes.TestIdentity):
     domain = sdk_fakes.generate_fake_resource(_domain.Domain)
 
     project_kwargs_no_options = {
@@ -1549,7 +1572,7 @@ class TestProjectSet(identity_fakes.TestIdentityv3):
         self.assertIsNone(result)
 
 
-class TestProjectShow(identity_fakes.TestIdentityv3):
+class TestProjectShow(identity_fakes.TestIdentity):
     domain = sdk_fakes.generate_fake_resource(_domain.Domain)
 
     columns = (

openstackclient/tests/unit/identity/v3/test_protocol.py

@@ -49,7 +49,7 @@ class TestProtocolCreate(identity_fakes.TestFederatedIdentity):
         columns, data = self.cmd.take_action(parsed_args)
         self.identity_sdk_client.create_federation_protocol.assert_called_with(
             name=self.proto.id,
-            idp_id=self.proto.idp_id,
+            idp=self.proto.idp_id,
             mapping_id=self.proto.mapping_id,
         )
 
@@ -89,7 +89,7 @@ class TestProtocolDelete(identity_fakes.TestFederatedIdentity):
         result = self.cmd.take_action(parsed_args)
 
         self.identity_sdk_client.delete_federation_protocol.assert_called_with(
-            idp_id=self.proto.idp_id,
+            idp=self.proto.idp_id,
             protocol=self.proto.id,
             ignore_missing=False,
         )
@@ -208,7 +208,7 @@ class TestProtocolShow(identity_fakes.TestFederatedIdentity):
 
         columns, data = self.cmd.take_action(parsed_args)
         self.identity_sdk_client.get_federation_protocol.assert_called_with(
-            idp_id=self.proto.idp_id, protocol=self.proto.name
+            idp=self.proto.idp_id, protocol=self.proto.name
         )
 
         collist = ('id', 'identity_provider', 'mapping')

openstackclient/tests/unit/identity/v3/test_region.py

@@ -19,7 +19,7 @@ from openstackclient.identity.v3 import region
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 
-class TestRegionCreate(identity_fakes.TestIdentityv3):
+class TestRegionCreate(identity_fakes.TestIdentity):
     region = sdk_fakes.generate_fake_resource(_region.Region)
     columns = (
         'region',
@@ -121,7 +121,7 @@ class TestRegionCreate(identity_fakes.TestIdentityv3):
         self.assertEqual(self.datalist, data)
 
 
-class TestRegionDelete(identity_fakes.TestIdentityv3):
+class TestRegionDelete(identity_fakes.TestIdentity):
     def setUp(self):
         super().setUp()
 
@@ -148,7 +148,7 @@ class TestRegionDelete(identity_fakes.TestIdentityv3):
         self.assertIsNone(result)
 
 
-class TestRegionList(identity_fakes.TestIdentityv3):
+class TestRegionList(identity_fakes.TestIdentity):
     region = sdk_fakes.generate_fake_resource(_region.Region)
     columns = (
         'Region',
@@ -207,7 +207,7 @@ class TestRegionList(identity_fakes.TestIdentityv3):
         self.assertEqual(self.datalist, tuple(data))
 
 
-class TestRegionSet(identity_fakes.TestIdentityv3):
+class TestRegionSet(identity_fakes.TestIdentity):
     def setUp(self):
         super().setUp()
 
@@ -280,7 +280,7 @@ class TestRegionSet(identity_fakes.TestIdentityv3):
         self.assertIsNone(result)
 
 
-class TestRegionShow(identity_fakes.TestIdentityv3):
+class TestRegionShow(identity_fakes.TestIdentity):
     def setUp(self):
         super().setUp()
 

openstackclient/tests/unit/identity/v3/test_registered_limit.py

@@ -21,7 +21,7 @@ from openstackclient.identity.v3 import registered_limit
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 
-class TestRegisteredLimitCreate(identity_fakes.TestIdentityv3):
+class TestRegisteredLimitCreate(identity_fakes.TestIdentity):
     def setUp(self):
         super().setUp()
 
@@ -165,7 +165,7 @@ class TestRegisteredLimitCreate(identity_fakes.TestIdentityv3):
         self.assertEqual(datalist, data)
 
 
-class TestRegisteredLimitDelete(identity_fakes.TestIdentityv3):
+class TestRegisteredLimitDelete(identity_fakes.TestIdentity):
     def setUp(self):
         super().setUp()
 
@@ -207,7 +207,7 @@ class TestRegisteredLimitDelete(identity_fakes.TestIdentityv3):
             )
 
 
-class TestRegisteredLimitShow(identity_fakes.TestIdentityv3):
+class TestRegisteredLimitShow(identity_fakes.TestIdentity):
     def setUp(self):
         super().setUp()
 
@@ -311,7 +311,7 @@ class TestRegisteredLimitShow(identity_fakes.TestIdentityv3):
         self.assertEqual(datalist, data)
 
 
-class TestRegisteredLimitSet(identity_fakes.TestIdentityv3):
+class TestRegisteredLimitSet(identity_fakes.TestIdentity):
     def setUp(self):
         super().setUp()
 
@@ -590,7 +590,7 @@ class TestRegisteredLimitSet(identity_fakes.TestIdentityv3):
         self.assertEqual(datalist, data)
 
 
-class TestRegisteredLimitList(identity_fakes.TestIdentityv3):
+class TestRegisteredLimitList(identity_fakes.TestIdentity):
     def setUp(self):
         super().setUp()
 

openstackclient/tests/unit/identity/v3/test_role.py

@@ -29,12 +29,12 @@ from openstackclient.identity.v3 import role
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 
-class TestRoleInherited(identity_fakes.TestIdentityv3):
+class TestRoleInherited(identity_fakes.TestIdentity):
     def _is_inheritance_testcase(self):
         return True
 
 
-class TestRoleAdd(identity_fakes.TestIdentityv3):
+class TestRoleAdd(identity_fakes.TestIdentity):
     def _is_inheritance_testcase(self):
         return False
 
@@ -361,7 +361,7 @@ class TestRoleAddInherited(TestRoleAdd, TestRoleInherited):
     pass
 
 
-class TestRoleCreate(identity_fakes.TestIdentityv3):
+class TestRoleCreate(identity_fakes.TestIdentity):
     collist = ('id', 'name', 'domain_id', 'description')
     domain = sdk_fakes.generate_fake_resource(_domain.Domain)
 
@@ -573,7 +573,7 @@ class TestRoleCreate(identity_fakes.TestIdentityv3):
         self.assertEqual(datalist, data)
 
 
-class TestRoleDelete(identity_fakes.TestIdentityv3):
+class TestRoleDelete(identity_fakes.TestIdentity):
     def setUp(self):
         super().setUp()
 
@@ -680,7 +680,7 @@ class TestRoleDelete(identity_fakes.TestIdentityv3):
         )
 
 
-class TestRoleList(identity_fakes.TestIdentityv3):
+class TestRoleList(identity_fakes.TestIdentity):
     columns = (
         'ID',
         'Name',
@@ -767,7 +767,7 @@ class TestRoleList(identity_fakes.TestIdentityv3):
         self.assertEqual(datalist, tuple(data))
 
 
-class TestRoleRemove(identity_fakes.TestIdentityv3):
+class TestRoleRemove(identity_fakes.TestIdentity):
     def _is_inheritance_testcase(self):
         return False
 
@@ -1313,7 +1313,7 @@ class TestRoleRemove(identity_fakes.TestIdentityv3):
         )
 
 
-class TestRoleSet(identity_fakes.TestIdentityv3):
+class TestRoleSet(identity_fakes.TestIdentity):
     def setUp(self):
         super().setUp()
 
@@ -1474,7 +1474,7 @@ class TestRoleSet(identity_fakes.TestIdentityv3):
         self.assertIsNone(result)
 
 
-class TestRoleShow(identity_fakes.TestIdentityv3):
+class TestRoleShow(identity_fakes.TestIdentity):
     domain = sdk_fakes.generate_fake_resource(_domain.Domain)
 
     def setUp(self):

openstackclient/tests/unit/identity/v3/test_role_assignment.py

@@ -25,7 +25,7 @@ from openstackclient.identity.v3 import role_assignment
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 
-class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
+class TestRoleAssignmentList(identity_fakes.TestIdentity):
     columns = (
         'Role',
         'User',

openstackclient/tests/unit/identity/v3/test_service.py

@@ -22,7 +22,7 @@ from openstackclient.identity.v3 import service
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 
-class TestServiceCreate(identity_fakes.TestIdentityv3):
+class TestServiceCreate(identity_fakes.TestIdentity):
     columns = (
         'id',
         'name',
@@ -163,7 +163,7 @@ class TestServiceCreate(identity_fakes.TestIdentityv3):
         self.assertEqual(self.datalist, data)
 
 
-class TestServiceDelete(identity_fakes.TestIdentityv3):
+class TestServiceDelete(identity_fakes.TestIdentity):
     service = sdk_fakes.generate_fake_resource(_service.Service)
 
     def setUp(self):
@@ -195,7 +195,7 @@ class TestServiceDelete(identity_fakes.TestIdentityv3):
         self.assertIsNone(result)
 
 
-class TestServiceList(identity_fakes.TestIdentityv3):
+class TestServiceList(identity_fakes.TestIdentity):
     service = sdk_fakes.generate_fake_resource(_service.Service)
 
     def setUp(self):
@@ -259,7 +259,7 @@ class TestServiceList(identity_fakes.TestIdentityv3):
         self.assertEqual(datalist, tuple(data))
 
 
-class TestServiceSet(identity_fakes.TestIdentityv3):
+class TestServiceSet(identity_fakes.TestIdentity):
     service = sdk_fakes.generate_fake_resource(_service.Service)
 
     def setUp(self):
@@ -420,7 +420,7 @@ class TestServiceSet(identity_fakes.TestIdentityv3):
         self.assertIsNone(result)
 
 
-class TestServiceShow(identity_fakes.TestIdentityv3):
+class TestServiceShow(identity_fakes.TestIdentity):
     service = sdk_fakes.generate_fake_resource(_service.Service)
 
     def setUp(self):