python-openstackclient 6.6.1__py3-none-any.whl → 7.0.0__py3-none-any.whl

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

@@ -56,16 +56,16 @@ class TestProject(identity_fakes.TestIdentityv2):
     )
 
     def setUp(self):
-        super(TestProject, self).setUp()
+        super().setUp()
 
         # Get a shortcut to the TenantManager Mock
-        self.projects_mock = self.app.client_manager.identity.tenants
+        self.projects_mock = self.identity_client.tenants
         self.projects_mock.reset_mock()
 
 
 class TestProjectCreate(TestProject):
     def setUp(self):
-        super(TestProjectCreate, self).setUp()
+        super().setUp()
 
         self.projects_mock.create.return_value = self.fake_project
 
@@ -289,7 +289,7 @@ class TestProjectCreate(TestProject):
 
 class TestProjectDelete(TestProject):
     def setUp(self):
-        super(TestProjectDelete, self).setUp()
+        super().setUp()
 
         # This is the return value for utils.find_resource()
         self.projects_mock.get.return_value = self.fake_project
@@ -341,7 +341,7 @@ class TestProjectDelete(TestProject):
 
 class TestProjectList(TestProject):
     def setUp(self):
-        super(TestProjectList, self).setUp()
+        super().setUp()
 
         self.projects_mock.list.return_value = [self.fake_project]
 
@@ -431,7 +431,7 @@ class TestProjectList(TestProject):
 
 class TestProjectSet(TestProject):
     def setUp(self):
-        super(TestProjectSet, self).setUp()
+        super().setUp()
 
         self.projects_mock.get.return_value = self.fake_project
         self.projects_mock.update.return_value = self.fake_project
@@ -613,7 +613,7 @@ class TestProjectShow(TestProject):
     fake_proj_show = identity_fakes.FakeProject.create_one_project()
 
     def setUp(self):
-        super(TestProjectShow, self).setUp()
+        super().setUp()
 
         self.projects_mock.get.return_value = self.fake_proj_show
 
@@ -654,7 +654,7 @@ class TestProjectUnset(TestProject):
     fake_proj = identity_fakes.FakeProject.create_one_project(attr)
 
     def setUp(self):
-        super(TestProjectUnset, self).setUp()
+        super().setUp()
 
         self.projects_mock.get.return_value = self.fake_proj
 

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

@@ -40,18 +40,18 @@ class TestRole(identity_fakes.TestIdentityv2):
     fake_user = identity_fakes.FakeUser.create_one_user(attr)
 
     def setUp(self):
-        super(TestRole, self).setUp()
+        super().setUp()
 
         # Get a shortcut to the TenantManager Mock
-        self.projects_mock = self.app.client_manager.identity.tenants
+        self.projects_mock = self.identity_client.tenants
         self.projects_mock.reset_mock()
 
         # Get a shortcut to the UserManager Mock
-        self.users_mock = self.app.client_manager.identity.users
+        self.users_mock = self.identity_client.users
         self.users_mock.reset_mock()
 
         # Get a shortcut to the RoleManager Mock
-        self.roles_mock = self.app.client_manager.identity.roles
+        self.roles_mock = self.identity_client.roles
         self.roles_mock.reset_mock()
 
         auth_ref = identity_fakes.fake_auth_ref(
@@ -64,7 +64,7 @@ class TestRole(identity_fakes.TestIdentityv2):
 
 class TestRoleAdd(TestRole):
     def setUp(self):
-        super(TestRoleAdd, self).setUp()
+        super().setUp()
 
         self.projects_mock.get.return_value = self.fake_project
 
@@ -121,7 +121,7 @@ class TestRoleCreate(TestRole):
     )
 
     def setUp(self):
-        super(TestRoleCreate, self).setUp()
+        super().setUp()
 
         self.roles_mock.create.return_value = self.fake_role_c
 
