]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashbaord: orchestrator service: Revert wait_api_result to a single completion
authorSebastian Wagner <sebastian.wagner@suse.com>
Wed, 18 Mar 2020 09:52:38 +0000 (10:52 +0100)
committerSebastian Wagner <sebastian.wagner@suse.com>
Wed, 18 Mar 2020 10:03:20 +0000 (11:03 +0100)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
src/pybind/mgr/dashboard/services/orchestrator.py

index 400055c8620c15c7ca8453339f296c5e94c6fda8..8cd499b06f8f3db541db2f8cbc349ed75ba24605 100644 (file)
@@ -36,15 +36,10 @@ class OrchestratorAPI(OrchestratorClientMixin):
 def wait_api_result(method):
     @wraps(method)
     def inner(self, *args, **kwargs):
-        completions = method(self, *args, **kwargs)
-        if not isinstance(completions, list):
-            completions = [completions]
-        self.api.orchestrator_wait(completions)
-        for compl in completions:
-            raise_if_exception(compl)
-        if len(completions) == 1:
-            return completions[0].result
-        return [compl.result for compl in completions]
+        completion = method(self, *args, **kwargs)
+        self.api.orchestrator_wait([completion])
+        raise_if_exception(completion)
+        return completion.result
     return inner