Merge pull request #11884 from lfu/alert_email_recipient_1379303

event_enforce_policy should be called for all policy events. (cherry picked from commit d137cfd) https://bugzilla.redhat.com/show_bug.cgi?id=1379303
ManageIQ · Nov 7, 2016 · 5846cd5 · 5846cd5
1 parent 6930307
commit 5846cd5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/...ures/ae_datastore/ManageIQ/System/Event/MiqEvent/POLICY.class/request_service_retire.yaml b/...ures/ae_datastore/ManageIQ/System/Event/MiqEvent/POLICY.class/request_service_retire.yaml
@@ -14,3 +14,5 @@ object:
       value: "/Service/Retirement/StateMachines/Methods/GetRetirementEntryPoint"
   - rel4:
       value: "${/#retirement_entry_point}?service_id=${process#service_id}"
+  - rel5:
+      value: "/System/event_handlers/event_enforce_policy"
diff --git a/db/fixtures/ae_datastore/ManageIQ/System/Event/MiqEvent/POLICY.class/request_vm_retire.yaml b/db/fixtures/ae_datastore/ManageIQ/System/Event/MiqEvent/POLICY.class/request_vm_retire.yaml
@@ -14,3 +14,5 @@ object:
       value: "/System/Process/parse_provider_category"
   - rel5:
       value: "/${/#ae_provider_category}/VM/Lifecycle/Retirement?vm_id=${process#vm_id}"
+  - rel6:
+      value: "/System/event_handlers/event_enforce_policy"
diff --git a/db/fixtures/ae_datastore/ManageIQ/System/Event/MiqEvent/POLICY.class/service_retired.yaml b/db/fixtures/ae_datastore/ManageIQ/System/Event/MiqEvent/POLICY.class/service_retired.yaml
@@ -10,3 +10,5 @@ object:
   fields:
   - logical_event:
       value: service_retired
+  - rel2:
+      value: "/System/event_handlers/event_enforce_policy"
diff --git a/db/fixtures/ae_datastore/ManageIQ/System/Event/MiqEvent/POLICY.class/vm_reconfigure.yaml b/db/fixtures/ae_datastore/ManageIQ/System/Event/MiqEvent/POLICY.class/vm_reconfigure.yaml
@@ -10,3 +10,5 @@ object:
   fields:
   - rel4:
       value: "/Infrastructure/VM/Reconfigure/Email/VmReconfigureTaskComplete"
+  - rel5:
+      value: "/System/event_handlers/event_enforce_policy"
diff --git a/db/fixtures/ae_datastore/ManageIQ/System/Event/MiqEvent/POLICY.class/vm_retire_warn.yaml b/db/fixtures/ae_datastore/ManageIQ/System/Event/MiqEvent/POLICY.class/vm_retire_warn.yaml
@@ -14,3 +14,5 @@ object:
       value: "/System/Process/parse_provider_category"
   - rel5:
       value: "/${/#ae_provider_category}/VM/Retirement/Email/vm_retirement_emails"
+  - rel6:
+      value: "/System/event_handlers/event_enforce_policy"