Просмотр исходного кода

Fix Minion Pool options listing.

Nashwan Azhari 5 лет назад
Родитель
Сommit
fa0be59b95
1 измененных файлов с 13 добавлено и 10 удалено
  1. 13 10
      coriolis/endpoint_options/api.py

+ 13 - 10
coriolis/endpoint_options/api.py

@@ -1,29 +1,32 @@
 # Copyright 2020 Cloudbase Solutions Srl
 # All Rights Reserved.
 
-from coriolis.minion_manager.rpc import client as rpc_client
+from coriolis.conductor.rpc import client as rpc_conductor_client
+from coriolis.minion_manager.rpc import client as rpc_minion_manager_client
 
 
 class API(object):
     def __init__(self):
-        self._rpc_client = rpc_client.MinionManagerClient()
+        self._rpc_minion_manager_client = (
+            rpc_minion_manager_client.MinionManagerClient())
+        self._rpc_conductor_client = rpc_conductor_client.ConductorClient()
 
-    def get_endpoint_destination_options(
+    def get_endpoint_source_options(
             self, ctxt, endpoint_id, env=None, option_names=None):
-        return self._rpc_client.get_endpoint_destination_options(
+        return self._rpc_conductor_client.get_endpoint_source_options(
             ctxt, endpoint_id, env, option_names)
 
-    def get_endpoint_source_minion_pool_options(
+    def get_endpoint_destination_options(
             self, ctxt, endpoint_id, env=None, option_names=None):
-        return self._rpc_client.get_endpoint_source_minion_pool_options(
+        return self._rpc_conductor_client.get_endpoint_destination_options(
             ctxt, endpoint_id, env, option_names)
 
-    def get_endpoint_destination_minion_pool_options(
+    def get_endpoint_source_minion_pool_options(
             self, ctxt, endpoint_id, env=None, option_names=None):
-        return self._rpc_client.get_endpoint_destination_minion_pool_options(
+        return self._rpc_minion_manager_client.get_endpoint_source_minion_pool_options(
             ctxt, endpoint_id, env, option_names)
 
-    def get_endpoint_source_options(
+    def get_endpoint_destination_minion_pool_options(
             self, ctxt, endpoint_id, env=None, option_names=None):
-        return self._rpc_client.get_endpoint_source_options(
+        return self._rpc_minion_manager_client.get_endpoint_destination_minion_pool_options(
             ctxt, endpoint_id, env, option_names)