import ceph quincy 17.2.6

[ceph.git] / ceph / src / pybind / mgr / dashboard / controllers / service.py

diff --git a/ceph/src/pybind/mgr/dashboard/controllers/service.py b/ceph/src/pybind/mgr/dashboard/controllers/service.py
index afe684302b160d4ce962595b8fb241c9635800b4..b75f417361498fdfffb26257726f11ef7520bd4b 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/controllers/service.py
+++ b/ceph/src/pybind/mgr/dashboard/controllers/service.py
@@ -8,6 +8,7 @@ from ..services.exception import handle_custom_error, handle_orchestrator_error
 from ..services.orchestrator import OrchClient, OrchFeature
 from . import APIDoc, APIRouter, CreatePermission, DeletePermission, Endpoint, \
     ReadPermission, RESTController, Task, UpdatePermission
+from ._version import APIVersion
 from .orchestrator import raise_if_no_orchestrator
 
 
@@ -29,9 +30,14 @@ class Service(RESTController):
         return ServiceSpec.KNOWN_SERVICE_TYPES
 
     @raise_if_no_orchestrator([OrchFeature.SERVICE_LIST])
-    def list(self, service_name: Optional[str] = None) -> List[dict]:
+    @RESTController.MethodMap(version=APIVersion(2, 0))  # type: ignore
+    def list(self, service_name: Optional[str] = None, offset: int = 0, limit: int = 5,
+             search: str = '', sort: str = '+service_name') -> List[dict]:
         orch = OrchClient.instance()
-        return [service.to_dict() for service in orch.services.list(service_name=service_name)]
+        services, count = orch.services.list(service_name=service_name, offset=int(offset),
+                                             limit=int(limit), search=search, sort=sort)
+        cherrypy.response.headers['X-Total-Count'] = count
+        return services
 
     @raise_if_no_orchestrator([OrchFeature.SERVICE_LIST])
     def get(self, service_name: str) -> List[dict]: