From 83ff8436156f3f976eff2633b0c54b9426d11a25 Mon Sep 17 00:00:00 2001
From: Enbo Wang <wangenbo@huawei.com>
Date: Fri, 10 May 2019 10:04:18 +0000
Subject: [PATCH] Fix missing payload for DGs and Playbooks of SW upgrade

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

Former-commit-id: 4ca9a8ea6cebfad2e3f423b90df187bcbc51a67b
---
 .../Playbooks/ansible_huawei_postcheck@0.01.yml    |  22 +-
 .../Playbooks/ansible_huawei_precheck@0.01.yml     |  22 +-
 .../Playbooks/ansible_huawei_rollback@0.00.yml     |  11 +
 .../main/Playbooks/ansible_huawei_upgrade@0.01.yml |  63 ++
 .../lcm/src/main/json/LCM_upgrade-software.json    | 910 +++++++++++++--------
 .../lcm/src/main/xml/LCM_upgrade-software.xml      | 216 ++++-
 6 files changed, 868 insertions(+), 376 deletions(-)

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
index ad4edf51..b9b1ab81 100644
--- 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
@@ -3,13 +3,11 @@
   tasks:
   - name: create a temporary file for additional data
     file: 
-        path: /tmp/tmp-{{Id}}
-        state: touch
-    become: false
+      path: /tmp/tmp-{{Id}}
+      state: touch
 
   - 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}}
@@ -22,9 +20,19 @@
 
   - name: remove the temporary file
     file:
-        path: /tmp/tmp-{{Id}}
-        state: absent
-    become: false
+      path: /tmp/tmp-{{Id}}
+      state: absent
+
+  - name: build error message
+    set_fact:
+      err_msg:
+        "reason": "{{postcheck_result.stderr}}"
+        "result": "Failure"
+    when: postcheck_result is failed and postcheck_result.stdout == "" and postcheck_result.stderr != ""
+
+  - name: write error message to file
+    local_action: copy content="{{err_msg}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"
+    when: postcheck_result is failed and postcheck_result.stdout == "" and postcheck_result.stderr != ""
 
   - name: use result of post-check as the result of Playbook
     fail:
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
index 668ed7d0..dcb6f6a0 100644
--- 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
@@ -3,13 +3,11 @@
   tasks:
   - name: create a temporary file for additional data
     file: 
-        path: /tmp/tmp-{{Id}}
-        state: touch
-    become: false
+      path: /tmp/tmp-{{Id}}
+      state: touch
 
   - 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}}
@@ -22,9 +20,19 @@
 
   - name: remove the temporary file
     file:
-        path: /tmp/tmp-{{Id}}
-        state: absent
-    become: false
+      path: /tmp/tmp-{{Id}}
+      state: absent
+
+  - name: build error message
+    set_fact:
+      err_msg:
+        "reason": "{{precheck_result.stderr}}"
+        "result": "Failure"
+    when: precheck_result is failed and precheck_result.stdout == "" and precheck_result.stderr != ""
+
+  - name: write error message to file
+    local_action: copy content="{{err_msg}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"
+    when: precheck_result is failed and precheck_result.stdout == "" and precheck_result.stderr != ""
 
   - name: use result of pre-check as the result of Playbook
     fail:
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 fa164c9c..8d8982af 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
@@ -11,6 +11,17 @@
     local_action: copy content="{{fallback_result.stdout}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"
     when: fallback_result.stdout != ""
 
+  - name: build error message
+    set_fact:
+      err_msg:
+        "reason": "{{fallback_result.stderr}}"
+        "result": "Failure"
+    when: fallback_result is failed and fallback_result.stdout == "" and fallback_result.stderr != ""
+
+  - name: write error message to file
+    local_action: copy content="{{err_msg}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"
+    when: fallback_result is failed and fallback_result.stdout == "" and fallback_result.stderr != ""
+
   - name: use result of swFallback as the result of Playbook
     fail:
       msg: "{{fallback_result.stderr}}"
diff --git a/installation/ansible-server/src/main/Playbooks/ansible_huawei_upgrade@0.01.yml b/installation/ansible-server/src/main/Playbooks/ansible_huawei_upgrade@0.01.yml
index 4ebe69f0..c4b76b0f 100644
--- a/installation/ansible-server/src/main/Playbooks/ansible_huawei_upgrade@0.01.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_huawei_upgrade@0.01.yml
@@ -38,8 +38,25 @@
 
   - name: execute downloadNESw operation
     shell: ./swm/downloadNESw --swToBeDownloaded {{sw_to_be_downloaded}} --neIdentifier {{ne_identifier}}
+    ignore_errors: yes
     register: download_result
 
