From e073d1ae8ab54bfb380cde2b7361920eb56f4d37 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 12 Feb 2020 15:51:19 -0600 Subject: [PATCH] mgr/orch: service action cleanup - no 'service' prefix - single name arg (type[.id...]) Signed-off-by: Sage Weil --- src/pybind/mgr/orchestrator_cli/module.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/orchestrator_cli/module.py b/src/pybind/mgr/orchestrator_cli/module.py index 564c6968ae42..3b06c0510fef 100644 --- a/src/pybind/mgr/orchestrator_cli/module.py +++ b/src/pybind/mgr/orchestrator_cli/module.py @@ -501,13 +501,17 @@ Usage: return HandleCommandResult(stdout=completion.result_str()) @orchestrator._cli_write_command( - 'orch service', + 'orch', "name=action,type=CephChoices,strings=start|stop|restart|redeploy|reconfig " - "name=svc_type,type=CephString " "name=svc_name,type=CephString", 'Start, stop, restart, redeploy, or reconfig an entire service (i.e. all daemons)') - def _service_action(self, action, svc_type, svc_name): - completion = self.service_action(action, svc_type, svc_name) + def _service_action(self, action, svc_name): + if '.' in svc_name: + (service_type, service_id) = svc_name.split('.', 1) + else: + service_type = svc_name; + service_id = None + completion = self.service_action(action, service_type, service_id) self._orchestrator_wait([completion]) orchestrator.raise_if_exception(completion) return HandleCommandResult(stdout=completion.result_str()) -- 2.47.3