From 948b97d09e27a7dd92ec98edfc5faa9aeffe7898 Mon Sep 17 00:00:00 2001 From: ArtofBugs Date: Tue, 9 Apr 2024 12:15:00 -0700 Subject: [PATCH] Identity: Properly list users in a group in 'user list' commands Change-Id: Ia4457eaea5016b2e0325c6eb704d1592058e455e --- openstackclient/identity/v3/user.py | 6 +++++- openstackclient/tests/unit/identity/v3/test_user.py | 6 ++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py index 6837340c3..365240674 100644 --- a/openstackclient/identity/v3/user.py +++ b/openstackclient/identity/v3/user.py @@ -442,10 +442,14 @@ class ListUser(command.Lister): user = identity_client.find_user(user_id, ignore_missing=False) data.append(user) + elif parsed_args.group: + data = identity_client.group_users( + domain_id=domain, + group=group, + ) else: data = identity_client.users( domain_id=domain, - group=group, ) # Column handling diff --git a/openstackclient/tests/unit/identity/v3/test_user.py b/openstackclient/tests/unit/identity/v3/test_user.py index 822abd682..ede5b85c0 100644 --- a/openstackclient/tests/unit/identity/v3/test_user.py +++ b/openstackclient/tests/unit/identity/v3/test_user.py @@ -922,6 +922,7 @@ class TestUserList(identity_fakes.TestIdentityv3): self.identity_sdk_client.find_user.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_group.return_value = self.group self.identity_sdk_client.find_project.return_value = self.project @@ -945,7 +946,6 @@ class TestUserList(identity_fakes.TestIdentityv3): # Set expected values kwargs = { 'domain_id': None, - 'group': None, } self.identity_sdk_client.users.assert_called_with(**kwargs) @@ -971,7 +971,6 @@ class TestUserList(identity_fakes.TestIdentityv3): # Set expected values kwargs = { 'domain_id': self.domain.id, - 'group': None, } self.identity_sdk_client.users.assert_called_with(**kwargs) @@ -1000,7 +999,7 @@ class TestUserList(identity_fakes.TestIdentityv3): '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.datalist, tuple(data)) @@ -1022,7 +1021,6 @@ class TestUserList(identity_fakes.TestIdentityv3): # Set expected values kwargs = { 'domain_id': None, - 'group': None, } self.identity_sdk_client.users.assert_called_with(**kwargs)