From: Sage Weil <sage@redhat.com>
Date: Mon, 17 Feb 2020 01:31:22 +0000 (-0600)
Subject: mgr/tests/test_orchestrator: fix ServiceDescription test
X-Git-Tag: v15.1.1~362^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e0df409cd315190bf5e167c57f9afaaa98281588;p=ceph.git

mgr/tests/test_orchestrator: fix ServiceDescription test

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/tests/test_orchestrator.py b/src/pybind/mgr/tests/test_orchestrator.py
index 532fdd5b8bd7..5461c0f3f433 100644
--- a/src/pybind/mgr/tests/test_orchestrator.py
+++ b/src/pybind/mgr/tests/test_orchestrator.py
@@ -8,7 +8,7 @@ import pytest
 from ceph.deployment import inventory
 from orchestrator import raise_if_exception, RGWSpec, Completion, ProgressReference, \
     servicespec_validate_add
-from orchestrator import InventoryNode, ServiceDescription
+from orchestrator import InventoryNode, ServiceDescription, DaemonDescription
 from orchestrator import OrchestratorValidationError
 from orchestrator import HostPlacementSpec
 
@@ -82,13 +82,13 @@ def test_inventory():
             InventoryNode.from_json(data)
 
 
-def test_service_description():
+def test_daemon_description():
     json_data = {
         'nodename': 'test',
-        'service_type': 'mon',
-        'service_instance': 'a'
+        'daemon_type': 'mon',
+        'daemon_id': 'a'
     }
-    _test_resource(json_data, ServiceDescription, {'abc': False})
+    _test_resource(json_data, DaemonDescription, {'abc': False})
 
 
 def test_raise():