From 1d406328268b8d761a2a669889bceb5c5c9374b8 Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Mon, 8 Feb 2021 09:54:07 +0100
Subject: [PATCH] mgr/mds_autoscaler: adapt to now orch interface

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---
 src/pybind/mgr/mds_autoscaler/module.py          |  2 --
 .../mgr/mds_autoscaler/tests/test_autoscaler.py  | 16 +++++-----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/pybind/mgr/mds_autoscaler/module.py b/src/pybind/mgr/mds_autoscaler/module.py
index 3be3380e97d..01a9df2f4a8 100644
--- a/src/pybind/mgr/mds_autoscaler/module.py
+++ b/src/pybind/mgr/mds_autoscaler/module.py
@@ -25,7 +25,6 @@ class MDSAutoscaler(orchestrator.OrchestratorClientMixin, MgrModule):
         completion = self.describe_service(service_type='mds',
                                            service_name=service,
                                            refresh=True)
-        self._orchestrator_wait([completion])
         orchestrator.raise_if_exception(completion)
         if completion.result:
             return completion.result[0]
@@ -80,7 +79,6 @@ class MDSAutoscaler(orchestrator.OrchestratorClientMixin, MgrModule):
             self.log.info(f"fs {fs_name}: adjusting daemon count from {svc.spec.placement.count} to {want}")
             newspec = self.update_daemon_count(svc.spec, fs_name, want)
             completion = self.apply_mds(newspec)
-            self._orchestrator_wait([completion])
             orchestrator.raise_if_exception(completion)
         except orchestrator.OrchestratorError as e:
             self.log.exception(f"fs {fs_name}: exception while updating service: {e}")
diff --git a/src/pybind/mgr/mds_autoscaler/tests/test_autoscaler.py b/src/pybind/mgr/mds_autoscaler/tests/test_autoscaler.py
index efdd2dd9bce..05f84db2fc0 100644
--- a/src/pybind/mgr/mds_autoscaler/tests/test_autoscaler.py
+++ b/src/pybind/mgr/mds_autoscaler/tests/test_autoscaler.py
@@ -2,7 +2,7 @@ import pytest
 from unittest import mock
 
 from ceph.deployment.service_spec import ServiceSpec, PlacementSpec
-from orchestrator import DaemonDescription, Completion, ServiceDescription
+from orchestrator import DaemonDescription, OrchResult, ServiceDescription
 
 try:
     from typing import Any, List
@@ -16,10 +16,7 @@ from mds_autoscaler.module import MDSAutoscaler
 @pytest.yield_fixture()
 def mds_autoscaler_module():
 
-    with mock.patch("mds_autoscaler.module.MDSAutoscaler._orchestrator_wait"):
-        m = MDSAutoscaler('cephadm', 0, 0)
-
-        yield m
+    yield MDSAutoscaler('cephadm', 0, 0)
 
 
 class TestCephadm(object):
@@ -29,7 +26,7 @@ class TestCephadm(object):
     @mock.patch("mds_autoscaler.module.MDSAutoscaler.describe_service")
     @mock.patch("mds_autoscaler.module.MDSAutoscaler.apply_mds")
     def test_scale_up(self, _apply_mds, _describe_service, _list_daemons, _get, mds_autoscaler_module: MDSAutoscaler):
-        daemons = Completion(value=[
+        daemons = OrchResult(result=[
             DaemonDescription(
                 hostname='myhost',
                 daemon_type='mds',
@@ -41,10 +38,9 @@ class TestCephadm(object):
                 daemon_id='fs_name.myhost.b'
             ),
         ])
-        daemons.finalize()
         _list_daemons.return_value = daemons
 
-        services = Completion(value=[
+        services = OrchResult(result=[
             ServiceDescription(
                 spec=ServiceSpec(
                     service_type='mds',
@@ -55,11 +51,9 @@ class TestCephadm(object):
                 )
             )
         ])
-        services.finalize()
         _describe_service.return_value = services
 
-        apply = Completion(value='')
-        apply.finalize()
+        apply = OrchResult(result='')
         _apply_mds.return_value = apply