@@ -212,7 +212,7 @@ class TestRoleCreate(TestRole):
 
 class TestRoleDelete(TestRole):
     def setUp(self):
-        super(TestRoleDelete, self).setUp()
+        super().setUp()
 
         self.roles_mock.get.return_value = self.fake_role
         self.roles_mock.delete.return_value = None
@@ -263,7 +263,7 @@ class TestRoleDelete(TestRole):
 
 class TestRoleList(TestRole):
     def setUp(self):
-        super(TestRoleList, self).setUp()
+        super().setUp()
 
         self.roles_mock.list.return_value = [self.fake_role]
 
@@ -295,7 +295,7 @@ class TestRoleList(TestRole):
 
 class TestRoleRemove(TestRole):
     def setUp(self):
-        super(TestRoleRemove, self).setUp()
+        super().setUp()
 
         self.projects_mock.get.return_value = self.fake_project
 
@@ -335,7 +335,7 @@ class TestRoleRemove(TestRole):
 
 class TestRoleShow(TestRole):
     def setUp(self):
-        super(TestRoleShow, self).setUp()
+        super().setUp()
 
         self.roles_mock.get.return_value = self.fake_role
 

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

@@ -23,7 +23,7 @@ from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
 
 class TestRoleAssignment(identity_fakes.TestIdentityv2):
     def setUp(self):
-        super(TestRoleAssignment, self).setUp()
+        super().setUp()
 
 
 class TestRoleAssignmentList(TestRoleAssignment):
@@ -37,15 +37,15 @@ class TestRoleAssignmentList(TestRoleAssignment):
         super(TestRoleAssignment, self).setUp()
 
         # Get a shortcut to the UserManager Mock
-        self.users_mock = self.app.client_manager.identity.users
+        self.users_mock = self.identity_client.users
         self.users_mock.reset_mock()
 
         # Get a shortcut to the ProjectManager Mock
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
         self.projects_mock.reset_mock()
 
         # Get a shortcut to the RoleManager Mock
-        self.roles_mock = self.app.client_manager.identity.roles
+        self.roles_mock = self.identity_client.roles
         self.roles_mock.reset_mock()
 
         self.projects_mock.get.return_value = fakes.FakeResource(

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

@@ -24,10 +24,10 @@ class TestService(identity_fakes.TestIdentityv2):
     fake_service = identity_fakes.FakeService.create_one_service()
 
     def setUp(self):
-        super(TestService, self).setUp()
+        super().setUp()
 
         # Get a shortcut to the ServiceManager Mock
-        self.services_mock = self.app.client_manager.identity.services
+        self.services_mock = self.identity_client.services
         self.services_mock.reset_mock()
 
 
@@ -47,7 +47,7 @@ class TestServiceCreate(TestService):
     )
 
     def setUp(self):
-        super(TestServiceCreate, self).setUp()
+        super().setUp()
 
         self.services_mock.create.return_value = self.fake_service_c
 
@@ -141,7 +141,7 @@ class TestServiceCreate(TestService):
 
 class TestServiceDelete(TestService):
     def setUp(self):
-        super(TestServiceDelete, self).setUp()
+        super().setUp()
 
         self.services_mock.get.side_effect = identity_exc.NotFound(None)
         self.services_mock.find.return_value = self.fake_service
@@ -169,7 +169,7 @@ class TestServiceDelete(TestService):
 
 class TestServiceList(TestService):
     def setUp(self):
-        super(TestServiceList, self).setUp()
+        super().setUp()
 
         self.services_mock.list.return_value = [self.fake_service]
 
@@ -232,7 +232,7 @@ class TestServiceShow(TestService):
     fake_service_s = identity_fakes.FakeService.create_one_service()
 
     def setUp(self):
-        super(TestServiceShow, self).setUp()
+        super().setUp()
 
         self.services_mock.get.side_effect = identity_exc.NotFound(None)
         self.services_mock.find.return_value = self.fake_service_s

