]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: clean-up service module type checking
authorMichael Fritch <mfritch@suse.com>
Fri, 17 Jul 2020 15:26:52 +0000 (09:26 -0600)
committerSebastian Wagner <sebastian.wagner@suse.com>
Thu, 23 Jul 2020 13:20:10 +0000 (15:20 +0200)
mypy cast to avoid:

cephadm/module.py: note: In member "_config_fn" of class "CephadmOrchestrator":
cephadm/module.py:1797: error: Incompatible return value type (got "Optional[function]", expected "Optional[Callable[[ServiceSpec], None]]")

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 502c574c36f49947cb7a501cafd5530455451773)

src/pybind/mgr/cephadm/module.py

index 9198f7705821166712debcde33f5d7f6a5949fd9..dd9582805c6ed0a6e874cf53a6fa7a3be60302b2 100644 (file)
@@ -1842,12 +1842,13 @@ you may want to run:
             return "Removed {} from host '{}'".format(name, host)
 
     def _config_fn(self, service_type) -> Optional[Callable[[ServiceSpec], None]]:
-        return {
+        fn = {
             'mds': self.mds_service.config,
             'rgw': self.rgw_service.config,
             'nfs': self.nfs_service.config,
             'iscsi': self.iscsi_service.config,
-        }.get(service_type)  # type: ignore
+        }.get(service_type)
+        return cast(Callable[[ServiceSpec], None], fn)
 
     def _apply_service(self, spec: ServiceSpec) -> bool:
         """