openstack/python-openstackclient
Code Issues Proposed changes

Merge "Identity: Properly list users in a group in 'user list' commands"

Browse Source
This commit is contained in:
Zuul
2024-04-15 13:00:37 +00:00
committed by Gerrit Code Review
parent 07b71fc99c 948b97d09e
commit e9aa6f57c5
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -442,10 +442,14 @@ class ListUser(command.Lister):
user = identity_client.find_user(user_id, ignore_missing=False) user = identity_client.find_user(user_id, ignore_missing=False)
data.append(user) data.append(user)
elif parsed_args.group:
data = identity_client.group_users(
domain_id=domain,
group=group,
)
else: else:
data = identity_client.users( data = identity_client.users(
domain_id=domain, domain_id=domain,
group=group,
) )
# Column handling # Column handling

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

@@ -922,6 +922,7 @@ class TestUserList(identity_fakes.TestIdentityv3):
self.identity_sdk_client.find_user.return_value = self.user self.identity_sdk_client.find_user.return_value = self.user
self.identity_sdk_client.users.return_value = [self.user] self.identity_sdk_client.users.return_value = [self.user]
self.identity_sdk_client.group_users.return_value = [self.user]
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
@@ -945,7 +946,6 @@ class TestUserList(identity_fakes.TestIdentityv3):
# Set expected values # Set expected values
kwargs = { kwargs = {
'domain_id': None, 'domain_id': None,
'group': None,
} }
self.identity_sdk_client.users.assert_called_with(**kwargs) self.identity_sdk_client.users.assert_called_with(**kwargs)
@@ -971,7 +971,6 @@ class TestUserList(identity_fakes.TestIdentityv3):
# Set expected values # Set expected values
kwargs = { kwargs = {
'domain_id': self.domain.id, 'domain_id': self.domain.id,
'group': None,
} }
self.identity_sdk_client.users.assert_called_with(**kwargs) self.identity_sdk_client.users.assert_called_with(**kwargs)
@@ -1000,7 +999,7 @@ class TestUserList(identity_fakes.TestIdentityv3):
'group': self.group.id, 'group': self.group.id,
} }
self.identity_sdk_client.users.assert_called_with(**kwargs) self.identity_sdk_client.group_users.assert_called_with(**kwargs)
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertEqual(self.datalist, tuple(data)) self.assertEqual(self.datalist, tuple(data))
@@ -1022,7 +1021,6 @@ class TestUserList(identity_fakes.TestIdentityv3):
# Set expected values # Set expected values
kwargs = { kwargs = {
'domain_id': None, 'domain_id': None,
'group': None,
} }
self.identity_sdk_client.users.assert_called_with(**kwargs) self.identity_sdk_client.users.assert_called_with(**kwargs)