python-openstackclient 8.1.0__py3-none-any.whl → 8.3.0__py3-none-any.whl

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

@@ -127,7 +127,7 @@ class TestIdentityProviderCreate(TestIdentityProvider):
         ]
         verifylist = [
             ('identity_provider_id', identity_fakes.idp_id),
-            ('remote_id', identity_fakes.idp_remote_ids[:1]),
+            ('remote_ids', identity_fakes.idp_remote_ids[:1]),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
@@ -157,7 +157,7 @@ class TestIdentityProviderCreate(TestIdentityProvider):
         ]
         verifylist = [
             ('identity_provider_id', identity_fakes.idp_id),
-            ('remote_id', identity_fakes.idp_remote_ids),
+            ('remote_ids', identity_fakes.idp_remote_ids),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
@@ -561,7 +561,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
             ('description', new_description),
             ('enable', False),
             ('disable', False),
-            ('remote_id', None),
+            ('remote_ids', None),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
@@ -597,7 +597,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
             ('description', None),
             ('enable', False),
             ('disable', True),
-            ('remote_id', identity_fakes.idp_remote_ids),
+            ('remote_ids', identity_fakes.idp_remote_ids),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -637,7 +637,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
             ('description', None),
             ('enable', True),
             ('disable', False),
-            ('remote_id', identity_fakes.idp_remote_ids),
+            ('remote_ids', identity_fakes.idp_remote_ids),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -675,7 +675,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
             ('description', None),
             ('enable', True),
             ('disable', False),
-            ('remote_id', [self.new_remote_id]),
+            ('remote_ids', [self.new_remote_id]),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -756,7 +756,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
             ('identity_provider', identity_fakes.idp_id),
             ('enable', False),
             ('disable', False),
-            ('remote_id', None),
+            ('remote_ids', None),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -776,7 +776,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
             ('identity_provider', identity_fakes.idp_id),
             ('enable', False),
             ('disable', False),
-            ('remote_id', None),
+            ('remote_ids', None),
             ('authorization_ttl', 60),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -800,7 +800,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
             ('identity_provider', identity_fakes.idp_id),
             ('enable', False),
             ('disable', False),
-            ('remote_id', None),
+            ('remote_ids', None),
             ('authorization_ttl', 0),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -816,7 +816,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
             ('identity_provider', identity_fakes.idp_id),
             ('enable', False),
             ('disable', False),
-            ('remote_id', None),
+            ('remote_ids', None),
             ('authorization_ttl', -1),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)

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

@@ -109,7 +109,7 @@ class TestRequestTokenAuthorize(TestOAuth1):
         ]
         verifylist = [
             ('request_key', identity_fakes.request_token_id),
-            ('role', [identity_fakes.role_name]),
+            ('roles', [identity_fakes.role_name]),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)

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

@@ -77,8 +77,7 @@ class TestProjectCreate(TestProject):
         ]
         verifylist = [
             ('parent', None),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('tags', []),
         ]
@@ -134,8 +133,7 @@ class TestProjectCreate(TestProject):
         ]
         verifylist = [
             ('description', 'new desc'),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('parent', None),
             ('tags', []),
@@ -172,8 +170,7 @@ class TestProjectCreate(TestProject):
         ]
         verifylist = [
             ('domain', self.project.domain_id),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('parent', None),
             ('tags', []),
@@ -210,8 +207,7 @@ class TestProjectCreate(TestProject):
         ]
         verifylist = [
             ('domain', self.project.domain_id),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('parent', None),
             ('tags', []),
@@ -243,8 +239,7 @@ class TestProjectCreate(TestProject):
             self.project.name,
         ]
         verifylist = [
-            ('enable', True),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('parent', None),
             ('tags', []),
@@ -279,8 +274,7 @@ class TestProjectCreate(TestProject):
             self.project.name,
         ]
         verifylist = [
-            ('enable', False),
-            ('disable', True),
+            ('enabled', False),
             ('name', self.project.name),
             ('parent', None),
         ]