openstackclient/tests/unit/identity/v2_0/test_token.py

@@ -24,7 +24,7 @@ class TestToken(identity_fakes.TestIdentityv2):
     fake_project = identity_fakes.FakeProject.create_one_project()
 
     def setUp(self):
-        super(TestToken, self).setUp()
+        super().setUp()
 
         # Get a shortcut to the Auth Ref Mock
         self.ar_mock = mock.PropertyMock()
@@ -33,7 +33,7 @@ class TestToken(identity_fakes.TestIdentityv2):
 
 class TestTokenIssue(TestToken):
     def setUp(self):
-        super(TestTokenIssue, self).setUp()
+        super().setUp()
 
         self.cmd = token.IssueToken(self.app, None)
 
@@ -95,8 +95,8 @@ class TestTokenRevoke(TestToken):
     TOKEN = 'fob'
 
     def setUp(self):
-        super(TestTokenRevoke, self).setUp()
-        self.tokens_mock = self.app.client_manager.identity.tokens
+        super().setUp()
+        self.tokens_mock = self.identity_client.tokens
         self.tokens_mock.reset_mock()
         self.tokens_mock.delete.return_value = True
         self.cmd = token.RevokeToken(self.app, None)

openstackclient/tests/unit/identity/v2_0/test_user.py

@@ -31,14 +31,14 @@ class TestUser(identity_fakes.TestIdentityv2):
     fake_user = identity_fakes.FakeUser.create_one_user(attr)
 
     def setUp(self):
-        super(TestUser, self).setUp()
+        super().setUp()
 
         # Get a shortcut to the TenantManager Mock
-        self.projects_mock = self.app.client_manager.identity.tenants
+        self.projects_mock = self.identity_client.tenants
         self.projects_mock.reset_mock()
 
         # Get a shortcut to the UserManager Mock
-        self.users_mock = self.app.client_manager.identity.users
+        self.users_mock = self.identity_client.users
         self.users_mock.reset_mock()
 
 
@@ -65,7 +65,7 @@ class TestUserCreate(TestUser):
     )
 
     def setUp(self):
-        super(TestUserCreate, self).setUp()
+        super().setUp()
 
         self.projects_mock.get.return_value = self.fake_project_c
 
@@ -363,7 +363,7 @@ class TestUserCreate(TestUser):
 
 class TestUserDelete(TestUser):
     def setUp(self):
-        super(TestUserDelete, self).setUp()
+        super().setUp()
 
         # This is the return value for utils.find_resource()
         self.users_mock.get.return_value = self.fake_user
@@ -432,7 +432,7 @@ class TestUserList(TestUser):
     )
 
     def setUp(self):
-        super(TestUserList, self).setUp()
+        super().setUp()
 
         self.projects_mock.get.return_value = self.fake_project_l
         self.projects_mock.list.return_value = [self.fake_project_l]
@@ -513,7 +513,7 @@ class TestUserList(TestUser):
 
 class TestUserSet(TestUser):
     def setUp(self):
-        super(TestUserSet, self).setUp()
+        super().setUp()
 
         self.projects_mock.get.return_value = self.fake_project
         self.users_mock.get.return_value = self.fake_user
@@ -755,7 +755,7 @@ class TestUserSet(TestUser):
 
 class TestUserShow(TestUser):
     def setUp(self):
-        super(TestUserShow, self).setUp()
+        super().setUp()
 
         self.users_mock.get.return_value = self.fake_user
 

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

@@ -20,6 +20,7 @@ import uuid
 
 from keystoneauth1 import access
 from keystoneauth1 import fixture
+from openstack.identity.v3 import _proxy
 from osc_lib.cli import format_columns
 
 from openstackclient.tests.unit import fakes
@@ -564,7 +565,7 @@ def fake_auth_ref(fake_token, fake_service=None):
     return auth_ref
 
 
