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

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

@@ -19,8 +19,8 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 class TestOAuth1(identity_fakes.TestOAuth1):
     def setUp(self):
-        super(TestOAuth1, self).setUp()
-        identity_client = self.app.client_manager.identity
+        super().setUp()
+        identity_client = self.identity_client
         self.access_tokens_mock = identity_client.oauth1.access_tokens
         self.access_tokens_mock.reset_mock()
         self.request_tokens_mock = identity_client.oauth1.request_tokens
@@ -33,7 +33,7 @@ class TestOAuth1(identity_fakes.TestOAuth1):
 
 class TestAccessTokenCreate(TestOAuth1):
     def setUp(self):
-        super(TestAccessTokenCreate, self).setUp()
+        super().setUp()
 
         self.access_tokens_mock.create.return_value = fakes.FakeResource(
             None,
@@ -87,7 +87,7 @@ class TestAccessTokenCreate(TestOAuth1):
 
 class TestRequestTokenAuthorize(TestOAuth1):
     def setUp(self):
-        super(TestRequestTokenAuthorize, self).setUp()
+        super().setUp()
 
         self.roles_mock.get.return_value = fakes.FakeResource(
             None,
@@ -127,7 +127,7 @@ class TestRequestTokenAuthorize(TestOAuth1):
 
 class TestRequestTokenCreate(TestOAuth1):
     def setUp(self):
-        super(TestRequestTokenCreate, self).setUp()
+        super().setUp()
 
         self.request_tokens_mock.create.return_value = fakes.FakeResource(
             None,

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

@@ -26,14 +26,14 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 class TestProject(identity_fakes.TestIdentityv3):
     def setUp(self):
-        super(TestProject, self).setUp()
+        super().setUp()
 
         # Get a shortcut to the DomainManager Mock
-        self.domains_mock = self.app.client_manager.identity.domains
+        self.domains_mock = self.identity_client.domains
         self.domains_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()
 
 
@@ -52,7 +52,7 @@ class TestProjectCreate(TestProject):
     )
 
     def setUp(self):
-        super(TestProjectCreate, self).setUp()
+        super().setUp()
 
         self.project = identity_fakes.FakeProject.create_one_project(
             attrs={'domain_id': self.domain.id}
@@ -676,7 +676,7 @@ class TestProjectDelete(TestProject):
     project = identity_fakes.FakeProject.create_one_project()
 
     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.project
@@ -759,7 +759,7 @@ class TestProjectList(TestProject):
     )
 
     def setUp(self):
-        super(TestProjectList, self).setUp()
+        super().setUp()
 
         self.projects_mock.list.return_value = [self.project]
 
@@ -951,7 +951,7 @@ class TestProjectSet(TestProject):
     )
 
     def setUp(self):
-        super(TestProjectSet, self).setUp()
+        super().setUp()
 
         self.domains_mock.get.return_value = self.domain
 
@@ -1130,7 +1130,7 @@ class TestProjectSet(TestProject):
         # Set expected values. new tag is added to original tags for update.
         kwargs = {
             'name': 'qwerty',
-            'tags': list(set(['tag1', 'tag2', 'tag3', 'foo'])),
+            'tags': sorted({'tag1', 'tag2', 'tag3', 'foo'}),
         }
         # ProjectManager.update(project, name=, domain=, description=,
         #                       enabled=, **kwargs)
@@ -1155,7 +1155,7 @@ class TestProjectSet(TestProject):
 
         result = self.cmd.take_action(parsed_args)
 
-        kwargs = {'tags': list(set(['tag3']))}
+        kwargs = {'tags': list({'tag3'})}
         self.projects_mock.update.assert_called_with(self.project.id, **kwargs)
         self.assertIsNone(result)
 
@@ -1214,7 +1214,7 @@ class TestProjectShow(TestProject):
     domain = identity_fakes.FakeDomain.create_one_domain()
 
     def setUp(self):
-        super(TestProjectShow, self).setUp()
+        super().setUp()
 
         self.project = identity_fakes.FakeProject.create_one_project(
             attrs={'domain_id': self.domain.id}
@@ -1234,7 +1234,7 @@ class TestProjectShow(TestProject):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.app.client_manager.identity.tokens.get_token_data.return_value = {
+        self.identity_client.tokens.get_token_data.return_value = {
             'token': {
                 'project': {
                     'domain': {},
@@ -1293,7 +1293,7 @@ class TestProjectShow(TestProject):
             ('children', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.app.client_manager.identity.tokens.get_token_data.return_value = {
+        self.identity_client.tokens.get_token_data.return_value = {
             'token': {
                 'project': {
                     'domain': {},
@@ -1360,7 +1360,7 @@ class TestProjectShow(TestProject):
             ('children', True),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.app.client_manager.identity.tokens.get_token_data.return_value = {
+        self.identity_client.tokens.get_token_data.return_value = {
             'token': {
                 'project': {
                     'domain': {},
@@ -1428,7 +1428,7 @@ class TestProjectShow(TestProject):
             ('children', True),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.app.client_manager.identity.tokens.get_token_data.return_value = {
+        self.identity_client.tokens.get_token_data.return_value = {
             'token': {
                 'project': {
                     'domain': {},
@@ -1482,7 +1482,7 @@ class TestProjectShow(TestProject):
             {"name": self.project.name}
         )
 
-        self.app.client_manager.identity.tokens.get_token_data.return_value = {
+        self.identity_client.tokens.get_token_data.return_value = {
             'token': {
                 'project': {
                     'domain': {"id": self.project.domain_id},
@@ -1492,7 +1492,7 @@ class TestProjectShow(TestProject):
             }
         }
 
-        identity_client = self.app.client_manager.identity
+        identity_client = self.identity_client
         arglist = [
             "--domain",
             self.domain.id,

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

@@ -21,16 +21,16 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 class TestProtocol(identity_fakes.TestFederatedIdentity):
     def setUp(self):
-        super(TestProtocol, self).setUp()
+        super().setUp()
 
-        federation_lib = self.app.client_manager.identity.federation
+        federation_lib = self.identity_client.federation
         self.protocols_mock = federation_lib.protocols
         self.protocols_mock.reset_mock()
 
 
 class TestProtocolCreate(TestProtocol):
     def setUp(self):
-        super(TestProtocolCreate, self).setUp()
+        super().setUp()
 
         proto = copy.deepcopy(identity_fakes.PROTOCOL_OUTPUT)
         resource = fakes.FakeResource(None, proto, loaded=True)
@@ -72,7 +72,7 @@ class TestProtocolCreate(TestProtocol):
 
 class TestProtocolDelete(TestProtocol):
     def setUp(self):
-        super(TestProtocolDelete, self).setUp()
+        super().setUp()
 
         # This is the return value for utils.find_resource()
         self.protocols_mock.get.return_value = fakes.FakeResource(
@@ -106,7 +106,7 @@ class TestProtocolDelete(TestProtocol):
 
 class TestProtocolList(TestProtocol):
     def setUp(self):
-        super(TestProtocolList, self).setUp()
+        super().setUp()
 
         self.protocols_mock.get.return_value = fakes.FakeResource(
             None, identity_fakes.PROTOCOL_ID_MAPPING, loaded=True
@@ -132,7 +132,7 @@ class TestProtocolList(TestProtocol):
 
 class TestProtocolSet(TestProtocol):
     def setUp(self):
-        super(TestProtocolSet, self).setUp()
+        super().setUp()
         self.protocols_mock.get.return_value = fakes.FakeResource(
             None, identity_fakes.PROTOCOL_OUTPUT, loaded=True
         )
@@ -178,7 +178,7 @@ class TestProtocolSet(TestProtocol):
 
 class TestProtocolShow(TestProtocol):
     def setUp(self):
-        super(TestProtocolShow, self).setUp()
+        super().setUp()
         self.protocols_mock.get.return_value = fakes.FakeResource(
             None, identity_fakes.PROTOCOL_OUTPUT, loaded=False
         )

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

@@ -20,10 +20,10 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 class TestRegion(identity_fakes.TestIdentityv3):
     def setUp(self):
-        super(TestRegion, self).setUp()
+        super().setUp()
 
         # Get a shortcut to the RegionManager Mock
-        self.regions_mock = self.app.client_manager.identity.regions
+        self.regions_mock = self.identity_client.regions
         self.regions_mock.reset_mock()
 
 
@@ -40,7 +40,7 @@ class TestRegionCreate(TestRegion):
     )
 
     def setUp(self):
-        super(TestRegionCreate, self).setUp()
+        super().setUp()
 
         self.regions_mock.create.return_value = fakes.FakeResource(
             None,
@@ -134,7 +134,7 @@ class TestRegionCreate(TestRegion):
 
 class TestRegionDelete(TestRegion):
     def setUp(self):
-        super(TestRegionDelete, self).setUp()
+        super().setUp()
 
         self.regions_mock.delete.return_value = None
 
@@ -173,7 +173,7 @@ class TestRegionList(TestRegion):
     )
 
     def setUp(self):
-        super(TestRegionList, self).setUp()
+        super().setUp()
 
         self.regions_mock.list.return_value = [
             fakes.FakeResource(
@@ -224,7 +224,7 @@ class TestRegionList(TestRegion):
 
 class TestRegionSet(TestRegion):
     def setUp(self):
-        super(TestRegionSet, self).setUp()
+        super().setUp()
 
         self.regions_mock.update.return_value = fakes.FakeResource(
             None,
@@ -301,7 +301,7 @@ class TestRegionSet(TestRegion):
 
 class TestRegionShow(TestRegion):
     def setUp(self):
-        super(TestRegionShow, self).setUp()
+        super().setUp()
 
         self.regions_mock.get.return_value = fakes.FakeResource(
             None,

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

@@ -22,21 +22,20 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 class TestRegisteredLimit(identity_fakes.TestIdentityv3):
     def setUp(self):
-        super(TestRegisteredLimit, self).setUp()
+        super().setUp()
 
-        identity_manager = self.app.client_manager.identity
-        self.registered_limit_mock = identity_manager.registered_limits
+        self.registered_limit_mock = self.identity_client.registered_limits
 
-        self.services_mock = identity_manager.services
+        self.services_mock = self.identity_client.services
         self.services_mock.reset_mock()
 
-        self.regions_mock = identity_manager.regions
+        self.regions_mock = self.identity_client.regions
         self.regions_mock.reset_mock()
 
 
 class TestRegisteredLimitCreate(TestRegisteredLimit):
     def setUp(self):
-        super(TestRegisteredLimitCreate, self).setUp()
+        super().setUp()
 
         self.service = fakes.FakeResource(
             None, copy.deepcopy(identity_fakes.SERVICE), loaded=True
@@ -160,7 +159,7 @@ class TestRegisteredLimitCreate(TestRegisteredLimit):
 
 class TestRegisteredLimitDelete(TestRegisteredLimit):
     def setUp(self):
-        super(TestRegisteredLimitDelete, self).setUp()
+        super().setUp()
 
         self.cmd = registered_limit.DeleteRegisteredLimit(self.app, None)
 
@@ -199,7 +198,7 @@ class TestRegisteredLimitDelete(TestRegisteredLimit):
 
 class TestRegisteredLimitShow(TestRegisteredLimit):
     def setUp(self):
-        super(TestRegisteredLimitShow, self).setUp()
+        super().setUp()
 
         self.registered_limit_mock.get.return_value = fakes.FakeResource(
             None, copy.deepcopy(identity_fakes.REGISTERED_LIMIT), loaded=True
@@ -242,14 +241,14 @@ class TestRegisteredLimitShow(TestRegisteredLimit):
 
 class TestRegisteredLimitSet(TestRegisteredLimit):
     def setUp(self):
-        super(TestRegisteredLimitSet, self).setUp()
+        super().setUp()
         self.cmd = registered_limit.SetRegisteredLimit(self.app, None)
 
     def test_registered_limit_set_description(self):
         registered_limit = copy.deepcopy(identity_fakes.REGISTERED_LIMIT)
-        registered_limit[
-            'description'
-        ] = identity_fakes.registered_limit_description
+        registered_limit['description'] = (
+            identity_fakes.registered_limit_description
+        )
         self.registered_limit_mock.update.return_value = fakes.FakeResource(
             None, registered_limit, loaded=True
         )
@@ -490,7 +489,7 @@ class TestRegisteredLimitSet(TestRegisteredLimit):
 
 class TestRegisteredLimitList(TestRegisteredLimit):
     def setUp(self):
-        super(TestRegisteredLimitList, self).setUp()
+        super().setUp()
 
         self.registered_limit_mock.get.return_value = fakes.FakeResource(
             None, copy.deepcopy(identity_fakes.REGISTERED_LIMIT), loaded=True

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

@@ -27,26 +27,26 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 class TestRole(identity_fakes.TestIdentityv3):
     def setUp(self):
-        super(TestRole, self).setUp()
+        super().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 UserManager Mock
-        self.groups_mock = self.app.client_manager.identity.groups
+        self.groups_mock = self.identity_client.groups
         self.groups_mock.reset_mock()
 
         # Get a shortcut to the DomainManager Mock
-        self.domains_mock = self.app.client_manager.identity.domains
+        self.domains_mock = self.identity_client.domains
         self.domains_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()
 
     def _is_inheritance_testcase(self):
@@ -60,7 +60,7 @@ class TestRoleInherited(TestRole):
 
 class TestRoleAdd(TestRole):
     def setUp(self):
-        super(TestRoleAdd, self).setUp()
+        super().setUp()
 
         self.users_mock.get.return_value = fakes.FakeResource(
             None,
@@ -371,7 +371,7 @@ class TestRoleAddInherited(TestRoleAdd, TestRoleInherited):
 
 class TestRoleCreate(TestRole):
     def setUp(self):
-        super(TestRoleCreate, self).setUp()
+        super().setUp()
 
         self.domains_mock.get.return_value = fakes.FakeResource(
             None,
@@ -592,7 +592,7 @@ class TestRoleCreate(TestRole):
 
 class TestRoleDelete(TestRole):
     def setUp(self):
-        super(TestRoleDelete, self).setUp()
+        super().setUp()
 
         self.roles_mock.get.return_value = fakes.FakeResource(
             None,
@@ -691,7 +691,7 @@ class TestRoleList(TestRole):
     )
 
     def setUp(self):
-        super(TestRoleList, self).setUp()
+        super().setUp()
 
         self.roles_mock.list.return_value = [
             fakes.FakeResource(
@@ -766,7 +766,7 @@ class TestRoleList(TestRole):
 
 class TestRoleRemove(TestRole):
     def setUp(self):
-        super(TestRoleRemove, self).setUp()
+        super().setUp()
 
         self.users_mock.get.return_value = fakes.FakeResource(
             None,
@@ -1316,7 +1316,7 @@ class TestRoleRemove(TestRole):
 
 class TestRoleSet(TestRole):
     def setUp(self):
-        super(TestRoleSet, self).setUp()
+        super().setUp()
 
         self.roles_mock.get.return_value = fakes.FakeResource(
             None,
@@ -1491,7 +1491,7 @@ class TestRoleSet(TestRole):
 
 class TestRoleShow(TestRole):
     def setUp(self):
-        super(TestRoleShow, self).setUp()
+        super().setUp()
 
         self.roles_mock.get.return_value = fakes.FakeResource(
             None,