From 80a4b582813fdb6ef786c63a091fa0bd67b239b2 Mon Sep 17 00:00:00 2001
From: Dmitriy Chubinidze <dcu995@gmail.com>
Date: Fri, 21 Mar 2025 08:56:32 +0000
Subject: [PATCH] Specifying project-domain for project
The fix ensures that if a user wants to set a default project,
they must also provide the project domain. If it's missing,
an explicit error message is shown, making it clear that the
project domain is required.
Also adding some unit tests by modifying respective calls.
Change-Id: Ia6e921a53da55ab1bce85a42c8160872a9d47d64
Closes-Bug: #2102146
(cherry picked from commit 2883f3fb957ca79b984f8b9e312ee500f2194aab)
---
openstackclient/identity/v3/user.py | 10 ++++++----
.../tests/unit/identity/v3/test_user.py | 16 ++++++++++++++++
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py
index 545b1cda77..4c2aa1db09 100644
--- a/openstackclient/identity/v3/user.py
+++ b/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,
diff --git a/openstackclient/tests/unit/identity/v3/test_user.py b/openstackclient/tests/unit/identity/v3/test_user.py
index 7f4c2497ec..91e8b45c3e 100644
--- a/openstackclient/tests/unit/identity/v3/test_user.py
+++ b/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):