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

openstackclient/identity/v3/user.py

@@ -467,15 +467,13 @@ class ListUser(command.Lister):
                     ignore_missing=False,
                 ).id
 
-            assignments = identity_client.role_assignments_filter(
-                project=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
             # are looking for any role, let's just track unique user IDs.
             user_ids = set()
-            for assignment in assignments:
+            for assignment in identity_client.role_assignments(
+                scope_project_id=project
+            ):
                 if assignment.user:
                     user_ids.add(assignment.user['id'])
 

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

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