update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / pybind / mgr / orchestrator / __init__.py

diff --git a/ceph/src/pybind/mgr/orchestrator/__init__.py b/ceph/src/pybind/mgr/orchestrator/__init__.py
index 2d6cba8a15626bdf0cad9e33cf01ab8b6203f4e0..d9837e0c08192cb3989f0568d66ceb1f38fbb284 100644 (file)
--- a/ceph/src/pybind/mgr/orchestrator/__init__.py
+++ b/ceph/src/pybind/mgr/orchestrator/__init__.py
@@ -1,19 +1,20 @@
-from __future__ import absolute_import
-import os
-
-if 'UNITTEST' in os.environ:
-    import tests
+# flake8: noqa
 
 from .module import OrchestratorCli
 
 # usage: E.g. `from orchestrator import StatelessServiceSpec`
 from ._interface import \
-    Completion, TrivialReadCompletion, raise_if_exception, ProgressReference, pretty_print, _Promise, \
+    OrchResult, raise_if_exception, handle_orch_error, \
     CLICommand, _cli_write_command, _cli_read_command, CLICommandMeta, \
     Orchestrator, OrchestratorClientMixin, \
     OrchestratorValidationError, OrchestratorError, NoOrchestrator, \
     ServiceDescription, InventoryFilter, HostSpec, \
-    DaemonDescription, \
+    DaemonDescription, DaemonDescriptionStatus, \
     OrchestratorEvent, set_exception_subject, \
     InventoryHost, DeviceLightLoc, \
-    UpgradeStatusSpec
+    UpgradeStatusSpec, daemon_type_to_service, service_to_daemon_types
+
+
+import os
+if 'UNITTEST' in os.environ:
+    import tests