Merge "Watcher Planner Selector"

watcher/tests/decision_engine/audit/test_audit_handlers.py

@@ -439,7 +439,7 @@ class TestContinuousAuditHandler(base.DbTestCase):
         audit_handler.launch_audits_periodically()
         m_remove_job.assert_called()
 
-    @mock.patch.object(continuous.ContinuousAuditHandler, 'planner',
+    @mock.patch.object(continuous.ContinuousAuditHandler, 'get_planner',
                        mock.Mock())
     @mock.patch.object(base_strategy.BaseStrategy, "compute_model",
                        mock.Mock(stale=False))

watcher/tests/decision_engine/planner/test_planner_manager.py

@@ -25,4 +25,6 @@ class TestPlannerManager(base.TestCase):
     def test_load(self):
         cfg.CONF.set_override('planner', "weight", group='watcher_planner')
         manager = planner.PlannerManager()
-        self.assertIsInstance(manager.load(), weight.WeightPlanner)
+        selected_planner = cfg.CONF.watcher_planner.planner
+        self.assertIsInstance(manager.load(selected_planner),
+                              weight.WeightPlanner)