python-openstackclient 7.4.0__py3-none-any.whl → 7.5.0__py3-none-any.whl

openstackclient/identity/v3/trust.py

@@ -123,37 +123,67 @@ class CreateTrust(command.ShowOne):
         # pointless, and trusts are immutable, so let's enforce it at the
         # client level.
         try:
-            trustor_id = identity_client.find_user(
-                parsed_args.trustor, parsed_args.trustor_domain
-            ).id
-            kwargs['trustor_id'] = trustor_id
+            if parsed_args.trustor_domain:
+                trustor_domain_id = identity_client.find_domain(
+                    parsed_args.trustor_domain, ignore_missing=False
+                ).id
+                trustor_id = identity_client.find_user(
+                    parsed_args.trustor,
+                    ignore_missing=False,
+                    domain_id=trustor_domain_id,
+                ).id
+            else:
+                trustor_id = identity_client.find_user(
+                    parsed_args.trustor, ignore_missing=False
+                ).id
+            kwargs['trustor_user_id'] = trustor_id
         except sdk_exceptions.ForbiddenException:
-            kwargs['trustor_id'] = parsed_args.trustor
+            kwargs['trustor_user_id'] = parsed_args.trustor
 
         try:
-            trustee_id = identity_client.find_user(
-                parsed_args.trustee, parsed_args.trustee_domain
-            ).id
-            kwargs['trustee_id'] = trustee_id
+            if parsed_args.trustee_domain:
+                trustee_domain_id = identity_client.find_domain(
+                    parsed_args.trustee_domain, ignore_missing=False
+                ).id
+                trustee_id = identity_client.find_user(
+                    parsed_args.trustee,
+                    ignore_missing=False,
+                    domain_id=trustee_domain_id,
+                ).id
+            else:
+                trustee_id = identity_client.find_user(
+                    parsed_args.trustee, ignore_missing=False
+                ).id
+            kwargs['trustee_user_id'] = trustee_id
         except sdk_exceptions.ForbiddenException:
-            kwargs['trustee_id'] = parsed_args.trustee
+            kwargs['trustee_user_id'] = parsed_args.trustee
 
         try:
-            project_id = identity_client.find_project(
-                parsed_args.project, parsed_args.project_domain
-            ).id
+            if parsed_args.project_domain:
+                project_domain_id = identity_client.find_domain(
+                    parsed_args.project_domain, ignore_missing=False
+                ).id
+                project_id = identity_client.find_project(
+                    parsed_args.project,
+                    ignore_missing=False,
+                    domain_id=project_domain_id,
+                ).id
+            else:
+                project_id = identity_client.find_project(
+                    parsed_args.project, ignore_missing=False
+                ).id
             kwargs['project_id'] = project_id
         except sdk_exceptions.ForbiddenException:
             kwargs['project_id'] = parsed_args.project
 
-        role_ids = []
+        roles = []
         for role in parsed_args.roles:
             try:
                 role_id = identity_client.find_role(role).id
             except sdk_exceptions.ForbiddenException:
                 role_id = role
-            role_ids.append(role_id)
-        kwargs['roles'] = role_ids
+            roles.append({"id": role_id})
+        kwargs['roles'] = roles
 
         if parsed_args.expiration:
             expires_at = datetime.datetime.strptime(
@@ -161,8 +191,7 @@ class CreateTrust(command.ShowOne):
             )
             kwargs['expires_at'] = expires_at
 
-        if parsed_args.is_impersonation:
-            kwargs['is_impersonation'] = parsed_args.is_impersonation
+        kwargs['impersonation'] = bool(parsed_args.is_impersonation)
 
         trust = identity_client.create_trust(**kwargs)
 
@@ -289,9 +318,19 @@ class ListTrust(command.Lister):
             trustor = None
             if parsed_args.trustor:
                 try:
