import ceph 16.2.7

[ceph.git] / ceph / src / pybind / mgr / nfs / utils.py

diff --git a/ceph/src/pybind/mgr/nfs/utils.py b/ceph/src/pybind/mgr/nfs/utils.py
index f899e1ce91329a68f5d32e29f070d4f82356eb86..00552dfc0de12c18f4e987047d187027b602d0af 100644 (file)
--- a/ceph/src/pybind/mgr/nfs/utils.py
+++ b/ceph/src/pybind/mgr/nfs/utils.py
@@ -1,9 +1,12 @@
+from typing import List, TYPE_CHECKING
+
 import orchestrator
 
-POOL_NAME = 'nfs-ganesha'
+if TYPE_CHECKING:
+    from nfs.module import Module
 
 
-def available_clusters(mgr):
+def available_clusters(mgr: 'Module') -> List[str]:
     '''
     This method returns list of available cluster ids.
     Service name is service_type.service_id
@@ -15,20 +18,21 @@ def available_clusters(mgr):
     # TODO check cephadm cluster list with rados pool conf objects
     completion = mgr.describe_service(service_type='nfs')
     orchestrator.raise_if_exception(completion)
+    assert completion.result is not None
     return [cluster.spec.service_id for cluster in completion.result
             if cluster.spec.service_id]
 
 
-def restart_nfs_service(mgr, cluster_id):
+def restart_nfs_service(mgr: 'Module', cluster_id: str) -> None:
     '''
     This methods restarts the nfs daemons
     '''
     completion = mgr.service_action(action='restart',
-                                    service_name='nfs.'+cluster_id)
+                                    service_name='nfs.' + cluster_id)
     orchestrator.raise_if_exception(completion)
 
 
-def check_fs(mgr, fs_name):
+def check_fs(mgr: 'Module', fs_name: str) -> bool:
     '''
     This method checks if given fs is valid
     '''