openstack/python-openstackclient
Code Issues Proposed changes

Merge "identity: Fix 'user list --project' option"

Browse Source
This commit is contained in:
Zuul
2025-10-02 12:29:02 +00:00
committed by Gerrit Code Review
parent fb8cdd4441 0ed122094a
commit 4282a512c0
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openstackclient/identity/v3/user.py
View File

@@ -467,15 +467,13 @@ class ListUser(command.Lister):
ignore_missing=False, ignore_missing=False,
).id ).id
assignments = identity_client.role_assignments_filter(
project=project
)
# NOTE(stevemar): If a user has more than one role on a project # NOTE(stevemar): If a user has more than one role on a project
# then they will have two entries in the returned data. Since we # then they will have two entries in the returned data. Since we
# are looking for any role, let's just track unique user IDs. # are looking for any role, let's just track unique user IDs.
user_ids = set() user_ids = set()
for assignment in assignments: for assignment in identity_client.role_assignments(
scope_project_id=project
):
if assignment.user: if assignment.user:
user_ids.add(assignment.user['id']) user_ids.add(assignment.user['id'])

8
openstackclient/tests/unit/identity/v3/test_user.py
View File

@@ -891,7 +891,7 @@ class TestUserList(identity_fakes.TestIdentityv3):
self.identity_sdk_client.find_domain.return_value = self.domain 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_group.return_value = self.group
self.identity_sdk_client.find_project.return_value = self.project 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 self.role_assignment
] ]
@@ -1029,12 +1029,10 @@ class TestUserList(identity_fakes.TestIdentityv3):
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
kwargs = { kwargs = {
'project': self.project.id, 'scope_project_id': self.project.id,
} }
self.identity_sdk_client.role_assignments_filter.assert_called_with( self.identity_sdk_client.role_assignments.assert_called_with(**kwargs)
**kwargs
)
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertEqual(self.datalist, tuple(data)) self.assertEqual(self.datalist, tuple(data))