]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #36456 from sebastian-philipp/orch-type-py3
authorSebastian Wagner <sebastian.wagner@suse.com>
Tue, 11 Aug 2020 12:52:01 +0000 (14:52 +0200)
committerGitHub <noreply@github.com>
Tue, 11 Aug 2020 12:52:01 +0000 (14:52 +0200)
mgr/orch: _interface.py cleanup: PEP8 and type annotations

Reviewed-by: Joshua Schmid <jschmid@suse.de>
1  2 
src/pybind/mgr/orchestrator/_interface.py
src/pybind/mgr/tox.ini

index e2b1c62a6602f3be6888db3f2a656b323ec3073d,3d262c0fb44556caedc9ef58ecddd4eea5c5f64e..3da340c39af6a0438529fdb5e1a51351bc1263b7
@@@ -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]:
Simple merge