Merge "Add a dynamic loading of Actions handlers in the Watcher Applier"

2016-01-15 15:44:56 +00:00
parent 55d186be58 8bac4fd42a
commit fd6ecc1b13
29 changed files with 305 additions and 450 deletions
--- a/watcher/decision_engine/strategy/strategies/outlet_temp_control.py
+++ b/watcher/decision_engine/strategy/strategies/outlet_temp_control.py
@@ -149,8 +149,8 @@ class OutletTempControl(BaseStrategy):
                            LOG.info(_LE("VM not active, skipped: %s"),
                                     vm.uuid)
                            continue
-                        return (mig_src_hypervisor, vm)
-                    except wexc.VMNotFound as e:
+                        return mig_src_hypervisor, vm
+                    except wexc.InstanceNotFound as e:
                        LOG.info("VM not found Error: %s" % e.message)
                        pass