mgr/cephadm: clean-up nfs service module imports

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

diff --git a/src/pybind/mgr/cephadm/services/nfs.py b/src/pybind/mgr/cephadm/services/nfs.py
index 33ce52e946bc32ce2dbe72d71db911082895fd0e..6fb7d158879d6f9df7b1f07f6910f23d7a44819d 100644 (file)
--- a/src/pybind/mgr/cephadm/services/nfs.py
+++ b/src/pybind/mgr/cephadm/services/nfs.py
@@ -1,18 +1,13 @@
 import logging
-
-import rados
-from typing import Dict, Optional, Tuple, Any, List, Set, cast
+from typing import TYPE_CHECKING, Dict, Optional, Tuple, Any, List, Set, cast
 
 from ceph.deployment.service_spec import NFSServiceSpec
+import rados
 
-import orchestrator
-from orchestrator import OrchestratorError
-from orchestrator import DaemonDescription
-
-import cephadm
-from .. import utils
+from orchestrator import OrchestratorError, DaemonDescription
 
-from .cephadmservice import CephadmService, CephadmDaemonSpec
+from cephadm import utils
+from cephadm.services.cephadmservice import CephadmService, CephadmDaemonSpec
 
 logger = logging.getLogger(__name__)
 
@@ -31,7 +26,7 @@ class NFSService(CephadmService):
 
         # find the matching NFSServiceSpec
         # TODO: find the spec and pass via _create_daemon instead ??
-        dd = orchestrator.DaemonDescription()
+        dd = DaemonDescription()
         dd.daemon_type = daemon_type
         dd.daemon_id = daemon_id
         dd.hostname = host