From: Sebastian Wagner Date: Tue, 11 Aug 2020 12:52:01 +0000 (+0200) Subject: Merge pull request #36456 from sebastian-philipp/orch-type-py3 X-Git-Tag: wip-pdonnell-testing-20200918.022351~388 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=46dddbca0a3c0ad04a367ca6d4bf41f00359c56f;p=ceph-ci.git Merge pull request #36456 from sebastian-philipp/orch-type-py3 mgr/orch: _interface.py cleanup: PEP8 and type annotations Reviewed-by: Joshua Schmid --- 46dddbca0a3c0ad04a367ca6d4bf41f00359c56f diff --cc src/pybind/mgr/orchestrator/_interface.py index e2b1c62a660,3d262c0fb44..3da340c39af --- a/src/pybind/mgr/orchestrator/_interface.py +++ b/src/pybind/mgr/orchestrator/_interface.py @@@ -956,11 -925,11 +925,11 @@@ class Orchestrator(object) providing the logical service). :param action: one of "start", "stop", "restart", "redeploy", "reconfig" - :param service_type: e.g. "mds", "rgw", ... - :param service_name: name of logical service ("cephfs", "us-east", ...) + :param service_name: service_type + '.' + service_id + (e.g. "mon", "mgr", "mds.mycephfs", "rgw.realm.zone", ...) :rtype: Completion """ - #assert action in ["start", "stop", "reload, "restart", "redeploy"] + # assert action in ["start", "stop", "reload, "restart", "redeploy"] raise NotImplementedError() def daemon_action(self, action: str, daemon_name: str, image: Optional[str]=None) -> Completion[str]: