From 6b47b360afd43cd691619dd6cf7628874224c900 Mon Sep 17 00:00:00 2001
From: Dougal Matthews <dougal@redhat.com>
Date: Tue, 20 Mar 2018 14:10:47 +0000
Subject: [PATCH] Use the standard messaging in the networks workbook

Update the networks workbook to use the standard message sending
workflow. This workflow reduces the boilerplate that is copied between
workflows by defining the message structure, providing the retry logic
and ensuring the task on a "FAILED" message.

The workflow also offers optional persistence in Swift. If the plan name
is given to the workflow it will store the messages in a Swift container
named <plan_name>-messages.

Related-Bug: #1757372

Change-Id: Ib346f56b4de59c275e907a6ee4364eb311af2fc5
---
 workbooks/networks.yaml | 59 +++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 34 deletions(-)

diff --git a/workbooks/networks.yaml b/workbooks/networks.yaml
index f039a1b94..0c0248edb 100644
--- a/workbooks/networks.yaml
+++ b/workbooks/networks.yaml
@@ -29,33 +29,28 @@ workflows:
         publish-on-error:
           status: FAILED
           message: <% task().result %>
-        on-error: notify_zaqar
+        on-error: send_message
 
       set_status_success:
-        on-success: notify_zaqar
+        on-success: send_message
         publish:
           status: SUCCESS
           message: <% task(validate_network_names).result %>
 
       set_status_error:
-        on-success: notify_zaqar
+        on-success: send_message
         publish:
           status: FAILED
           message: "One or more entries did not contain the required field 'name'"
 
-      notify_zaqar:
-        action: zaqar.queue_post
+      send_message:
+        workflow: tripleo.messaging.v1.send
         input:
           queue_name: <% $.queue_name %>
-          messages:
-            body:
-              type: tripleo.networks.v1.validate_networks_input
-              payload:
-                status: <% $.status %>
-                message: <% $.get('message', '') %>
-                execution: <% execution() %>
-        on-success:
-          - fail: <% $.get('status') = "FAILED" %>
+          type: <% execution().name %>
+          status: <% $.status %>
+          execution: <% execution() %>
+          message: <% $.get('message', '') %>
 
   update_networks:
     description: >
@@ -87,7 +82,7 @@ workflows:
         publish-on-error:
           status: FAILED
           message: <% task().result %>
-        on-error: notify_zaqar
+        on-error: send_message
 
       validate_network_files:
         description: >
@@ -103,7 +98,7 @@ workflows:
         publish-on-error:
           status: FAILED
           message: <% task().result %>
-        on-error: notify_zaqar
+        on-error: send_message
 
       get_available_networks:
         workflow: tripleo.plan_management.v1.list_available_networks
@@ -116,7 +111,7 @@ workflows:
         publish-on-error:
           status: FAILED
           message: <% task().result %>
-        on-error: notify_zaqar
+        on-error: send_message
 
       get_current_networks:
         workflow: tripleo.plan_management.v1.get_network_data
@@ -130,7 +125,7 @@ workflows:
         publish-on-error:
           status: FAILED
           message: <% task().result %>
-        on-error: notify_zaqar
+        on-error: send_message
 
       update_network_data:
         description: >
@@ -146,7 +141,7 @@ workflows:
         publish-on-error:
           status: FAILED
           message: <% task().result %>
-        on-error: notify_zaqar
+        on-error: send_message
 
       update_network_data_in_swift:
         description: >
@@ -160,7 +155,7 @@ workflows:
         publish-on-error:
           status: FAILED
           message: <% task().result %>
-        on-error: notify_zaqar
+        on-error: send_message
 
       regenerate_templates:
         action: tripleo.templates.process container=<% $.container %>
@@ -168,7 +163,7 @@ workflows:
         publish-on-error:
           status: FAILED
           message: <% task().result %>
-        on-error: notify_zaqar
+        on-error: send_message
 
       get_networks:
         description: >
@@ -185,24 +180,20 @@ workflows:
         publish-on-error:
           status: FAILED
           message: <% task().result %>
-        on-error: notify_zaqar
+        on-error: send_message
 
       set_status_success:
-        on-success: notify_zaqar
+        on-success: send_message
         publish:
           status: SUCCESS
           message: <% task(get_networks).result %>
 
-      notify_zaqar:
-        action: zaqar.queue_post
+      send_message:
+        workflow: tripleo.messaging.v1.send
         input:
           queue_name: <% $.queue_name %>
-          messages:
-            body:
-              type: tripleo.networks.v1.update_networks
-              payload:
-                status: <% $.status %>
-                message: <% $.get('message', '') %>
-                execution: <% execution() %>
-        on-success:
-          - fail: <% $.get('status') = "FAILED" %>
+          type: <% execution().name %>
+          status: <% $.status %>
+          execution: <% execution() %>
+          message: <% $.get('message', '') %>
+          plan_name: <% $.container %>