From e5aea0d8f2ca5c50cf65a2bfad92d2522743fcbf Mon Sep 17 00:00:00 2001
From: Enbo Wang <wangenbo@huawei.com>
Date: Fri, 19 Apr 2019 11:09:15 +0000
Subject: [PATCH] Add missing payload for DGs and Playbooks of LCM APIs

Add missing payload for DGs and Playbooks of LCM:rollback,
LCM:upgrade-pre-check and LCM:upgrade-post-check.

Change-Id: I96d8d86af1200843f85b9ee8a0cc8abf6a0b8ec8
Issue-ID: SDNC-733
Signed-off-by: Enbo Wang <wangenbo@huawei.com>

Former-commit-id: 681d674c31d356fb46fa8301219878619185b68b
---
 .../Playbooks/ansible_huawei_postcheck@0.01.yml    |  33 +
 .../Playbooks/ansible_huawei_precheck@0.01.yml     |  33 +
 .../Playbooks/ansible_huawei_rollback@0.00.yml     |  14 +-
 platform-logic/lcm/src/main/json/LCM_rollback.json | 784 +++++++++++++-------
 .../lcm/src/main/json/LCM_upgrade-post-check.json  | 822 ++++++++++++++-------
 .../lcm/src/main/json/LCM_upgrade-pre-check.json   | 822 ++++++++++++++-------
 platform-logic/lcm/src/main/xml/LCM_rollback.xml   | 214 ++++--
 .../lcm/src/main/xml/LCM_upgrade-post-check.xml    | 214 ++++--
 .../lcm/src/main/xml/LCM_upgrade-pre-check.xml     | 214 ++++--
 9 files changed, 2213 insertions(+), 937 deletions(-)
 create mode 100644 installation/ansible-server/src/main/Playbooks/ansible_huawei_postcheck@0.01.yml
 create mode 100644 installation/ansible-server/src/main/Playbooks/ansible_huawei_precheck@0.01.yml

diff --git a/installation/ansible-server/src/main/Playbooks/ansible_huawei_postcheck@0.01.yml b/installation/ansible-server/src/main/Playbooks/ansible_huawei_postcheck@0.01.yml
new file mode 100644
index 00000000..ad4edf51
--- /dev/null
+++ b/installation/ansible-server/src/main/Playbooks/ansible_huawei_postcheck@0.01.yml
@@ -0,0 +1,33 @@
+---
+- hosts: all
+  tasks:
+  - name: create a temporary file for additional data
+    file: 
+        path: /tmp/tmp-{{Id}}
+        state: touch
+    become: false
+
+  - name: prepare additional data
+    shell: echo {{additionalData}} > /tmp/tmp-{{Id}}
+    become: false
+
+  - name: execute post-check operation
+    shell: ./swm/upgrade-post-check {{pnfId}} {{oldSwVersion}} {{targetSwVersion}} {{ruleName}} /tmp/tmp-{{Id}}
+    ignore_errors: yes
+    register: postcheck_result
+
+  - name: write output to file
+    local_action: copy content="{{postcheck_result.stdout}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"
+    when: postcheck_result.stdout != ""
+
+  - name: remove the temporary file
+    file:
+        path: /tmp/tmp-{{Id}}
+        state: absent
+    become: false
+
+  - name: use result of post-check as the result of Playbook
+    fail:
+      msg: "{{postcheck_result.stderr}}"
+    when: postcheck_result is failed
+
diff --git a/installation/ansible-server/src/main/Playbooks/ansible_huawei_precheck@0.01.yml b/installation/ansible-server/src/main/Playbooks/ansible_huawei_precheck@0.01.yml
new file mode 100644
index 00000000..668ed7d0
--- /dev/null
+++ b/installation/ansible-server/src/main/Playbooks/ansible_huawei_precheck@0.01.yml
@@ -0,0 +1,33 @@
+---
+- hosts: all
+  tasks:
+  - name: create a temporary file for additional data
+    file: 
+        path: /tmp/tmp-{{Id}}
+        state: touch
+    become: false
+
+  - name: prepare additional data
+    shell: echo {{additionalData}} > /tmp/tmp-{{Id}}
+    become: false
+
+  - name: execute pre-check operation
+    shell: ./swm/upgrade-pre-check {{pnfId}} {{oldSwVersion}} {{targetSwVersion}} {{ruleName}} /tmp/tmp-{{Id}}
+    ignore_errors: yes
+    register: precheck_result
+
+  - name: write output to file
+    local_action: copy content="{{precheck_result.stdout}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"
+    when: precheck_result.stdout != ""
+
+  - name: remove the temporary file
+    file:
+        path: /tmp/tmp-{{Id}}
+        state: absent
+    become: false
+
+  - name: use result of pre-check as the result of Playbook
+    fail:
+      msg: "{{precheck_result.stderr}}"
+    when: precheck_result is failed
+
diff --git a/installation/ansible-server/src/main/Playbooks/ansible_huawei_rollback@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_huawei_rollback@0.00.yml
index 0d20bc3e..fa164c9c 100644
--- a/installation/ansible-server/src/main/Playbooks/ansible_huawei_rollback@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_huawei_rollback@0.00.yml
@@ -3,6 +3,16 @@
   tasks:
 
   - name: execute swFallback operation
-    shell: ./swm/swFallback.sh --filter {{filter}}
-    register: fallback__result
+    shell: ./swm/swFallback --filter {{filter}}
+    ignore_errors: yes
+    register: fallback_result
+    
+  - name: write output to file
+    local_action: copy content="{{fallback_result.stdout}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"
+    when: fallback_result.stdout != ""
+
+  - name: use result of swFallback as the result of Playbook
+    fail:
+      msg: "{{fallback_result.stderr}}"
+    when: fallback_result is failed
 
