Merge pull request ManageIQ#308 from billfitzgerald0120/email3_config…

…ured_system Email instances for /Infrastructure/Configured_System provisioning.
agrare · Jun 4, 2018 · e24c4e4 · e24c4e4
2 parents 122256d + 68f11fd
commit e24c4e4
Show file tree

Hide file tree

Showing 11 changed files with 106 additions and 4 deletions.
diff --git a/...nfrastructure/Configured_System/Provisioning/StateMachines/Provision.class/__class__.yaml b/...nfrastructure/Configured_System/Provisioning/StateMachines/Provision.class/__class__.yaml
@@ -258,7 +258,7 @@ object:
       datatype: string
       priority: 13
       owner: 
-      default_value: "/Infrastructure/Configured_System/Provisioning/Email/Provision_complete?event=configured_system_provisioned"
+      default_value: "/System/Notification/Email/InfrastructureConfiguredSystemMiqProvisionComplete?event=configured_system_provisioned"
       substitute: true
       message: create
       visibility: 

diff --git a/...Q/System/Notification/Email.class/infrastructureconfiguredsystemmiqprovisioncomplete.yaml b/...Q/System/Notification/Email.class/infrastructureconfiguredsystemmiqprovisioncomplete.yaml
@@ -0,0 +1,15 @@
+---
+object_type: instance
+version: 1.0
+object:
+  attributes:
+    display_name: 
+    name: InfrastructureConfiguredSystemMiqProvisionComplete
+    inherits: 
+    description: 
+  fields:
+  - to:
+      value: "${/#miq_provision.miq_request.get_option(:owner_email)} || ${/#miq_provision.miq_request.requester.email}
+        || ${/Configuration/Email/Default#default_recipient}"
+  - mail_method:
+      value: "#stop_email"
diff --git a/...cation/Email.class/infrastructureconfiguredsystemmiqprovisionrequestapproverapproved.yaml b/...cation/Email.class/infrastructureconfiguredsystemmiqprovisionrequestapproverapproved.yaml
@@ -0,0 +1,12 @@
+---
+object_type: instance
+version: 1.0
+object:
+  attributes:
+    display_name: 
+    name: InfrastructureConfiguredSystemMiqProvisionRequestApproverApproved
+    inherits: 
+    description: 
+  fields:
+  - mail_method:
+      value: "#stop_email"
diff --git a/...fication/Email.class/infrastructureconfiguredsystemmiqprovisionrequestapproverdenied.yaml b/...fication/Email.class/infrastructureconfiguredsystemmiqprovisionrequestapproverdenied.yaml
@@ -0,0 +1,12 @@
+---
+object_type: instance
+version: 1.0
+object:
+  attributes:
+    display_name: 
+    name: InfrastructureConfiguredSystemMiqProvisionRequestApproverDenied
+    inherits: 
+    description: 
+  fields:
+  - mail_method:
+      value: "#stop_email"
diff --git a/...ication/Email.class/infrastructureconfiguredsystemmiqprovisionrequestapproverpending.yaml b/...ication/Email.class/infrastructureconfiguredsystemmiqprovisionrequestapproverpending.yaml
@@ -0,0 +1,12 @@
+---
+object_type: instance
+version: 1.0
+object:
+  attributes:
+    display_name: 
+    name: InfrastructureConfiguredSystemMiqProvisionRequestApproverPending
+    inherits: 
+    description: 
+  fields:
+  - mail_method:
+      value: "#stop_email"
diff --git a/...ation/Email.class/infrastructureconfiguredsystemmiqprovisionrequestrequesterapproved.yaml b/...ation/Email.class/infrastructureconfiguredsystemmiqprovisionrequestrequesterapproved.yaml
@@ -0,0 +1,15 @@
+---
+object_type: instance
+version: 1.0
+object:
+  attributes:
+    display_name: 
+    name: InfrastructureConfiguredSystemMiqProvisionRequestRequesterApproved
+    inherits: 
+    description: 
+  fields:
+  - to:
+      value: "${/#miq_request.get_option(:owner_email)} || ${/#miq_request.requester.email}
+        || ${/Configuration/Email/Default#default_recipient}"
+  - mail_method:
+      value: "#stop_email"
diff --git a/...ication/Email.class/infrastructureconfiguredsystemmiqprovisionrequestrequesterdenied.yaml b/...ication/Email.class/infrastructureconfiguredsystemmiqprovisionrequestrequesterdenied.yaml
@@ -0,0 +1,15 @@
+---
+object_type: instance
+version: 1.0
+object:
+  attributes:
+    display_name: 
+    name: InfrastructureConfiguredSystemMiqProvisionRequestRequesterDenied
+    inherits: 
+    description: 
+  fields:
+  - to:
+      value: "${/#miq_request.get_option(:owner_email)} || ${/#miq_request.requester.email}
+        || ${/Configuration/Email/Default#default_recipient}"
+  - mail_method:
+      value: "#stop_email"
diff --git a/...cation/Email.class/infrastructureconfiguredsystemmiqprovisionrequestrequesterpending.yaml b/...cation/Email.class/infrastructureconfiguredsystemmiqprovisionrequestrequesterpending.yaml
@@ -0,0 +1,15 @@
+---
+object_type: instance
+version: 1.0
+object:
+  attributes:
+    display_name: 
+    name: InfrastructureConfiguredSystemMiqProvisionRequestRequesterPending
+    inherits: 
+    description: 
+  fields:
+  - to:
+      value: "${/#miq_request.get_option(:owner_email)} || ${/#miq_request.requester.email}
+        || ${/Configuration/Email/Default#default_recipient}"
+  - mail_method:
+      value: "#stop_email"
diff --git a/...t/automate/ManageIQ/System/Policy.class/miqprovisionconfiguredsystemrequest_approved.yaml b/...t/automate/ManageIQ/System/Policy.class/miqprovisionconfiguredsystemrequest_approved.yaml
@@ -9,4 +9,6 @@ object:
     description: 
   fields:
   - rel5:
-      value: "/Infrastructure/${/#miq_request.resource.ci_type}/Provisioning/Email/Request_Approved"
+      value: "/System/Notification/Email/InfrastructureConfiguredSystemMiqProvisionRequestRequesterApproved"
+  - rel6:
+      value: "/System/Notification/Email/InfrastructureConfiguredSystemMiqProvisionRequestApproverApproved"
diff --git a/...ent/automate/ManageIQ/System/Policy.class/miqprovisionconfiguredsystemrequest_denied.yaml b/...ent/automate/ManageIQ/System/Policy.class/miqprovisionconfiguredsystemrequest_denied.yaml
@@ -9,4 +9,6 @@ object:
     description: 
   fields:
   - rel5:
-      value: "/Infrastructure/${/#miq_request.resource.ci_type}/Provisioning/Email/Request_denied"
+      value: "/System/Notification/Email/InfrastructureConfiguredSystemMiqProvisionRequestRequesterDenied"
+  - rel6:
+      value: "/System/Notification/Email/InfrastructureConfiguredSystemMiqProvisionRequestApproverDenied"
diff --git a/...nt/automate/ManageIQ/System/Policy.class/miqprovisionconfiguredsystemrequest_pending.yaml b/...nt/automate/ManageIQ/System/Policy.class/miqprovisionconfiguredsystemrequest_pending.yaml
@@ -9,4 +9,6 @@ object:
     description: 
   fields:
   - rel5:
-      value: "/Infrastructure/${/#miq_request.resource.ci_type}/Provisioning/Email/Request_pending"
+      value: "/System/Notification/Email/InfrastructureConfiguredSystemMiqProvisionRequestRequesterPending"
+  - rel6:
+      value: "/System/Notification/Email/InfrastructureConfiguredSystemMiqProvisionRequestApproverPending"