python-openstackclient 8.2.0__py3-none-any.whl → 9.0.0__py3-none-any.whl

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

@@ -15,8 +15,6 @@
 
 from unittest import mock
 
-from osc_lib import exceptions
-
 from openstack import exceptions as sdk_exc
 from openstack.identity.v3 import domain as _domain
 from openstack.identity.v3 import group as _group
@@ -25,10 +23,10 @@ from openstack.identity.v3 import role as _role
 from openstack.identity.v3 import system as _system
 from openstack.identity.v3 import user as _user
 from openstack.test import fakes as sdk_fakes
+from osc_lib import exceptions
 
 from openstackclient.identity.v3 import role
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
-from openstackclient.tests.unit import utils as test_utils
 
 
 class TestRoleInherited(identity_fakes.TestIdentityv3):
@@ -36,85 +34,6 @@ class TestRoleInherited(identity_fakes.TestIdentityv3):
         return True
 
 
-class TestFindSDKId(test_utils.TestCase):
-    def setUp(self):
-        super().setUp()
-        self.user = sdk_fakes.generate_fake_resource(_user.User)
-        self.identity_sdk_client = mock.Mock()
-        self.identity_sdk_client.find_user = mock.Mock()
-
-    def test_find_sdk_id_validate(self):
-        self.identity_sdk_client.find_user.side_effect = [self.user]
-
-        result = role._find_sdk_id(
-            self.identity_sdk_client.find_user,
-            name_or_id=self.user.id,
-            validate_actor_existence=True,
-        )
-        self.assertEqual(self.user.id, result)
-
-    def test_find_sdk_id_no_validate(self):
-        self.identity_sdk_client.find_user.side_effect = [self.user]
-
-        result = role._find_sdk_id(
-            self.identity_sdk_client.find_user,
-            name_or_id=self.user.id,
-            validate_actor_existence=False,
-        )
-        self.assertEqual(self.user.id, result)
-
-    def test_find_sdk_id_not_found_validate(self):
-        self.identity_sdk_client.find_user.side_effect = [
-            sdk_exc.ResourceNotFound,
-        ]
-
-        self.assertRaises(
-            exceptions.CommandError,
-            role._find_sdk_id,
-            self.identity_sdk_client.find_user,
-            name_or_id=self.user.id,
-            validate_actor_existence=True,
-        )
-
-    def test_find_sdk_id_not_found_no_validate(self):
-        self.identity_sdk_client.find_user.side_effect = [
-            sdk_exc.ResourceNotFound,
-        ]
-
-        result = role._find_sdk_id(
-            self.identity_sdk_client.find_user,
-            name_or_id=self.user.id,
-            validate_actor_existence=False,
-        )
-        self.assertEqual(self.user.id, result)
-
-    def test_find_sdk_id_forbidden_validate(self):
-        self.identity_sdk_client.find_user.side_effect = [
-            sdk_exc.ForbiddenException,
-        ]
-
-        result = role._find_sdk_id(
-            self.identity_sdk_client.find_user,
-            name_or_id=self.user.id,
-            validate_actor_existence=True,
-        )
-
-        self.assertEqual(self.user.id, result)
-
-    def test_find_sdk_id_forbidden_no_validate(self):
-        self.identity_sdk_client.find_user.side_effect = [
-            sdk_exc.ForbiddenException,
-        ]
-
-        result = role._find_sdk_id(
-            self.identity_sdk_client.find_user,
-            name_or_id=self.user.id,
-            validate_actor_existence=False,
-        )
-
-        self.assertEqual(self.user.id, result)
-
-
 class TestRoleAdd(identity_fakes.TestIdentityv3):
     def _is_inheritance_testcase(self):
         return False

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

