mgr/cephadm: convert py2 -> py3 type checking

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

diff --git a/src/pybind/mgr/cephadm/services/nfs.py b/src/pybind/mgr/cephadm/services/nfs.py
index 6fb7d158879d6f9df7b1f07f6910f23d7a44819d..d00c7c2cf18feb8ed741ba4edaedac31ede784ad 100644 (file)
--- a/src/pybind/mgr/cephadm/services/nfs.py
+++ b/src/pybind/mgr/cephadm/services/nfs.py
@@ -9,6 +9,9 @@ from orchestrator import OrchestratorError, DaemonDescription
 from cephadm import utils
 from cephadm.services.cephadmservice import CephadmService, CephadmDaemonSpec
 
+if TYPE_CHECKING:
+    from cephadm.module import CephadmOrchestrator
+
 logger = logging.getLogger(__name__)
 
 
@@ -22,7 +25,7 @@ class NFSService(CephadmService):
         daemon_id = daemon_spec.daemon_id
         host = daemon_spec.host
 
-        deps = []  # type: List[str]
+        deps: List[str] = []
 
         # find the matching NFSServiceSpec
         # TODO: find the spec and pass via _create_daemon instead ??
@@ -115,10 +118,9 @@ class NFSService(CephadmService):
 
 class NFSGanesha(object):
     def __init__(self,
-                 mgr,
-                 daemon_id,
-                 spec):
-        # type: (cephadm.CephadmOrchestrator, str, NFSServiceSpec) -> None
+                 mgr: "CephadmOrchestrator",
+                 daemon_id: str,
+                 spec: NFSServiceSpec) -> None:
         assert spec.service_id and daemon_id.startswith(spec.service_id)
         self.mgr = mgr
         self.daemon_id = daemon_id
@@ -200,7 +202,7 @@ class NFSGanesha(object):
         return self.mgr.template.render('services/nfs/ganesha.conf.j2', context)
 
     def get_cephadm_config(self) -> Dict[str, Any]:
-        config = {'pool': self.spec.pool}  # type: Dict
+        config: Dict[str, Any] = {'pool': self.spec.pool}
         if self.spec.namespace:
             config['namespace'] = self.spec.namespace
         config['userid'] = self.get_rados_user()