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

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 ad4edf5..b9b1ab8 100644 (file)
--- 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:\r
   - name: create a temporary file for additional data\r
     file: \r
-        path: /tmp/tmp-{{Id}}\r
-        state: touch\r
-    become: false\r
+      path: /tmp/tmp-{{Id}}\r
+      state: touch\r
 \r
   - name: prepare additional data\r
     shell: echo {{additionalData}} > /tmp/tmp-{{Id}}\r
-    become: false\r
 \r
   - name: execute post-check operation\r
     shell: ./swm/upgrade-post-check {{pnfId}} {{oldSwVersion}} {{targetSwVersion}} {{ruleName}} /tmp/tmp-{{Id}}\r
@@ -22,9 +20,19 @@
 \r
   - name: remove the temporary file\r
     file:\r
-        path: /tmp/tmp-{{Id}}\r
-        state: absent\r
-    become: false\r
+      path: /tmp/tmp-{{Id}}\r
+      state: absent\r
+\r
+  - name: build error message\r
+    set_fact:\r
+      err_msg:\r
+        "reason": "{{postcheck_result.stderr}}"\r
+        "result": "Failure"\r
+    when: postcheck_result is failed and postcheck_result.stdout == "" and postcheck_result.stderr != ""\r
+\r
+  - name: write error message to file\r
+    local_action: copy content="{{err_msg}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"\r
+    when: postcheck_result is failed and postcheck_result.stdout == "" and postcheck_result.stderr != ""\r
 \r
   - name: use result of post-check as the result of Playbook\r
     fail:\r

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 668ed7d..dcb6f6a 100644 (file)
--- 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:\r
   - name: create a temporary file for additional data\r
     file: \r
-        path: /tmp/tmp-{{Id}}\r
-        state: touch\r
-    become: false\r
+      path: /tmp/tmp-{{Id}}\r
+      state: touch\r
 \r
   - name: prepare additional data\r
     shell: echo {{additionalData}} > /tmp/tmp-{{Id}}\r
-    become: false\r
 \r
   - name: execute pre-check operation\r
     shell: ./swm/upgrade-pre-check {{pnfId}} {{oldSwVersion}} {{targetSwVersion}} {{ruleName}} /tmp/tmp-{{Id}}\r
@@ -22,9 +20,19 @@
 \r
   - name: remove the temporary file\r
     file:\r
-        path: /tmp/tmp-{{Id}}\r
-        state: absent\r
-    become: false\r
+      path: /tmp/tmp-{{Id}}\r
+      state: absent\r
+\r
+  - name: build error message\r
+    set_fact:\r
+      err_msg:\r
+        "reason": "{{precheck_result.stderr}}"\r
+        "result": "Failure"\r
+    when: precheck_result is failed and precheck_result.stdout == "" and precheck_result.stderr != ""\r
+\r
+  - name: write error message to file\r
+    local_action: copy content="{{err_msg}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"\r
+    when: precheck_result is failed and precheck_result.stdout == "" and precheck_result.stderr != ""\r
 \r
   - name: use result of pre-check as the result of Playbook\r
     fail:\r

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 fa164c9..8d8982a 100644 (file)
--- 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"\r
     when: fallback_result.stdout != ""\r
 \r
+  - name: build error message\r
+    set_fact:\r
+      err_msg:\r
+        "reason": "{{fallback_result.stderr}}"\r
+        "result": "Failure"\r
+    when: fallback_result is failed and fallback_result.stdout == "" and fallback_result.stderr != ""\r
+\r
+  - name: write error message to file\r
+    local_action: copy content="{{err_msg}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"\r
+    when: fallback_result is failed and fallback_result.stdout == "" and fallback_result.stderr != ""\r
+\r
   - name: use result of swFallback as the result of Playbook\r
     fail:\r
       msg: "{{fallback_result.stderr}}"\r

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 4ebe69f..c4b76b0 100644 (file)
--- 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 @@
 \r
   - name: execute downloadNESw operation\r
     shell: ./swm/downloadNESw --swToBeDownloaded {{sw_to_be_downloaded}} --neIdentifier {{ne_identifier}}\r
+    ignore_errors: yes\r
     register: download_result\r
 \r
+  - name: build error message for downloadNESw\r
+    set_fact:\r
+      download_err_msg:\r
+        "reason": "downloadNESw failure"\r
+        "result": "Failure"\r
+    when: download_result is failed\r
+\r
+  - name: write error message to file for downloadNESw\r
+    local_action: copy content="{{download_err_msg}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"\r
+    when: download_result is failed\r
+\r
+  - name: use result of downloadNESw as the result of Playbook\r
+    fail:\r
+      msg: "{{download_err_msg}}"\r
+    when: download_result is failed\r
+\r
   - name: parse response of downloadNESw\r
     set_fact:\r
       download_response: "{{ download_result.stdout | from_json }}"\r
