python-openstackclient 7.1.2__py3-none-any.whl → 7.2.0__py3-none-any.whl

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

@@ -13,72 +13,66 @@
 #   under the License.
 #
 
-import copy
+from unittest.mock import call
 
-from keystoneclient import exceptions as identity_exc
+from openstack import exceptions as sdk_exceptions
+from openstack.identity.v3 import access_rule as _access_rule
+from openstack.test import fakes as sdk_fakes
 from osc_lib import exceptions
 
 from openstackclient.identity.v3 import access_rule
-from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 
-class TestAccessRule(identity_fakes.TestIdentityv3):
-    def setUp(self):
-        super().setUp()
-
-        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
-        self.roles_mock.reset_mock()
+class TestAccessRuleDelete(identity_fakes.TestIdentityv3):
+    access_rule = sdk_fakes.generate_fake_resource(_access_rule.AccessRule)
 
-
-class TestAccessRuleDelete(TestAccessRule):
     def setUp(self):
         super().setUp()
 
-        # This is the return value for utils.find_resource()
-        self.access_rules_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.ACCESS_RULE),
-            loaded=True,
+        self.identity_sdk_client.get_access_rule.return_value = (
+            self.access_rule
         )
-        self.access_rules_mock.delete.return_value = None
+        self.identity_sdk_client.delete_access_rule.return_value = None
 
         # Get the command object to test
         self.cmd = access_rule.DeleteAccessRule(self.app, None)
 
     def test_access_rule_delete(self):
-        arglist = [
-            identity_fakes.access_rule_id,
-        ]
-        verifylist = [('access_rule', [identity_fakes.access_rule_id])]
+        arglist = [self.access_rule.id]
+        verifylist = [('access_rule', [self.access_rule.id])]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
+        conn = self.app.client_manager.sdk_connection
+        user_id = conn.config.get_auth().get_user_id(conn.identity)
+
         result = self.cmd.take_action(parsed_args)
 
