From: Kiefer Chang <kiefer.chang@suse.com>
Date: Tue, 4 Feb 2020 06:27:17 +0000 (+0800)
Subject: qa/tasks/mgr/test_orchestrator_cli: support multiple DriveGroups
X-Git-Tag: v15.1.1~532^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33055%2Fhead;p=ceph.git

qa/tasks/mgr/test_orchestrator_cli: support multiple DriveGroups

create_osds interface in Orchestrator supports multiple named DriveGroups
since https://github.com/ceph/ceph/pull/32972. Adapt the changes in
the test.

Fixes: https://tracker.ceph.com/issues/43945
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
---

diff --git a/qa/tasks/mgr/test_orchestrator_cli.py b/qa/tasks/mgr/test_orchestrator_cli.py
index 80378f766979a..7575126c17087 100644
--- a/qa/tasks/mgr/test_orchestrator_cli.py
+++ b/qa/tasks/mgr/test_orchestrator_cli.py
@@ -85,12 +85,14 @@ class TestOrchestratorCli(MgrTestCase):
         self._orch_cmd("osd", "create", "*:device")
         self._orch_cmd("osd", "create", "*:device,device2")
 
-        drive_group = {
-            "host_pattern": "*",
-            "data_devices": {"paths": ["/dev/sda"]}
+        drive_groups = {
+            'test': {
+                "host_pattern": "*",
+                "data_devices": {"paths": ["/dev/sda"]}
+            }
         }
 
-        res = self._orch_cmd_result("osd", "create", "-i", "-", stdin=json.dumps(drive_group))
+        res = self._orch_cmd_result("osd", "create", "-i", "-", stdin=json.dumps(drive_groups))
         self.assertEqual(res, 0)
 
         with self.assertRaises(CommandFailedError):