From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Thu, 2 May 2019 09:59:42 +0000 (+0200)
Subject: mgr/orchestrator: check for DEVICE_{IDENT|FAULT}_ON
X-Git-Tag: v15.1.0~1025^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=157fb06facc4f233204fa607f82988d0b0576870;p=ceph-ci.git

mgr/orchestrator: check for DEVICE_{IDENT|FAULT}_ON

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/qa/suites/rados/mgr/tasks/orchestrator_cli.yaml b/qa/suites/rados/mgr/tasks/orchestrator_cli.yaml
index 65b1d78b158..d585616e588 100644
--- a/qa/suites/rados/mgr/tasks/orchestrator_cli.yaml
+++ b/qa/suites/rados/mgr/tasks/orchestrator_cli.yaml
@@ -8,8 +8,8 @@ tasks:
       log-whitelist:
         - overall HEALTH_
         - \(MGR_DOWN\)
-        - \(MGR_INSIGHTS_WARNING\)
-        - \(insights_health_check
+        - \(DEVICE_IDENT_ON\)
+        - \(DEVICE_FAULT_ON\)
         - \(PG_
         - replacing it with standby
         - No standby daemons available
diff --git a/qa/tasks/mgr/test_orchestrator_cli.py b/qa/tasks/mgr/test_orchestrator_cli.py
index 9a9c4b3b39c..1f5875c9f9d 100644
--- a/qa/tasks/mgr/test_orchestrator_cli.py
+++ b/qa/tasks/mgr/test_orchestrator_cli.py
@@ -108,9 +108,18 @@ class TestOrchestratorCli(MgrTestCase):
             self.assertNotIn(dev_id, _ls_lights(t))
             self._cmd("device", t + "-light-on", dev_id)
             self.assertIn(dev_id, _ls_lights(t))
+
+            health = {
+                'ident': 'DEVICE_IDENT_ON',
+                'fault': 'DEVICE_FAULT_ON',
+            }[t]
+            self.wait_for_health(health, 30)
+
             self._cmd("device", t + "-light-off", dev_id)
             self.assertNotIn(dev_id, _ls_lights(t))
 
+        self.wait_for_health_clear(30)
+
     def test_mds_add(self):
         self._orch_cmd("mds", "add", "service_name")