Merge "check actionplan state when deleting actionplan"

2018-01-11 09:12:37 +00:00
parent 9e027940d7 cdc847d352
commit 9626cb1356
3 changed files with 20 additions and 0 deletions
--- a/watcher/api/controllers/v1/action_plan.py
+++ b/watcher/api/controllers/v1/action_plan.py
@@ -460,6 +460,15 @@ class ActionPlansController(rest.RestController):
        policy.enforce(context, 'action_plan:delete', action_plan,
                       action='action_plan:delete')

+        allowed_states = (ap_objects.State.SUCCEEDED,
+                          ap_objects.State.RECOMMENDED,
+                          ap_objects.State.FAILED,
+                          ap_objects.State.SUPERSEDED,
+                          ap_objects.State.CANCELLED)
+        if action_plan.state not in allowed_states:
+            raise exception.DeleteError(
+                state=action_plan.state)
+
        action_plan.soft_delete()

    @wsme.validate(types.uuid, [ActionPlanPatchType])