kgess-mirror/openstack-python-openstackclient
1
0
Fork 0
mirror of https://opendev.org/openstack/python-openstackclient.git synced 2026-01-16 23:13:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "Specifying project-domain for project" into stable/2025.1

Browse source
This commit is contained in:
Zuul 2025-04-01 10:48:09 +00:00 • committed by Gerrit Code Review
commit bc1930c20e
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
openstackclient/identity/v3/user.py
View file

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

16
openstackclient/tests/unit/identity/v3/test_user.py
View file

@ -1206,6 +1206,17 @@ class TestUserSet(identity_fakes.TestIdentityv3):
self.identity_sdk_client.update_user.assert_called_with( self.identity_sdk_client.update_user.assert_called_with(
user=self.user, **kwargs 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) self.assertIsNone(result)
def test_user_set_project_domain(self): 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( self.identity_sdk_client.update_user.assert_called_with(
user=self.user, **kwargs 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) self.assertIsNone(result)
def test_user_set_enable(self): def test_user_set_enable(self):