pybind/mgr: enable `disallow_untyped_defs` for mgr_module

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>

diff --git a/src/mypy.ini b/src/mypy.ini
index ccb614d714cb16901a463e5e9cf78c7ff1336ffc..89a80afa9c7eb262e7fd47e6e049002407d43b7b 100755 (executable)
--- a/src/mypy.ini
+++ b/src/mypy.ini
@@ -96,9 +96,6 @@ disallow_untyped_defs = False
 [mypy-influx.*]
 disallow_untyped_defs = False
 
-[mypy-mgr_module]
-disallow_untyped_defs = False
-
 [mypy-mirroring.*]
 disallow_untyped_defs = False
 

diff --git a/src/pybind/mgr/ceph_module.pyi b/src/pybind/mgr/ceph_module.pyi
index a50bc4fd9cdb9c8e8304919cac1b4142df0c36a7..4794d9c36112e2e626cb44f1b53032d7e20c9487 100644 (file)
--- a/src/pybind/mgr/ceph_module.pyi
+++ b/src/pybind/mgr/ceph_module.pyi
@@ -67,7 +67,7 @@ class BaseMgrModule(object):
     def _ceph_lookup_release_name(self, release: int) -> str: ...
     def _ceph_cluster_log(self, channel: str, priority: int, message: str) -> None: ...
     def _ceph_get_context(self) -> object: ...
-    def _ceph_get(self, data_name: str) -> Dict[str, Any]: ...
+    def _ceph_get(self, data_name: str) -> Any: ...
     def _ceph_get_server(self, hostname: Optional[str]) -> Union[ServerInfoT,
                                                                  List[ServerInfoT]]: ...
     def _ceph_get_perf_schema(self, svc_type: str, svc_name: str) -> Dict[str, Any]: ...

diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py
index f7da34b771344a15bc07b13a67be7d13a33758b4..76fded798e4719221657b519d1af626f7d47794b 100644 (file)
--- a/src/pybind/mgr/mgr_module.py
+++ b/src/pybind/mgr/mgr_module.py
@@ -180,7 +180,7 @@ class OSDMap(ceph_module.BasePyOSDMap):
         return self._pool_raw_used_rate(pool_id)
 
     @classmethod
-    def build_simple(cls, epoch: int = 1, uuid: Optional[str] = None, num_osd: int = -1):
+    def build_simple(cls, epoch: int = 1, uuid: Optional[str] = None, num_osd: int = -1) -> 'ceph_module.BasePyOSDMap':
         return cls._build_simple(epoch, uuid, num_osd)
 
     def get_ec_profile(self, name: str) -> Optional[List[Dict[str, str]]]:
@@ -454,7 +454,7 @@ def CLICheckNonemptyFileInput(desc: str) -> Callable[[HandlerFuncType], HandlerF
 
 def CLIRequiresDB(func: HandlerFuncType) -> HandlerFuncType:
     @functools.wraps(func)
-    def check(self, *args: Any, **kwargs: Any) -> Tuple[int, str, str]:
+    def check(self: MgrModule, *args: Any, **kwargs: Any) -> Tuple[int, str, str]:
         if not self.db_ready():
             return -errno.EAGAIN, "", "mgr db not yet available"
         return func(self, *args, **kwargs)
@@ -828,7 +828,7 @@ class MgrStandbyModule(ceph_module.BaseMgrStandbyModule, MgrModuleLoggingMixin):
     def get_active_uri(self) -> str:
         return self._ceph_get_active_uri()
 
-    def get(self, data_name: str):
+    def get(self, data_name: str) -> Dict[str, Any]:
         return self._ceph_get(data_name)
 
     def get_mgr_ip(self) -> str:
@@ -1236,7 +1236,7 @@ class MgrModule(ceph_module.BaseMgrModule, MgrModuleLoggingMixin):
             self._rados.shutdown()
             self._ceph_unregister_client(addrs)
 
-    def get(self, data_name: str):
+    def get(self, data_name: str) -> Any:
         """
         Called by the plugin to fetch named cluster-wide objects from ceph-mgr.
 
@@ -1358,7 +1358,7 @@ class MgrModule(ceph_module.BaseMgrModule, MgrModuleLoggingMixin):
 
         return ret
 
-    def get_server(self, hostname) -> ServerInfoT:
+    def get_server(self, hostname: str) -> ServerInfoT:
         """
         Called by the plugin to fetch metadata about a particular hostname from
         ceph-mgr.

diff --git a/src/pybind/mgr/selftest/module.py b/src/pybind/mgr/selftest/module.py
index e9e6ca4159c7563d28a5c329cef36ef328e9c2e6..90b00628feb10c97bd32adc86bcab4113af24315 100644 (file)
--- a/src/pybind/mgr/selftest/module.py
+++ b/src/pybind/mgr/selftest/module.py
@@ -253,7 +253,7 @@ class Module(MgrModule):
 
         servers = self.list_servers()
         for server in servers:
-            self.get_server(server['hostname'])
+            self.get_server(server['hostname'])  # type: ignore
 
         osdmap = self.get('osd_map')
         for o in osdmap['osds']: