mgr/localpool: add type annotations

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/mypy.ini b/src/mypy.ini
index b25d7621aabc2c58480b49b505925e84af065fce..b2882f861851bb9c3d55ac4c15f46be036e6ad6b 100755 (executable)
--- a/src/mypy.ini
+++ b/src/mypy.ini
@@ -49,6 +49,9 @@ disallow_untyped_defs = True
 [mypy-iostat.*]
 disallow_untyped_defs = True
 
+[mypy-localpool.*]
+disallow_untyped_defs = True
+
 [mypy-orchestrator.*]
 disallow_untyped_defs = True
 

diff --git a/src/pybind/mgr/localpool/module.py b/src/pybind/mgr/localpool/module.py
index fbedc55f1ede3548084fd6ed0cb9ac4d88916384..05ba4829b4562c9366635ce1a3b6d392069b756f 100644 (file)
--- a/src/pybind/mgr/localpool/module.py
+++ b/src/pybind/mgr/localpool/module.py
@@ -1,6 +1,8 @@
 from mgr_module import MgrModule, CommandResult, Option
 import json
 import threading
+from typing import cast, Any
+
 
 class Module(MgrModule):
 
@@ -42,24 +44,24 @@ class Module(MgrModule):
             runtime=True),
     ]
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
         super(Module, self).__init__(*args, **kwargs)
         self.serve_event = threading.Event()
 
-    def notify(self, notify_type, notify_id):
+    def notify(self, notify_type: str, notify_id: str) -> None:
         if notify_type == 'osd_map':
             self.handle_osd_map()
 
-    def handle_osd_map(self):
+    def handle_osd_map(self) -> None:
         """
         Check pools on each OSDMap change
         """
-        subtree_type = self.get_module_option('subtree')
+        subtree_type = cast(str, self.get_module_option('subtree'))
         failure_domain = self.get_module_option('failure_domain')
         pg_num = self.get_module_option('pg_num')
         num_rep = self.get_module_option('num_rep')
         min_size = self.get_module_option('min_size')
-        prefix = self.get_module_option('prefix') or 'by-' + subtree_type + '-'
+        prefix = cast(str, self.get_module_option('prefix')) or 'by-' + subtree_type + '-'
 
         osdmap = self.get("osd_map")
         lpools = []
@@ -121,10 +123,10 @@ class Module(MgrModule):
 
         # TODO remove pools for hosts that don't exist?
 
-    def serve(self):
+    def serve(self) -> None:
         self.handle_osd_map()
         self.serve_event.wait()
         self.serve_event.clear()
 
-    def shutdown(self):
+    def shutdown(self) -> None:
         self.serve_event.set()

diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index d50c45ab865e22d2a2a75451575538db5f8dec15..73891b94372b11bae69eb5720b9986856d0abc87 100644 (file)
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -71,6 +71,7 @@ commands =
            -m hello \
            -m influx \
            -m iostat \
+           -m localpool \
            -m mds_autoscaler \
            -m mgr_module \
            -m mgr_util \