-                    trustor_id = identity_client.find_user(
-                        parsed_args.trustor, parsed_args.trustor_domain
-                    ).id
+                    if parsed_args.trustor_domain:
+                        trustor_domain_id = identity_client.find_domain(
+                            parsed_args.trustor_domain, ignore_missing=False
+                        ).id
+                        trustor_id = identity_client.find_user(
+                            parsed_args.trustor,
+                            ignore_missing=False,
+                            domain_id=trustor_domain_id,
+                        ).id
+                    else:
+                        trustor_id = identity_client.find_user(
+                            parsed_args.trustor, ignore_missing=False
+                        ).id
                     trustor = trustor_id
                 except sdk_exceptions.ForbiddenException:
                     trustor = parsed_args.trustor
@@ -299,9 +338,19 @@ class ListTrust(command.Lister):
             trustee = None
             if parsed_args.trustee:
                 try:
-                    trustee_id = identity_client.find_user(
-                        parsed_args.trustee, parsed_args.trustee_domain
-                    ).id
+                    if parsed_args.trustee_domain:
+                        trustee_domain_id = identity_client.find_domain(
+                            parsed_args.trustee_domain, ignore_missing=False
+                        ).id
+                        trustee_id = identity_client.find_user(
+                            parsed_args.trustee,
+                            ignore_missing=False,
+                            domain_id=trustee_domain_id,
+                        ).id
+                    else:
+                        trustee_id = identity_client.find_user(
+                            parsed_args.trustee, ignore_missing=False
+                        ).id
                     trustee = trustee_id
                 except sdk_exceptions.ForbiddenException:
                     trustee = parsed_args.trustee

openstackclient/identity/v3/user.py

@@ -612,10 +612,12 @@ class SetUser(command.Command):
         if parsed_args.description:
             kwargs['description'] = parsed_args.description
         if parsed_args.project:
