import ceph pacific 16.2.5

[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 4470f8f831e02ff5231f6c139f8123007435e22e..b3c3ab94798bf4c4788ec29cb68057c7823fb74b 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/controllers/service.py
+++ b/ceph/src/pybind/mgr/dashboard/controllers/service.py
@@ -32,7 +32,7 @@ class Service(RESTController):
     @raise_if_no_orchestrator([OrchFeature.SERVICE_LIST])
     def list(self, service_name: Optional[str] = None) -> List[dict]:
         orch = OrchClient.instance()
-        return [service.to_json() for service in orch.services.list(service_name=service_name)]
+        return [service.to_dict() for service in orch.services.list(service_name=service_name)]
 
     @raise_if_no_orchestrator([OrchFeature.SERVICE_LIST])
     def get(self, service_name: str) -> List[dict]:
@@ -47,7 +47,7 @@ class Service(RESTController):
     def daemons(self, service_name: str) -> List[dict]:
         orch = OrchClient.instance()
         daemons = orch.services.list_daemons(service_name=service_name)
-        return [d.to_json() for d in daemons]
+        return [d.to_dict() for d in daemons]
 
     @CreatePermission
     @raise_if_no_orchestrator([OrchFeature.SERVICE_CREATE])