Merge "Moved do_execute method to AuditHandler class"

watcher/decision_engine/audit/base.py

@@ -74,6 +74,13 @@ class AuditHandler(BaseAuditHandler):
     def strategy_context(self):
         return self._strategy_context
 
+    def do_execute(self, audit, request_context):
+        # execute the strategy
+        solution = self.strategy_context.execute_strategy(
+            audit, request_context)
+
+        return solution
+
     def do_schedule(self, request_context, audit, solution):
         try:
             notifications.audit.send_action_notification(

watcher/decision_engine/audit/continuous.py

@@ -71,9 +71,8 @@ class ContinuousAuditHandler(base.AuditHandler):
         return False
 
     def do_execute(self, audit, request_context):
-        # execute the strategy
-        solution = self.strategy_context.execute_strategy(
-            audit, request_context)
+        solution = super(ContinuousAuditHandler, self)\
+            .do_execute(audit, request_context)
 
         if audit.audit_type == objects.audit.AuditType.CONTINUOUS.value:
             a_plan_filters = {'audit_uuid': audit.uuid,

watcher/decision_engine/audit/oneshot.py

@@ -20,13 +20,6 @@ from watcher import objects
 
 class OneShotAuditHandler(base.AuditHandler):
 
-    def do_execute(self, audit, request_context):
-        # execute the strategy
-        solution = self.strategy_context.execute_strategy(
-            audit, request_context)
-
-        return solution
-
     def post_execute(self, audit, solution, request_context):
         super(OneShotAuditHandler, self).post_execute(audit, solution,
                                                       request_context)