-        self.access_rules_mock.delete.assert_called_with(
-            identity_fakes.access_rule_id,
+        self.identity_sdk_client.delete_access_rule.assert_called_with(
+            user_id,
+            self.access_rule.id,
         )
         self.assertIsNone(result)
 
     def test_delete_multi_access_rules_with_exception(self):
-        # mock returns for common.get_resource_by_id
-        mock_get = self.access_rules_mock.get
-        mock_get.side_effect = [
-            mock_get.return_value,
-            identity_exc.NotFound,
+        self.identity_sdk_client.get_access_rule.side_effect = [
+            self.access_rule,
+            sdk_exceptions.NotFoundException,
         ]
+
         arglist = [
-            identity_fakes.access_rule_id,
+            self.access_rule.id,
             'nonexistent_access_rule',
         ]
         verifylist = [
             ('access_rule', arglist),
         ]
+
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
+        conn = self.app.client_manager.sdk_connection
+        user_id = conn.config.get_auth().get_user_id(conn.identity)
+
         try:
             self.cmd.take_action(parsed_args)
             self.fail('CommandError should be raised.')
@@ -87,26 +81,27 @@ class TestAccessRuleDelete(TestAccessRule):
                 '1 of 2 access rules failed to' ' delete.', str(e)
             )
 
-        mock_get.assert_any_call(identity_fakes.access_rule_id)
-        mock_get.assert_any_call('nonexistent_access_rule')
+        calls = []
+        for a in arglist:
+            calls.append(call(user_id, a))
+
+        self.identity_sdk_client.get_access_rule.assert_has_calls(calls)
 
-        self.assertEqual(2, mock_get.call_count)
-        self.access_rules_mock.delete.assert_called_once_with(
-            identity_fakes.access_rule_id
+        self.assertEqual(
+            2, self.identity_sdk_client.get_access_rule.call_count
+        )
+        self.identity_sdk_client.delete_access_rule.assert_called_once_with(
+            user_id, self.access_rule.id
         )
 
 
-class TestAccessRuleList(TestAccessRule):
+class TestAccessRuleList(identity_fakes.TestIdentityv3):
+    access_rule = sdk_fakes.generate_fake_resource(_access_rule.AccessRule)
+
     def setUp(self):
         super().setUp()
 
-        self.access_rules_mock.list.return_value = [
-            fakes.FakeResource(
-                None,
-                copy.deepcopy(identity_fakes.ACCESS_RULE),
-                loaded=True,
-            ),
-        ]
+        self.identity_sdk_client.access_rules.return_value = [self.access_rule]
 
         # Get the command object to test
         self.cmd = access_rule.ListAccessRule(self.app, None)
@@ -116,31 +111,34 @@ class TestAccessRuleList(TestAccessRule):
         verifylist = []
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
+        conn = self.app.client_manager.sdk_connection
+        user_id = conn.config.get_auth().get_user_id(conn.identity)
+
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.access_rules_mock.list.assert_called_with(user=None)
+        self.identity_sdk_client.access_rules.assert_called_with(user=user_id)
 
         collist = ('ID', 'Service', 'Method', 'Path')
         self.assertEqual(collist, columns)
         datalist = (
             (
-                identity_fakes.access_rule_id,
-                identity_fakes.access_rule_service,
-                identity_fakes.access_rule_method,
-                identity_fakes.access_rule_path,
+                self.access_rule.id,
+                self.access_rule.service,
+                self.access_rule.method,
+                self.access_rule.path,
             ),
         )
         self.assertEqual(datalist, tuple(data))
 
 
-class TestAccessRuleShow(TestAccessRule):
+class TestAccessRuleShow(identity_fakes.TestIdentityv3):
+    access_rule = sdk_fakes.generate_fake_resource(_access_rule.AccessRule)
+
     def setUp(self):
         super().setUp()
 
-        self.access_rules_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.ACCESS_RULE),
-            loaded=True,
+        self.identity_sdk_client.get_access_rule.return_value = (
+            self.access_rule
         )
 
         # Get the command object to test
@@ -148,25 +146,28 @@ class TestAccessRuleShow(TestAccessRule):
 
     def test_access_rule_show(self):
         arglist = [
-            identity_fakes.access_rule_id,
+            self.access_rule.id,
         ]
         verifylist = [
-            ('access_rule', identity_fakes.access_rule_id),
+            ('access_rule', self.access_rule.id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
+        conn = self.app.client_manager.sdk_connection
+        user_id = conn.config.get_auth().get_user_id(conn.identity)
+
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.access_rules_mock.get.assert_called_with(
-            identity_fakes.access_rule_id
+        self.identity_sdk_client.get_access_rule.assert_called_with(
+            user_id, self.access_rule.id
         )
 
-        collist = ('id', 'method', 'path', 'service')
+        collist = ('ID', 'Method', 'Path', 'Service')
         self.assertEqual(collist, columns)
         datalist = (
-            identity_fakes.access_rule_id,
-            identity_fakes.access_rule_method,
-            identity_fakes.access_rule_path,
-            identity_fakes.access_rule_service,
+            self.access_rule.id,
+            self.access_rule.method,
+            self.access_rule.path,
+            self.access_rule.service,
         )
         self.assertEqual(datalist, data)

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

@@ -109,12 +109,9 @@ class TestGroupAddUser(TestGroup):
             self.cmd.take_action(parsed_args)
             self.fail('CommandError should be raised.')
         except exceptions.CommandError as e:
-            msg = "1 of 2 users not added to group %s." % self._group.name
+            msg = f"1 of 2 users not added to group {self._group.name}."
             self.assertEqual(msg, str(e))
-        msg = ("%(user)s not added to group %(group)s: ") % {
-            'user': self.users[0].name,
-            'group': self._group.name,
-        }
+        msg = f"{self.users[0].name} not added to group {self._group.name}: "
         mock_error.assert_called_once_with(msg)
 
 
@@ -561,12 +558,9 @@ class TestGroupRemoveUser(TestGroup):
             self.cmd.take_action(parsed_args)
             self.fail('CommandError should be raised.')
         except exceptions.CommandError as e:
-            msg = "1 of 2 users not removed from group %s." % self._group.id
+            msg = f"1 of 2 users not removed from group {self._group.id}."
             self.assertEqual(msg, str(e))
-        msg = ("%(user)s not removed from group %(group)s: ") % {
-            'user': self.users[0].id,
-            'group': self._group.id,
-        }
+        msg = f"{self.users[0].id} not removed from group {self._group.id}: "
         mock_error.assert_called_once_with(msg)
 
 

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

@@ -90,7 +90,7 @@ class TestLimitCreate(TestLimit):
             self.service,
             identity_fakes.limit_resource_name,
             resource_limit,
-            **kwargs
+            **kwargs,
         )
 
         collist = (
@@ -154,7 +154,7 @@ class TestLimitCreate(TestLimit):
             self.service,
             identity_fakes.limit_resource_name,
             resource_limit,
-            **kwargs
+            **kwargs,
         )
 
         collist = (

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

@@ -311,7 +311,6 @@ class TestServiceSet(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'type': self.service.type,
-            'is_enabled': None,
         }
         self.identity_sdk_client.update_service.assert_called_with(
             self.service.id, **kwargs
@@ -338,7 +337,6 @@ class TestServiceSet(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.service.name,
-            'is_enabled': None,
         }
         self.identity_sdk_client.update_service.assert_called_with(
             self.service.id, **kwargs
@@ -365,7 +363,6 @@ class TestServiceSet(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'description': self.service.description,
-            'is_enabled': None,
         }
         self.identity_sdk_client.update_service.assert_called_with(
             self.service.id, **kwargs

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

@@ -91,11 +91,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
-            'options': {},
             'is_enabled': True,
             'password': None,
         }
@@ -127,11 +122,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
-            'options': {},
             'is_enabled': True,
             'password': 'secret',
         }
@@ -165,11 +155,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
-            'options': {},
             'is_enabled': True,
             'password': 'abc123',
         }
@@ -200,12 +185,8 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
             'email': 'barney@example.com',
             'is_enabled': True,
-            'options': {},
             'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
@@ -236,11 +217,7 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         kwargs = {
             'name': self.user.name,
             'default_project_id': self.project.id,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
-            'options': {},
             'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
@@ -284,14 +261,13 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         kwargs = {
             'name': self.user.name,
             'default_project_id': self.project.id,
-            'description': None,
-            'domain_id': None,
-            'email': None,
-            'options': {},
             'is_enabled': True,
             'password': None,
         }
-        self.identity_sdk_client.create_user.assert_called_with(**kwargs)
+        self.identity_sdk_client.create_user.assert_called_once_with(**kwargs)
+        self.identity_sdk_client.find_domain.assert_called_once_with(
+            self.project.domain_id, ignore_missing=False
+        )
 
         self.assertEqual(self.columns, columns)
         datalist = (
@@ -328,11 +304,7 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
             'domain_id': self.domain.id,
-            'email': None,
-            'options': {},
             'is_enabled': True,
             'password': None,
         }
@@ -361,11 +333,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
-            'options': {},
             'is_enabled': True,
             'password': None,
         }
@@ -394,11 +361,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
-            'options': {},
             'is_enabled': False,
             'password': None,
         }
@@ -428,10 +390,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'ignore_lockout_failure_attempts': True},
             'password': None,
@@ -462,10 +420,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'ignore_lockout_failure_attempts': False},
             'password': None,
@@ -496,10 +450,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'ignore_password_expiry': True},
             'password': None,
