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

Change-Id: Ia4457eaea5016b2e0325c6eb704d1592058e455e

Author: ArtofBugs

openstackclient/identity/v3/user.py

@@ -442,10 +442,14 @@ def take_action(self, parsed_args):
                 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

openstackclient/tests/unit/identity/v3/test_user.py

@@ -922,6 +922,7 @@ def setUp(self):
 
         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 @@ def test_user_list_no_options(self):
         # Set expected values
         kwargs = {
             'domain_id': None,
-            'group': None,
         }
 
         self.identity_sdk_client.users.assert_called_with(**kwargs)
@@ -971,7 +971,6 @@ def test_user_list_domain(self):
         # Set expected values
         kwargs = {
             'domain_id': self.domain.id,
-            'group': None,
         }
 
         self.identity_sdk_client.users.assert_called_with(**kwargs)
@@ -1000,7 +999,7 @@ def test_user_list_group(self):
             '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 @@ def test_user_list_long(self):
         # Set expected values
         kwargs = {
             'domain_id': None,
-            'group': None,
         }
 
         self.identity_sdk_client.users.assert_called_with(**kwargs)