@@ -317,7 +311,7 @@ class TestProjectCreate(TestProject):
             self.project.name,
         ]
         verifylist = [
-            ('property', {'fee': 'fi', 'fo': 'fum'}),
+            ('properties', {'fee': 'fi', 'fo': 'fum'}),
             ('name', self.project.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -354,11 +348,10 @@ class TestProjectCreate(TestProject):
         ]
         verifylist = [
             ('parent', None),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('tags', []),
-            ('property', {'is_domain': 'false'}),
+            ('properties', {'is_domain': 'false'}),
             ('name', self.project.name),
         ]
 
@@ -393,11 +386,10 @@ class TestProjectCreate(TestProject):
         ]
         verifylist = [
             ('parent', None),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('tags', []),
-            ('property', {'is_domain': 'true'}),
+            ('properties', {'is_domain': 'true'}),
             ('name', self.project.name),
         ]
 
@@ -432,11 +424,10 @@ class TestProjectCreate(TestProject):
         ]
         verifylist = [
             ('parent', None),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('tags', []),
-            ('property', {'is_domain': 'none'}),
+            ('properties', {'is_domain': 'none'}),
             ('name', self.project.name),
         ]
 
@@ -481,8 +472,7 @@ class TestProjectCreate(TestProject):
         verifylist = [
             ('domain', self.project.domain_id),
             ('parent', self.parent.name),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('tags', []),
         ]