diff --git a/platform-logic/lcm/src/main/json/LCM_rollback.json b/platform-logic/lcm/src/main/json/LCM_rollback.json
index 96adf3f4..108d0156 100644
--- a/platform-logic/lcm/src/main/json/LCM_rollback.json
+++ b/platform-logic/lcm/src/main/json/LCM_rollback.json
@@ -1,22 +1,22 @@
 [
     {
-        "id": "367cac6c.e28ad4",
+        "id": "603c1b6d.6124c4",
         "type": "method",
         "name": "rollback",
         "xml": "<method rpc='rollback' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 606,
-        "y": 73,
-        "z": "6f1e5235.30d27c",
+        "x": 577,
+        "y": 47,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "397a12a.10f34ee"
+                "8f078f23.03658"
             ]
         ]
     },
     {
-        "id": "b7a7c5dd.d286a8",
+        "id": "88cbe26c.f2c83",
         "type": "service-logic",
         "name": "LCM ${project.version}",
         "module": "LCM",
@@ -24,679 +24,949 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='LCM' version='${project.version}'>",
         "outputs": 1,
-        "x": 393.99993896484375,
-        "y": 74,
-        "z": "6f1e5235.30d27c",
+        "x": 364.99993896484375,
+        "y": 48,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "367cac6c.e28ad4"
+                "603c1b6d.6124c4"
             ]
         ]
     },
     {
-        "id": "2749994d.fe16d6",
+        "id": "76631d3d.b2bda4",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$rollback-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$rollback-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 461.00001525878906,
-        "y": 681,
-        "z": "6f1e5235.30d27c",
+        "x": 432.00001525878906,
+        "y": 655,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "d80c72ca.e0d3b",
-                "3b639a7b.0ca876",
-                "f4b3d5c4.d9b698"
+                "86dfcb26.6ad318",
+                "ace54675.d37718",
+                "bac4c91b.f07a18"
             ]
         ]
     },
     {
-        "id": "3f74fb5f.f66a64",
+        "id": "4b37ff5.334c5",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 860.9999389648438,
-        "y": 789.0000305175781,
-        "z": "6f1e5235.30d27c",
+        "x": 831.9999389648438,
+        "y": 763.0000305175781,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "5e7ae3c.af98c1c",
-                "80745976.4dae58",
-                "2d735711.50c158"
+                "9a0bf3d2.1d44f",
+                "2ee77d61.9094f2",
+                "c9baa5a1.b1a3e8"
             ]
         ]
     },
     {
-        "id": "5e7ae3c.af98c1c",
+        "id": "9a0bf3d2.1d44f",
         "type": "other",
         "name": "outcome 500",
         "xml": "<outcome value='500'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1005.9999389648438,
-        "y": 787.0000381469727,
-        "z": "6f1e5235.30d27c",
+        "x": 976.9999389648438,
+        "y": 761.0000381469727,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "c157f020.8fa16"
+                "c81014d9.4af6a8"
             ]
         ]
     },
     {
-        "id": "80745976.4dae58",
+        "id": "2ee77d61.9094f2",
         "type": "other",
         "name": "outcome 100",
         "xml": "<outcome value='100'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1002.9999389648438,
-        "y": 844.0000305175781,
-        "z": "6f1e5235.30d27c",
+        "x": 973.9999389648438,
+        "y": 818.0000305175781,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "8633c607.bab378"
+                "b8c25e18.a4534"
             ]
         ]
     },
     {
-        "id": "8633c607.bab378",
+        "id": "b8c25e18.a4534",
         "type": "execute",
         "name": "execute reqExecResult",
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1190.9999389648438,
-        "y": 843.0000305175781,
-        "z": "6f1e5235.30d27c",
+        "x": 1161,
+        "y": 818.0000610351562,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "7d406d3c.e2a7a4",
-                "c98b9933.a78a78"
+                "9fd8cd6c.24d13",
+                "f0a35f4d.9195a"
             ]
         ]
     },
     {
-        "id": "3b639a7b.0ca876",
+        "id": "ace54675.d37718",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 719.9999389648438,
-        "y": 702.0000915527344,
-        "z": "6f1e5235.30d27c",
+        "x": 690.9999389648438,
+        "y": 676.0000915527344,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "c157f020.8fa16"
+                "c81014d9.4af6a8"
             ]
         ]
     },
     {
-        "id": "d80c72ca.e0d3b",
+        "id": "86dfcb26.6ad318",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 721.9999389648438,
-        "y": 754.0000610351562,
-        "z": "6f1e5235.30d27c",
+        "x": 692.9999389648438,
+        "y": 728.0000610351562,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "3f74fb5f.f66a64"
+                "4b37ff5.334c5"
             ]
         ]
     },
     {
-        "id": "7d406d3c.e2a7a4",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1359.9999389648438,
-        "y": 801.0000381469727,
-        "z": "6f1e5235.30d27c",
-        "wires": [
-            [
-                "c157f020.8fa16"
-            ]
-        ]
-    },
-    {
-        "id": "2d735711.50c158",
+        "id": "c9baa5a1.b1a3e8",
         "type": "other",
         "name": "outcome 101",
         "xml": "<outcome value='101'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1002.9999389648438,
-        "y": 745.0000686645508,
-        "z": "6f1e5235.30d27c",
+        "x": 973.9999389648438,
+        "y": 719.0000686645508,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "c157f020.8fa16"
+                "c81014d9.4af6a8"
             ]
         ]
     },
     {
-        "id": "c98b9933.a78a78",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1367.9998779296875,
-        "y": 849.0001220703125,
-        "z": "6f1e5235.30d27c",
-        "wires": [
-            [
-                "5b424098.08bd5"
-            ]
-        ]
-    },
-    {
-        "id": "4e1d4556.7dd52c",
+        "id": "8024a972.fa79a8",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
         "comments": "",
-        "x": 1661.9998779296875,
-        "y": 906.0000610351562,
-        "z": "6f1e5235.30d27c",
+        "x": 2413.999755859375,
+        "y": 948.0000610351562,
+        "z": "deca6c6e.62787",
         "wires": []
     },
     {
-        "id": "d900eabd.53e918",
+        "id": "9e6a1fde.3d38e",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 209,
-        "y": 73,
-        "z": "6f1e5235.30d27c",
+        "x": 180,
+        "y": 47,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "b7a7c5dd.d286a8"
+                "88cbe26c.f2c83"
             ]
         ]
     },
     {
-        "id": "397a12a.10f34ee",
+        "id": "8f078f23.03658",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 206.9166259765625,
-        "y": 165.08331298828125,
-        "z": "6f1e5235.30d27c",
+        "x": 177.9166259765625,
+        "y": 139.08331298828125,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "2749994d.fe16d6",
-                "73725554.5774bc",
-                "8603ce63.b7c47",
-                "9a79bc82.279ce",
-                "cc7baeb9.6a3dc",
-                "b9b832a7.ed87d",
-                "16e37417.d2c8bc",
-                "763cfac9.48a8a4"
+                "76631d3d.b2bda4",
+                "18f99414.0f1f5c",
+                "e9a0ae4a.a010c",
+                "720dbe92.a2daf",
+                "90d2eba5.bddd78",
+                "e456084e.3d1b28",
+                "abd53cca.80312",
+                "86b92780.e4fd18"
             ]
         ]
     },
     {
-        "id": "73725554.5774bc",
+        "id": "18f99414.0f1f5c",
         "type": "execute",
         "name": "execute Properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 505.0000305175781,
-        "y": 198.08334350585938,
-        "z": "6f1e5235.30d27c",
+        "x": 476.0000305175781,
+        "y": 172.08334350585938,
+        "z": "deca6c6e.62787",
         "wires": [
             []
         ]
     },
     {
-        "id": "c9d7b572.9b1b08",
+        "id": "dd58ea95.701bc8",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1671.9998779296875,
-        "y": 651.0834045410156,
-        "z": "6f1e5235.30d27c",
+        "x": 1642.9998779296875,
+        "y": 625.0834045410156,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "18a85145.032faf"
+                "79c12f79.46a5"
             ]
         ]
     },
     {
-        "id": "18a85145.032faf",
+        "id": "79c12f79.46a5",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1841.9998168945312,
-        "y": 650.0834045410156,
-        "z": "6f1e5235.30d27c",
+        "x": 1812.9998168945312,
+        "y": 624.0834045410156,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "1f387472.1096ac"
+                "69422560.e902dc"
             ]
         ]
     },
     {
-        "id": "c157f020.8fa16",
+        "id": "c81014d9.4af6a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1474.9998168945312,
-        "y": 675.0834045410156,
-        "z": "6f1e5235.30d27c",
+        "x": 1445.9998168945312,
+        "y": 649.0834045410156,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "c9d7b572.9b1b08",
-                "b8d2a948.9f6268",
-                "9c77e950.a59098"
+                "dd58ea95.701bc8",
+                "5a6746.ee1428bc",
+                "3c47a348.5e546c"
             ]
         ]
     },
     {
-        "id": "246949fc.089f56",
+        "id": "12844f47.97d421",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1672.4998779296875,
-        "y": 856.0833740234375,
-        "z": "6f1e5235.30d27c",
+        "x": 1690.4998779296875,
+        "y": 924.0833740234375,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "3c6c9ce.ec3e364"
+                "cbef2423.2a36b8"
             ]
         ]
     },
     {
-        "id": "3c6c9ce.ec3e364",
+        "id": "cbef2423.2a36b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1840.4998779296875,
-        "y": 856.0833740234375,
-        "z": "6f1e5235.30d27c",
+        "x": 1877.5,
+        "y": 924.0833740234375,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "8c845e57.511d"
+                "9fd0c5ed.f195b8"
             ]
         ]
     },
     {
-        "id": "1f387472.1096ac",
+        "id": "69422560.e902dc",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1961.9998779296875,
-        "y": 649.0833740234375,
-        "z": "6f1e5235.30d27c",
+        "x": 1932.9998779296875,
+        "y": 623.0833740234375,
+        "z": "deca6c6e.62787",
         "wires": [
             []
         ]
     },
     {
-        "id": "b8d2a948.9f6268",
+        "id": "5a6746.ee1428bc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
         "comments": "",
-        "x": 1653.91650390625,
-        "y": 702.0834045410156,
-        "z": "6f1e5235.30d27c",
+        "x": 1624.91650390625,
+        "y": 676.0834045410156,
+        "z": "deca6c6e.62787",
         "wires": []
     },
     {
-        "id": "8c845e57.511d",
+        "id": "9fd0c5ed.f195b8",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1968.9166259765625,
-        "y": 856.0833740234375,
-        "z": "6f1e5235.30d27c",
+        "x": 2019.91650390625,
+        "y": 924.0833740234375,
+        "z": "deca6c6e.62787",
         "wires": [
             []
         ]
     },
     {
-        "id": "9c77e950.a59098",
+        "id": "3c47a348.5e546c",
         "type": "set",
         "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='rollback'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1658.9998779296875,
-        "y": 598.0833740234375,
-        "z": "6f1e5235.30d27c",
+        "x": 1629.9998779296875,
+        "y": 572.0833740234375,
+        "z": "deca6c6e.62787",
         "wires": []
     },
     {
-        "id": "5b424098.08bd5",
+        "id": "542925f0.27fbdc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1495.9998779296875,
-        "y": 850.0833740234375,
-        "z": "6f1e5235.30d27c",
+        "x": 1482.9998779296875,
+        "y": 821.0833740234375,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "246949fc.089f56",
-                "4d96ab15.f92c04",
-                "4e1d4556.7dd52c"
+                "12844f47.97d421",
+                "e3737dc2.9a3b6",
+                "764a748a.61b14c",
+                "9775ae82.61b25",
+                "9a61d7f0.2347b8"
             ]
         ]
     },
     {
-        "id": "4d96ab15.f92c04",
+        "id": "63386817.4a7cc8",
         "type": "set",
         "name": "set DmaapReq",
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='rollback'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='rollback'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
         "comments": "",
-        "x": 1662.1666259765625,
-        "y": 801.0833740234375,
-        "z": "6f1e5235.30d27c",
+        "x": 2042.16650390625,
+        "y": 827.0833740234375,
+        "z": "deca6c6e.62787",
         "wires": []
     },
     {
-        "id": "f4b3d5c4.d9b698",
+        "id": "bac4c91b.f07a18",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 728.9999389648438,
-        "y": 654.0000610351562,
-        "z": "6f1e5235.30d27c",
+        "x": 699.9999389648438,
+        "y": 628.0000610351562,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "9b946286.c1fc1"
+                "2763f6ed.1a7e1a"
             ]
         ]
     },
     {
-        "id": "2c09132b.2c598c",
+        "id": "eb87e665.0acf88",
         "type": "set",
         "name": "set Defaults",
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
         "comments": "",
-        "x": 1019.9999389648438,
-        "y": 613,
-        "z": "6f1e5235.30d27c",
+        "x": 990.9999389648438,
+        "y": 587,
+        "z": "deca6c6e.62787",
         "wires": []
     },
     {
-        "id": "9b946286.c1fc1",
+        "id": "2763f6ed.1a7e1a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 865.9999389648438,
-        "y": 648.0000610351562,
-        "z": "6f1e5235.30d27c",
+        "x": 836.9999389648438,
+        "y": 622.0000610351562,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "2c09132b.2c598c",
-                "c157f020.8fa16"
+                "eb87e665.0acf88",
+                "c81014d9.4af6a8"
             ]
         ]
     },
     {
-        "id": "8603ce63.b7c47",
+        "id": "e9a0ae4a.a010c",
         "type": "set",
         "name": "set default values",
         "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
         "comments": "",
-        "x": 498,
-        "y": 245,
-        "z": "6f1e5235.30d27c",
+        "x": 469,
+        "y": 219,
+        "z": "deca6c6e.62787",
         "wires": []
     },
     {
-        "id": "16e37417.d2c8bc",
+        "id": "abd53cca.80312",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 426.9998779296875,
-        "y": 609,
-        "z": "6f1e5235.30d27c",
+        "x": 397.9998779296875,
+        "y": 583,
+        "z": "deca6c6e.62787",
         "wires": [
             []
         ]
     },
     {
-        "id": "cc7baeb9.6a3dc",
+        "id": "90d2eba5.bddd78",
         "type": "switchNode",
         "name": "switch pnf-flag",
         "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 480,
-        "y": 346,
-        "z": "6f1e5235.30d27c",
+        "x": 451,
+        "y": 320,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "b515ebb.9b7de18",
-                "ea8f46f7.654968"
+                "97096eec.158be",
+                "db62c67c.f16678"
             ]
         ]
     },
     {
-        "id": "9a79bc82.279ce",
+        "id": "720dbe92.a2daf",
         "type": "execute",
         "name": "execute jsonStringToCtx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='rollback-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
         "comments": "",
         "outputs": 1,
-        "x": 512,
-        "y": 292,
-        "z": "6f1e5235.30d27c",
+        "x": 483,
+        "y": 266,
+        "z": "deca6c6e.62787",
         "wires": [
             []
         ]
     },
     {
-        "id": "b515ebb.9b7de18",
+        "id": "97096eec.158be",
         "type": "outcome",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 677,
-        "y": 325,
-        "z": "6f1e5235.30d27c",
+        "x": 648,
+        "y": 299,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "d8920a01.f108b8"
+                "2baa8c31.1c7364"
             ]
         ]
     },
     {
-        "id": "ea8f46f7.654968",
+        "id": "db62c67c.f16678",
         "type": "outcome",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 677,
-        "y": 386,
-        "z": "6f1e5235.30d27c",
+        "x": 648,
+        "y": 360,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "32f9eda7.1c1082"
+                "e8ec5d49.26bb5"
             ]
         ]
     },
     {
-        "id": "32f9eda7.1c1082",
+        "id": "e8ec5d49.26bb5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 824.9999389648438,
-        "y": 385,
-        "z": "6f1e5235.30d27c",
+        "x": 795.9999389648438,
+        "y": 359,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "3756c2a1.fa5d6e"
+                "d1d2edc3.c0ebb"
             ]
         ]
     },
     {
-        "id": "d8920a01.f108b8",
+        "id": "2baa8c31.1c7364",
         "type": "set",
         "name": "set AnsibleReq",
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.rollback.playbookname`'/>\n",
         "comments": "",
-        "x": 838,
-        "y": 323,
-        "z": "6f1e5235.30d27c",
+        "x": 809,
+        "y": 297,
+        "z": "deca6c6e.62787",
         "wires": []
     },
     {
-        "id": "b9b832a7.ed87d",
+        "id": "e456084e.3d1b28",
         "type": "switchNode",
         "name": "switch playbookname",
         "xml": "<switch test='`$playbookname`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 477,
-        "y": 477,
-        "z": "6f1e5235.30d27c",
+        "x": 448,
+        "y": 451,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "5725646c.c7b37c"
+                "852cba96.1b8598"
             ]
         ]
     },
     {
-        "id": "5725646c.c7b37c",
+        "id": "852cba96.1b8598",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 648,
-        "y": 478,
-        "z": "6f1e5235.30d27c",
+        "x": 619,
+        "y": 452,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "4546e558.72429c"
+                "c3a06545.f22d98"
             ]
         ]
     },
     {
-        "id": "4546e558.72429c",
+        "id": "c3a06545.f22d98",
         "type": "set",
         "name": "set playbookname",
         "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.rollback.playbookname`'/>",
         "comments": "",
-        "x": 838,
-        "y": 477,
-        "z": "6f1e5235.30d27c",
+        "x": 809,
+        "y": 451,
+        "z": "deca6c6e.62787",
         "wires": []
     },
     {
-        "id": "763cfac9.48a8a4",
+        "id": "86b92780.e4fd18",
         "type": "switchNode",
         "name": "switch nodelist",
         "xml": "<switch test='`$nodelist`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 467,
-        "y": 536,
-        "z": "6f1e5235.30d27c",
+        "x": 438,
+        "y": 510,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "76eb51c0.552ce",
-                "178c823.496cd7e"
+                "314228d.17719d8",
+                "d39f4666.4c5158"
             ]
         ]
     },
     {
-        "id": "76eb51c0.552ce",
+        "id": "314228d.17719d8",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 647,
-        "y": 529,
-        "z": "6f1e5235.30d27c",
+        "x": 618,
+        "y": 503,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "66b6e37a.9e852c"
+                "e384eccc.6fd13"
             ]
         ]
     },
     {
-        "id": "66b6e37a.9e852c",
+        "id": "e384eccc.6fd13",
         "type": "set",
         "name": "set nodelist",
         "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
         "comments": "",
-        "x": 804,
-        "y": 543,
-        "z": "6f1e5235.30d27c",
+        "x": 775,
+        "y": 517,
+        "z": "deca6c6e.62787",
         "wires": []
     },
     {
-        "id": "178c823.496cd7e",
+        "id": "d39f4666.4c5158",
         "type": "outcome",
         "name": "empty",
         "xml": "<outcome value=\"['']\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 646,
-        "y": 573,
-        "z": "6f1e5235.30d27c",
+        "x": 617,
+        "y": 547,
+        "z": "deca6c6e.62787",
         "wires": [
             [
-                "66b6e37a.9e852c"
+                "e384eccc.6fd13"
             ]
         ]
     },
     {
-        "id": "3756c2a1.fa5d6e",
+        "id": "d1d2edc3.c0ebb",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='Currently only support PNF.' />",
         "comments": "",
-        "x": 998,
-        "y": 385,
-        "z": "6f1e5235.30d27c",
+        "x": 969,
+        "y": 359,
+        "z": "deca6c6e.62787",
         "wires": []
+    },
+    {
+        "id": "e3737dc2.9a3b6",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='org.onap.appc.adapter.ansible.results' />\n\t<parameter name='outputPath' value='resultsJson' />\n\t<parameter name='isEscaped' value='false' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1703,
+        "y": 741,
+        "z": "deca6c6e.62787",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "764a748a.61b14c",
+        "type": "execute",
+        "name": "execute getAttributeValue",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='source' value=\"`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`\" />\n\t<parameter name='outputPath' value='outputPayload' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1709,
+        "y": 796,
+        "z": "deca6c6e.62787",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9775ae82.61b25",
+        "type": "switchNode",
+        "name": "switch outputPayload",
+        "xml": "<switch test='`$outputPayload`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1694,
+        "y": 854,
+        "z": "deca6c6e.62787",
+        "wires": [
+            [
+                "17082276.b4933e",
+                "55bb01f1.008aa"
+            ]
+        ]
+    },
+    {
+        "id": "ba985798.6d2de8",
+        "type": "set",
+        "name": "set DmaapReq with payload",
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='rollback'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>",
+        "comments": "",
+        "x": 2080,
+        "y": 873,
+        "z": "deca6c6e.62787",
+        "wires": []
+    },
+    {
+        "id": "17082276.b4933e",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1876,
+        "y": 827,
+        "z": "deca6c6e.62787",
+        "wires": [
+            [
+                "63386817.4a7cc8"
+            ]
+        ]
+    },
+    {
+        "id": "55bb01f1.008aa",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1875,
+        "y": 873,
+        "z": "deca6c6e.62787",
+        "wires": [
+            [
+                "ba985798.6d2de8"
+            ]
+        ]
+    },
+    {
+        "id": "a556bfd0.26234",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1875,
+        "y": 970,
+        "z": "deca6c6e.62787",
+        "wires": [
+            [
+                "921bd724.038378"
+            ]
+        ]
+    },
+    {
+        "id": "bfa7e392.13bb3",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1875,
+        "y": 1046,
+        "z": "deca6c6e.62787",
+        "wires": [
+            [
+                "37bee539.62e3ea"
+            ]
+        ]
+    },
+    {
+        "id": "9a61d7f0.2347b8",
+        "type": "switchNode",
+        "name": "switch outputPayload",
+        "xml": "<switch test='`$outputPayload`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1691,
+        "y": 1009,
+        "z": "deca6c6e.62787",
+        "wires": [
+            [
+                "a556bfd0.26234",
+                "bfa7e392.13bb3"
+            ]
+        ]
+    },
+    {
+        "id": "dbab97fc.ffb6e8",
+        "type": "returnSuccess",
+        "name": "return success with payload",
+        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='payload' value='`$outputPayload`'/>",
+        "comments": "",
+        "x": 2455,
+        "y": 1030,
+        "z": "deca6c6e.62787",
+        "wires": []
+    },
+    {
+        "id": "f0a35f4d.9195a",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1343.9998779296875,
+        "y": 841.0001220703125,
+        "z": "deca6c6e.62787",
+        "wires": [
+            [
+                "542925f0.27fbdc"
+            ]
+        ]
+    },
+    {
+        "id": "9fd8cd6c.24d13",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1340.9998779296875,
+        "y": 799.0000610351562,
+        "z": "deca6c6e.62787",
+        "wires": [
+            [
+                "542925f0.27fbdc"
+            ]
+        ]
+    },
+    {
+        "id": "921bd724.038378",
+        "type": "switchNode",
+        "name": "switch result code",
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2050,
+        "y": 970,
+        "z": "deca6c6e.62787",
+        "wires": [
+            [
+                "292c4dcf.7880e2",
+                "73b035d4.ad062c"
+            ]
+        ]
+    },
+    {
+        "id": "37bee539.62e3ea",
+        "type": "switchNode",
+        "name": "switch result code",
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2050,
+        "y": 1046,
+        "z": "deca6c6e.62787",
+        "wires": [
+            [
+                "7e470c4a.386af4",
+                "5feb02a4.d890ac"
+            ]
+        ]
+    },
+    {
+        "id": "7ef093b7.2cf64c",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
+        "comments": "",
+        "x": 2408,
+        "y": 986,
+        "z": "deca6c6e.62787",
+        "wires": []
+    },
+    {
+        "id": "b08c6ff3.d3ef1",
+        "type": "returnFailure",
+        "name": "return failure with payload",
+        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n<parameter name='payload' value='`$outputPayload`'/>",
+        "comments": "",
+        "x": 2451,
+        "y": 1068,
+        "z": "deca6c6e.62787",
+        "wires": []
+    },
+    {
+        "id": "292c4dcf.7880e2",
+        "type": "other",
+        "name": "outcome 400",
+        "xml": "<outcome value='400'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2238,
+        "y": 948,
+        "z": "deca6c6e.62787",
+        "wires": [
+            [
+                "8024a972.fa79a8"
+            ]
+        ]
+    },
+    {
+        "id": "73b035d4.ad062c",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2219,
+        "y": 986,
+        "z": "deca6c6e.62787",
+        "wires": [
+            [
+                "7ef093b7.2cf64c"
+            ]
+        ]
+    },
+    {
+        "id": "7e470c4a.386af4",
+        "type": "other",
+        "name": "outcome 400",
+        "xml": "<outcome value='400'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2239,
+        "y": 1030,
+        "z": "deca6c6e.62787",
+        "wires": [
+            [
+                "dbab97fc.ffb6e8"
+            ]
+        ]
+    },
+    {
+        "id": "5feb02a4.d890ac",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2221,
+        "y": 1068,
+        "z": "deca6c6e.62787",
+        "wires": [
+            [
+                "b08c6ff3.d3ef1"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json b/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
index 38086480..aad0514d 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
@@ -1,22 +1,22 @@
 [
     {
-        "id": "fab0f7ed.c486b8",
+        "id": "fe0acee3.b3d4f",
         "type": "method",
         "name": "upgrade-post-check",
         "xml": "<method rpc='upgrade-post-check' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 480,
-        "y": 147,
-        "z": "50de34e0.ace54c",
+        "x": 523,
+        "y": 71,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "5ccc8e8d.06e5"
+                "88d3f9c3.91e818"
             ]
         ]
     },
     {
-        "id": "5c791eb8.0072b",
+        "id": "dd69f330.0db38",
         "type": "service-logic",
         "name": "LCM ${project.version}",
         "module": "LCM",
@@ -24,790 +24,1060 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='LCM' version='${project.version}'>",
         "outputs": 1,
-        "x": 267.99993896484375,
-        "y": 148,
-        "z": "50de34e0.ace54c",
+        "x": 310.99993896484375,
+        "y": 72,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "fab0f7ed.c486b8"
+                "fe0acee3.b3d4f"
             ]
         ]
     },
     {
-        "id": "3503ece1.d7ad14",
+        "id": "ca77e1d2.5f235",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-post-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 335.00001525878906,
-        "y": 755,
-        "z": "50de34e0.ace54c",
+        "x": 378.00001525878906,
+        "y": 679,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "734b2c42.973ee4",
-                "bb8a76ca.fb7058",
-                "a457fe79.46497"
+                "98532a13.9e8648",
+                "300b9189.6839ae",
+                "93689f4a.8157"
             ]
         ]
     },
     {
-        "id": "f17ff2aa.67075",
+        "id": "338f7649.ef4e9a",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 734.9999389648438,
-        "y": 863.0000305175781,
-        "z": "50de34e0.ace54c",
+        "x": 777.9999389648438,
+        "y": 787.0000305175781,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "7ad5787f.1c20f8",
-                "b6f779a3.cc7ed8",
-                "f695f05e.abf31"
+                "13e6fdd5.284672",
+                "558456ec.861628",
+                "d84c0d6b.4e961"
             ]
         ]
     },
     {
-        "id": "7ad5787f.1c20f8",
+        "id": "13e6fdd5.284672",
         "type": "other",
         "name": "outcome 500",
         "xml": "<outcome value='500'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 879.9999389648438,
-        "y": 861.0000381469727,
-        "z": "50de34e0.ace54c",
+        "x": 922.9999389648438,
+        "y": 785.0000381469727,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "2b54a991.b17b16"
+                "d4f3b77a.b39508"
             ]
         ]
     },
     {
-        "id": "b6f779a3.cc7ed8",
+        "id": "558456ec.861628",
         "type": "other",
         "name": "outcome 100",
         "xml": "<outcome value='100'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 876.9999389648438,
-        "y": 918.0000305175781,
-        "z": "50de34e0.ace54c",
+        "x": 919.9999389648438,
+        "y": 842.0000305175781,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "1a65bc45.b2fcb4"
+                "a1c39fcf.a06c"
             ]
         ]
     },
     {
-        "id": "1a65bc45.b2fcb4",
+        "id": "a1c39fcf.a06c",
         "type": "execute",
         "name": "execute reqExecResult",
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1064.9999389648438,
-        "y": 917.0000305175781,
-        "z": "50de34e0.ace54c",
+        "x": 1107.9999389648438,
+        "y": 841.0000305175781,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "5b0d24c6.9eb0ac",
-                "2b5e4322.1d495c"
+                "f58c60bb.b391f",
+                "b18d4538.e8ef28"
             ]
         ]
     },
     {
-        "id": "bb8a76ca.fb7058",
+        "id": "300b9189.6839ae",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 593.9999389648438,
-        "y": 776.0000915527344,
-        "z": "50de34e0.ace54c",
+        "x": 636.9999389648438,
+        "y": 700.0000915527344,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "2b54a991.b17b16"
+                "d4f3b77a.b39508"
             ]
         ]
     },
     {
-        "id": "734b2c42.973ee4",
+        "id": "98532a13.9e8648",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 595.9999389648438,
-        "y": 828.0000610351562,
-        "z": "50de34e0.ace54c",
+        "x": 638.9999389648438,
+        "y": 752.0000610351562,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "f17ff2aa.67075"
+                "338f7649.ef4e9a"
             ]
         ]
     },
     {
-        "id": "5b0d24c6.9eb0ac",
+        "id": "f58c60bb.b391f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1233.9999389648438,
-        "y": 875.0000381469727,
-        "z": "50de34e0.ace54c",
+        "x": 1278.9998779296875,
+        "y": 820.0000610351562,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "2b54a991.b17b16"
+                "44e1b1d0.b5bf9"
             ]
         ]
     },
     {
-        "id": "f695f05e.abf31",
+        "id": "d84c0d6b.4e961",
         "type": "other",
         "name": "outcome 101",
         "xml": "<outcome value='101'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 876.9999389648438,
-        "y": 819.0000686645508,
-        "z": "50de34e0.ace54c",
+        "x": 919.9999389648438,
+        "y": 743.0000686645508,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "2b54a991.b17b16"
+                "d4f3b77a.b39508"
             ]
         ]
     },
     {
-        "id": "2b5e4322.1d495c",
+        "id": "b18d4538.e8ef28",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1241.9998779296875,
-        "y": 923.0001220703125,
-        "z": "50de34e0.ace54c",
+        "x": 1281.9998779296875,
+        "y": 871.0001220703125,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "db1e6d62.a1404"
+                "44e1b1d0.b5bf9"
             ]
         ]
     },
     {
-        "id": "c1a2b259.11e46",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
-        "comments": "",
-        "x": 1535.9998779296875,
-        "y": 980.0000610351562,
-        "z": "50de34e0.ace54c",
-        "wires": []
-    },
-    {
-        "id": "566f9779.c05d38",
+        "id": "67392fb2.3fda3",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 83,
-        "y": 147,
-        "z": "50de34e0.ace54c",
+        "x": 126,
+        "y": 71,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "5c791eb8.0072b"
+                "dd69f330.0db38"
             ]
         ]
     },
     {
-        "id": "5ccc8e8d.06e5",
+        "id": "88d3f9c3.91e818",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 80.91668701171875,
-        "y": 239.08334350585938,
-        "z": "50de34e0.ace54c",
+        "x": 123.91668701171875,
+        "y": 163.08334350585938,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "3503ece1.d7ad14",
-                "dc18f7c9.2e4ac8",
-                "814875d2.cac108",
-                "e9d89bdf.30f7a8",
-                "69e97f86.e07ef",
-                "fa9a8e1f.bba53",
-                "baba22fc.1ceb5",
-                "81510405.ca8868"
+                "ca77e1d2.5f235",
+                "c7ec6050.45978",
+                "889f84ed.e111e8",
+                "40652fca.65d24",
+                "983b7f00.0aa95",
+                "43b098aa.2b8088",
+                "3c8d18f4.57a768",
+                "5c9efc94.d81d24"
             ]
         ]
     },
     {
-        "id": "dc18f7c9.2e4ac8",
+        "id": "c7ec6050.45978",
         "type": "execute",
         "name": "execute Properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 379.0000305175781,
-        "y": 272.0833435058594,
-        "z": "50de34e0.ace54c",
+        "x": 422.0000305175781,
+        "y": 196.08334350585938,
+        "z": "b4969602.e5a2a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "70d1c79a.089af8",
+        "id": "d9d2286.379c4d8",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1545.9998779296875,
-        "y": 725.0834045410156,
-        "z": "50de34e0.ace54c",
+        "x": 1588.9998779296875,
+        "y": 649.0834045410156,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "d776c76b.1dd188"
+                "642ae55d.535a7c"
             ]
         ]
     },
     {
-        "id": "d776c76b.1dd188",
+        "id": "642ae55d.535a7c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1715.9998168945312,
-        "y": 724.0834045410156,
-        "z": "50de34e0.ace54c",
+        "x": 1758.9998168945312,
+        "y": 648.0834045410156,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "eac6c260.d11fc"
+                "7969554f.e56e0c"
             ]
         ]
     },
     {
-        "id": "2b54a991.b17b16",
+        "id": "d4f3b77a.b39508",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1348.9998168945312,
-        "y": 749.0834045410156,
-        "z": "50de34e0.ace54c",
+        "x": 1391.9998168945312,
+        "y": 673.0834045410156,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "70d1c79a.089af8",
-                "7970fcd5.6f11b4",
-                "3d8934f9.d0339c"
+                "d9d2286.379c4d8",
+                "8a00ee98.85d8c",
+                "a967853.2e08a78"
             ]
         ]
     },
     {
-        "id": "e790e11b.4f947",
+        "id": "61a865a3.81374c",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1546.4998779296875,
-        "y": 930.0833740234375,
-        "z": "50de34e0.ace54c",
+        "x": 1600.4998779296875,
+        "y": 904.0833740234375,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "2e13891.034f576"
+                "bf6e3414.ac0ab8"
             ]
         ]
     },
     {
-        "id": "2e13891.034f576",
+        "id": "bf6e3414.ac0ab8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1714.4998779296875,
-        "y": 930.0833740234375,
-        "z": "50de34e0.ace54c",
+        "x": 1782.4998779296875,
+        "y": 904.0833740234375,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "30475e40.9b8be2"
+                "a98ac8b6.1c8b18"
             ]
         ]
     },
     {
-        "id": "eac6c260.d11fc",
+        "id": "7969554f.e56e0c",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1835.9998779296875,
-        "y": 723.0833740234375,
-        "z": "50de34e0.ace54c",
+        "x": 1878.9998779296875,
+        "y": 647.0833740234375,
+        "z": "b4969602.e5a2a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "7970fcd5.6f11b4",
+        "id": "8a00ee98.85d8c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
         "comments": "",
-        "x": 1527.91650390625,
-        "y": 776.0834045410156,
-        "z": "50de34e0.ace54c",
+        "x": 1570.91650390625,
+        "y": 700.0834045410156,
+        "z": "b4969602.e5a2a8",
         "wires": []
     },
     {
-        "id": "30475e40.9b8be2",
+        "id": "a98ac8b6.1c8b18",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1842.9166259765625,
-        "y": 930.0833740234375,
-        "z": "50de34e0.ace54c",
+        "x": 1912.9166259765625,
+        "y": 904.0833740234375,
+        "z": "b4969602.e5a2a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "3d8934f9.d0339c",
+        "id": "a967853.2e08a78",
         "type": "set",
         "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1532.9998779296875,
-        "y": 672.0833740234375,
-        "z": "50de34e0.ace54c",
+        "x": 1575.9998779296875,
+        "y": 596.0833740234375,
+        "z": "b4969602.e5a2a8",
         "wires": []
     },
     {
-        "id": "db1e6d62.a1404",
+        "id": "44e1b1d0.b5bf9",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1369.9998779296875,
-        "y": 924.0833740234375,
-        "z": "50de34e0.ace54c",
+        "x": 1406.9998779296875,
+        "y": 845.0833740234375,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "e790e11b.4f947",
-                "3a3f1d44.898da2",
-                "c1a2b259.11e46"
+                "61a865a3.81374c",
+                "af2360f3.a1b32",
+                "c058b1a3.cafa7",
+                "d59d4575.f7aa08",
+                "97b68625.59c538"
             ]
         ]
     },
     {
-        "id": "3a3f1d44.898da2",
+        "id": "72836a7a.768624",
         "type": "set",
         "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1536.1666259765625,
-        "y": 875.0833740234375,
-        "z": "50de34e0.ace54c",
+        "x": 1938.1666259765625,
+        "y": 819.0833740234375,
+        "z": "b4969602.e5a2a8",
         "wires": []
     },
     {
-        "id": "a457fe79.46497",
+        "id": "93689f4a.8157",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 602.9999389648438,
-        "y": 728.0000610351562,
-        "z": "50de34e0.ace54c",
+        "x": 645.9999389648438,
+        "y": 652.0000610351562,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "3d4c2c9a.7b1324"
+                "c92e96da.bead68"
             ]
         ]
     },
     {
-        "id": "d512629f.bc625",
+        "id": "3705b5ae.a55ada",
         "type": "set",
         "name": "set Defaults",
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
         "comments": "",
-        "x": 893.9999389648438,
-        "y": 687,
-        "z": "50de34e0.ace54c",
+        "x": 936.9999389648438,
+        "y": 611,
+        "z": "b4969602.e5a2a8",
         "wires": []
     },
     {
-        "id": "3d4c2c9a.7b1324",
+        "id": "c92e96da.bead68",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 739.9999389648438,
-        "y": 722.0000610351562,
-        "z": "50de34e0.ace54c",
+        "x": 782.9999389648438,
+        "y": 646.0000610351562,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "d512629f.bc625",
-                "2b54a991.b17b16"
+                "3705b5ae.a55ada",
+                "d4f3b77a.b39508"
             ]
         ]
     },
     {
-        "id": "814875d2.cac108",
+        "id": "889f84ed.e111e8",
         "type": "set",
         "name": "set default values",
         "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
         "comments": "",
-        "x": 372,
-        "y": 319,
-        "z": "50de34e0.ace54c",
+        "x": 415,
+        "y": 243,
+        "z": "b4969602.e5a2a8",
         "wires": []
     },
     {
-        "id": "442dbdff.6dfcb4",
+        "id": "9e2047bf.84ca98",
         "type": "get-resource",
         "name": "get aai.generic-vnf ",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $upgrade-post-check-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
         "comments": "",
         "outputs": 1,
-        "x": 912,
-        "y": 495,
-        "z": "50de34e0.ace54c",
+        "x": 955,
+        "y": 419,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "1e57cb28.122ad5"
+                "db67679b.d5f7f8"
             ]
         ]
     },
     {
-        "id": "1e57cb28.122ad5",
+        "id": "db67679b.d5f7f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1070.3907470703125,
-        "y": 493.28399658203125,
-        "z": "50de34e0.ace54c",
+        "x": 1113.3907470703125,
+        "y": 417.28399658203125,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "5a65efc0.bf413"
+                "9f78147c.45b0d8"
             ]
         ]
     },
     {
-        "id": "baba22fc.1ceb5",
+        "id": "3c8d18f4.57a768",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 300.9998779296875,
-        "y": 683,
-        "z": "50de34e0.ace54c",
+        "x": 343.9998779296875,
+        "y": 607,
+        "z": "b4969602.e5a2a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "69e97f86.e07ef",
+        "id": "983b7f00.0aa95",
         "type": "switchNode",
         "name": "switch pnf-flag",
         "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 354,
-        "y": 420,
-        "z": "50de34e0.ace54c",
+        "x": 397,
+        "y": 344,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "e43265e9.4c7f38",
-                "d78c93da.7125f"
+                "6ab53366.6b679c",
+                "c2f80dd0.8d1"
             ]
         ]
     },
     {
-        "id": "e9d89bdf.30f7a8",
+        "id": "40652fca.65d24",
         "type": "execute",
         "name": "execute jsonStringToCtx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-post-check-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
         "comments": "",
         "outputs": 1,
-        "x": 386,
-        "y": 366,
-        "z": "50de34e0.ace54c",
+        "x": 429,
+        "y": 290,
+        "z": "b4969602.e5a2a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "e43265e9.4c7f38",
+        "id": "6ab53366.6b679c",
         "type": "outcome",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 551,
-        "y": 399,
-        "z": "50de34e0.ace54c",
+        "x": 594,
+        "y": 323,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "abbc4ae4.be5328"
+                "b2f335c.b319ac8"
             ]
         ]
     },
     {
-        "id": "d78c93da.7125f",
+        "id": "c2f80dd0.8d1",
         "type": "outcome",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 550.9999389648438,
-        "y": 460,
-        "z": "50de34e0.ace54c",
+        "x": 593.9999389648438,
+        "y": 384,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "f68ee407.ca6d88"
+                "64084999.263e28"
             ]
         ]
     },
     {
-        "id": "f68ee407.ca6d88",
+        "id": "64084999.263e28",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 698.9999389648438,
-        "y": 459,
-        "z": "50de34e0.ace54c",
+        "x": 741.9999389648438,
+        "y": 383,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "442dbdff.6dfcb4",
-                "80c560bb.eea5f"
+                "9e2047bf.84ca98",
+                "1c2838e7.02c327"
             ]
         ]
     },
     {
-        "id": "abbc4ae4.be5328",
+        "id": "b2f335c.b319ac8",
         "type": "set",
         "name": "set AnsibleReq",
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-post-check.playbookname`'/>\n",
         "comments": "",
-        "x": 712,
-        "y": 397,
-        "z": "50de34e0.ace54c",
+        "x": 755,
+        "y": 321,
+        "z": "b4969602.e5a2a8",
         "wires": []
     },
     {
-        "id": "80c560bb.eea5f",
+        "id": "1c2838e7.02c327",
         "type": "execute",
         "name": "set playbookname",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-post-check.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 921,
-        "y": 439,
-        "z": "50de34e0.ace54c",
+        "x": 964,
+        "y": 363,
+        "z": "b4969602.e5a2a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "fa9a8e1f.bba53",
+        "id": "43b098aa.2b8088",
         "type": "switchNode",
         "name": "switch playbookname",
         "xml": "<switch test='`$playbookname`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 351,
-        "y": 551,
-        "z": "50de34e0.ace54c",
+        "x": 394,
+        "y": 475,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "1a5624d2.74e98b"
+                "f5a4d554.8310a8"
             ]
         ]
     },
     {
-        "id": "1a5624d2.74e98b",
+        "id": "f5a4d554.8310a8",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 522,
-        "y": 552,
-        "z": "50de34e0.ace54c",
+        "x": 565,
+        "y": 476,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "524c17a1.30fbf8"
+                "e3207caa.85b44"
             ]
         ]
     },
     {
-        "id": "524c17a1.30fbf8",
+        "id": "e3207caa.85b44",
         "type": "set",
         "name": "set playbookname",
         "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-post-check.playbookname`'/>",
         "comments": "",
-        "x": 712,
-        "y": 551,
-        "z": "50de34e0.ace54c",
+        "x": 755,
+        "y": 475,
+        "z": "b4969602.e5a2a8",
         "wires": []
     },
     {
-        "id": "81510405.ca8868",
+        "id": "5c9efc94.d81d24",
         "type": "switchNode",
         "name": "switch nodelist",
         "xml": "<switch test='`$nodelist`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 341,
-        "y": 610,
-        "z": "50de34e0.ace54c",
+        "x": 384,
+        "y": 534,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "7a126f.d2de2d9",
-                "8743a074.e8506"
+                "77224991.c20a78",
+                "2deab8c5.642298"
             ]
         ]
     },
     {
-        "id": "7a126f.d2de2d9",
+        "id": "77224991.c20a78",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 521,
-        "y": 603,
-        "z": "50de34e0.ace54c",
+        "x": 564,
+        "y": 527,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "c954af6f.c34df"
+                "3881d027.425ff"
             ]
         ]
     },
     {
-        "id": "c954af6f.c34df",
+        "id": "3881d027.425ff",
         "type": "set",
         "name": "set nodelist",
         "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
         "comments": "",
-        "x": 678,
-        "y": 617,
-        "z": "50de34e0.ace54c",
+        "x": 721,
+        "y": 541,
+        "z": "b4969602.e5a2a8",
         "wires": []
     },
     {
-        "id": "8743a074.e8506",
+        "id": "2deab8c5.642298",
         "type": "outcome",
         "name": "empty",
         "xml": "<outcome value=\"['']\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 520,
-        "y": 647,
-        "z": "50de34e0.ace54c",
+        "x": 563,
+        "y": 571,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "c954af6f.c34df"
+                "3881d027.425ff"
             ]
         ]
     },
     {
-        "id": "90b2891b.001708",
+        "id": "153ed401.962ddc",
         "type": "switchNode",
         "name": "switch playbookname",
         "xml": "<switch test='`$playbookname`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1396,
-        "y": 482,
-        "z": "50de34e0.ace54c",
+        "x": 1439,
+        "y": 406,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "c9dd0d76.432f7"
+                "3cfaf009.20065"
             ]
         ]
     },
     {
-        "id": "c9dd0d76.432f7",
+        "id": "3cfaf009.20065",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1574,
-        "y": 482,
-        "z": "50de34e0.ace54c",
+        "x": 1617,
+        "y": 406,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "6ea15b2b.d9cd74"
+                "8e725f1f.6662f"
             ]
         ]
     },
     {
-        "id": "9706bdee.6acf9",
+        "id": "9e70216f.c9b2f",
         "type": "set",
         "name": "set nodelist",
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",
         "comments": "",
-        "x": 1369,
-        "y": 535,
-        "z": "50de34e0.ace54c",
+        "x": 1412,
+        "y": 459,
+        "z": "b4969602.e5a2a8",
         "wires": []
     },
     {
-        "id": "5a65efc0.bf413",
+        "id": "9f78147c.45b0d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1199,
-        "y": 492,
-        "z": "50de34e0.ace54c",
+        "x": 1242,
+        "y": 416,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "90b2891b.001708",
-                "9706bdee.6acf9"
+                "153ed401.962ddc",
+                "9e70216f.c9b2f"
             ]
         ]
     },
     {
-        "id": "6ea15b2b.d9cd74",
+        "id": "8e725f1f.6662f",
         "type": "execute",
         "name": "set playbookname",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-post-check.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1746,
-        "y": 480,
-        "z": "50de34e0.ace54c",
+        "x": 1789,
+        "y": 404,
+        "z": "b4969602.e5a2a8",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "af2360f3.a1b32",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='org.onap.appc.adapter.ansible.results' />\n\t<parameter name='outputPath' value='resultsJson' />\n\t<parameter name='isEscaped' value='false' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1616,
+        "y": 750,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c058b1a3.cafa7",
+        "type": "execute",
+        "name": "execute getAttributeValue",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='source' value=\"`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`\" />\n\t<parameter name='outputPath' value='outputPayload' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1622,
+        "y": 793,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d59d4575.f7aa08",
+        "type": "switchNode",
+        "name": "switch outputPayload",
+        "xml": "<switch test='`$outputPayload`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1606,
+        "y": 840,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "676d5ce5.e9d864",
+                "8ecd1678.ebdff8"
+            ]
+        ]
+    },
+    {
+        "id": "676d5ce5.e9d864",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1783,
+        "y": 819,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "72836a7a.768624"
+            ]
+        ]
+    },
+    {
+        "id": "8ecd1678.ebdff8",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1782,
+        "y": 859,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "5f5e736e.9d3b8c"
+            ]
+        ]
+    },
+    {
+        "id": "5f5e736e.9d3b8c",
+        "type": "set",
+        "name": "set DmaapReq with payload",
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>",
+        "comments": "",
+        "x": 1980,
+        "y": 859,
+        "z": "b4969602.e5a2a8",
+        "wires": []
+    },
+    {
+        "id": "bd7deada.205038",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
+        "comments": "",
+        "x": 2322,
+        "y": 937,
+        "z": "b4969602.e5a2a8",
+        "wires": []
+    },
+    {
+        "id": "530e9d63.07dd34",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1788.000244140625,
+        "y": 958.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "aba50f21.a535d"
+            ]
+        ]
+    },
+    {
+        "id": "d6c0e471.9108d8",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1787.000244140625,
+        "y": 1034.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "801dd50e.8622c8"
+            ]
+        ]
+    },
+    {
+        "id": "97b68625.59c538",
+        "type": "switchNode",
+        "name": "switch outputPayload",
+        "xml": "<switch test='`$outputPayload`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1605.000244140625,
+        "y": 994.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "530e9d63.07dd34",
+                "d6c0e471.9108d8"
+            ]
+        ]
+    },
+    {
+        "id": "acbbf9db.eeba28",
+        "type": "returnSuccess",
+        "name": "return success with payload",
+        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='payload' value='`$outputPayload`'/>",
+        "comments": "",
+        "x": 2363.000244140625,
+        "y": 1018.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": []
+    },
+    {
+        "id": "aba50f21.a535d",
+        "type": "switchNode",
+        "name": "switch result code",
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1958.000244140625,
+        "y": 958.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "3ac4241b.62144c",
+                "c67e4b5c.d70a28"
+            ]
+        ]
+    },
+    {
+        "id": "801dd50e.8622c8",
+        "type": "switchNode",
+        "name": "switch result code",
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1958.000244140625,
+        "y": 1034.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "8dcd3ae3.608a58",
+                "a94e8dc6.52647"
+            ]
+        ]
+    },
+    {
+        "id": "657ecc9e.2687c4",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
+        "comments": "",
+        "x": 2316.000244140625,
+        "y": 974.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": []
+    },
+    {
+        "id": "52f49f6f.dcf4",
+        "type": "returnFailure",
+        "name": "return failure with payload",
+        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n<parameter name='payload' value='`$outputPayload`'/>",
+        "comments": "",
+        "x": 2359.000244140625,
+        "y": 1056.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": []
+    },
+    {
+        "id": "3ac4241b.62144c",
+        "type": "other",
+        "name": "outcome 400",
+        "xml": "<outcome value='400'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2146.000244140625,
+        "y": 936.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "bd7deada.205038"
+            ]
+        ]
+    },
+    {
+        "id": "c67e4b5c.d70a28",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2127.000244140625,
+        "y": 974.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "657ecc9e.2687c4"
+            ]
+        ]
+    },
+    {
+        "id": "8dcd3ae3.608a58",
+        "type": "other",
+        "name": "outcome 400",
+        "xml": "<outcome value='400'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2147.000244140625,
+        "y": 1018.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "acbbf9db.eeba28"
+            ]
+        ]
+    },
+    {
+        "id": "a94e8dc6.52647",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2129.000244140625,
+        "y": 1056.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "52f49f6f.dcf4"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json b/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
index 8657b538..aa78a91e 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
@@ -1,22 +1,22 @@
 [
     {
-        "id": "fab0f7ed.c486b8",
+        "id": "e17c1584.f756d8",
         "type": "method",
         "name": "upgrade-pre-check",
         "xml": "<method rpc='upgrade-pre-check' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 480,
-        "y": 147,
-        "z": "50de34e0.ace54c",
+        "x": 552,
+        "y": 67,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "5ccc8e8d.06e5"
+                "4a691c8b.6b9db4"
             ]
         ]
     },
     {
-        "id": "5c791eb8.0072b",
+        "id": "1f7a861d.c2112a",
         "type": "service-logic",
         "name": "LCM ${project.version}",
         "module": "LCM",
@@ -24,790 +24,1060 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='LCM' version='${project.version}'>",
         "outputs": 1,
-        "x": 267.99993896484375,
-        "y": 148,
-        "z": "50de34e0.ace54c",
+        "x": 339.99993896484375,
+        "y": 68,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "fab0f7ed.c486b8"
+                "e17c1584.f756d8"
             ]
         ]
     },
     {
-        "id": "3503ece1.d7ad14",
+        "id": "bb18ce54.65a6d",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-pre-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 335.00001525878906,
-        "y": 755,
-        "z": "50de34e0.ace54c",
+        "x": 407.00001525878906,
+        "y": 675,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "734b2c42.973ee4",
-                "bb8a76ca.fb7058",
-                "a457fe79.46497"
+                "c6f98872.c067e8",
+                "5614f2d4.83759c",
+                "1beab9a5.7e2366"
             ]
         ]
     },
     {
-        "id": "f17ff2aa.67075",
+        "id": "8e97cc56.5d143",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 734.9999389648438,
-        "y": 863.0000305175781,
-        "z": "50de34e0.ace54c",
+        "x": 806.9999389648438,
+        "y": 783.0000305175781,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "7ad5787f.1c20f8",
-                "b6f779a3.cc7ed8",
-                "f695f05e.abf31"
+                "d5d391c0.e33eb",
+                "96569d9a.8f849",
+                "8eb6da31.c976d8"
             ]
         ]
     },
     {
-        "id": "7ad5787f.1c20f8",
+        "id": "d5d391c0.e33eb",
         "type": "other",
         "name": "outcome 500",
         "xml": "<outcome value='500'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 879.9999389648438,
-        "y": 861.0000381469727,
-        "z": "50de34e0.ace54c",
+        "x": 951.9999389648438,
+        "y": 781.0000381469727,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "2b54a991.b17b16"
+                "261676ae.6c18ea"
             ]
         ]
     },
     {
-        "id": "b6f779a3.cc7ed8",
+        "id": "96569d9a.8f849",
         "type": "other",
         "name": "outcome 100",
         "xml": "<outcome value='100'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 876.9999389648438,
-        "y": 918.0000305175781,
-        "z": "50de34e0.ace54c",
+        "x": 948.9999389648438,
+        "y": 838.0000305175781,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "1a65bc45.b2fcb4"
+                "a9aeb5d4.ad8218"
             ]
         ]
     },
     {
-        "id": "1a65bc45.b2fcb4",
+        "id": "a9aeb5d4.ad8218",
         "type": "execute",
         "name": "execute reqExecResult",
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1064.9999389648438,
-        "y": 917.0000305175781,
-        "z": "50de34e0.ace54c",
+        "x": 1136.9999389648438,
+        "y": 837.0000305175781,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "5b0d24c6.9eb0ac",
-                "2b5e4322.1d495c"
+                "50e30f80.cb97b",
+                "f9b1e44f.cf0bf8"
             ]
         ]
     },
     {
-        "id": "bb8a76ca.fb7058",
+        "id": "5614f2d4.83759c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 593.9999389648438,
-        "y": 776.0000915527344,
-        "z": "50de34e0.ace54c",
+        "x": 665.9999389648438,
+        "y": 696.0000915527344,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "2b54a991.b17b16"
+                "261676ae.6c18ea"
             ]
         ]
     },
     {
-        "id": "734b2c42.973ee4",
+        "id": "c6f98872.c067e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 595.9999389648438,
-        "y": 828.0000610351562,
-        "z": "50de34e0.ace54c",
+        "x": 667.9999389648438,
+        "y": 748.0000610351562,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "f17ff2aa.67075"
+                "8e97cc56.5d143"
             ]
         ]
     },
     {
-        "id": "5b0d24c6.9eb0ac",
+        "id": "50e30f80.cb97b",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1233.9999389648438,
-        "y": 875.0000381469727,
-        "z": "50de34e0.ace54c",
+        "x": 1305.9998779296875,
+        "y": 819.0000610351562,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "2b54a991.b17b16"
+                "7ac364bd.12e01c"
             ]
         ]
     },
     {
-        "id": "f695f05e.abf31",
+        "id": "8eb6da31.c976d8",
         "type": "other",
         "name": "outcome 101",
         "xml": "<outcome value='101'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 876.9999389648438,
-        "y": 819.0000686645508,
-        "z": "50de34e0.ace54c",
+        "x": 948.9999389648438,
+        "y": 739.0000686645508,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "2b54a991.b17b16"
+                "261676ae.6c18ea"
             ]
         ]
     },
     {
-        "id": "2b5e4322.1d495c",
+        "id": "f9b1e44f.cf0bf8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1241.9998779296875,
-        "y": 923.0001220703125,
-        "z": "50de34e0.ace54c",
+        "x": 1309.9998779296875,
+        "y": 863.0001220703125,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "db1e6d62.a1404"
+                "7ac364bd.12e01c"
             ]
         ]
     },
     {
-        "id": "c1a2b259.11e46",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
-        "comments": "",
-        "x": 1535.9998779296875,
-        "y": 980.0000610351562,
-        "z": "50de34e0.ace54c",
-        "wires": []
-    },
-    {
-        "id": "566f9779.c05d38",
+        "id": "a40759ed.63a388",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 83,
-        "y": 147,
-        "z": "50de34e0.ace54c",
+        "x": 155,
+        "y": 67,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "5c791eb8.0072b"
+                "1f7a861d.c2112a"
             ]
         ]
     },
     {
-        "id": "5ccc8e8d.06e5",
+        "id": "4a691c8b.6b9db4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 80.91668701171875,
-        "y": 239.08334350585938,
-        "z": "50de34e0.ace54c",
+        "x": 152.91668701171875,
+        "y": 159.08334350585938,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "3503ece1.d7ad14",
-                "dc18f7c9.2e4ac8",
-                "814875d2.cac108",
-                "e9d89bdf.30f7a8",
-                "69e97f86.e07ef",
-                "fa9a8e1f.bba53",
-                "baba22fc.1ceb5",
-                "81510405.ca8868"
+                "bb18ce54.65a6d",
+                "4f789742.ddd168",
+                "2f15d339.87cf0c",
+                "556d2c3e.217c14",
+                "905f1137.7562f",
+                "5cc58e7c.083a5",
+                "db896c60.3d19a",
+                "ae5d9d02.d1fe4"
             ]
         ]
     },
     {
-        "id": "dc18f7c9.2e4ac8",
+        "id": "4f789742.ddd168",
         "type": "execute",
         "name": "execute Properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 379.0000305175781,
-        "y": 272.0833435058594,
-        "z": "50de34e0.ace54c",
+        "x": 451.0000305175781,
+        "y": 192.08334350585938,
+        "z": "df893cfa.16f38",
         "wires": [
             []
         ]
     },
     {
-        "id": "70d1c79a.089af8",
+        "id": "9f29e934.d196d8",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1545.9998779296875,
-        "y": 725.0834045410156,
-        "z": "50de34e0.ace54c",
+        "x": 1617.9998779296875,
+        "y": 645.0834045410156,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "d776c76b.1dd188"
+                "eff6b07f.5f555"
             ]
         ]
     },
     {
-        "id": "d776c76b.1dd188",
+        "id": "eff6b07f.5f555",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1715.9998168945312,
-        "y": 724.0834045410156,
-        "z": "50de34e0.ace54c",
+        "x": 1787.9998168945312,
+        "y": 644.0834045410156,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "eac6c260.d11fc"
+                "39c1e046.0c9a2"
             ]
         ]
     },
     {
-        "id": "2b54a991.b17b16",
+        "id": "261676ae.6c18ea",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1348.9998168945312,
-        "y": 749.0834045410156,
-        "z": "50de34e0.ace54c",
+        "x": 1420.9998168945312,
+        "y": 669.0834045410156,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "70d1c79a.089af8",
-                "7970fcd5.6f11b4",
-                "3d8934f9.d0339c"
+                "9f29e934.d196d8",
+                "20f5321f.fe2dee",
+                "b16d5209.3031f"
             ]
         ]
     },
     {
-        "id": "e790e11b.4f947",
+        "id": "dd99789.6491a88",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1546.4998779296875,
-        "y": 930.0833740234375,
-        "z": "50de34e0.ace54c",
+        "x": 1653.4998779296875,
+        "y": 911.0833740234375,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "2e13891.034f576"
+                "16bb547b.d2861c"
             ]
         ]
     },
     {
-        "id": "2e13891.034f576",
+        "id": "16bb547b.d2861c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1714.4998779296875,
-        "y": 930.0833740234375,
-        "z": "50de34e0.ace54c",
+        "x": 1838.4998779296875,
+        "y": 911.0833740234375,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "30475e40.9b8be2"
+                "95e8f51a.226ea8"
             ]
         ]
     },
     {
-        "id": "eac6c260.d11fc",
+        "id": "39c1e046.0c9a2",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1835.9998779296875,
-        "y": 723.0833740234375,
-        "z": "50de34e0.ace54c",
+        "x": 1907.9998779296875,
+        "y": 643.0833740234375,
+        "z": "df893cfa.16f38",
         "wires": [
             []
         ]
     },
     {
-        "id": "7970fcd5.6f11b4",
+        "id": "20f5321f.fe2dee",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
         "comments": "",
-        "x": 1527.91650390625,
-        "y": 776.0834045410156,
-        "z": "50de34e0.ace54c",
+        "x": 1599.91650390625,
+        "y": 696.0834045410156,
+        "z": "df893cfa.16f38",
         "wires": []
     },
     {
-        "id": "30475e40.9b8be2",
+        "id": "95e8f51a.226ea8",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1842.9166259765625,
-        "y": 930.0833740234375,
-        "z": "50de34e0.ace54c",
+        "x": 1970.9166259765625,
+        "y": 911.0833740234375,
+        "z": "df893cfa.16f38",
         "wires": [
             []
         ]
     },
     {
-        "id": "3d8934f9.d0339c",
+        "id": "b16d5209.3031f",
         "type": "set",
         "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1532.9998779296875,
-        "y": 672.0833740234375,
-        "z": "50de34e0.ace54c",
+        "x": 1604.9998779296875,
+        "y": 592.0833740234375,
+        "z": "df893cfa.16f38",
         "wires": []
     },
     {
-        "id": "db1e6d62.a1404",
+        "id": "7ac364bd.12e01c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1369.9998779296875,
-        "y": 924.0833740234375,
-        "z": "50de34e0.ace54c",
+        "x": 1441.9998779296875,
+        "y": 838.0833740234375,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "e790e11b.4f947",
-                "3a3f1d44.898da2",
-                "c1a2b259.11e46"
+                "dd99789.6491a88",
+                "66ca1a2.98ef5e4",
+                "6f78d9df.0d3518",
+                "3c0a54ab.00262c",
+                "9977ea00.521808"
             ]
         ]
     },
     {
-        "id": "3a3f1d44.898da2",
+        "id": "b364bef1.e2765",
         "type": "set",
         "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1536.1666259765625,
-        "y": 875.0833740234375,
-        "z": "50de34e0.ace54c",
+        "x": 1995.1666259765625,
+        "y": 816.0833740234375,
+        "z": "df893cfa.16f38",
         "wires": []
     },
     {
-        "id": "a457fe79.46497",
+        "id": "1beab9a5.7e2366",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 602.9999389648438,
-        "y": 728.0000610351562,
-        "z": "50de34e0.ace54c",
+        "x": 674.9999389648438,
+        "y": 648.0000610351562,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "3d4c2c9a.7b1324"
+                "dd0b1351.6bec5"
             ]
         ]
     },
     {
-        "id": "d512629f.bc625",
+        "id": "6e45eb8e.292b44",
         "type": "set",
         "name": "set Defaults",
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
         "comments": "",
-        "x": 893.9999389648438,
-        "y": 687,
-        "z": "50de34e0.ace54c",
+        "x": 965.9999389648438,
+        "y": 607,
+        "z": "df893cfa.16f38",
         "wires": []
     },
     {
-        "id": "3d4c2c9a.7b1324",
+        "id": "dd0b1351.6bec5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 739.9999389648438,
-        "y": 722.0000610351562,
-        "z": "50de34e0.ace54c",
+        "x": 811.9999389648438,
+        "y": 642.0000610351562,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "d512629f.bc625",
-                "2b54a991.b17b16"
+                "6e45eb8e.292b44",
+                "261676ae.6c18ea"
             ]
         ]
     },
     {
-        "id": "814875d2.cac108",
+        "id": "2f15d339.87cf0c",
         "type": "set",
         "name": "set default values",
         "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
         "comments": "",
-        "x": 372,
-        "y": 319,
-        "z": "50de34e0.ace54c",
+        "x": 444,
+        "y": 239,
+        "z": "df893cfa.16f38",
         "wires": []
     },
     {
-        "id": "442dbdff.6dfcb4",
+        "id": "3bd1d194.63001e",
         "type": "get-resource",
         "name": "get aai.generic-vnf ",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $upgrade-pre-check-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
         "comments": "",
         "outputs": 1,
-        "x": 912,
-        "y": 495,
-        "z": "50de34e0.ace54c",
+        "x": 984,
+        "y": 415,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "1e57cb28.122ad5"
+                "d0549989.50cdf8"
             ]
         ]
     },
     {
-        "id": "1e57cb28.122ad5",
+        "id": "d0549989.50cdf8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1070.3907470703125,
-        "y": 493.28399658203125,
-        "z": "50de34e0.ace54c",
+        "x": 1142.3907470703125,
+        "y": 413.28399658203125,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "5a65efc0.bf413"
+                "50890a76.58d434"
             ]
         ]
     },
     {
-        "id": "baba22fc.1ceb5",
+        "id": "db896c60.3d19a",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 300.9998779296875,
-        "y": 683,
-        "z": "50de34e0.ace54c",
+        "x": 372.9998779296875,
+        "y": 603,
+        "z": "df893cfa.16f38",
         "wires": [
             []
         ]
     },
     {
-        "id": "69e97f86.e07ef",
+        "id": "905f1137.7562f",
         "type": "switchNode",
         "name": "switch pnf-flag",
         "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 354,
-        "y": 420,
-        "z": "50de34e0.ace54c",
+        "x": 426,
+        "y": 340,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "e43265e9.4c7f38",
-                "d78c93da.7125f"
+                "d4a98e23.62f9b",
+                "a403044b.ebc9f8"
             ]
         ]
     },
     {
-        "id": "e9d89bdf.30f7a8",
+        "id": "556d2c3e.217c14",
         "type": "execute",
         "name": "execute jsonStringToCtx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-pre-check-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
         "comments": "",
         "outputs": 1,
-        "x": 386,
-        "y": 366,
-        "z": "50de34e0.ace54c",
+        "x": 458,
+        "y": 286,
+        "z": "df893cfa.16f38",
         "wires": [
             []
         ]
     },
     {
-        "id": "e43265e9.4c7f38",
+        "id": "d4a98e23.62f9b",
         "type": "outcome",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 551,
-        "y": 399,
-        "z": "50de34e0.ace54c",
+        "x": 623,
+        "y": 319,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "abbc4ae4.be5328"
+                "582ec79b.faa468"
             ]
         ]
     },
     {
-        "id": "d78c93da.7125f",
+        "id": "a403044b.ebc9f8",
         "type": "outcome",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 550.9999389648438,
-        "y": 460,
-        "z": "50de34e0.ace54c",
+        "x": 622.9999389648438,
+        "y": 380,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "f68ee407.ca6d88"
+                "3184e083.2b204"
             ]
         ]
     },
     {
-        "id": "f68ee407.ca6d88",
+        "id": "3184e083.2b204",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 698.9999389648438,
-        "y": 459,
-        "z": "50de34e0.ace54c",
+        "x": 770.9999389648438,
+        "y": 379,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "442dbdff.6dfcb4",
-                "80c560bb.eea5f"
+                "3bd1d194.63001e",
+                "395906a2.acd1ea"
             ]
         ]
     },
     {
-        "id": "abbc4ae4.be5328",
+        "id": "582ec79b.faa468",
         "type": "set",
         "name": "set AnsibleReq",
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-pre-check.playbookname`'/>\n",
         "comments": "",
-        "x": 712,
-        "y": 397,
-        "z": "50de34e0.ace54c",
+        "x": 784,
+        "y": 317,
+        "z": "df893cfa.16f38",
         "wires": []
     },
     {
-        "id": "80c560bb.eea5f",
+        "id": "395906a2.acd1ea",
         "type": "execute",
         "name": "set playbookname",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-pre-check.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 921,
-        "y": 439,
-        "z": "50de34e0.ace54c",
+        "x": 993,
+        "y": 359,
+        "z": "df893cfa.16f38",
         "wires": [
             []
         ]
     },
     {
-        "id": "fa9a8e1f.bba53",
+        "id": "5cc58e7c.083a5",
         "type": "switchNode",
         "name": "switch playbookname",
         "xml": "<switch test='`$playbookname`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 351,
-        "y": 551,
-        "z": "50de34e0.ace54c",
+        "x": 423,
+        "y": 471,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "1a5624d2.74e98b"
+                "b9c121b9.01765"
             ]
         ]
     },
     {
-        "id": "1a5624d2.74e98b",
+        "id": "b9c121b9.01765",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 522,
-        "y": 552,
-        "z": "50de34e0.ace54c",
+        "x": 594,
+        "y": 472,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "524c17a1.30fbf8"
+                "96dc86e8.19da88"
             ]
         ]
     },
     {
-        "id": "524c17a1.30fbf8",
+        "id": "96dc86e8.19da88",
         "type": "set",
         "name": "set playbookname",
         "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>",
         "comments": "",
-        "x": 712,
-        "y": 551,
-        "z": "50de34e0.ace54c",
+        "x": 784,
+        "y": 471,
+        "z": "df893cfa.16f38",
         "wires": []
     },
     {
-        "id": "81510405.ca8868",
+        "id": "ae5d9d02.d1fe4",
         "type": "switchNode",
         "name": "switch nodelist",
         "xml": "<switch test='`$nodelist`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 341,
-        "y": 610,
-        "z": "50de34e0.ace54c",
+        "x": 413,
+        "y": 530,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "7a126f.d2de2d9",
-                "8743a074.e8506"
+                "d47821da.1dd48",
+                "69b2cec2.dd018"
             ]
         ]
     },
     {
-        "id": "7a126f.d2de2d9",
+        "id": "d47821da.1dd48",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 521,
-        "y": 603,
-        "z": "50de34e0.ace54c",
+        "x": 593,
+        "y": 523,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "c954af6f.c34df"
+                "dce9b14d.bb77b"
             ]
         ]
     },
     {
-        "id": "c954af6f.c34df",
+        "id": "dce9b14d.bb77b",
         "type": "set",
         "name": "set nodelist",
         "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
         "comments": "",
-        "x": 678,
-        "y": 617,
-        "z": "50de34e0.ace54c",
+        "x": 750,
+        "y": 537,
+        "z": "df893cfa.16f38",
         "wires": []
     },
     {
-        "id": "8743a074.e8506",
+        "id": "69b2cec2.dd018",
         "type": "outcome",
         "name": "empty",
         "xml": "<outcome value=\"['']\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 520,
-        "y": 647,
-        "z": "50de34e0.ace54c",
+        "x": 592,
+        "y": 567,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "c954af6f.c34df"
+                "dce9b14d.bb77b"
             ]
         ]
     },
     {
-        "id": "90b2891b.001708",
+        "id": "8d045871.31f638",
         "type": "switchNode",
         "name": "switch playbookname",
         "xml": "<switch test='`$playbookname`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1396,
-        "y": 482,
-        "z": "50de34e0.ace54c",
+        "x": 1468,
+        "y": 402,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "c9dd0d76.432f7"
+                "ef1e7a17.621f38"
             ]
         ]
     },
     {
-        "id": "c9dd0d76.432f7",
+        "id": "ef1e7a17.621f38",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1574,
-        "y": 482,
-        "z": "50de34e0.ace54c",
+        "x": 1646,
+        "y": 402,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "6ea15b2b.d9cd74"
+                "862a6ea8.3ba16"
             ]
         ]
     },
     {
-        "id": "9706bdee.6acf9",
+        "id": "8543ebcf.2ead48",
         "type": "set",
         "name": "set nodelist",
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",
         "comments": "",
-        "x": 1369,
-        "y": 535,
-        "z": "50de34e0.ace54c",
+        "x": 1441,
+        "y": 455,
+        "z": "df893cfa.16f38",
         "wires": []
     },
     {
-        "id": "5a65efc0.bf413",
+        "id": "50890a76.58d434",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1199,
-        "y": 492,
-        "z": "50de34e0.ace54c",
+        "x": 1271,
+        "y": 412,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "90b2891b.001708",
-                "9706bdee.6acf9"
+                "8d045871.31f638",
+                "8543ebcf.2ead48"
             ]
         ]
     },
     {
-        "id": "6ea15b2b.d9cd74",
+        "id": "862a6ea8.3ba16",
         "type": "execute",
         "name": "set playbookname",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-pre-check.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1746,
-        "y": 480,
-        "z": "50de34e0.ace54c",
+        "x": 1818,
+        "y": 400,
+        "z": "df893cfa.16f38",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "66ca1a2.98ef5e4",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='org.onap.appc.adapter.ansible.results' />\n\t<parameter name='outputPath' value='resultsJson' />\n\t<parameter name='isEscaped' value='false' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1668,
+        "y": 744,
+        "z": "df893cfa.16f38",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "6f78d9df.0d3518",
+        "type": "execute",
+        "name": "execute getAttributeValue",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='source' value=\"`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`\" />\n\t<parameter name='outputPath' value='outputPayload' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1674,
+        "y": 789,
+        "z": "df893cfa.16f38",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3c0a54ab.00262c",
+        "type": "switchNode",
+        "name": "switch outputPayload",
+        "xml": "<switch test='`$outputPayload`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1660,
+        "y": 836,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "65b8d06e.2f308",
+                "db2edf05.5dbf2"
+            ]
+        ]
+    },
+    {
+        "id": "65b8d06e.2f308",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1838,
+        "y": 816,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "b364bef1.e2765"
+            ]
+        ]
+    },
+    {
+        "id": "db2edf05.5dbf2",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1839,
+        "y": 860,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "3b020d0b.edb822"
+            ]
+        ]
+    },
+    {
+        "id": "3b020d0b.edb822",
+        "type": "set",
+        "name": "set DmaapReq with payload",
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>",
+        "comments": "",
+        "x": 2036,
+        "y": 860,
+        "z": "df893cfa.16f38",
+        "wires": []
+    },
+    {
+        "id": "e583cc0b.79586",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
+        "comments": "",
+        "x": 2371,
+        "y": 946.9999389648438,
+        "z": "df893cfa.16f38",
+        "wires": []
+    },
+    {
+        "id": "b678b572.4bc6d8",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1837.000244140625,
+        "y": 968.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "bebb9bde.cadbc8"
+            ]
+        ]
+    },
+    {
+        "id": "e71f0e75.f5e6e",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1836.000244140625,
+        "y": 1044.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "a34ae1ab.50555"
+            ]
+        ]
+    },
+    {
+        "id": "9977ea00.521808",
+        "type": "switchNode",
+        "name": "switch outputPayload",
+        "xml": "<switch test='`$outputPayload`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1654.000244140625,
+        "y": 1004.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "b678b572.4bc6d8",
+                "e71f0e75.f5e6e"
+            ]
+        ]
+    },
+    {
+        "id": "c888915f.7e81c",
+        "type": "returnSuccess",
+        "name": "return success with payload",
+        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='payload' value='`$outputPayload`'/>",
+        "comments": "",
+        "x": 2412.000244140625,
+        "y": 1028.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": []
+    },
+    {
+        "id": "bebb9bde.cadbc8",
+        "type": "switchNode",
+        "name": "switch result code",
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2007.000244140625,
+        "y": 968.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "1b395046.b5f6",
+                "d4989dec.88a2e"
+            ]
+        ]
+    },
+    {
+        "id": "a34ae1ab.50555",
+        "type": "switchNode",
+        "name": "switch result code",
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2007.000244140625,
+        "y": 1044.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "8e9f2082.ee767",
+                "3b44f0c3.4b7c2"
+            ]
+        ]
+    },
+    {
+        "id": "5e9a3c.5f7e95c4",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
+        "comments": "",
+        "x": 2365.000244140625,
+        "y": 984.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": []
+    },
+    {
+        "id": "398f4135.fd470e",
+        "type": "returnFailure",
+        "name": "return failure with payload",
+        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n<parameter name='payload' value='`$outputPayload`'/>",
+        "comments": "",
+        "x": 2408.000244140625,
+        "y": 1066.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": []
+    },
+    {
+        "id": "1b395046.b5f6",
+        "type": "other",
+        "name": "outcome 400",
+        "xml": "<outcome value='400'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2195.000244140625,
+        "y": 946.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "e583cc0b.79586"
+            ]
+        ]
+    },
+    {
+        "id": "d4989dec.88a2e",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2176.000244140625,
+        "y": 984.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "5e9a3c.5f7e95c4"
+            ]
+        ]
+    },
+    {
+        "id": "8e9f2082.ee767",
+        "type": "other",
+        "name": "outcome 400",
+        "xml": "<outcome value='400'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2196.000244140625,
+        "y": 1028.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "c888915f.7e81c"
+            ]
+        ]
+    },
+    {
+        "id": "3b44f0c3.4b7c2",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2178.000244140625,
+        "y": 1066.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "398f4135.fd470e"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/lcm/src/main/xml/LCM_rollback.xml b/platform-logic/lcm/src/main/xml/LCM_rollback.xml
index bb540b6d..dd240633 100644
--- a/platform-logic/lcm/src/main/xml/LCM_rollback.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_rollback.xml
@@ -250,23 +250,56 @@
                                 <parameter name='PlaybookName' value='`$playbookname`'/>
                                 <outcome value='failure'>
                                     <block>
-                                        <set>
-                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                            <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                            <parameter name='lcm-dmaap.rpc-name' value='rollback'/>
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                            <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>
-                                            <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>
-                                            <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>
-                                            <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>
-                                            <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>
-                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                                        </set>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />
+                                            <parameter name='outputPath' value='resultsJson' />
+                                            <parameter name='isEscaped' value='false' />
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />
+                                            <parameter name='outputPath' value='outputPayload' />
+                                        </execute>
+                                        <switch test='`$outputPayload`'>
+                                            <outcome value=''>
+                                                <set>
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='rollback'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                </set>
+                                            </outcome>
+                                            <outcome value='Other'>
+                                                <set>
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='rollback'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
+                                                </set>
+                                            </outcome>
+                                        </switch>
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />
@@ -283,31 +316,96 @@
                                                 </record>
                                             </outcome>
                                         </execute>
-                                        <return status='failure'>
-                                            <parameter name='status.code' value='401' />
-                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
-                                        </return>
+                                        <switch test='`$outputPayload`'>
+                                            <outcome value=''>
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+                                                    <outcome value='400'>
+                                                        <return status='success'>
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='Other'>
+                                                        <return status='failure'>
+                                                            <parameter name='status.code' value='401' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                                        </return>
+                                                    </outcome>
+                                                </switch>
+                                            </outcome>
+                                            <outcome value='Other'>
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+                                                    <outcome value='400'>
+                                                        <return status='success'>
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                            <parameter name='payload' value='`$outputPayload`'/>
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='Other'>
+                                                        <return status='failure'>
+                                                            <parameter name='status.code' value='401' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                                            <parameter name='payload' value='`$outputPayload`'/>
+                                                        </return>
+                                                    </outcome>
+                                                </switch>
+                                            </outcome>
+                                        </switch>
                                     </block>
                                 </outcome>
                                 <outcome value='success'>
                                     <block>
-                                        <set>
-                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                            <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                            <parameter name='lcm-dmaap.rpc-name' value='rollback'/>
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                            <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>
-                                            <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>
-                                            <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>
-                                            <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>
-                                            <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>
-                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                                        </set>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />
+                                            <parameter name='outputPath' value='resultsJson' />
+                                            <parameter name='isEscaped' value='false' />
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />
+                                            <parameter name='outputPath' value='outputPayload' />
+                                        </execute>
+                                        <switch test='`$outputPayload`'>
+                                            <outcome value=''>
+                                                <set>
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='rollback'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                </set>
+                                            </outcome>
+                                            <outcome value='Other'>
+                                                <set>
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='rollback'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
+                                                </set>
+                                            </outcome>
+                                        </switch>
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />
@@ -324,10 +422,42 @@
                                                 </record>
                                             </outcome>
                                         </execute>
-                                        <return status='success'>
-                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                                        </return>
+                                        <switch test='`$outputPayload`'>
+                                            <outcome value=''>
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+                                                    <outcome value='400'>
+                                                        <return status='success'>
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='Other'>
+                                                        <return status='failure'>
+                                                            <parameter name='status.code' value='401' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                                        </return>
+                                                    </outcome>
+                                                </switch>
+                                            </outcome>
+                                            <outcome value='Other'>
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+                                                    <outcome value='400'>
+                                                        <return status='success'>
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                            <parameter name='payload' value='`$outputPayload`'/>
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='Other'>
+                                                        <return status='failure'>
+                                                            <parameter name='status.code' value='401' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                                            <parameter name='payload' value='`$outputPayload`'/>
+                                                        </return>
+                                                    </outcome>
+                                                </switch>
+                                            </outcome>
+                                        </switch>
                                     </block>
                                 </outcome>
                             </execute>
diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
index 3338f1c2..a772373d 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
@@ -271,23 +271,56 @@
                                 <parameter name='PlaybookName' value='`$playbookname`'/>
                                 <outcome value='failure'>
                                     <block>
-                                        <set>
-                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
-                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
-                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
-                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
-                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>
-                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                                        </set>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />
+                                            <parameter name='outputPath' value='resultsJson' />
+                                            <parameter name='isEscaped' value='false' />
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />
+                                            <parameter name='outputPath' value='outputPayload' />
+                                        </execute>
+                                        <switch test='`$outputPayload`'>
+                                            <outcome value=''>
+                                                <set>
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                </set>
+                                            </outcome>
+                                            <outcome value='Other'>
+                                                <set>
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
+                                                </set>
+                                            </outcome>
+                                        </switch>
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />
@@ -304,31 +337,96 @@
                                                 </record>
                                             </outcome>
                                         </execute>
-                                        <return status='failure'>
-                                            <parameter name='status.code' value='401' />
-                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
-                                        </return>
+                                        <switch test='`$outputPayload`'>
+                                            <outcome value=''>
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+                                                    <outcome value='400'>
+                                                        <return status='success'>
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='Other'>
+                                                        <return status='failure'>
+                                                            <parameter name='status.code' value='401' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                                        </return>
+                                                    </outcome>
+                                                </switch>
+                                            </outcome>
+                                            <outcome value='Other'>
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+                                                    <outcome value='400'>
+                                                        <return status='success'>
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                            <parameter name='payload' value='`$outputPayload`'/>
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='Other'>
+                                                        <return status='failure'>
+                                                            <parameter name='status.code' value='401' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                                            <parameter name='payload' value='`$outputPayload`'/>
+                                                        </return>
+                                                    </outcome>
+                                                </switch>
+                                            </outcome>
+                                        </switch>
                                     </block>
                                 </outcome>
                                 <outcome value='success'>
                                     <block>
-                                        <set>
-                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
-                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
-                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
-                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
-                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>
-                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                                        </set>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />
+                                            <parameter name='outputPath' value='resultsJson' />
+                                            <parameter name='isEscaped' value='false' />
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />
+                                            <parameter name='outputPath' value='outputPayload' />
+                                        </execute>
+                                        <switch test='`$outputPayload`'>
+                                            <outcome value=''>
+                                                <set>
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                </set>
+                                            </outcome>
+                                            <outcome value='Other'>
+                                                <set>
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
+                                                </set>
+                                            </outcome>
+                                        </switch>
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />
@@ -345,10 +443,42 @@
                                                 </record>
                                             </outcome>
                                         </execute>
-                                        <return status='success'>
-                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                                        </return>
+                                        <switch test='`$outputPayload`'>
+                                            <outcome value=''>
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+                                                    <outcome value='400'>
+                                                        <return status='success'>
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='Other'>
+                                                        <return status='failure'>
+                                                            <parameter name='status.code' value='401' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                                        </return>
+                                                    </outcome>
+                                                </switch>
+                                            </outcome>
+                                            <outcome value='Other'>
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+                                                    <outcome value='400'>
+                                                        <return status='success'>
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                            <parameter name='payload' value='`$outputPayload`'/>
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='Other'>
+                                                        <return status='failure'>
+                                                            <parameter name='status.code' value='401' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                                            <parameter name='payload' value='`$outputPayload`'/>
+                                                        </return>
+                                                    </outcome>
+                                                </switch>
+                                            </outcome>
+                                        </switch>
                                     </block>
                                 </outcome>
                             </execute>
diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
index 1bf68e52..28f7048e 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
@@ -271,23 +271,56 @@
                                 <parameter name='PlaybookName' value='`$playbookname`'/>
                                 <outcome value='failure'>
                                     <block>
-                                        <set>
-                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
-                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
-                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
-                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
-                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
-                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                                        </set>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />
+                                            <parameter name='outputPath' value='resultsJson' />
+                                            <parameter name='isEscaped' value='false' />
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />
+                                            <parameter name='outputPath' value='outputPayload' />
+                                        </execute>
+                                        <switch test='`$outputPayload`'>
+                                            <outcome value=''>
+                                                <set>
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                </set>
+                                            </outcome>
+                                            <outcome value='Other'>
+                                                <set>
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
+                                                </set>
+                                            </outcome>
+                                        </switch>
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />
@@ -304,31 +337,96 @@
                                                 </record>
                                             </outcome>
                                         </execute>
-                                        <return status='failure'>
-                                            <parameter name='status.code' value='401' />
-                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
-                                        </return>
+                                        <switch test='`$outputPayload`'>
+                                            <outcome value=''>
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+                                                    <outcome value='400'>
+                                                        <return status='success'>
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='Other'>
+                                                        <return status='failure'>
+                                                            <parameter name='status.code' value='401' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                                        </return>
+                                                    </outcome>
+                                                </switch>
+                                            </outcome>
+                                            <outcome value='Other'>
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+                                                    <outcome value='400'>
+                                                        <return status='success'>
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                            <parameter name='payload' value='`$outputPayload`'/>
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='Other'>
+                                                        <return status='failure'>
+                                                            <parameter name='status.code' value='401' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                                            <parameter name='payload' value='`$outputPayload`'/>
+                                                        </return>
+                                                    </outcome>
+                                                </switch>
+                                            </outcome>
+                                        </switch>
                                     </block>
                                 </outcome>
                                 <outcome value='success'>
                                     <block>
-                                        <set>
-                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
-                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
-                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
-                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
-                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
-                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                                        </set>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />
+                                            <parameter name='outputPath' value='resultsJson' />
+                                            <parameter name='isEscaped' value='false' />
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />
+                                            <parameter name='outputPath' value='outputPayload' />
+                                        </execute>
+                                        <switch test='`$outputPayload`'>
+                                            <outcome value=''>
+                                                <set>
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                </set>
+                                            </outcome>
+                                            <outcome value='Other'>
+                                                <set>
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
+                                                </set>
+                                            </outcome>
+                                        </switch>
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />
@@ -345,10 +443,42 @@
                                                 </record>
                                             </outcome>
                                         </execute>
-                                        <return status='success'>
-                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                                        </return>
+                                        <switch test='`$outputPayload`'>
+                                            <outcome value=''>
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+                                                    <outcome value='400'>
+                                                        <return status='success'>
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='Other'>
+                                                        <return status='failure'>
+                                                            <parameter name='status.code' value='401' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                                        </return>
+                                                    </outcome>
+                                                </switch>
+                                            </outcome>
+                                            <outcome value='Other'>
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+                                                    <outcome value='400'>
+                                                        <return status='success'>
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                            <parameter name='payload' value='`$outputPayload`'/>
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='Other'>
+                                                        <return status='failure'>
+                                                            <parameter name='status.code' value='401' />
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                                            <parameter name='payload' value='`$outputPayload`'/>
+                                                        </return>
+                                                    </outcome>
+                                                </switch>
+                                            </outcome>
+                                        </switch>
                                     </block>
                                 </outcome>
                             </execute>
-- 
2.16.6