@@ -530,10 +480,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'ignore_password_expiry': False},
             'password': None,
@@ -564,10 +510,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'ignore_change_password_upon_first_use': True},
             'password': None,
@@ -598,10 +540,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'ignore_change_password_upon_first_use': False},
             'password': None,
@@ -632,10 +570,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'lock_password': True},
             'password': None,
@@ -666,10 +600,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'lock_password': False},
             'password': None,
@@ -700,10 +630,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'multi_factor_auth_enabled': True},
             'password': None,
@@ -734,10 +660,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {'multi_factor_auth_enabled': False},
             'password': None,
@@ -774,10 +696,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {
                 'multi_factor_auth_rules': [["password", "totp"], ["password"]]
@@ -815,10 +733,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.user.name,
-            'default_project_id': None,
-            'description': None,
-            'domain_id': None,
-            'email': None,
             'is_enabled': True,
             'options': {
                 'ignore_password_expiry': True,

openstackclient/tests/unit/image/v2/test_metadef_objects.py

@@ -256,7 +256,6 @@ class TestMetadefObjectPropertyShow(fakes.TestImagev2):
             parsed_args,
         )
         self.assertIn(
-            'Property %s not found in object %s.'
-            % (parsed_args.property, parsed_args.object),
+            f'Property {parsed_args.property} not found in object {parsed_args.object}.',
             str(exc),
         )

openstackclient/tests/unit/image/v2/test_metadef_resource_type_association.py

@@ -42,9 +42,7 @@ class TestMetadefResourceTypeAssociationCreate(
     def setUp(self):
         super().setUp()
 
-        self.image_client.create_metadef_resource_type_association.return_value = (
-            self.resource_type_association
-        )
+        self.image_client.create_metadef_resource_type_association.return_value = self.resource_type_association
         self.cmd = metadef_resource_type_association.CreateMetadefResourceTypeAssociation(
             self.app, None
         )
@@ -74,9 +72,7 @@ class TestMetadefResourceTypeAssociationDelete(
     def setUp(self):
         super().setUp()
 
-        self.image_client.delete_metadef_resource_type_association.return_value = (
-            self.resource_type_association
-        )
+        self.image_client.delete_metadef_resource_type_association.return_value = self.resource_type_association
         self.cmd = metadef_resource_type_association.DeleteMetadefResourceTypeAssociation(
             self.app, None
         )

openstackclient/tests/unit/integ/base.py

@@ -18,7 +18,7 @@ from openstackclient.tests.unit import utils
 
 
 HOST = "192.168.5.41"
-URL_BASE = "http://%s/identity" % HOST
+URL_BASE = f"http://{HOST}/identity"
 
 V2_AUTH_URL = URL_BASE + "/v2.0/"
 V2_VERSION_RESP = {

openstackclient/tests/unit/network/v2/test_default_security_group_rule.py

@@ -79,7 +79,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
         default_security_group_rule_attrs.update(attrs)
         self._default_sg_rule = sdk_fakes.generate_fake_resource(
             _default_security_group_rule.DefaultSecurityGroupRule,
-            **default_security_group_rule_attrs
+            **default_security_group_rule_attrs,
         )
 
         self.sdk_client.create_default_security_group_rule.return_value = (
@@ -956,11 +956,11 @@ class TestListDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
     # The security group rule to be listed.
     _default_sg_rule_tcp = sdk_fakes.generate_fake_resource(
         _default_security_group_rule.DefaultSecurityGroupRule,
-        **{'protocol': 'tcp', 'port_range_max': 80, 'port_range_min': 80}
+        **{'protocol': 'tcp', 'port_range_max': 80, 'port_range_min': 80},
     )
     _default_sg_rule_icmp = sdk_fakes.generate_fake_resource(
         _default_security_group_rule.DefaultSecurityGroupRule,
-        **{'protocol': 'icmp', 'remote_ip_prefix': '10.0.2.0/24'}
+        **{'protocol': 'icmp', 'remote_ip_prefix': '10.0.2.0/24'},
     )
     _default_sg_rules = [
         _default_sg_rule_tcp,

openstackclient/tests/unit/network/v2/test_floating_ip_port_forwarding.py

@@ -153,7 +153,7 @@ class TestCreateFloatingIPPortForwarding(TestFloatingIPPortForwarding):
                 'internal_port_id': self.new_port_forwarding_with_ranges.internal_port_id,  # noqa: E501
                 'protocol': self.new_port_forwarding_with_ranges.protocol,
                 'description': self.new_port_forwarding_with_ranges.description,  # noqa: E501
-            }
+            },
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
@@ -334,7 +334,7 @@ class TestCreateFloatingIPPortForwarding(TestFloatingIPPortForwarding):
                 'internal_port_id': self.new_port_forwarding.internal_port_id,
                 'protocol': self.new_port_forwarding.protocol,
                 'description': self.new_port_forwarding.description,
-            }
+            },
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
@@ -587,7 +587,7 @@ class TestSetFloatingIPPortForwarding(TestFloatingIPPortForwarding):
         self.network_client.update_floating_ip_port_forwarding.assert_called_with(
             self._port_forwarding.floatingip_id,
             self._port_forwarding.id,
-            **attrs
+            **attrs,
         )
         self.assertIsNone(result)
 
@@ -648,7 +648,7 @@ class TestSetFloatingIPPortForwarding(TestFloatingIPPortForwarding):
             self.network_client.update_floating_ip_port_forwarding.assert_called_with(
                 self._port_forwarding.floatingip_id,
                 self._port_forwarding.id,
-                **attrs
+                **attrs,
             )
             self.assertIsNone(result)
 

openstackclient/tests/unit/network/v2/test_local_ip_association.py

@@ -86,7 +86,7 @@ class TestCreateLocalIPAssociation(TestLocalIPAssociation):
             self.new_local_ip_association.local_ip_id,
             **{
                 'fixed_port_id': self.new_local_ip_association.fixed_port_id,
-            }
+            },
         )
         self.assertEqual(set(self.columns), set(columns))
         self.assertEqual(set(self.data), set(data))
@@ -111,7 +111,7 @@ class TestCreateLocalIPAssociation(TestLocalIPAssociation):
             **{
                 'fixed_port_id': self.new_local_ip_association.fixed_port_id,
                 'fixed_ip': self.new_local_ip_association.fixed_ip,
-            }
+            },
         )
         self.assertEqual(set(self.columns), set(columns))
         self.assertEqual(set(self.data), set(data))