mgr/cephadm: make annotations for upgrade.py mandatory

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 3f9bf2b3f35566ec5537fd36a5163a17ab7778c6)

diff --git a/src/mypy.ini b/src/mypy.ini
index e74604e732c9601b585e0507ae03f9e6a5cb24f5..12534cf1c3951de0ac2202cdb7f17da62b1d122a 100755 (executable)
--- a/src/mypy.ini
+++ b/src/mypy.ini
@@ -9,3 +9,6 @@ show_error_context = True
 
 disallow_untyped_defs = True
 
+[mypy-cephadm.upgrade.*]
+disallow_untyped_defs = True
+

diff --git a/src/pybind/mgr/cephadm/upgrade.py b/src/pybind/mgr/cephadm/upgrade.py
index c7b26d592806fbf94878497ee0a2be61d025f122..45c352b503ab48043eef89ed652dbf18be431841 100644 (file)
--- a/src/pybind/mgr/cephadm/upgrade.py
+++ b/src/pybind/mgr/cephadm/upgrade.py
@@ -49,7 +49,7 @@ class UpgradeState:
         }
 
     @classmethod
-    def from_json(cls, data) -> Optional['UpgradeState']:
+    def from_json(cls, data: dict) -> Optional['UpgradeState']:
         if data:
             return cls(**data)
         else:
@@ -93,7 +93,7 @@ class CephadmUpgrade:
                 r.message = 'Upgrade paused'
         return r
 
-    def upgrade_start(self, image, version) -> str:
+    def upgrade_start(self, image: str, version: str) -> str:
         if self.mgr.mode != 'root':
             raise OrchestratorError('upgrade is not supported in %s mode' % (
                 self.mgr.mode))
@@ -210,7 +210,7 @@ class CephadmUpgrade:
         self.mgr.health_checks[alert_id] = alert
         self.mgr.set_health_checks(self.mgr.health_checks)
 
-    def _update_upgrade_progress(self, progress) -> None:
+    def _update_upgrade_progress(self, progress: float) -> None:
         if not self.upgrade_state:
             assert False, 'No upgrade in progress'