From c9b12e2b667872fbd3350015db0b6b9aa400c055 Mon Sep 17 00:00:00 2001 From: Kiefer Chang Date: Tue, 4 Feb 2020 14:27:17 +0800 Subject: [PATCH] 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 --- qa/tasks/mgr/test_orchestrator_cli.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/qa/tasks/mgr/test_orchestrator_cli.py b/qa/tasks/mgr/test_orchestrator_cli.py index 80378f76697..7575126c170 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): -- 2.47.3