+  - name: build error message for downloadNESw
+    set_fact:
+      download_err_msg:
+        "reason": "downloadNESw failure"
+        "result": "Failure"
+    when: download_result is failed
+
+  - name: write error message to file for downloadNESw
+    local_action: copy content="{{download_err_msg}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"
+    when: download_result is failed
+
+  - name: use result of downloadNESw as the result of Playbook
+    fail:
+      msg: "{{download_err_msg}}"
+    when: download_result is failed
+
   - name: parse response of downloadNESw
     set_fact:
       download_response: "{{ download_result.stdout | from_json }}"
@@ -67,11 +84,13 @@
 
   - name: execute installNESw operation
     shell: ./swm/installNESw --swToBeInstalled {{item}} --neIdentifier {{ne_identifier}}
+    ignore_errors: yes
     register: install_result
     with_items: "{{ downloaded_ne_sw_info | default([]) }}"
 
   - name: execute installNESw operation using new parameter
     shell: ./swm/installNESw --swToBeInstalled {{item}} --neIdentifier {{ne_identifier}}
+    ignore_errors: yes
     register: install_result_new
     with_items: "{{ sw_to_be_installed | default([]) }}"
 
@@ -80,6 +99,22 @@
       install_result: "{{ install_result_new }}"
     when: swToBeInstalled is defined
 
+  - name: build error message for installNESw
+    set_fact:
+      install_err_msg:
+        "reason": "installNESw failure"
+        "result": "Failure"
+    when: install_result is failed
+
+  - name: write error message to file for installNESw
+    local_action: copy content="{{install_err_msg}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"
+    when: install_result is failed
+
+  - name: use result of installNESw as the result of Playbook
+    fail:
+      msg: "{{install_err_msg}}"
+    when: install_result is failed
+
   - name: set install results list
     set_fact:
       install_results_list: "{{ install_result.results }}"
@@ -112,11 +147,13 @@
 
   - name: execute activateNESw operation
     shell: ./swm/activateNESw --swVersionToBeActivated {{item}} --neIdentifier {{ne_identifier}}
+    ignore_errors: yes
     register: activate_result
     with_items: "{{ installed_ne_sw_info | default([]) }}"
 
   - name: execute activateNESw operation using new parameter
     shell: ./swm/activateNESw --swVersionToBeActivated {{sw_version_to_be_activated}} --neIdentifier {{ne_identifier}}
+    ignore_errors: yes
     register: activate_result_new
     when: swVersionToBeActivated is defined
 
@@ -125,3 +162,29 @@
       activate_result: "{{ activate_result_new }}"
     when: swVersionToBeActivated is defined
 