@@ -67,11 +84,13 @@
 \r
   - name: execute installNESw operation\r
     shell: ./swm/installNESw --swToBeInstalled {{item}} --neIdentifier {{ne_identifier}}\r
+    ignore_errors: yes\r
     register: install_result\r
     with_items: "{{ downloaded_ne_sw_info | default([]) }}"\r
 \r
   - name: execute installNESw operation using new parameter\r
     shell: ./swm/installNESw --swToBeInstalled {{item}} --neIdentifier {{ne_identifier}}\r
+    ignore_errors: yes\r
     register: install_result_new\r
     with_items: "{{ sw_to_be_installed | default([]) }}"\r
 \r
@@ -80,6 +99,22 @@
       install_result: "{{ install_result_new }}"\r
     when: swToBeInstalled is defined\r
 \r
+  - name: build error message for installNESw\r
+    set_fact:\r
+      install_err_msg:\r
+        "reason": "installNESw failure"\r
+        "result": "Failure"\r
+    when: install_result is failed\r
+\r
+  - name: write error message to file for installNESw\r
+    local_action: copy content="{{install_err_msg}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"\r
+    when: install_result is failed\r
+\r
+  - name: use result of installNESw as the result of Playbook\r
+    fail:\r
+      msg: "{{install_err_msg}}"\r
+    when: install_result is failed\r
+\r
   - name: set install results list\r
     set_fact:\r
       install_results_list: "{{ install_result.results }}"\r
@@ -112,11 +147,13 @@
 \r
   - name: execute activateNESw operation\r
     shell: ./swm/activateNESw --swVersionToBeActivated {{item}} --neIdentifier {{ne_identifier}}\r
+    ignore_errors: yes\r
     register: activate_result\r
     with_items: "{{ installed_ne_sw_info | default([]) }}"\r
 \r
   - name: execute activateNESw operation using new parameter\r
     shell: ./swm/activateNESw --swVersionToBeActivated {{sw_version_to_be_activated}} --neIdentifier {{ne_identifier}}\r
+    ignore_errors: yes\r
     register: activate_result_new\r
     when: swVersionToBeActivated is defined\r
 \r
@@ -125,3 +162,29 @@
       activate_result: "{{ activate_result_new }}"\r
     when: swVersionToBeActivated is defined\r
 \r