-            project_domain_id = identity_client.find_domain(
-                name_or_id=parsed_args.project_domain,
-                ignore_missing=False,
-            ).id
+            project_domain_id = None
+            if parsed_args.project_domain:
+                project_domain_id = identity_client.find_domain(
+                    name_or_id=parsed_args.project_domain,
+                    ignore_missing=False,
+                ).id
             project_id = identity_client.find_project(
                 name_or_id=parsed_args.project,
                 ignore_missing=False,

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

@@ -70,12 +70,15 @@ class TestTrustCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'project_id': self.project.id,
-            'roles': [self.role.id],
+            'roles': [{'id': self.role.id}],
+            'impersonation': False,
         }
         # TrustManager.create(trustee_id, trustor_id, impersonation=,
         #   project=, role_names=, expires_at=)
         self.identity_sdk_client.create_trust.assert_called_with(
-            trustor_id=self.user.id, trustee_id=self.user.id, **kwargs
+            trustor_user_id=self.user.id,
+            trustee_user_id=self.user.id,
+            **kwargs,
         )
 
         collist = (

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

@@ -1206,6 +1206,17 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         self.identity_sdk_client.update_user.assert_called_with(
             user=self.user, **kwargs
         )
+        self.identity_sdk_client.find_domain.assert_not_called()
+
+        # Set expected values
+        kwargs = {
+            'ignore_missing': False,
+            'domain_id': None,
+        }
+        self.identity_sdk_client.find_project.assert_called_once_with(
+            name_or_id=self.project.id, **kwargs
+        )
+
         self.assertIsNone(result)
 
     def test_user_set_project_domain(self):
@@ -1238,6 +1249,11 @@ class TestUserSet(identity_fakes.TestIdentityv3):
         self.identity_sdk_client.update_user.assert_called_with(
             user=self.user, **kwargs
         )
+
+        self.identity_sdk_client.find_domain.assert_called_once_with(
+            name_or_id=self.project.domain_id, ignore_missing=False
+        )
+
         self.assertIsNone(result)
 
     def test_user_set_enable(self):

{python_openstackclient-7.4.0.dist-info → python_openstackclient-7.5.0.dist-info}/AUTHORS

@@ -107,6 +107,7 @@ Dina Belova <dbelova@mirantis.com>
 Dirk Mueller <dirk@dmllr.de>
 Diwei Zhu <zhu.diw@northeastern.edu>
 Dmitrii Shcherbakov <dmitrii.shcherbakov@canonical.com>
+Dmitriy Chubinidze <dcu995@gmail.com>
 Dmitriy Rabotyagov <drabotyagov@vexxhost.com>
 Dmitriy Rabotyagov <noonedeadpunk@ya.ru>
 Dmitry Tantsur <dtantsur@protonmail.com>
@@ -425,6 +426,7 @@ Violet Kurtz <vi.kurtz@protonmail.com>
 Violet Kurtz <vikurtz@osuosl.org>
 Vishakha Agarwal <agarwalvishakha18@gmail.com>
 Vladimir Eremin <yottatsa@yandex-team.ru>
+Vladimir Kozhukalov <kozhukalov@gmail.com>
 Vu Cong Tuan <tuanvc@vn.fujitsu.com>
 Wenran Xiao <xiaowenran@unitedstack.com>
 Wenzhi Yu <wenzhi_yu@163.com>

{python_openstackclient-7.4.0.dist-info → python_openstackclient-7.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-openstackclient
-Version: 7.4.0
+Version: 7.5.0
 Summary: OpenStack Command-line Client
 Home-page: https://docs.openstack.org/python-openstackclient/latest/
 Author: OpenStack

{python_openstackclient-7.4.0.dist-info → python_openstackclient-7.5.0.dist-info}/RECORD

@@ -78,9 +78,9 @@ openstackclient/identity/v3/service.py,sha256=2VuxiOEuEnqjWEPNryKRe4LLe70-MIndkD
 openstackclient/identity/v3/service_provider.py,sha256=tw_X_S3dXZPs-AijTbi_UC14JivBZ-IxsVwcj-6dYSY,8433
 openstackclient/identity/v3/tag.py,sha256=dcVDheoWxdkwsZYvyJSpzIF2EGpqZtaE0h7x2halscc,3972
 openstackclient/identity/v3/token.py,sha256=dXP7iRYZRROw3k8knao6NteZeP67mVGCc2Y9jMHudnQ,7399
-openstackclient/identity/v3/trust.py,sha256=wfKh9Xp4d_FpvrqmiZ2F9nxgjx0Uc1MMYY3CYXXr57Y,11589
+openstackclient/identity/v3/trust.py,sha256=5VZYtn8Dy_R_JlWmG3eiiv93cLwrlD7OiMcjO5qFDsU,13884
 openstackclient/identity/v3/unscoped_saml.py,sha256=A-645W2kp0_27NxG03YcEU9EtcCFex6Ojzw4fLApuds,2031
-openstackclient/identity/v3/user.py,sha256=oDz9nfUeDyFsjHMALmNZxrG5qoGROOZ9CoTmNg7EMls,24051
+openstackclient/identity/v3/user.py,sha256=y0pKxoNnXmchABzTt8lg9tkgOPqTZxUYiaXjw1xSrlM,24147
 openstackclient/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openstackclient/image/client.py,sha256=I088KrjZ9ubuS_8NDX98W6_lHkdaxbBtRHTHt5q_HC8,1508
 openstackclient/image/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -340,9 +340,9 @@ openstackclient/tests/unit/identity/v3/test_role_assignment.py,sha256=Lpb0vwOfP7
 openstackclient/tests/unit/identity/v3/test_service.py,sha256=eFRjaeuJKd4_G1_gSTzAKmLTN035rQjY4E5RnLzMutY,15028
 openstackclient/tests/unit/identity/v3/test_service_provider.py,sha256=vAY1-5zzhbw_Fa5tcYMWzNezTKMpHfvYDYN2w6zOFdI,12080
 openstackclient/tests/unit/identity/v3/test_token.py,sha256=7Vp-thUbZcaXvIybvD40Xc8JfncZF9DcipgibyTjIdw,4098
-openstackclient/tests/unit/identity/v3/test_trust.py,sha256=P9FOE9SPWjqaOfA7pMa_1wEBewLsSIYpybel4i5lL0Q,12874
+openstackclient/tests/unit/identity/v3/test_trust.py,sha256=C-RY9_SJypImzDbHgyMNj-yzvEfqdylwONdFFt8D4wg,12953
 openstackclient/tests/unit/identity/v3/test_unscoped_saml.py,sha256=gBtouVvKaOTflJ6TMg497ScL4GsVS3lVM_h8XKFExXg,3592
-openstackclient/tests/unit/identity/v3/test_user.py,sha256=BFNh4waeT_eM5IQkzPaeB6gxtDYh9CW1tuEDWbF8rQc,58245
+openstackclient/tests/unit/identity/v3/test_user.py,sha256=z2fChcuhT711GDyKlYsIPpvAx2aDtFn9C2KAe4kvYNw,58719
 openstackclient/tests/unit/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openstackclient/tests/unit/image/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openstackclient/tests/unit/image/v1/fakes.py,sha256=rwYSQK12WxSaX2p-f15e6D94qC6lg1XIgBFvdiJ5aRc,2271
@@ -494,11 +494,11 @@ openstackclient/volume/v3/volume_message.py,sha256=HBBxPEcYoNqGjEbzGIEnIJ1XTcQ2K
 openstackclient/volume/v3/volume_snapshot.py,sha256=pZ4q_qCwqh4jaGhX28G59wsWDmEc3uXdbpeD176osZg,3186
 openstackclient/volume/v3/volume_transfer_request.py,sha256=PthOJV2m-pTV1njFzwTpaekXZkET1c6alIJrpuN7R6Q,7530
 openstackclient/volume/v3/volume_type.py,sha256=_nbmu6e87UAHRjh30fQIwScMubox_FpHcQKDUOxO4NA,33955
-python_openstackclient-7.4.0.dist-info/AUTHORS,sha256=JEcKU3f-60jlNEfCB_U9elxEpvg-o-HNB_AFGF6zg7k,21598
-python_openstackclient-7.4.0.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
-python_openstackclient-7.4.0.dist-info/METADATA,sha256=gc5mG6EMYbYGvHktTTd50EtNE9Frb_sgguIwo-Rjdso,6516
-python_openstackclient-7.4.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-python_openstackclient-7.4.0.dist-info/entry_points.txt,sha256=VsZCw-6So3hkHuIiX-dGaMVL1PEqmfDynF37m1EwjCs,53260
-python_openstackclient-7.4.0.dist-info/pbr.json,sha256=PIaHogvl-6SsHqyhVcnmyVjkEiRsEfltQ8jjvnwS8tA,47
-python_openstackclient-7.4.0.dist-info/top_level.txt,sha256=htg7z9oZgysRuVUHn-m1Bk6XLGOeV65nMbZX9H8qhs0,16
-python_openstackclient-7.4.0.dist-info/RECORD,,
+python_openstackclient-7.5.0.dist-info/AUTHORS,sha256=dLJoA2nJCPXXMQlfd8nyRZhXkR2Ai9t6frv3d3eZUII,21679
+python_openstackclient-7.5.0.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
+python_openstackclient-7.5.0.dist-info/METADATA,sha256=t2n54Ya-t_0Ca4BJFk0TYWfMNjRbGhdPMRs4nsiRrpc,6516
+python_openstackclient-7.5.0.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+python_openstackclient-7.5.0.dist-info/entry_points.txt,sha256=VsZCw-6So3hkHuIiX-dGaMVL1PEqmfDynF37m1EwjCs,53260
+python_openstackclient-7.5.0.dist-info/pbr.json,sha256=E0U5ImtX7CrMc6toMJW1G42hL8cWtMsUKUJyLrUc3sM,47
+python_openstackclient-7.5.0.dist-info/top_level.txt,sha256=htg7z9oZgysRuVUHn-m1Bk6XLGOeV65nMbZX9H8qhs0,16
+python_openstackclient-7.5.0.dist-info/RECORD,,

{python_openstackclient-7.4.0.dist-info → python_openstackclient-7.5.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.3.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

python_openstackclient-7.5.0.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "bc1930c2", "is_release": true}

python_openstackclient-7.4.0.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "4b7e32ca", "is_release": true}