-class FakeAuth(object):
+class FakeAuth:
     def __init__(self, auth_method_class=None):
         self._auth_method_class = auth_method_class
 
@@ -572,12 +573,12 @@ class FakeAuth(object):
         return token_id
 
 
-class FakeSession(object):
+class FakeSession:
     def __init__(self, **kwargs):
         self.auth = FakeAuth()
 
 
-class FakeIdentityv3Client(object):
+class FakeIdentityv3Client:
     def __init__(self, **kwargs):
         self.domains = mock.Mock()
         self.domains.resource_class = fakes.FakeResource(None, {})
@@ -632,7 +633,7 @@ class FakeIdentityv3Client(object):
         self.limits.resource_class = fakes.FakeResource(None, {})
 
 
-class FakeFederationManager(object):
+class FakeFederationManager:
     def __init__(self, **kwargs):
         self.identity_providers = mock.Mock()
         self.identity_providers.resource_class = fakes.FakeResource(None, {})
@@ -650,13 +651,13 @@ class FakeFederationManager(object):
 
 class FakeFederatedClient(FakeIdentityv3Client):
     def __init__(self, **kwargs):
-        super(FakeFederatedClient, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.federation = FakeFederationManager()
 
 
 class FakeOAuth1Client(FakeIdentityv3Client):
     def __init__(self, **kwargs):
-        super(FakeOAuth1Client, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
         self.access_tokens = mock.Mock()
         self.access_tokens.resource_class = fakes.FakeResource(None, {})
@@ -666,35 +667,73 @@ class FakeOAuth1Client(FakeIdentityv3Client):
         self.request_tokens.resource_class = fakes.FakeResource(None, {})
 
 
-class TestIdentityv3(utils.TestCommand):
+class FakeClientMixin:
     def setUp(self):
-        super(TestIdentityv3, self).setUp()
+        super().setUp()
 
         self.app.client_manager.identity = FakeIdentityv3Client(
             endpoint=fakes.AUTH_URL,
             token=fakes.AUTH_TOKEN,
         )
+        self.identity_client = self.app.client_manager.identity
+
+        # TODO(stephenfin): Rename to 'identity_client' once all commands are
+        # migrated to SDK
+        self.app.client_manager.sdk_connection.identity = mock.Mock(
+            _proxy.Proxy
+        )
+        self.identity_sdk_client = (
+            self.app.client_manager.sdk_connection.identity
+        )
 
 
+class TestIdentityv3(
+    FakeClientMixin,
+    utils.TestCommand,
+): ...
+
+
+# We don't use FakeClientMixin since we want a different fake legacy client
 class TestFederatedIdentity(utils.TestCommand):
     def setUp(self):
-        super(TestFederatedIdentity, self).setUp()
+        super().setUp()
 
         self.app.client_manager.identity = FakeFederatedClient(
             endpoint=fakes.AUTH_URL, token=fakes.AUTH_TOKEN
         )
+        self.identity_client = self.app.client_manager.identity
+
+        # TODO(stephenfin): Rename to 'identity_client' once all commands are
+        # migrated to SDK
+        self.app.client_manager.sdk_connection.identity = mock.Mock(
+            _proxy.Proxy
+        )
+        self.identity_sdk_client = (
+            self.app.client_manager.sdk_connection.identity
+        )
 
 
+# We don't use FakeClientMixin since we want a different fake legacy client
 class TestOAuth1(utils.TestCommand):
     def setUp(self):
-        super(TestOAuth1, self).setUp()
+        super().setUp()
 
         self.app.client_manager.identity = FakeOAuth1Client(
             endpoint=fakes.AUTH_URL, token=fakes.AUTH_TOKEN
         )
+        self.identity_client = self.app.client_manager.identity
+
+        # TODO(stephenfin): Rename to 'identity_client' once all commands are
+        # migrated to SDK
+        self.app.client_manager.sdk_connection.identity = mock.Mock(
+            _proxy.Proxy
+        )
+        self.identity_sdk_client = (
+            self.app.client_manager.sdk_connection.identity
+        )
 
 
-class FakeProject(object):
+class FakeProject:
     """Fake one or more project."""
 
     @staticmethod
@@ -746,7 +785,7 @@ class FakeProject(object):
         return projects
 
 
-class FakeDomain(object):
+class FakeDomain:
     """Fake one or more domain."""
 
     @staticmethod
@@ -778,7 +817,7 @@ class FakeDomain(object):
         return domain
 
 
-class FakeCredential(object):
+class FakeCredential:
     """Fake one or more credential."""
 
     @staticmethod
@@ -848,7 +887,7 @@ class FakeCredential(object):
         return mock.Mock(side_effect=credentials)
 
 
-class FakeUser(object):
+class FakeUser:
     """Fake one or more user."""
 
     @staticmethod
@@ -917,7 +956,7 @@ class FakeUser(object):
         return mock.Mock(side_effect=users)
 
 
-class FakeGroup(object):
+class FakeGroup:
     """Fake one or more group."""
 
     @staticmethod
@@ -984,7 +1023,7 @@ class FakeGroup(object):
         return mock.Mock(side_effect=groups)
 
 
-class FakeEndpoint(object):
+class FakeEndpoint:
     """Fake one or more endpoint."""
 
     @staticmethod
@@ -1041,7 +1080,7 @@ class FakeEndpoint(object):
         return endpoint_filter
 
 
-class FakeEndpointGroup(object):
+class FakeEndpointGroup:
     """Fake one or more endpoint group."""
 
     @staticmethod
@@ -1101,7 +1140,7 @@ class FakeEndpointGroup(object):
         return endpointgroup_filter
 
 
-class FakeService(object):
+class FakeService:
     """Fake one or more service."""
 
     @staticmethod
@@ -1133,7 +1172,7 @@ class FakeService(object):
         return service
 
 
-class FakeRoleAssignment(object):
+class FakeRoleAssignment:
     """Fake one or more role assignment."""
 
     @staticmethod
@@ -1163,7 +1202,7 @@ class FakeRoleAssignment(object):
         return role_assignment
 
 
-class FakeImpliedRoleResponse(object):
+class FakeImpliedRoleResponse:
     """Fake one or more role assignment."""
 
     def __init__(self, prior_role, implied_roles):

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

@@ -25,9 +25,9 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 class TestAccessRule(identity_fakes.TestIdentityv3):
     def setUp(self):
-        super(TestAccessRule, self).setUp()
+        super().setUp()
 
-        identity_manager = self.app.client_manager.identity
+        identity_manager = self.identity_client
         self.access_rules_mock = identity_manager.access_rules
         self.access_rules_mock.reset_mock()
         self.roles_mock = identity_manager.roles
@@ -36,7 +36,7 @@ class TestAccessRule(identity_fakes.TestIdentityv3):
 
 class TestAccessRuleDelete(TestAccessRule):
     def setUp(self):
-        super(TestAccessRuleDelete, self).setUp()
+        super().setUp()
 
         # This is the return value for utils.find_resource()
         self.access_rules_mock.get.return_value = fakes.FakeResource(
@@ -98,7 +98,7 @@ class TestAccessRuleDelete(TestAccessRule):
 
 class TestAccessRuleList(TestAccessRule):
     def setUp(self):
-        super(TestAccessRuleList, self).setUp()
+        super().setUp()
 
         self.access_rules_mock.list.return_value = [
             fakes.FakeResource(
@@ -135,7 +135,7 @@ class TestAccessRuleList(TestAccessRule):
 
 class TestAccessRuleShow(TestAccessRule):
     def setUp(self):
-        super(TestAccessRuleShow, self).setUp()
+        super().setUp()
 
         self.access_rules_mock.get.return_value = fakes.FakeResource(
             None,