+  - name: build error message for activateNESw
+    set_fact:
+      activate_err_msg:
+        "reason": "activateNESw failure"
+        "result": "Failure"
+    when: activate_result is failed
+
+  - name: write error message to file for activateNESw
+    local_action: copy content="{{activate_err_msg}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"
+    when: activate_result is failed
+
+  - name: use result of activateNESw as the result of Playbook
+    fail:
+      msg: "{{activate_err_msg}}"
+    when: activate_result is failed
+
+  - name: build success message for activateNESw
+    set_fact:
+      activate_success_msg:
+        "result": "Success"
+    when: activate_result is not failed
+
+  - name: write success message to file for activateNESw
+    local_action: copy content="{{activate_success_msg}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"
+    when: activate_result is not failed
+
diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-software.json b/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
index 656abb45..98bb939d 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
@@ -1,813 +1,1083 @@
 [
     {
-        "id": "d52a9fe6.4a061",
+        "id": "700a0160.004aa",
         "type": "method",
         "name": "upgrade-software",
         "xml": "<method rpc='upgrade-software' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 544,
-        "y": 52,
-        "z": "d0eb0cbd.ae56e",
+        "x": 567,
+        "y": 95,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "8be92af7.e48088"
+                "bd9b1e7b.c0a1e"
             ]
         ]
     },
     {
-        "id": "b090596a.f30168",
+        "id": "fa41fb4b.580858",
         "type": "service-logic",
-        "name": "LCM 1.4.5",
+        "name": "LCM ${project.version}",
         "module": "LCM",
-        "version": "1.4.5",
+        "version": "${project.version}",
         "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": 331.99993896484375,
-        "y": 53,
-        "z": "d0eb0cbd.ae56e",
+        "x": 354.99993896484375,
+        "y": 96,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "d52a9fe6.4a061"
+                "700a0160.004aa"
             ]
         ]
     },
     {
-        "id": "2f057096.50046",
+        "id": "e9118cc6.cb56",
         "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-software-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-software-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 399.00001525878906,
-        "y": 660,
-        "z": "d0eb0cbd.ae56e",
+        "x": 422.00001525878906,
+        "y": 703,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "f4a52a80.3301f8",
-                "4c3969ef.3ad0e8",
-                "519ffe08.0c9b3"
+                "a4805e06.99a58",
+                "c3cf6822.251028",
+                "8fa9e7e9.017688"
             ]
         ]
     },
     {
-        "id": "5a208b8c.11bad4",
+        "id": "53951e82.372c1",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 798.9999389648438,
-        "y": 768.0000305175781,
-        "z": "d0eb0cbd.ae56e",
+        "x": 821.9999389648438,
+        "y": 811.0000305175781,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "e1869f29.6536c",
-                "43f57bf1.626ff4",
-                "c32ffe89.d048e"
+                "46287bfa.134154",
+                "b76b1945.f582c8",
+                "c42f2303.695eb"
             ]
         ]
     },
     {
-        "id": "e1869f29.6536c",
+        "id": "46287bfa.134154",
         "type": "other",
         "name": "outcome 500",
         "xml": "<outcome value='500'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 943.9999389648438,
-        "y": 766.0000381469727,
-        "z": "d0eb0cbd.ae56e",
+        "x": 966.9999389648438,
+        "y": 809.0000381469727,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "398fd4fb.d6173c"
+                "cd8ebd14.23c24"
             ]
         ]
     },
     {
-        "id": "43f57bf1.626ff4",
+        "id": "b76b1945.f582c8",
         "type": "other",
         "name": "outcome 100",
         "xml": "<outcome value='100'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 940.9999389648438,
-        "y": 823.0000305175781,
-        "z": "d0eb0cbd.ae56e",
+        "x": 963.9999389648438,
+        "y": 866.0000305175781,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "f88fcab6.006eb8"
+                "6450772a.c289b8"
             ]
         ]
     },
     {
-        "id": "f88fcab6.006eb8",
+        "id": "6450772a.c289b8",
         "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": 1128.9999389648438,
-        "y": 822.0000305175781,
-        "z": "d0eb0cbd.ae56e",
+        "x": 1151.9999389648438,
+        "y": 865.0000305175781,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "73432b98.4b25e4",
-                "bd487c1a.8c998"
+                "e139990d.0bffa8",
+                "d862bbfb.0fc3d8"
             ]
         ]
     },
     {
-        "id": "4c3969ef.3ad0e8",
+        "id": "c3cf6822.251028",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 657.9999389648438,
-        "y": 681.0000915527344,
-        "z": "d0eb0cbd.ae56e",
+        "x": 680.9999389648438,
+        "y": 724.0000915527344,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "398fd4fb.d6173c"
+                "cd8ebd14.23c24"
             ]
         ]
     },
     {
-        "id": "f4a52a80.3301f8",
+        "id": "a4805e06.99a58",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 659.9999389648438,
-        "y": 733.0000610351562,
-        "z": "d0eb0cbd.ae56e",
+        "x": 682.9999389648438,
+        "y": 776.0000610351562,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "5a208b8c.11bad4"
+                "53951e82.372c1"
             ]
         ]
     },
     {
-        "id": "73432b98.4b25e4",
+        "id": "e139990d.0bffa8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1297.9999389648438,
-        "y": 780.0000381469727,
-        "z": "d0eb0cbd.ae56e",
+        "x": 1320.9998779296875,
+        "y": 841.0000610351562,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "398fd4fb.d6173c"
+                "c8609f9e.cb4cc"
             ]
         ]
     },
     {
-        "id": "c32ffe89.d048e",
+        "id": "c42f2303.695eb",
         "type": "other",
         "name": "outcome 101",
         "xml": "<outcome value='101'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 940.9999389648438,
-        "y": 724.0000686645508,
-        "z": "d0eb0cbd.ae56e",
+        "x": 963.9999389648438,
+        "y": 767.0000686645508,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "398fd4fb.d6173c"
+                "cd8ebd14.23c24"
             ]
         ]
     },
     {
-        "id": "bd487c1a.8c998",
+        "id": "d862bbfb.0fc3d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1305.9998779296875,
-        "y": 828.0001220703125,
-        "z": "d0eb0cbd.ae56e",
+        "x": 1324.9998779296875,
+        "y": 895.0001220703125,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "adb9b1a6.61eb5"
+                "c8609f9e.cb4cc"
             ]
         ]
     },
     {
-        "id": "2b291cab.721924",
-        "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": 1599.9998779296875,
-        "y": 885.0000610351562,
-        "z": "d0eb0cbd.ae56e",
-        "wires": []
-    },
-    {
-        "id": "db787a9a.5729a8",
+        "id": "a498eeb0.e871c",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 147,
-        "y": 52,
-        "z": "d0eb0cbd.ae56e",
+        "x": 170,
+        "y": 95,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "b090596a.f30168"
+                "fa41fb4b.580858"
             ]
         ]
     },
     {
-        "id": "8be92af7.e48088",
+        "id": "bd9b1e7b.c0a1e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 144.91668701171875,
-        "y": 144.08334350585938,
-        "z": "d0eb0cbd.ae56e",
+        "x": 167.91668701171875,
+        "y": 187.08334350585938,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "2f057096.50046",
-                "f86ff952.0492a8",
-                "e1e7ef0d.bad94",
-                "3f387094.3465e",
-                "1f8f1867.c1cf08",
-                "4e2df025.06262",
-                "690e9c9d.3aca34",
-                "3ebaf64f.5a6c4a"
+                "e9118cc6.cb56",
+                "8f2cdd2c.cf15b",
+                "881e51a9.bba9",
+                "3bae173d.769688",
+                "f24727d0.cfe3a8",
+                "a40512f5.69e4d",
+                "57b0407c.30e16",
+                "2f8a882.7fbf078"
             ]
         ]
     },
     {
-        "id": "f86ff952.0492a8",
+        "id": "8f2cdd2c.cf15b",
         "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": 443.0000305175781,
-        "y": 177.08334350585938,
-        "z": "d0eb0cbd.ae56e",
+        "x": 466.0000305175781,
+        "y": 220.08334350585938,
+        "z": "ec3deb45.e00818",
         "wires": [
             []
         ]
     },
     {
-        "id": "70a47606.d49438",
+        "id": "f33bb583.25a398",
         "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": 1609.9998779296875,
-        "y": 630.0834045410156,
-        "z": "d0eb0cbd.ae56e",
+        "x": 1632.9998779296875,
+        "y": 673.0834045410156,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "34ac5379.9a844c"
+                "1ec548c6.857767"
             ]
         ]
     },
     {
-        "id": "34ac5379.9a844c",
+        "id": "1ec548c6.857767",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1779.9998168945312,
-        "y": 629.0834045410156,
-        "z": "d0eb0cbd.ae56e",
+        "x": 1802.9998168945312,
+        "y": 672.0834045410156,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "fb390c18.77a19"
+                "f99d1384.2dae"
             ]
         ]
     },
     {
-        "id": "398fd4fb.d6173c",
+        "id": "cd8ebd14.23c24",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1412.9998168945312,
-        "y": 654.0834045410156,
-        "z": "d0eb0cbd.ae56e",
+        "x": 1435.9998168945312,
+        "y": 697.0834045410156,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "70a47606.d49438",
-                "d82deaf3.a98988",
-                "df7a754d.479a48"
+                "f33bb583.25a398",
+                "bfff1f61.da463",
+                "b136bf71.fb6b9"
             ]
         ]
     },
     {
-        "id": "add47742.421838",
-        "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": 1610.4998779296875,
-        "y": 835.0833740234375,
-        "z": "d0eb0cbd.ae56e",
-        "wires": [
-            [
-                "5ad46d9d.c433d4"
-            ]
-        ]
-    },
-    {
-        "id": "5ad46d9d.c433d4",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1778.4998779296875,
-        "y": 835.0833740234375,
-        "z": "d0eb0cbd.ae56e",
-        "wires": [
-            [
-                "a1c42905.fff878"
-            ]
-        ]
-    },
-    {
-        "id": "fb390c18.77a19",
+        "id": "f99d1384.2dae",
         "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": 1899.9998779296875,
-        "y": 628.0833740234375,
-        "z": "d0eb0cbd.ae56e",
+        "x": 1922.9998779296875,
+        "y": 671.0833740234375,
+        "z": "ec3deb45.e00818",
         "wires": [
             []
         ]
     },
     {
-        "id": "d82deaf3.a98988",
+        "id": "bfff1f61.da463",
         "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": 1591.91650390625,
-        "y": 681.0834045410156,
-        "z": "d0eb0cbd.ae56e",
+        "x": 1614.91650390625,
+        "y": 724.0834045410156,
+        "z": "ec3deb45.e00818",
         "wires": []
     },
     {
-        "id": "a1c42905.fff878",
-        "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": 1906.9166259765625,
-        "y": 835.0833740234375,
-        "z": "d0eb0cbd.ae56e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "df7a754d.479a48",
+        "id": "b136bf71.fb6b9",
         "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-software-input.common-header.request-id + '-' + $upgrade-software-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-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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": 1596.9998779296875,
-        "y": 577.0833740234375,
-        "z": "d0eb0cbd.ae56e",
+        "x": 1619.9998779296875,
+        "y": 620.0833740234375,
+        "z": "ec3deb45.e00818",
         "wires": []
     },
     {
-        "id": "adb9b1a6.61eb5",
+        "id": "c8609f9e.cb4cc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1433.9998779296875,
-        "y": 829.0833740234375,
-        "z": "d0eb0cbd.ae56e",
+        "x": 1453.9998779296875,
+        "y": 864.0833740234375,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "add47742.421838",
-                "ff897b1a.9583f8",
-                "2b291cab.721924"
+                "77de5f8d.0aa37",
+                "87eb757f.5a9998",
+                "d4c78c4a.10f57",
+                "9253558b.1de3f8",
+                "abc5eb21.233c78"
             ]
         ]
     },
     {
-        "id": "ff897b1a.9583f8",
-        "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-software-input.common-header.request-id + '-' + $upgrade-software-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-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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": 1600.1666259765625,
-        "y": 780.0833740234375,
-        "z": "d0eb0cbd.ae56e",
-        "wires": []
-    },
-    {
-        "id": "519ffe08.0c9b3",
+        "id": "8fa9e7e9.017688",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 666.9999389648438,
-        "y": 633.0000610351562,
-        "z": "d0eb0cbd.ae56e",
+        "x": 689.9999389648438,
+        "y": 676.0000610351562,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "e32c4a6d.892558"
+                "8d1a07a6.9f8f38"
             ]
         ]
     },
     {
-        "id": "8405f654.a242a8",
+        "id": "d1a59bdb.49c988",
         "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": 957.9999389648438,
-        "y": 592,
-        "z": "d0eb0cbd.ae56e",
+        "x": 980.9999389648438,
+        "y": 635,
+        "z": "ec3deb45.e00818",
         "wires": []
     },
     {
-        "id": "e32c4a6d.892558",
+        "id": "8d1a07a6.9f8f38",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 803.9999389648438,
-        "y": 627.0000610351562,
-        "z": "d0eb0cbd.ae56e",
+        "x": 826.9999389648438,
+        "y": 670.0000610351562,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "8405f654.a242a8",
-                "398fd4fb.d6173c"
+                "d1a59bdb.49c988",
+                "cd8ebd14.23c24"
             ]
         ]
     },
     {
-        "id": "e1e7ef0d.bad94",
+        "id": "881e51a9.bba9",
         "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",
+        "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<parameter name='outputPayloadField' value='.Output' />\n",
         "comments": "",
-        "x": 436,
-        "y": 224,
-        "z": "d0eb0cbd.ae56e",
+        "x": 459,
+        "y": 267,
+        "z": "ec3deb45.e00818",
         "wires": []
     },
     {
-        "id": "62ae5ec1.69479",
+        "id": "27e24246.a44b8e",
         "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-software-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
         "comments": "",
         "outputs": 1,
-        "x": 978,
-        "y": 415,
-        "z": "d0eb0cbd.ae56e",
+        "x": 999,
+        "y": 443,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "45f13d8e.2baab4"
+                "4d967fc5.86e13"
             ]
         ]
     },
     {
-        "id": "45f13d8e.2baab4",
+        "id": "4d967fc5.86e13",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1134.3907470703125,
-        "y": 398.28399658203125,
-        "z": "d0eb0cbd.ae56e",
+        "x": 1157.3907470703125,
+        "y": 441.28399658203125,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "374bb3b9.6cefec"
+                "363cf7ac.eea978"
             ]
         ]
     },
     {
-        "id": "690e9c9d.3aca34",
+        "id": "57b0407c.30e16",
         "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": 364.9998779296875,
-        "y": 588,
-        "z": "d0eb0cbd.ae56e",
+        "x": 387.9998779296875,
+        "y": 631,
+        "z": "ec3deb45.e00818",
         "wires": [
             []
         ]
     },
     {
-        "id": "1f8f1867.c1cf08",
+        "id": "f24727d0.cfe3a8",
         "type": "switchNode",
         "name": "switch pnf-flag",
         "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 418,
-        "y": 325,
-        "z": "d0eb0cbd.ae56e",
+        "x": 441,
+        "y": 368,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "5b32bef7.b059e",
-                "f5bcff23.7649a"
+                "ebcaa444.5c15f8",
+                "200181e1.aab39e"
             ]
         ]
     },
     {
-        "id": "3f387094.3465e",
+        "id": "3bae173d.769688",
         "type": "execute",
         "name": "execute jsonStringToCtx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-software-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
         "comments": "",
         "outputs": 1,
-        "x": 450,
-        "y": 271,
-        "z": "d0eb0cbd.ae56e",
+        "x": 473,
+        "y": 314,
+        "z": "ec3deb45.e00818",
         "wires": [
             []
         ]
     },
     {
-        "id": "5b32bef7.b059e",
+        "id": "ebcaa444.5c15f8",
         "type": "outcome",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 615,
-        "y": 304,
-        "z": "d0eb0cbd.ae56e",
+        "x": 638,
+        "y": 347,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "a02f543f.407778"
+                "4f4ae7b6.577da8"
             ]
         ]
     },
     {
-        "id": "f5bcff23.7649a",
+        "id": "200181e1.aab39e",
         "type": "outcome",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 614.9999389648438,
-        "y": 365,
-        "z": "d0eb0cbd.ae56e",
+        "x": 637.9999389648438,
+        "y": 408,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "4ae3a7c9.907f18"
+                "b59848fc.f07918"
             ]
         ]
     },
     {
-        "id": "4ae3a7c9.907f18",
+        "id": "b59848fc.f07918",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 762.9999389648438,
-        "y": 364,
-        "z": "d0eb0cbd.ae56e",
+        "x": 785.9999389648438,
+        "y": 407,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "62ae5ec1.69479",
-                "fc28a02d.cc248"
+                "27e24246.a44b8e",
+                "91c96ed6.a5b05"
             ]
         ]
     },
     {
-        "id": "a02f543f.407778",
+        "id": "4f4ae7b6.577da8",
         "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-software.playbookname`'/>\n",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-software.playbookname`'/>\n<parameter name='outputPayloadField' value=\"`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`\"/>\n",
         "comments": "",
-        "x": 776,
-        "y": 302,
-        "z": "d0eb0cbd.ae56e",
+        "x": 799,
+        "y": 345,
+        "z": "ec3deb45.e00818",
         "wires": []
     },
     {
-        "id": "fc28a02d.cc248",
+        "id": "91c96ed6.a5b05",
         "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-software.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 976,
-        "y": 312,
-        "z": "d0eb0cbd.ae56e",
+        "x": 1008,
+        "y": 387,
+        "z": "ec3deb45.e00818",
         "wires": [
             []
         ]
     },
     {
-        "id": "4e2df025.06262",
+        "id": "a40512f5.69e4d",
         "type": "switchNode",
         "name": "switch playbookname",
         "xml": "<switch test='`$playbookname`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 415,
-        "y": 456,
-        "z": "d0eb0cbd.ae56e",
+        "x": 438,
+        "y": 499,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "6164fda7.628474"
+                "e6c437a6.29de58"
             ]
         ]
     },
     {
-        "id": "6164fda7.628474",
+        "id": "e6c437a6.29de58",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 586,
-        "y": 457,
-        "z": "d0eb0cbd.ae56e",
+        "x": 609,
+        "y": 500,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "789294b0.3e8a8c"
+                "a4fde5cc.d4c598"
             ]
         ]
     },
     {
-        "id": "789294b0.3e8a8c",
+        "id": "a4fde5cc.d4c598",
         "type": "set",
         "name": "set playbookname",
         "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-software.playbookname`'/>",
         "comments": "",
-        "x": 776,
-        "y": 456,
-        "z": "d0eb0cbd.ae56e",
+        "x": 799,
+        "y": 499,
+        "z": "ec3deb45.e00818",
         "wires": []
     },
     {
-        "id": "3ebaf64f.5a6c4a",
+        "id": "2f8a882.7fbf078",
         "type": "switchNode",
         "name": "switch nodelist",
         "xml": "<switch test='`$nodelist`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 405,
-        "y": 515,
-        "z": "d0eb0cbd.ae56e",
+        "x": 428,
+        "y": 558,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "12193ca9.50e163",
-                "8146ae4e.2b29b"
+                "fc8a62b5.226f9",
+                "174740d3.bb580f"
             ]
         ]
     },
     {
-        "id": "12193ca9.50e163",
+        "id": "fc8a62b5.226f9",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 585,
-        "y": 508,
-        "z": "d0eb0cbd.ae56e",
+        "x": 608,
+        "y": 551,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "b589f932.9ec108"
+                "82a452fa.2b2b4"
             ]
         ]
     },
     {
-        "id": "b589f932.9ec108",
+        "id": "82a452fa.2b2b4",
         "type": "set",
         "name": "set nodelist",
         "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
         "comments": "",
-        "x": 742,
-        "y": 522,
-        "z": "d0eb0cbd.ae56e",
+        "x": 765,
+        "y": 565,
+        "z": "ec3deb45.e00818",
         "wires": []
     },
     {
-        "id": "8146ae4e.2b29b",
+        "id": "174740d3.bb580f",
         "type": "outcome",
         "name": "empty",
         "xml": "<outcome value=\"['']\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 584,
-        "y": 552,
-        "z": "d0eb0cbd.ae56e",
+        "x": 607,
+        "y": 595,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "b589f932.9ec108"
+                "82a452fa.2b2b4"
             ]
         ]
     },
     {
-        "id": "94498b41.794368",
+        "id": "2651af68.3f9dc",
         "type": "switchNode",
         "name": "switch playbookname",
         "xml": "<switch test='`$playbookname`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1460,
-        "y": 387,
-        "z": "d0eb0cbd.ae56e",
+        "x": 1483,
+        "y": 430,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "975c4b05.0f6d08"
+                "bf08f71c.7cf758"
             ]
         ]
     },
     {
-        "id": "975c4b05.0f6d08",
+        "id": "bf08f71c.7cf758",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1638,
-        "y": 387,
-        "z": "d0eb0cbd.ae56e",
+        "x": 1661,
+        "y": 430,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "eee08f4b.ee327"
+                "61379210.f96dcc"
             ]
         ]
     },
     {
-        "id": "7c4590ff.245c9",
+        "id": "5f26038d.9f08dc",
         "type": "set",
         "name": "set nodelist",
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",
         "comments": "",
-        "x": 1433,
-        "y": 440,
-        "z": "d0eb0cbd.ae56e",
+        "x": 1456,
+        "y": 483,
+        "z": "ec3deb45.e00818",
         "wires": []
     },
     {
-        "id": "374bb3b9.6cefec",
+        "id": "363cf7ac.eea978",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1263,
-        "y": 397,
-        "z": "d0eb0cbd.ae56e",
+        "x": 1286,
+        "y": 440,
+        "z": "ec3deb45.e00818",
         "wires": [
             [
-                "94498b41.794368",
-                "7c4590ff.245c9"
+                "2651af68.3f9dc",
+                "5f26038d.9f08dc"
             ]
         ]
     },
     {
-        "id": "eee08f4b.ee327",
+        "id": "61379210.f96dcc",
         "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-software.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1810,
-        "y": 385,
-        "z": "d0eb0cbd.ae56e",
+        "x": 1833,
+        "y": 428,
+        "z": "ec3deb45.e00818",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "9253558b.1de3f8",
+        "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": 1648,
+        "y": 939,
+        "z": "ec3deb45.e00818",
+        "wires": [
+            [
+                "a452deae.c86e6"
+            ]
+        ]
+    },
+    {
+        "id": "a452deae.c86e6",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1830,
+        "y": 939,
+        "z": "ec3deb45.e00818",
+        "wires": [
+            [
+                "fedb3391.b66c"
+            ]
+        ]
+    },
+    {
+        "id": "fedb3391.b66c",
+        "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": 1960.416748046875,
+        "y": 939,
+        "z": "ec3deb45.e00818",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4f44742c.4c245c",
+        "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-software-input.common-header.request-id + '-' + $upgrade-software-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-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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": 1985.666748046875,
+        "y": 854,
+        "z": "ec3deb45.e00818",
+        "wires": []
+    },
+    {
+        "id": "77de5f8d.0aa37",
+        "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": 1663.5001220703125,
+        "y": 784.9166259765625,
+        "z": "ec3deb45.e00818",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "87eb757f.5a9998",
+        "type": "execute",
+        "name": "execute getAttributeValue",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='source' value=\"`'resultsJson' + $outputPayloadField`\" />\n\t<parameter name='outputPath' value='outputPayload' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1669.5001220703125,
+        "y": 827.9166259765625,
+        "z": "ec3deb45.e00818",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d4c78c4a.10f57",
+        "type": "switchNode",
+        "name": "switch outputPayload",
+        "xml": "<switch test='`$outputPayload`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1653.5001220703125,
+        "y": 874.9166259765625,
+        "z": "ec3deb45.e00818",
+        "wires": [
+            [
+                "52af5803.b461c8",
+                "f8c7b0fd.65877"
+            ]
+        ]
+    },
+    {
+        "id": "52af5803.b461c8",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1830.5001220703125,
+        "y": 853.9166259765625,
+        "z": "ec3deb45.e00818",
+        "wires": [
+            [
+                "4f44742c.4c245c"
+            ]
+        ]
+    },
+    {
+        "id": "f8c7b0fd.65877",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1829.5001220703125,
+        "y": 893.9166259765625,
+        "z": "ec3deb45.e00818",
+        "wires": [
+            [
+                "596dd9e6.b15a48"
+            ]
+        ]
+    },
+    {
+        "id": "596dd9e6.b15a48",
+        "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-software-input.common-header.request-id + '-' + $upgrade-software-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-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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": 2027.5001220703125,
+        "y": 893.9166259765625,
+        "z": "ec3deb45.e00818",
+        "wires": []
+    },
+    {
+        "id": "1310b766.620cb9",
+        "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": 2369.5001220703125,
+        "y": 971.9166259765625,
+        "z": "ec3deb45.e00818",
+        "wires": []
+    },
+    {
+        "id": "94ccd9bd.ce5728",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1835.5003662109375,
+        "y": 993.9165649414062,
+        "z": "ec3deb45.e00818",
+        "wires": [
+            [
+                "acf117a7.e47ff8"
+            ]
+        ]
+    },
+    {
+        "id": "af6eae51.b597d",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1834.5003662109375,
+        "y": 1069.9165649414062,
+        "z": "ec3deb45.e00818",
+        "wires": [
+            [
+                "526dfc55.6eeaf4"
+            ]
+        ]
+    },
+    {
+        "id": "abc5eb21.233c78",
+        "type": "switchNode",
+        "name": "switch outputPayload",
+        "xml": "<switch test='`$outputPayload`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1652.5003662109375,
+        "y": 1029.9165649414062,
+        "z": "ec3deb45.e00818",
+        "wires": [
+            [
+                "94ccd9bd.ce5728",
+                "af6eae51.b597d"
+            ]
+        ]
+    },
+    {
+        "id": "d4fc7ba0.d97cd8",
+        "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": 2410.5003662109375,
+        "y": 1053.9165649414062,
+        "z": "ec3deb45.e00818",
+        "wires": []
+    },
+    {
+        "id": "acf117a7.e47ff8",
+        "type": "switchNode",
+        "name": "switch result code",
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2005.5003662109375,
+        "y": 993.9165649414062,
+        "z": "ec3deb45.e00818",
+        "wires": [
+            [
+                "7b6a7dcd.0bf034",
+                "964b16ae.6cb568"
+            ]
+        ]
+    },
+    {
+        "id": "526dfc55.6eeaf4",
+        "type": "switchNode",
+        "name": "switch result code",
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2005.5003662109375,
+        "y": 1069.9165649414062,
+        "z": "ec3deb45.e00818",
+        "wires": [
+            [
+                "116f67f9.8b84e8",
+                "b7261460.4d2728"
+            ]
+        ]
+    },
+    {
+        "id": "270915b4.03f91a",
+        "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": 2363.5003662109375,
+        "y": 1009.9165649414062,
+        "z": "ec3deb45.e00818",
+        "wires": []
+    },
+    {
+        "id": "ba208b9e.ce90f8",
+        "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": 2406.5003662109375,
+        "y": 1091.9165649414062,
+        "z": "ec3deb45.e00818",
+        "wires": []
+    },
+    {
+        "id": "7b6a7dcd.0bf034",
+        "type": "other",
+        "name": "outcome 400",
+        "xml": "<outcome value='400'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2193.5003662109375,
+        "y": 971.9165649414062,
+        "z": "ec3deb45.e00818",
+        "wires": [
+            [
+                "1310b766.620cb9"
+            ]
+        ]
+    },
+    {
+        "id": "964b16ae.6cb568",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2174.5003662109375,
+        "y": 1009.9165649414062,
+        "z": "ec3deb45.e00818",
+        "wires": [
+            [
+                "270915b4.03f91a"
+            ]
+        ]
+    },
+    {
+        "id": "116f67f9.8b84e8",
+        "type": "other",
+        "name": "outcome 400",
+        "xml": "<outcome value='400'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2194.5003662109375,
+        "y": 1053.9165649414062,
+        "z": "ec3deb45.e00818",
+        "wires": [
+            [
+                "d4fc7ba0.d97cd8"
+            ]
+        ]
+    },
+    {
+        "id": "b7261460.4d2728",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2176.5003662109375,
+        "y": 1091.9165649414062,
+        "z": "ec3deb45.e00818",
+        "wires": [
+            [
+                "ba208b9e.ce90f8"
+            ]
+        ]
     }
-]
\ No newline at end of file
+]
diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
index e4f818f7..af0ee715 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
@@ -11,6 +11,7 @@
                 <parameter name='status.code' value='200' />
                 <parameter name='status.message' value='unexpected return from DG' />
                 <parameter name='quote' value="'" />
+                <parameter name='outputPayloadField' value='.Output' />
             </set>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
                 <parameter name='source' value='upgrade-software-input.payload' />
@@ -22,6 +23,7 @@
                     <set>
                         <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>
                         <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-software.playbookname`'/>
+                        <parameter name='outputPayloadField' value="`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`"/>
                     </set>
                 </outcome>
                 <outcome value='Other'>
@@ -270,23 +272,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-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
-                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
-                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
-                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
-                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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' + $outputPayloadField`" />
+                                            <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-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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`' />
@@ -303,31 +338,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-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
-                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
-                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
-                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
-                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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' + $outputPayloadField`" />
+                                            <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-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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`' />
@@ -344,10 +444,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