+  - name: build error message for activateNESw\r
+    set_fact:\r
+      activate_err_msg:\r
+        "reason": "activateNESw failure"\r
+        "result": "Failure"\r
+    when: activate_result is failed\r
+\r
+  - name: write error message to file for activateNESw\r
+    local_action: copy content="{{activate_err_msg}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"\r
+    when: activate_result is failed\r
+\r
+  - name: use result of activateNESw as the result of Playbook\r
+    fail:\r
+      msg: "{{activate_err_msg}}"\r
+    when: activate_result is failed\r
+\r
+  - name: build success message for activateNESw\r
+    set_fact:\r
+      activate_success_msg:\r
+        "result": "Success"\r
+    when: activate_result is not failed\r
+\r
+  - name: write success message to file for activateNESw\r
+    local_action: copy content="{{activate_success_msg}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"\r
+    when: activate_result is not failed\r
+\r

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 656abb4..98bb939 100644 (file)
--- 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 @@
 [\r
     {\r
-        "id": "d52a9fe6.4a061",\r
+        "id": "700a0160.004aa",\r
         "type": "method",\r
         "name": "upgrade-software",\r
         "xml": "<method rpc='upgrade-software' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 544,\r
-        "y": 52,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 567,\r
+        "y": 95,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "8be92af7.e48088"\r
+                "bd9b1e7b.c0a1e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b090596a.f30168",\r
+        "id": "fa41fb4b.580858",\r
         "type": "service-logic",\r
-        "name": "LCM 1.4.5",\r
+        "name": "LCM ${project.version}",\r
         "module": "LCM",\r
-        "version": "1.4.5",\r
+        "version": "${project.version}",\r
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 331.99993896484375,\r
-        "y": 53,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 354.99993896484375,\r
+        "y": 96,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "d52a9fe6.4a061"\r
+                "700a0160.004aa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2f057096.50046",\r
+        "id": "e9118cc6.cb56",\r
         "type": "execute",\r
         "name": "execute AnsibleA.reqExec",\r
         "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`'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 399.00001525878906,\r
-        "y": 660,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 422.00001525878906,\r
+        "y": 703,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "f4a52a80.3301f8",\r
-                "4c3969ef.3ad0e8",\r
-                "519ffe08.0c9b3"\r
+                "a4805e06.99a58",\r
+                "c3cf6822.251028",\r
+                "8fa9e7e9.017688"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5a208b8c.11bad4",\r
+        "id": "53951e82.372c1",\r
         "type": "switchNode",\r
         "name": "switch",\r
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 798.9999389648438,\r
-        "y": 768.0000305175781,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 821.9999389648438,\r
+        "y": 811.0000305175781,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "e1869f29.6536c",\r
-                "43f57bf1.626ff4",\r
-                "c32ffe89.d048e"\r
+                "46287bfa.134154",\r
+                "b76b1945.f582c8",\r
+                "c42f2303.695eb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e1869f29.6536c",\r
+        "id": "46287bfa.134154",\r
         "type": "other",\r
         "name": "outcome 500",\r
         "xml": "<outcome value='500'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 943.9999389648438,\r
-        "y": 766.0000381469727,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 966.9999389648438,\r
+        "y": 809.0000381469727,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "398fd4fb.d6173c"\r
+                "cd8ebd14.23c24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43f57bf1.626ff4",\r
+        "id": "b76b1945.f582c8",\r
         "type": "other",\r
         "name": "outcome 100",\r
         "xml": "<outcome value='100'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 940.9999389648438,\r
-        "y": 823.0000305175781,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 963.9999389648438,\r
+        "y": 866.0000305175781,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "f88fcab6.006eb8"\r
+                "6450772a.c289b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f88fcab6.006eb8",\r
+        "id": "6450772a.c289b8",\r
         "type": "execute",\r
         "name": "execute reqExecResult",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1128.9999389648438,\r
-        "y": 822.0000305175781,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 1151.9999389648438,\r
+        "y": 865.0000305175781,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "73432b98.4b25e4",\r
-                "bd487c1a.8c998"\r
+                "e139990d.0bffa8",\r
+                "d862bbfb.0fc3d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4c3969ef.3ad0e8",\r
+        "id": "c3cf6822.251028",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 657.9999389648438,\r
-        "y": 681.0000915527344,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 680.9999389648438,\r
+        "y": 724.0000915527344,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "398fd4fb.d6173c"\r
+                "cd8ebd14.23c24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4a52a80.3301f8",\r
+        "id": "a4805e06.99a58",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 659.9999389648438,\r
-        "y": 733.0000610351562,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 682.9999389648438,\r
+        "y": 776.0000610351562,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "5a208b8c.11bad4"\r
+                "53951e82.372c1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73432b98.4b25e4",\r
+        "id": "e139990d.0bffa8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1297.9999389648438,\r
-        "y": 780.0000381469727,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 1320.9998779296875,\r
+        "y": 841.0000610351562,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "398fd4fb.d6173c"\r
+                "c8609f9e.cb4cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c32ffe89.d048e",\r
+        "id": "c42f2303.695eb",\r
         "type": "other",\r
         "name": "outcome 101",\r
         "xml": "<outcome value='101'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 940.9999389648438,\r
-        "y": 724.0000686645508,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 963.9999389648438,\r
+        "y": 767.0000686645508,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "398fd4fb.d6173c"\r
+                "cd8ebd14.23c24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd487c1a.8c998",\r
+        "id": "d862bbfb.0fc3d8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1305.9998779296875,\r
-        "y": 828.0001220703125,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 1324.9998779296875,\r
+        "y": 895.0001220703125,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "adb9b1a6.61eb5"\r
+                "c8609f9e.cb4cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b291cab.721924",\r
-        "type": "returnSuccess",\r
-        "name": "return success",\r
-        "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`'/>",\r
-        "comments": "",\r
-        "x": 1599.9998779296875,\r
-        "y": 885.0000610351562,\r
-        "z": "d0eb0cbd.ae56e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "db787a9a.5729a8",\r
+        "id": "a498eeb0.e871c",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 147,\r
-        "y": 52,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 170,\r
+        "y": 95,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "b090596a.f30168"\r
+                "fa41fb4b.580858"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8be92af7.e48088",\r
+        "id": "bd9b1e7b.c0a1e",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 144.91668701171875,\r
-        "y": 144.08334350585938,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 167.91668701171875,\r
+        "y": 187.08334350585938,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "2f057096.50046",\r
-                "f86ff952.0492a8",\r
-                "e1e7ef0d.bad94",\r
-                "3f387094.3465e",\r
-                "1f8f1867.c1cf08",\r
-                "4e2df025.06262",\r
-                "690e9c9d.3aca34",\r
-                "3ebaf64f.5a6c4a"\r
+                "e9118cc6.cb56",\r
+                "8f2cdd2c.cf15b",\r
+                "881e51a9.bba9",\r
+                "3bae173d.769688",\r
+                "f24727d0.cfe3a8",\r
+                "a40512f5.69e4d",\r
+                "57b0407c.30e16",\r
+                "2f8a882.7fbf078"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f86ff952.0492a8",\r
+        "id": "8f2cdd2c.cf15b",\r
         "type": "execute",\r
         "name": "execute Properties",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 443.0000305175781,\r
-        "y": 177.08334350585938,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 466.0000305175781,\r
+        "y": 220.08334350585938,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "70a47606.d49438",\r
+        "id": "f33bb583.25a398",\r
         "type": "execute",\r
         "name": "execute DmaapMsg",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1609.9998779296875,\r
-        "y": 630.0834045410156,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 1632.9998779296875,\r
+        "y": 673.0834045410156,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "34ac5379.9a844c"\r
+                "1ec548c6.857767"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "34ac5379.9a844c",\r
+        "id": "1ec548c6.857767",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1779.9998168945312,\r
-        "y": 629.0834045410156,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 1802.9998168945312,\r
+        "y": 672.0834045410156,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "fb390c18.77a19"\r
+                "f99d1384.2dae"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "398fd4fb.d6173c",\r
+        "id": "cd8ebd14.23c24",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1412.9998168945312,\r
-        "y": 654.0834045410156,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 1435.9998168945312,\r
+        "y": 697.0834045410156,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "70a47606.d49438",\r
-                "d82deaf3.a98988",\r
-                "df7a754d.479a48"\r
+                "f33bb583.25a398",\r
+                "bfff1f61.da463",\r
+                "b136bf71.fb6b9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "add47742.421838",\r
-        "type": "execute",\r
-        "name": "execute DmaapMsg",\r
-        "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",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1610.4998779296875,\r
-        "y": 835.0833740234375,\r
-        "z": "d0eb0cbd.ae56e",\r
-        "wires": [\r
-            [\r
-                "5ad46d9d.c433d4"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "5ad46d9d.c433d4",\r
-        "type": "failure",\r
-        "name": "failure",\r
-        "xml": "<outcome value='failure'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1778.4998779296875,\r
-        "y": 835.0833740234375,\r
-        "z": "d0eb0cbd.ae56e",\r
-        "wires": [\r
-            [\r
-                "a1c42905.fff878"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "fb390c18.77a19",\r
+        "id": "f99d1384.2dae",\r
         "type": "record",\r
         "name": "record",\r
         "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'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1899.9998779296875,\r
-        "y": 628.0833740234375,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 1922.9998779296875,\r
+        "y": 671.0833740234375,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d82deaf3.a98988",\r
+        "id": "bfff1f61.da463",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",\r
         "comments": "",\r
-        "x": 1591.91650390625,\r
-        "y": 681.0834045410156,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 1614.91650390625,\r
+        "y": 724.0834045410156,\r
+        "z": "ec3deb45.e00818",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a1c42905.fff878",\r
-        "type": "record",\r
-        "name": "record",\r
-        "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'/>",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1906.9166259765625,\r
-        "y": 835.0833740234375,\r
-        "z": "d0eb0cbd.ae56e",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "df7a754d.479a48",\r
+        "id": "b136bf71.fb6b9",\r
         "type": "set",\r
         "name": "set DmaapReq",\r
         "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",\r
         "comments": "",\r
-        "x": 1596.9998779296875,\r
-        "y": 577.0833740234375,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 1619.9998779296875,\r
+        "y": 620.0833740234375,\r
+        "z": "ec3deb45.e00818",\r
         "wires": []\r
     },\r
     {\r
-        "id": "adb9b1a6.61eb5",\r
+        "id": "c8609f9e.cb4cc",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1433.9998779296875,\r
-        "y": 829.0833740234375,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 1453.9998779296875,\r
+        "y": 864.0833740234375,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "add47742.421838",\r
-                "ff897b1a.9583f8",\r
-                "2b291cab.721924"\r
+                "77de5f8d.0aa37",\r
+                "87eb757f.5a9998",\r
+                "d4c78c4a.10f57",\r
+                "9253558b.1de3f8",\r
+                "abc5eb21.233c78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff897b1a.9583f8",\r
-        "type": "set",\r
-        "name": "set DmaapReq",\r
-        "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",\r
-        "comments": "",\r
-        "x": 1600.1666259765625,\r
-        "y": 780.0833740234375,\r
-        "z": "d0eb0cbd.ae56e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "519ffe08.0c9b3",\r
+        "id": "8fa9e7e9.017688",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 666.9999389648438,\r
-        "y": 633.0000610351562,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 689.9999389648438,\r
+        "y": 676.0000610351562,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "e32c4a6d.892558"\r
+                "8d1a07a6.9f8f38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8405f654.a242a8",\r
+        "id": "d1a59bdb.49c988",\r
         "type": "set",\r
         "name": "set Defaults",\r
         "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",\r
         "comments": "",\r
-        "x": 957.9999389648438,\r
-        "y": 592,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 980.9999389648438,\r
+        "y": 635,\r
+        "z": "ec3deb45.e00818",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e32c4a6d.892558",\r
+        "id": "8d1a07a6.9f8f38",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 803.9999389648438,\r
-        "y": 627.0000610351562,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 826.9999389648438,\r
+        "y": 670.0000610351562,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "8405f654.a242a8",\r
-                "398fd4fb.d6173c"\r
+                "d1a59bdb.49c988",\r
+                "cd8ebd14.23c24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e1e7ef0d.bad94",\r
+        "id": "881e51a9.bba9",\r
         "type": "set",\r
         "name": "set default values",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
-        "x": 436,\r
-        "y": 224,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 459,\r
+        "y": 267,\r
+        "z": "ec3deb45.e00818",\r
         "wires": []\r
     },\r
     {\r
-        "id": "62ae5ec1.69479",\r
+        "id": "27e24246.a44b8e",\r
         "type": "get-resource",\r
         "name": "get aai.generic-vnf ",\r
         "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'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 978,\r
-        "y": 415,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 999,\r
+        "y": 443,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "45f13d8e.2baab4"\r
+                "4d967fc5.86e13"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45f13d8e.2baab4",\r
+        "id": "4d967fc5.86e13",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1134.3907470703125,\r
-        "y": 398.28399658203125,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 1157.3907470703125,\r
+        "y": 441.28399658203125,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "374bb3b9.6cefec"\r
+                "363cf7ac.eea978"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "690e9c9d.3aca34",\r
+        "id": "57b0407c.30e16",\r
         "type": "record",\r
         "name": "record",\r
         "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`'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 364.9998779296875,\r
-        "y": 588,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 387.9998779296875,\r
+        "y": 631,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1f8f1867.c1cf08",\r
+        "id": "f24727d0.cfe3a8",\r
         "type": "switchNode",\r
         "name": "switch pnf-flag",\r
         "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 418,\r
-        "y": 325,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 441,\r
+        "y": 368,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "5b32bef7.b059e",\r
-                "f5bcff23.7649a"\r
+                "ebcaa444.5c15f8",\r
+                "200181e1.aab39e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3f387094.3465e",\r
+        "id": "3bae173d.769688",\r
         "type": "execute",\r
         "name": "execute jsonStringToCtx",\r
         "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' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 450,\r
-        "y": 271,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 473,\r
+        "y": 314,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5b32bef7.b059e",\r
+        "id": "ebcaa444.5c15f8",\r
         "type": "outcome",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 615,\r
-        "y": 304,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 638,\r
+        "y": 347,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "a02f543f.407778"\r
+                "4f4ae7b6.577da8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5bcff23.7649a",\r
+        "id": "200181e1.aab39e",\r
         "type": "outcome",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 614.9999389648438,\r
-        "y": 365,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 637.9999389648438,\r
+        "y": 408,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "4ae3a7c9.907f18"\r
+                "b59848fc.f07918"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ae3a7c9.907f18",\r
+        "id": "b59848fc.f07918",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 762.9999389648438,\r
-        "y": 364,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 785.9999389648438,\r
+        "y": 407,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "62ae5ec1.69479",\r
-                "fc28a02d.cc248"\r
+                "27e24246.a44b8e",\r
+                "91c96ed6.a5b05"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a02f543f.407778",\r
+        "id": "4f4ae7b6.577da8",\r
         "type": "set",\r
         "name": "set AnsibleReq",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
-        "x": 776,\r
-        "y": 302,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 799,\r
+        "y": 345,\r
+        "z": "ec3deb45.e00818",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fc28a02d.cc248",\r
+        "id": "91c96ed6.a5b05",\r
         "type": "execute",\r
         "name": "set playbookname",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 976,\r
-        "y": 312,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 1008,\r
+        "y": 387,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4e2df025.06262",\r
+        "id": "a40512f5.69e4d",\r
         "type": "switchNode",\r
         "name": "switch playbookname",\r
         "xml": "<switch test='`$playbookname`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 415,\r
-        "y": 456,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 438,\r
+        "y": 499,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "6164fda7.628474"\r
+                "e6c437a6.29de58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6164fda7.628474",\r
+        "id": "e6c437a6.29de58",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 586,\r
-        "y": 457,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 609,\r
+        "y": 500,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "789294b0.3e8a8c"\r
+                "a4fde5cc.d4c598"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "789294b0.3e8a8c",\r
+        "id": "a4fde5cc.d4c598",\r
         "type": "set",\r
         "name": "set playbookname",\r
         "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-software.playbookname`'/>",\r
         "comments": "",\r
-        "x": 776,\r
-        "y": 456,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 799,\r
+        "y": 499,\r
+        "z": "ec3deb45.e00818",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3ebaf64f.5a6c4a",\r
+        "id": "2f8a882.7fbf078",\r
         "type": "switchNode",\r
         "name": "switch nodelist",\r
         "xml": "<switch test='`$nodelist`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 405,\r
-        "y": 515,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 428,\r
+        "y": 558,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "12193ca9.50e163",\r
-                "8146ae4e.2b29b"\r
+                "fc8a62b5.226f9",\r
+                "174740d3.bb580f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "12193ca9.50e163",\r
+        "id": "fc8a62b5.226f9",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 585,\r
-        "y": 508,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 608,\r
+        "y": 551,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "b589f932.9ec108"\r
+                "82a452fa.2b2b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b589f932.9ec108",\r
+        "id": "82a452fa.2b2b4",\r
         "type": "set",\r
         "name": "set nodelist",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",\r
         "comments": "",\r
-        "x": 742,\r
-        "y": 522,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 765,\r
+        "y": 565,\r
+        "z": "ec3deb45.e00818",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8146ae4e.2b29b",\r
+        "id": "174740d3.bb580f",\r
         "type": "outcome",\r
         "name": "empty",\r
         "xml": "<outcome value=\"['']\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 584,\r
-        "y": 552,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 607,\r
+        "y": 595,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "b589f932.9ec108"\r
+                "82a452fa.2b2b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "94498b41.794368",\r
+        "id": "2651af68.3f9dc",\r
         "type": "switchNode",\r
         "name": "switch playbookname",\r
         "xml": "<switch test='`$playbookname`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1460,\r
-        "y": 387,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 1483,\r
+        "y": 430,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "975c4b05.0f6d08"\r
+                "bf08f71c.7cf758"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "975c4b05.0f6d08",\r
+        "id": "bf08f71c.7cf758",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1638,\r
-        "y": 387,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 1661,\r
+        "y": 430,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "eee08f4b.ee327"\r
+                "61379210.f96dcc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c4590ff.245c9",\r
+        "id": "5f26038d.9f08dc",\r
         "type": "set",\r
         "name": "set nodelist",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",\r
         "comments": "",\r
-        "x": 1433,\r
-        "y": 440,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 1456,\r
+        "y": 483,\r
+        "z": "ec3deb45.e00818",\r
         "wires": []\r
     },\r
     {\r
-        "id": "374bb3b9.6cefec",\r
+        "id": "363cf7ac.eea978",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1263,\r
-        "y": 397,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 1286,\r
+        "y": 440,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             [\r
-                "94498b41.794368",\r
-                "7c4590ff.245c9"\r
+                "2651af68.3f9dc",\r
+                "5f26038d.9f08dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eee08f4b.ee327",\r
+        "id": "61379210.f96dcc",\r
         "type": "execute",\r
         "name": "set playbookname",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1810,\r
-        "y": 385,\r
-        "z": "d0eb0cbd.ae56e",\r
+        "x": 1833,\r
+        "y": 428,\r
+        "z": "ec3deb45.e00818",\r
         "wires": [\r
             []\r
         ]\r
+    },\r
+    {\r
+        "id": "9253558b.1de3f8",\r
+        "type": "execute",\r
+        "name": "execute DmaapMsg",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1648,\r
+        "y": 939,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": [\r
+            [\r
+                "a452deae.c86e6"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a452deae.c86e6",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1830,\r
+        "y": 939,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": [\r
+            [\r
+                "fedb3391.b66c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fedb3391.b66c",\r
+        "type": "record",\r
+        "name": "record",\r
+        "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'/>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1960.416748046875,\r
+        "y": 939,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "4f44742c.4c245c",\r
+        "type": "set",\r
+        "name": "set DmaapReq",\r
+        "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",\r
+        "comments": "",\r
+        "x": 1985.666748046875,\r
+        "y": 854,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "77de5f8d.0aa37",\r
+        "type": "execute",\r
+        "name": "execute jsonStringToCtx",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1663.5001220703125,\r
+        "y": 784.9166259765625,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "87eb757f.5a9998",\r
+        "type": "execute",\r
+        "name": "execute getAttributeValue",\r
+        "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' />",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1669.5001220703125,\r
+        "y": 827.9166259765625,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "d4c78c4a.10f57",\r
+        "type": "switchNode",\r
+        "name": "switch outputPayload",\r
+        "xml": "<switch test='`$outputPayload`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1653.5001220703125,\r
+        "y": 874.9166259765625,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": [\r
+            [\r
+                "52af5803.b461c8",\r
+                "f8c7b0fd.65877"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "52af5803.b461c8",\r
+        "type": "outcome",\r
+        "name": "null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1830.5001220703125,\r
+        "y": 853.9166259765625,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": [\r
+            [\r
+                "4f44742c.4c245c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f8c7b0fd.65877",\r
+        "type": "outcome",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1829.5001220703125,\r
+        "y": 893.9166259765625,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": [\r
+            [\r
+                "596dd9e6.b15a48"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "596dd9e6.b15a48",\r
+        "type": "set",\r
+        "name": "set DmaapReq with payload",\r
+        "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`'/>",\r
+        "comments": "",\r
+        "x": 2027.5001220703125,\r
+        "y": 893.9166259765625,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1310b766.620cb9",\r
+        "type": "returnSuccess",\r
+        "name": "return success",\r
+        "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`'/>",\r
+        "comments": "",\r
+        "x": 2369.5001220703125,\r
+        "y": 971.9166259765625,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "94ccd9bd.ce5728",\r
+        "type": "outcome",\r
+        "name": "null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1835.5003662109375,\r
+        "y": 993.9165649414062,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": [\r
+            [\r
+                "acf117a7.e47ff8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "af6eae51.b597d",\r
+        "type": "outcome",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1834.5003662109375,\r
+        "y": 1069.9165649414062,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": [\r
+            [\r
+                "526dfc55.6eeaf4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "abc5eb21.233c78",\r
+        "type": "switchNode",\r
+        "name": "switch outputPayload",\r
+        "xml": "<switch test='`$outputPayload`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1652.5003662109375,\r
+        "y": 1029.9165649414062,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": [\r
+            [\r
+                "94ccd9bd.ce5728",\r
+                "af6eae51.b597d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d4fc7ba0.d97cd8",\r
+        "type": "returnSuccess",\r
+        "name": "return success with payload",\r
+        "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`'/>",\r
+        "comments": "",\r
+        "x": 2410.5003662109375,\r
+        "y": 1053.9165649414062,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "acf117a7.e47ff8",\r
+        "type": "switchNode",\r
+        "name": "switch result code",\r
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2005.5003662109375,\r
+        "y": 993.9165649414062,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": [\r
+            [\r
+                "7b6a7dcd.0bf034",\r
+                "964b16ae.6cb568"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "526dfc55.6eeaf4",\r
+        "type": "switchNode",\r
+        "name": "switch result code",\r
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2005.5003662109375,\r
+        "y": 1069.9165649414062,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": [\r
+            [\r
+                "116f67f9.8b84e8",\r
+                "b7261460.4d2728"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "270915b4.03f91a",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",\r
+        "comments": "",\r
+        "x": 2363.5003662109375,\r
+        "y": 1009.9165649414062,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ba208b9e.ce90f8",\r
+        "type": "returnFailure",\r
+        "name": "return failure with payload",\r
+        "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`'/>",\r
+        "comments": "",\r
+        "x": 2406.5003662109375,\r
+        "y": 1091.9165649414062,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "7b6a7dcd.0bf034",\r
+        "type": "other",\r
+        "name": "outcome 400",\r
+        "xml": "<outcome value='400'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2193.5003662109375,\r
+        "y": 971.9165649414062,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": [\r
+            [\r
+                "1310b766.620cb9"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "964b16ae.6cb568",\r
+        "type": "outcome",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2174.5003662109375,\r
+        "y": 1009.9165649414062,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": [\r
+            [\r
+                "270915b4.03f91a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "116f67f9.8b84e8",\r
+        "type": "other",\r
+        "name": "outcome 400",\r
+        "xml": "<outcome value='400'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2194.5003662109375,\r
+        "y": 1053.9165649414062,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": [\r
+            [\r
+                "d4fc7ba0.d97cd8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b7261460.4d2728",\r
+        "type": "outcome",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2176.5003662109375,\r
+        "y": 1091.9165649414062,\r
+        "z": "ec3deb45.e00818",\r
+        "wires": [\r
+            [\r
+                "ba208b9e.ce90f8"\r
+            ]\r
+        ]\r
     }\r
-]
\ No newline at end of file
+]\r

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 e4f818f..af0ee71 100644 (file)
--- 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' />\r
                 <parameter name='status.message' value='unexpected return from DG' />\r
                 <parameter name='quote' value="'" />\r
+                <parameter name='outputPayloadField' value='.Output' />\r
             </set>\r
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
                 <parameter name='source' value='upgrade-software-input.payload' />\r
@@ -22,6 +23,7 @@
                     <set>\r
                         <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>\r
                         <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-software.playbookname`'/>\r
+                        <parameter name='outputPayloadField' value="`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`"/>\r
                     </set>\r
                 </outcome>\r
                 <outcome value='Other'>\r
@@ -270,23 +272,56 @@
                                 <parameter name='PlaybookName' value='`$playbookname`'/>\r
                                 <outcome value='failure'>\r
                                     <block>\r
-                                        <set>\r
-                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
-                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>\r
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
-                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\r
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
-                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\r
-                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\r
-                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\r
-                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\r
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\r
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\r
-                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\r
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\r
-                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                        </set>\r
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
+                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />\r
+                                            <parameter name='outputPath' value='resultsJson' />\r
+                                            <parameter name='isEscaped' value='false' />\r
+                                        </execute>\r
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                                            <parameter name='source' value="`'resultsJson' + $outputPayloadField`" />\r
+                                            <parameter name='outputPath' value='outputPayload' />\r
+                                        </execute>\r
+                                        <switch test='`$outputPayload`'>\r
+                                            <outcome value=''>\r
+                                                <set>\r
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>\r
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\r
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\r
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\r
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\r
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\r
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                </set>\r
+                                            </outcome>\r
+                                            <outcome value='Other'>\r
+                                                <set>\r
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>\r
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\r
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\r
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\r
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\r
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\r
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>\r
+                                                </set>\r
+                                            </outcome>\r
+                                        </switch>\r
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
@@ -303,31 +338,96 @@
                                                 </record>\r
                                             </outcome>\r
                                         </execute>\r
-                                        <return status='failure'>\r
-                                            <parameter name='status.code' value='401' />\r
-                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
-                                        </return>\r
+                                        <switch test='`$outputPayload`'>\r
+                                            <outcome value=''>\r
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                                    <outcome value='400'>\r
+                                                        <return status='success'>\r
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                    <outcome value='Other'>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='status.code' value='401' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                </switch>\r
+                                            </outcome>\r
+                                            <outcome value='Other'>\r
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                                    <outcome value='400'>\r
+                                                        <return status='success'>\r
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                            <parameter name='payload' value='`$outputPayload`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                    <outcome value='Other'>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='status.code' value='401' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                            <parameter name='payload' value='`$outputPayload`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                </switch>\r
+                                            </outcome>\r
+                                        </switch>\r
                                     </block>\r
                                 </outcome>\r
                                 <outcome value='success'>\r
                                     <block>\r
-                                        <set>\r
-                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
-                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>\r
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
-                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\r
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
-                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\r
-                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\r
-                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\r
-                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\r
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\r
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\r
-                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\r
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\r
-                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                        </set>\r
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
+                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />\r
+                                            <parameter name='outputPath' value='resultsJson' />\r
+                                            <parameter name='isEscaped' value='false' />\r
+                                        </execute>\r
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                                            <parameter name='source' value="`'resultsJson' + $outputPayloadField`" />\r
+                                            <parameter name='outputPath' value='outputPayload' />\r
+                                        </execute>\r
+                                        <switch test='`$outputPayload`'>\r
+                                            <outcome value=''>\r
+                                                <set>\r
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>\r
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\r
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\r
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\r
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\r
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\r
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                </set>\r
+                                            </outcome>\r
+                                            <outcome value='Other'>\r
+                                                <set>\r
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>\r
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\r
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\r
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\r
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\r
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\r
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>\r
+                                                </set>\r
+                                            </outcome>\r
+                                        </switch>\r
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
@@ -344,10 +444,42 @@
                                                 </record>\r
                                             </outcome>\r
                                         </execute>\r
-                                        <return status='success'>\r
-                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                        </return>\r
+                                        <switch test='`$outputPayload`'>\r
+                                            <outcome value=''>\r
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                                    <outcome value='400'>\r
+                                                        <return status='success'>\r
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                    <outcome value='Other'>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='status.code' value='401' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                </switch>\r
+                                            </outcome>\r
+                                            <outcome value='Other'>\r
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                                    <outcome value='400'>\r
+                                                        <return status='success'>\r
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                            <parameter name='payload' value='`$outputPayload`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                    <outcome value='Other'>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='status.code' value='401' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                            <parameter name='payload' value='`$outputPayload`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                </switch>\r
+                                            </outcome>\r
+                                        </switch>\r
                                     </block>\r
                                 </outcome>\r
                             </execute>\r