@@ -544,8 +534,7 @@ class TestProjectCreate(TestProject):
         verifylist = [
             ('domain', self.project.domain_id),
             ('parent', 'invalid'),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -566,8 +555,7 @@ class TestProjectCreate(TestProject):
         ]
         verifylist = [
             ('domain', self.project.domain_id),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('parent', None),
             ('tags', ['foo']),
@@ -602,8 +590,7 @@ class TestProjectCreate(TestProject):
         verifylist = [
             ('immutable', True),
             ('description', None),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('parent', None),
             ('tags', []),
@@ -638,10 +625,9 @@ class TestProjectCreate(TestProject):
             self.project.name,
         ]
         verifylist = [
-            ('no_immutable', True),
+            ('immutable', False),
             ('description', None),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('parent', None),
             ('tags', []),
@@ -981,8 +967,7 @@ class TestProjectSet(TestProject):
         ]
         verifylist = [
             ('project', self.project.name),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', None),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1001,8 +986,7 @@ class TestProjectSet(TestProject):
         verifylist = [
             ('name', 'qwerty'),
             ('domain', self.project.domain_id),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', None),
             ('project', self.project.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1029,8 +1013,7 @@ class TestProjectSet(TestProject):
         verifylist = [
             ('domain', self.project.domain_id),
             ('description', 'new desc'),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', None),
             ('project', self.project.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1053,8 +1036,7 @@ class TestProjectSet(TestProject):
         ]
         verifylist = [
             ('domain', self.project.domain_id),
-            ('enable', True),
-            ('disable', False),
+            ('enabled', True),
             ('project', self.project.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1077,8 +1059,7 @@ class TestProjectSet(TestProject):
         ]
         verifylist = [
             ('domain', self.project.domain_id),
-            ('enable', False),
-            ('disable', True),
+            ('enabled', False),
             ('project', self.project.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1104,7 +1085,7 @@ class TestProjectSet(TestProject):
         ]
         verifylist = [
             ('domain', self.project.domain_id),
-            ('property', {'fee': 'fi', 'fo': 'fum'}),
+            ('properties', {'fee': 'fi', 'fo': 'fum'}),
             ('project', self.project.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1132,8 +1113,7 @@ class TestProjectSet(TestProject):
         verifylist = [
             ('name', 'qwerty'),
             ('domain', self.project.domain_id),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', None),
             ('project', self.project.name),
             ('tags', ['foo']),
         ]
@@ -1160,10 +1140,9 @@ class TestProjectSet(TestProject):
             self.project.name,
         ]
         verifylist = [
-            ('enable', False),
-            ('disable', False),
+            ('enabled', None),
             ('project', self.project.name),
-            ('remove_tag', ['tag1', 'tag2']),
+            ('remove_tags', ['tag1', 'tag2']),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1183,8 +1162,7 @@ class TestProjectSet(TestProject):
         verifylist = [
             ('domain', self.project.domain_id),
             ('immutable', True),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', None),
             ('project', self.project.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1207,9 +1185,8 @@ class TestProjectSet(TestProject):
         ]
         verifylist = [
             ('domain', self.project.domain_id),
-            ('no_immutable', True),
-            ('enable', False),
-            ('disable', False),
+            ('immutable', False),
+            ('enabled', None),
             ('project', self.project.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)

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

@@ -168,7 +168,7 @@ class TestRegisteredLimitDelete(TestRegisteredLimit):
 
         arglist = [identity_fakes.registered_limit_id]
         verifylist = [
-            ('registered_limit_id', [identity_fakes.registered_limit_id])
+            ('registered_limits', [identity_fakes.registered_limit_id])
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -184,7 +184,7 @@ class TestRegisteredLimitDelete(TestRegisteredLimit):
         self.registered_limit_mock.delete.side_effect = return_value
 
         arglist = ['fake-registered-limit-id']
-        verifylist = [('registered_limit_id', ['fake-registered-limit-id'])]
+        verifylist = [('registered_limits', ['fake-registered-limit-id'])]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         try:

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
@@ -494,7 +413,6 @@ class TestRoleCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.role.name,
-            'options': {},
         }
 
         self.identity_sdk_client.create_role.assert_called_with(**kwargs)
@@ -533,7 +451,6 @@ class TestRoleCreate(identity_fakes.TestIdentityv3):
         kwargs = {
             'domain_id': self.domain.id,
             'name': self.role_with_domain.name,
-            'options': {},
         }
 
         self.identity_sdk_client.create_role.assert_called_with(**kwargs)
@@ -572,7 +489,6 @@ class TestRoleCreate(identity_fakes.TestIdentityv3):
         kwargs = {
             'name': self.role_with_description.name,
             'description': self.role_with_description.description,
-            'options': {},
         }
 
         self.identity_sdk_client.create_role.assert_called_with(**kwargs)
@@ -629,7 +545,7 @@ class TestRoleCreate(identity_fakes.TestIdentityv3):
             self.role.name,
         ]
         verifylist = [
-            ('no_immutable', True),
+            ('immutable', False),
             ('name', self.role.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1437,7 +1353,6 @@ class TestRoleSet(identity_fakes.TestIdentityv3):
         kwargs = {
             'name': 'over',
             'role': self.role.id,
-            'options': {},
         }
         self.identity_sdk_client.update_role.assert_called_with(**kwargs)
         self.assertIsNone(result)
@@ -1472,7 +1387,6 @@ class TestRoleSet(identity_fakes.TestIdentityv3):
             'name': 'over',
             'role': self.role_with_domain.id,
             'domain_id': self.domain2.id,
-            'options': {},
         }
         self.identity_sdk_client.update_role.assert_called_with(**kwargs)
         self.assertIsNone(result)
@@ -1501,7 +1415,6 @@ class TestRoleSet(identity_fakes.TestIdentityv3):
             'name': 'over',
             'description': 'role description',
             'role': self.role_with_domain.id,
-            'options': {},
         }
         self.identity_sdk_client.update_role.assert_called_with(**kwargs)
         self.assertIsNone(result)
@@ -1544,7 +1457,7 @@ class TestRoleSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', 'over'),
-            ('no_immutable', True),
+            ('immutable', False),
             ('role', self.role_with_domain.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)