@@ -94,7 +94,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         kwargs = {
             'name': self.user.name,
             'is_enabled': True,
-            'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
 
@@ -138,7 +137,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
             self.user.name,
         ]
         verifylist = [
-            ('password', None),
             ('password_prompt', True),
             ('enable', False),
             ('disable', False),
@@ -171,7 +169,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
             self.user.name,
         ]
         verifylist = [
-            ('password', None),
             ('password_prompt', True),
             ('enable', False),
             ('disable', False),
@@ -236,7 +233,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
             'name': self.user.name,
             'email': 'barney@example.com',
             'is_enabled': True,
-            'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
 
@@ -267,7 +263,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
             'name': self.user.name,
             'default_project_id': self.project.id,
             'is_enabled': True,
-            'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
 
@@ -312,7 +307,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
             'name': self.user.name,
             'default_project_id': self.project.id,
             'is_enabled': True,
-            'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_once_with(**kwargs)
         self.identity_sdk_client.find_domain.assert_called_once_with(
@@ -357,7 +351,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
             'name': self.user.name,
             'domain_id': self.domain.id,
             'is_enabled': True,
-            'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
 
@@ -385,7 +378,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         kwargs = {
             'name': self.user.name,
             'is_enabled': True,
-            'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
 
@@ -413,7 +405,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         kwargs = {
             'name': self.user.name,
             'is_enabled': False,
-            'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
 
@@ -443,7 +434,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
             'name': self.user.name,
             'is_enabled': True,
             'options': {'ignore_lockout_failure_attempts': True},
-            'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
 
@@ -473,7 +463,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
             'name': self.user.name,
             'is_enabled': True,
             'options': {'ignore_lockout_failure_attempts': False},
-            'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
 
@@ -503,7 +492,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
             'name': self.user.name,
             'is_enabled': True,
             'options': {'ignore_password_expiry': True},
-            'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
 
@@ -533,7 +521,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
             'name': self.user.name,
             'is_enabled': True,
             'options': {'ignore_password_expiry': False},
-            'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
 
@@ -563,7 +550,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
             'name': self.user.name,
             'is_enabled': True,
             'options': {'ignore_change_password_upon_first_use': True},
-            'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
 
@@ -593,7 +579,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
             'name': self.user.name,
             'is_enabled': True,
             'options': {'ignore_change_password_upon_first_use': False},
-            'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
 
@@ -623,7 +608,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
             'name': self.user.name,
             'is_enabled': True,
             'options': {'lock_password': True},
-            'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
 
@@ -653,7 +637,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
             'name': self.user.name,
             'is_enabled': True,
             'options': {'lock_password': False},
-            'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
 
@@ -683,7 +666,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
             'name': self.user.name,
             'is_enabled': True,
             'options': {'multi_factor_auth_enabled': True},
-            'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
 
@@ -713,7 +695,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
             'name': self.user.name,
             'is_enabled': True,
             'options': {'multi_factor_auth_enabled': False},
-            'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
 
@@ -730,7 +711,7 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             (
-                'multi_factor_auth_rule',
+                'multi_factor_auth_rules',
                 [identity_fakes.mfa_opt1, identity_fakes.mfa_opt2],
             ),
             ('enable', False),
@@ -751,7 +732,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
             'options': {
                 'multi_factor_auth_rules': [["password", "totp"], ["password"]]
             },
-            'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
 
@@ -769,7 +749,7 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         verifylist = [
             ('ignore_password_expiry', True),
             ('disable_multi_factor_auth', True),
-            ('multi_factor_auth_rule', [identity_fakes.mfa_opt1]),
+            ('multi_factor_auth_rules', [identity_fakes.mfa_opt1]),
             ('enable', False),
             ('disable', False),
             ('name', self.user.name),
@@ -790,7 +770,6 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
                 'multi_factor_auth_enabled': False,
                 'multi_factor_auth_rules': [["password", "totp"]],
             },
-            'password': None,
         }
         self.identity_sdk_client.create_user.assert_called_with(**kwargs)
 
@@ -891,7 +870,7 @@ class TestUserList(identity_fakes.TestIdentityv3):
         self.identity_sdk_client.find_domain.return_value = self.domain
         self.identity_sdk_client.find_group.return_value = self.group
         self.identity_sdk_client.find_project.return_value = self.project
-        self.identity_sdk_client.role_assignments_filter.return_value = [
+        self.identity_sdk_client.role_assignments.return_value = [
             self.role_assignment
         ]
 
@@ -1029,12 +1008,10 @@ class TestUserList(identity_fakes.TestIdentityv3):
         columns, data = self.cmd.take_action(parsed_args)
 
         kwargs = {
-            'project': self.project.id,
+            'scope_project_id': self.project.id,
         }
 
-        self.identity_sdk_client.role_assignments_filter.assert_called_with(
-            **kwargs
-        )
+        self.identity_sdk_client.role_assignments.assert_called_with(**kwargs)
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.datalist, tuple(data))
@@ -1086,7 +1063,6 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', None),
-            ('password', None),
             ('email', None),
             ('project', None),
             ('enable', False),
@@ -1107,7 +1083,6 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', 'qwerty'),
-            ('password', None),
             ('email', None),
             ('project', None),
             ('enable', False),
@@ -1138,7 +1113,6 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', 'qwerty'),
-            ('password', None),
             ('domain', self.domain.id),
             ('email', None),
             ('project', None),
@@ -1194,7 +1168,6 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', None),
-            ('password', None),
             ('password_prompt', True),
             ('email', None),
             ('project', None),
@@ -1227,7 +1200,6 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', None),
-            ('password', None),
             ('email', 'barney@example.com'),
             ('project', None),
             ('enable', False),
@@ -1256,7 +1228,6 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', None),
-            ('password', None),
             ('email', None),
             ('project', self.project.id),
             ('enable', False),
@@ -1298,7 +1269,6 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', None),
-            ('password', None),
             ('email', None),
             ('project', self.project.id),
             ('project_domain', self.project.domain_id),
@@ -1332,7 +1302,6 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', None),
-            ('password', None),
             ('email', None),
             ('project', None),
             ('enable', True),
@@ -1359,7 +1328,6 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', None),
-            ('password', None),
             ('email', None),
             ('project', None),
             ('enable', False),
@@ -1386,7 +1354,6 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', None),
-            ('password', None),
             ('email', None),
             ('ignore_lockout_failure_attempts', True),
             ('project', None),
@@ -1414,7 +1381,6 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', None),
-            ('password', None),
             ('email', None),
             ('no_ignore_lockout_failure_attempts', True),
             ('project', None),
@@ -1442,7 +1408,6 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', None),
-            ('password', None),
             ('email', None),
             ('ignore_password_expiry', True),
             ('project', None),
@@ -1470,7 +1435,6 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', None),
-            ('password', None),
             ('email', None),
             ('no_ignore_password_expiry', True),
             ('project', None),
@@ -1498,7 +1462,6 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', None),
-            ('password', None),
             ('email', None),
             ('ignore_change_password_upon_first_use', True),
             ('project', None),
@@ -1526,7 +1489,6 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', None),
-            ('password', None),
             ('email', None),
             ('no_ignore_change_password_upon_first_use', True),
             ('project', None),
@@ -1554,7 +1516,6 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', None),
-            ('password', None),
             ('email', None),
             ('enable_lock_password', True),
             ('project', None),
@@ -1582,7 +1543,6 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', None),
-            ('password', None),
             ('email', None),
             ('disable_lock_password', True),
             ('project', None),
@@ -1610,7 +1570,6 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', None),
-            ('password', None),
             ('email', None),
             ('enable_multi_factor_auth', True),
             ('project', None),
@@ -1638,7 +1597,6 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', None),
-            ('password', None),
             ('email', None),
             ('disable_multi_factor_auth', True),
             ('project', None),
@@ -1667,9 +1625,8 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', None),
-            ('password', None),
             ('email', None),
-            ('multi_factor_auth_rule', [identity_fakes.mfa_opt1]),
+            ('multi_factor_auth_rules', [identity_fakes.mfa_opt1]),
             ('project', None),
             ('enable', False),
             ('disable', False),
@@ -1699,11 +1656,10 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', None),
-            ('password', None),
             ('email', None),
             ('ignore_password_expiry', True),
             ('enable_multi_factor_auth', True),
-            ('multi_factor_auth_rule', [identity_fakes.mfa_opt1]),
+            ('multi_factor_auth_rules', [identity_fakes.mfa_opt1]),
             ('project', None),
             ('enable', False),
             ('disable', False),

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

@@ -1295,6 +1295,117 @@ class TestImageSet(TestImage):
         # the 'update membership' route.
         self.image_client.update_image.assert_called_with(self._image.id)
 
+    def test_image_set_membership_accept_with_project_no_owner_change(self):
+        """Test that --project with --accept doesn't change image owner."""
+        membership = image_fakes.create_one_image_member(
+            attrs={
+                'image_id': '0f41529e-7c12-4de8-be2d-181abb825b3c',
+                'member_id': self.project.id,
+            }
+        )
+        self.image_client.update_member.return_value = membership
+
+        arglist = [
+            '--project',
+            self.project.name,
+            '--accept',
+            self._image.id,
+        ]
+        verifylist = [
+            ('project', self.project.name),
+            ('membership', 'accepted'),
+            ('image', self._image.id),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+
+        self.image_client.update_member.assert_called_once_with(
+            image=self._image.id,
+            member=self.project.id,
+            status='accepted',
+        )
+
+        self.image_client.update_image.assert_called()
+        call_args = self.image_client.update_image.call_args
+        if call_args:
+            args, kwargs = call_args
+            self.assertNotIn('owner_id', kwargs)
+
+    def test_image_set_membership_reject_with_project_no_owner_change(self):
+        """Test that --project with --reject doesn't change image owner."""
+        membership = image_fakes.create_one_image_member(
+            attrs={
+                'image_id': '0f41529e-7c12-4de8-be2d-181abb825b3c',
+                'member_id': self.project.id,
+            }
+        )
+        self.image_client.update_member.return_value = membership
+
+        arglist = [
+            '--project',
+            self.project.name,
+            '--reject',
+            self._image.id,
+        ]
+        verifylist = [
+            ('project', self.project.name),
+            ('membership', 'rejected'),
+            ('image', self._image.id),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+
+        self.image_client.update_member.assert_called_once_with(
+            image=self._image.id,
+            member=self.project.id,
+            status='rejected',
+        )
+
+        self.image_client.update_image.assert_called()
+        call_args = self.image_client.update_image.call_args
+        if call_args:
+            args, kwargs = call_args
+            self.assertNotIn('owner_id', kwargs)
+
+    def test_image_set_membership_pending_with_project_no_owner_change(self):
+        """Test that --project with --pending doesn't change image owner."""
+        membership = image_fakes.create_one_image_member(
+            attrs={
+                'image_id': '0f41529e-7c12-4de8-be2d-181abb825b3c',
+                'member_id': self.project.id,
+            }
+        )
+        self.image_client.update_member.return_value = membership
+
+        arglist = [
+            '--project',
+            self.project.name,
+            '--pending',
+            self._image.id,
+        ]
+        verifylist = [
+            ('project', self.project.name),
+            ('membership', 'pending'),
+            ('image', self._image.id),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+
+        self.image_client.update_member.assert_called_once_with(
+            image=self._image.id,
+            member=self.project.id,
+            status='pending',
+        )
+
+        self.image_client.update_image.assert_called()
+        call_args = self.image_client.update_image.call_args
+        if call_args:
+            args, kwargs = call_args
+            self.assertNotIn('owner_id', kwargs)
+
     def test_image_set_options(self):
         arglist = [
             '--name',
@@ -1974,7 +2085,7 @@ class TestImageImport(TestImage):
             remote_image_id=None,
             remote_service_interface=None,
             stores=None,
-            all_stores=None,
+            all_stores=False,
             all_stores_must_succeed=False,
         )
 
@@ -2004,7 +2115,7 @@ class TestImageImport(TestImage):
             remote_image_id=None,
             remote_service_interface=None,
             stores=None,
-            all_stores=None,
+            all_stores=False,
             all_stores_must_succeed=False,
         )
 
@@ -2142,7 +2253,7 @@ class TestImageImport(TestImage):
             remote_image_id=None,
             remote_service_interface=None,
             stores=['fast'],
-            all_stores=None,
+            all_stores=False,
             all_stores_must_succeed=False,
         )
 
@@ -2174,7 +2285,7 @@ class TestImageImport(TestImage):
             remote_image_id=None,
             remote_service_interface=None,
             stores=['fast'],
-            all_stores=None,
+            all_stores=False,
             all_stores_must_succeed=True,
         )
 
@@ -2209,7 +2320,7 @@ class TestImageImport(TestImage):
             remote_image_id='remote-image-id',
             remote_service_interface='private',
             stores=None,
-            all_stores=None,
+            all_stores=False,
             all_stores_must_succeed=False,
         )
 

openstackclient/tests/unit/network/test_common.py

@@ -126,17 +126,13 @@ class TestNetworkAndCompute(utils.TestCommand):
         # Create client mocks. Note that we intentionally do not use specced
         # mocks since we want to test fake methods.
 
-        self.app.client_manager.network = mock.Mock()
-        self.network_client = self.app.client_manager.network
-        self.network_client.network_action = mock.Mock(
-            return_value='take_action_network'
-        )
+        self.app.client_manager.network = mock.Mock()  # noqa: O401
+        self.network_client = self.app.client_manager.network  # noqa: O401
+        self.network_client.network_action.return_value = 'take_action_network'
 
-        self.app.client_manager.compute = mock.Mock()
-        self.compute_client = self.app.client_manager.compute
-        self.compute_client.compute_action = mock.Mock(
-            return_value='take_action_compute'
-        )
+        self.app.client_manager.compute = mock.Mock()  # noqa: O401
+        self.compute_client = self.app.client_manager.compute  # noqa: O401
+        self.compute_client.compute_action.return_value = 'take_action_compute'
 
         self.cmd = FakeNetworkAndComputeCommand(self.app, None)
 
@@ -205,9 +201,9 @@ class TestNeutronCommandWithExtraArgs(utils.TestCommand):
         # Create client mocks. Note that we intentionally do not use specced
         # mocks since we want to test fake methods.
 
-        self.app.client_manager.network = mock.Mock()
-        self.network_client = self.app.client_manager.network
-        self.network_client.test_create_action = mock.Mock()
+        self.app.client_manager.network = mock.Mock()  # noqa: O401
+        self.network_client = self.app.client_manager.network  # noqa: O401
+        self.network_client.test_create_action = mock.Mock()  # noqa: O402
 
         # Subclasses can override the command object to test.
         self.cmd = FakeCreateNeutronCommandWithExtraArgs(self.app, None)