Add way to list org cluster users

Author: romasku

neuro_admin_client/__init__.py

@@ -103,19 +103,28 @@ async def delete_cluster(self, name: str) -> Cluster:
 
     @overload
     async def list_cluster_users(
-        self, cluster_name: str, with_user_info: Literal[True]
+        self,
+        cluster_name: str,
+        with_user_info: Literal[True],
+        org_name: Optional[str] = None,
     ) -> List[ClusterUserWithInfo]:
         ...
 
     @overload
     async def list_cluster_users(
-        self, cluster_name: str, with_user_info: Literal[False] = ...
+        self,
+        cluster_name: str,
+        with_user_info: Literal[False] = ...,
+        org_name: Optional[str] = None,
     ) -> List[ClusterUser]:
         ...
 
     @abstractmethod
     async def list_cluster_users(
-        self, cluster_name: str, with_user_info: bool = False
+        self,
+        cluster_name: str,
+        with_user_info: bool = False,
+        org_name: Optional[str] = None,
     ) -> Union[List[ClusterUser], List[ClusterUserWithInfo]]:
         ...
 
@@ -776,22 +785,35 @@ def _parse_cluster_user(
 
     @overload
     async def list_cluster_users(
-        self, cluster_name: str, with_user_info: Literal[True]
+        self,
+        cluster_name: str,
+        with_user_info: Literal[True],
+        org_name: Optional[str] = None,
     ) -> List[ClusterUserWithInfo]:
         ...
 
     @overload
     async def list_cluster_users(
-        self, cluster_name: str, with_user_info: Literal[False] = ...
+        self,
+        cluster_name: str,
+        with_user_info: Literal[False] = ...,
+        org_name: Optional[str] = None,
     ) -> List[ClusterUser]:
         ...
 
     async def list_cluster_users(
-        self, cluster_name: str, with_user_info: bool = False
+        self,
+        cluster_name: str,
+        with_user_info: bool = False,
+        org_name: Optional[str] = None,
     ) -> Union[List[ClusterUser], List[ClusterUserWithInfo]]:
+        if org_name:
+            url = f"clusters/{cluster_name}/orgs/{org_name}/users"
+        else:
+            url = f"clusters/{cluster_name}/users"
         async with self._request(
             "GET",
-            f"clusters/{cluster_name}/users",
+            url,
             params={"with_user_info": _to_query_bool(with_user_info)},
         ) as resp:
             resp.raise_for_status()
@@ -1804,18 +1826,27 @@ async def delete_cluster(self, name: str) -> Cluster:
 
     @overload
     async def list_cluster_users(
-        self, cluster_name: str, with_user_info: Literal[True]
+        self,
+        cluster_name: str,
+        with_user_info: Literal[True],
+        org_name: Optional[str] = None,
     ) -> List[ClusterUserWithInfo]:
         ...
 
     @overload
     async def list_cluster_users(
-        self, cluster_name: str, with_user_info: Literal[False] = ...
+        self,
+        cluster_name: str,
+        with_user_info: Literal[False] = ...,
+        org_name: Optional[str] = None,
     ) -> List[ClusterUser]:
         ...
 
     async def list_cluster_users(
-        self, cluster_name: str, with_user_info: bool = False
+        self,
+        cluster_name: str,
+        with_user_info: bool = False,
+        org_name: Optional[str] = None,
     ) -> Union[List[ClusterUser], List[ClusterUserWithInfo]]:
         return [self.DUMMY_CLUSTER_USER]
 

tests/conftest.py

@@ -443,12 +443,14 @@ async def handle_cluster_user_list(
         self, request: aiohttp.web.Request
     ) -> aiohttp.web.Response:
         cluster_name = request.match_info["cname"]
+        org_name = request.match_info.get("oname")
         resp = [
             self._serialize_cluster_user(
                 cluster_user, _parse_bool(request.query.get("with_user_info", "false"))
             )
             for cluster_user in self.cluster_users
             if cluster_user.cluster_name == cluster_name
+            and (org_name is None or cluster_user.org_name == org_name)
         ]
         return aiohttp.web.json_response(resp)
 
@@ -859,6 +861,10 @@ def _create_app() -> aiohttp.web.Application:
                     admin_server.handle_org_cluster_delete,
                 ),
                 # org user endpoints:
+                aiohttp.web.get(
+                    "/api/v1/clusters/{cname}/orgs/{oname}/users",
+                    admin_server.handle_cluster_user_list,
+                ),
                 aiohttp.web.get(
                     "/api/v1/clusters/{cname}/orgs/{oname}/users/{uname}",
                     admin_server.handle_cluster_user_get,

tests/test_admin_client.py

@@ -405,6 +405,49 @@ async def test_list_clusters_user(self, mock_admin_server: AdminServer) -> None:
         assert len(cluster_users) == 2
         assert set(cluster_users) == set(mock_admin_server.cluster_users)
 
+    async def test_list_clusters_user_with_org(
+        self, mock_admin_server: AdminServer
+    ) -> None:
+        mock_admin_server.users = [
+            User(
+                name="test1",
+                email="email",
+            ),
+            User(
+                name="test2",
+                email="email",
+            ),
+        ]
+        mock_admin_server.clusters = [
+            Cluster(
+                name="cluster",
+            ),
+        ]
+        mock_admin_server.cluster_users = [
+            ClusterUser(
+                user_name="test1",
+                cluster_name="cluster",
+                org_name=None,
+                balance=Balance(),
+                quota=Quota(),
+                role=ClusterUserRoleType.USER,
+            ),
+            ClusterUser(
+                user_name="test2",
+                cluster_name="cluster",
+                org_name="org1",
+                balance=Balance(),
+                quota=Quota(),
+                role=ClusterUserRoleType.ADMIN,
+            ),
+        ]
+
+        async with AdminClient(base_url=mock_admin_server.url) as client:
+            cluster_users = await client.list_cluster_users("cluster", org_name="org1")
+
+        assert len(cluster_users) == 1
+        assert set(cluster_users) == {mock_admin_server.cluster_users[1]}
+
     async def test_get_cluster_user(self, mock_admin_server: AdminServer) -> None:
         mock_admin_server.users = [
             User(