Merge "Remove direct access to dbapi"

2016-06-02 03:10:31 +00:00
parent 3d398b4d22 dbdf690cd0
commit e7e50b3955
1 changed files with 3 additions and 5 deletions
--- a/watcher/applier/default.py
+++ b/watcher/applier/default.py
@@ -56,9 +56,7 @@ class DefaultApplier(base.BaseApplier):

    def execute(self, action_plan_uuid):
        LOG.debug("Executing action plan %s ", action_plan_uuid)
-        action_plan = objects.ActionPlan.get_by_uuid(self.context,
-                                                     action_plan_uuid)
-        # todo(jed) remove direct access to dbapi need filter in object
-        filters = {'action_plan_id': action_plan.id}
-        actions = objects.Action.dbapi.get_action_list(self.context, filters)
+        filters = {'action_plan_uuid': action_plan_uuid}
+        actions = objects.Action.list(self.context,
+                                      filters=filters)
        return self.engine.execute(actions)