From: Tim Serong <tserong@suse.com>
Date: Thu, 25 Jul 2019 06:30:04 +0000 (+1000)
Subject: mgr/orchestrator: add --refresh to `ceph orchestrator service ls`
X-Git-Tag: v15.1.0~2026^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d5e320ae541cabb2bfdfe20e68fa88233999b63c;p=ceph-ci.git

mgr/orchestrator: add --refresh to `ceph orchestrator service ls`

`ceph orchestrator device ls` already supports --refresh to force
a reload, we should support this for `ceph orchestrator service ls`
as well.

Signed-off-by: Tim Serong <tserong@suse.com>
---

diff --git a/src/pybind/mgr/orchestrator_cli/module.py b/src/pybind/mgr/orchestrator_cli/module.py
index e9982e30190..7e3d1ed843d 100644
--- a/src/pybind/mgr/orchestrator_cli/module.py
+++ b/src/pybind/mgr/orchestrator_cli/module.py
@@ -118,13 +118,14 @@ class OrchestratorCli(orchestrator.OrchestratorClientMixin, MgrModule):
                "name=host,type=CephString,req=false "
                "name=svc_type,type=CephChoices,strings=mon|mgr|osd|mds|iscsi|nfs|rgw|rbd-mirror,req=false "
                "name=svc_id,type=CephString,req=false "
-               "name=format,type=CephChoices,strings=json|plain,req=false",
+               "name=format,type=CephChoices,strings=json|plain,req=false "
+               "name=refresh,type=CephBool,req=false",
                'List services known to orchestrator')
-    def _list_services(self, host=None, svc_type=None, svc_id=None, format='plain'):
+    def _list_services(self, host=None, svc_type=None, svc_id=None, format='plain', refresh=False):
         # XXX this is kind of confusing for people because in the orchestrator
         # context the service ID for MDS is the filesystem ID, not the daemon ID
 
-        completion = self.describe_service(svc_type, svc_id, host)
+        completion = self.describe_service(svc_type, svc_id, host, refresh=refresh)
         self._orchestrator_wait([completion])
         orchestrator.raise_if_exception(completion)
         services = completion.result