From ef1336a6cbd9cd2c417bebe03ac4fb7b8d328cfa Mon Sep 17 00:00:00 2001
From: Enbo Wang <wangenbo@huawei.com>
Date: Thu, 9 May 2019 15:28:55 +0000
Subject: [PATCH] Revert deleted payload in SW upgrade DGs

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

Former-commit-id: 73657078060445739c1a5c05e031a8216f8c87dd
---
 .../lcm/src/main/json/LCM_upgrade-post-check.json  | 828 +++++++++++++-------
 .../lcm/src/main/json/LCM_upgrade-pre-check.json   | 830 ++++++++++++++-------
 .../lcm/src/main/xml/LCM_upgrade-post-check.xml    | 216 ++++--
 .../lcm/src/main/xml/LCM_upgrade-pre-check.xml     | 216 ++++--
 4 files changed, 1447 insertions(+), 643 deletions(-)

diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json b/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
index 18a63f29..781faaa6 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
@@ -1,813 +1,1083 @@
 [
     {
-        "id": "ab475552.d851d8",
+        "id": "fe0acee3.b3d4f",
         "type": "method",
         "name": "upgrade-post-check",
         "xml": "<method rpc='upgrade-post-check' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 548,
-        "y": 59,
-        "z": "802a6e37.fb3c1",
+        "x": 523,
+        "y": 71,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "356938f4.e6ef78"
+                "88d3f9c3.91e818"
             ]
         ]
     },
     {
-        "id": "db22c5e0.c4b368",
+        "id": "dd69f330.0db38",
         "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": 335.99993896484375,
-        "y": 60,
-        "z": "802a6e37.fb3c1",
+        "x": 310.99993896484375,
+        "y": 72,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "ab475552.d851d8"
+                "fe0acee3.b3d4f"
             ]
         ]
     },
     {
-        "id": "74883a0a.669d34",
+        "id": "ca77e1d2.5f235",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-post-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 403.00001525878906,
-        "y": 667,
-        "z": "802a6e37.fb3c1",
+        "x": 378.00001525878906,
+        "y": 679,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "8efae65a.30c7b8",
-                "fdc248e2.dda948",
-                "fc8e86cf.976918"
+                "98532a13.9e8648",
+                "300b9189.6839ae",
+                "93689f4a.8157"
             ]
         ]
     },
     {
-        "id": "ea8ede8a.5e5e7",
+        "id": "338f7649.ef4e9a",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 802.9999389648438,
-        "y": 775.0000305175781,
-        "z": "802a6e37.fb3c1",
+        "x": 777.9999389648438,
+        "y": 787.0000305175781,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "ed747ae6.f82e38",
-                "d348a5a9.90bb58",
-                "606ee94e.547568"
+                "13e6fdd5.284672",
+                "558456ec.861628",
+                "d84c0d6b.4e961"
             ]
         ]
     },
     {
-        "id": "ed747ae6.f82e38",
+        "id": "13e6fdd5.284672",
         "type": "other",
         "name": "outcome 500",
         "xml": "<outcome value='500'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 947.9999389648438,
-        "y": 773.0000381469727,
-        "z": "802a6e37.fb3c1",
+        "x": 922.9999389648438,
+        "y": 785.0000381469727,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "8e974f56.dbd44"
+                "d4f3b77a.b39508"
             ]
         ]
     },
     {
-        "id": "d348a5a9.90bb58",
+        "id": "558456ec.861628",
         "type": "other",
         "name": "outcome 100",
         "xml": "<outcome value='100'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 944.9999389648438,
-        "y": 830.0000305175781,
-        "z": "802a6e37.fb3c1",
+        "x": 919.9999389648438,
+        "y": 842.0000305175781,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "5fe71ec4.57d62"
+                "a1c39fcf.a06c"
             ]
         ]
     },
     {
-        "id": "5fe71ec4.57d62",
+        "id": "a1c39fcf.a06c",
         "type": "execute",
         "name": "execute reqExecResult",
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1132.9999389648438,
-        "y": 829.0000305175781,
-        "z": "802a6e37.fb3c1",
+        "x": 1107.9999389648438,
+        "y": 841.0000305175781,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "484e1e77.a4c4c",
-                "ef7a898e.c55ae8"
+                "f58c60bb.b391f",
+                "b18d4538.e8ef28"
             ]
         ]
     },
     {
-        "id": "fdc248e2.dda948",
+        "id": "300b9189.6839ae",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 661.9999389648438,
-        "y": 688.0000915527344,
-        "z": "802a6e37.fb3c1",
+        "x": 636.9999389648438,
+        "y": 700.0000915527344,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "8e974f56.dbd44"
+                "d4f3b77a.b39508"
             ]
         ]
     },
     {
-        "id": "8efae65a.30c7b8",
+        "id": "98532a13.9e8648",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 663.9999389648438,
-        "y": 740.0000610351562,
-        "z": "802a6e37.fb3c1",
+        "x": 638.9999389648438,
+        "y": 752.0000610351562,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "ea8ede8a.5e5e7"
+                "338f7649.ef4e9a"
             ]
         ]
     },
     {
-        "id": "484e1e77.a4c4c",
+        "id": "f58c60bb.b391f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1301.9999389648438,
-        "y": 787.0000381469727,
-        "z": "802a6e37.fb3c1",
+        "x": 1278.9998779296875,
+        "y": 820.0000610351562,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "8e974f56.dbd44"
+                "44e1b1d0.b5bf9"
             ]
         ]
     },
     {
-        "id": "606ee94e.547568",
+        "id": "d84c0d6b.4e961",
         "type": "other",
         "name": "outcome 101",
         "xml": "<outcome value='101'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 944.9999389648438,
-        "y": 731.0000686645508,
-        "z": "802a6e37.fb3c1",
+        "x": 919.9999389648438,
+        "y": 743.0000686645508,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "8e974f56.dbd44"
+                "d4f3b77a.b39508"
             ]
         ]
     },
     {
-        "id": "ef7a898e.c55ae8",
+        "id": "b18d4538.e8ef28",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1309.9998779296875,
-        "y": 835.0001220703125,
-        "z": "802a6e37.fb3c1",
+        "x": 1281.9998779296875,
+        "y": 871.0001220703125,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "565fc0b9.1ff1a"
+                "44e1b1d0.b5bf9"
             ]
         ]
     },
     {
-        "id": "bca33267.b186f",
-        "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": 1603.9998779296875,
-        "y": 892.0000610351562,
-        "z": "802a6e37.fb3c1",
-        "wires": []
-    },
-    {
-        "id": "f3c40140.4762d",
+        "id": "67392fb2.3fda3",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 151,
-        "y": 59,
-        "z": "802a6e37.fb3c1",
+        "x": 126,
+        "y": 71,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "db22c5e0.c4b368"
+                "dd69f330.0db38"
             ]
         ]
     },
     {
-        "id": "356938f4.e6ef78",
+        "id": "88d3f9c3.91e818",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 148.91668701171875,
-        "y": 151.08334350585938,
-        "z": "802a6e37.fb3c1",
+        "x": 123.91668701171875,
+        "y": 163.08334350585938,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "74883a0a.669d34",
-                "5f157934.113238",
-                "fad67e1f.e709b",
-                "f04f2fb5.8c0ca",
-                "a1aa3253.06afa",
-                "e636c2ac.2dc0d",
-                "8b5b2558.88c888",
-                "89a1b60f.9a2848"
+                "ca77e1d2.5f235",
+                "c7ec6050.45978",
+                "889f84ed.e111e8",
+                "40652fca.65d24",
+                "983b7f00.0aa95",
+                "43b098aa.2b8088",
+                "3c8d18f4.57a768",
+                "5c9efc94.d81d24"
             ]
         ]
     },
     {
-        "id": "5f157934.113238",
+        "id": "c7ec6050.45978",
         "type": "execute",
         "name": "execute Properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 447.0000305175781,
-        "y": 184.08334350585938,
-        "z": "802a6e37.fb3c1",
+        "x": 422.0000305175781,
+        "y": 196.08334350585938,
+        "z": "b4969602.e5a2a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "9c2d2fed.0688d",
+        "id": "d9d2286.379c4d8",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1613.9998779296875,
-        "y": 637.0834045410156,
-        "z": "802a6e37.fb3c1",
+        "x": 1588.9998779296875,
+        "y": 649.0834045410156,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "789af377.cced2c"
+                "642ae55d.535a7c"
             ]
         ]
     },
     {
-        "id": "789af377.cced2c",
+        "id": "642ae55d.535a7c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1783.9998168945312,
-        "y": 636.0834045410156,
-        "z": "802a6e37.fb3c1",
+        "x": 1758.9998168945312,
+        "y": 648.0834045410156,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "c75d24f.c2de2d8"
+                "7969554f.e56e0c"
             ]
         ]
     },
     {
-        "id": "8e974f56.dbd44",
+        "id": "d4f3b77a.b39508",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1416.9998168945312,
-        "y": 661.0834045410156,
-        "z": "802a6e37.fb3c1",
+        "x": 1391.9998168945312,
+        "y": 673.0834045410156,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "9c2d2fed.0688d",
-                "a0c3935d.9a935",
-                "82255155.ccaef"
+                "d9d2286.379c4d8",
+                "8a00ee98.85d8c",
+                "a967853.2e08a78"
             ]
         ]
     },
     {
-        "id": "2939808a.b52ef",
+        "id": "61a865a3.81374c",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1614.4998779296875,
-        "y": 842.0833740234375,
-        "z": "802a6e37.fb3c1",
+        "x": 1600.4998779296875,
+        "y": 904.0833740234375,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "22bed4c.08b6a2c"
+                "bf6e3414.ac0ab8"
             ]
         ]
     },
     {
-        "id": "22bed4c.08b6a2c",
+        "id": "bf6e3414.ac0ab8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1782.4998779296875,
-        "y": 842.0833740234375,
-        "z": "802a6e37.fb3c1",
+        "y": 904.0833740234375,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "8841bc4a.67149"
+                "a98ac8b6.1c8b18"
             ]
         ]
     },
     {
-        "id": "c75d24f.c2de2d8",
+        "id": "7969554f.e56e0c",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1903.9998779296875,
-        "y": 635.0833740234375,
-        "z": "802a6e37.fb3c1",
+        "x": 1878.9998779296875,
+        "y": 647.0833740234375,
+        "z": "b4969602.e5a2a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a0c3935d.9a935",
+        "id": "8a00ee98.85d8c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
         "comments": "",
-        "x": 1595.91650390625,
-        "y": 688.0834045410156,
-        "z": "802a6e37.fb3c1",
+        "x": 1570.91650390625,
+        "y": 700.0834045410156,
+        "z": "b4969602.e5a2a8",
         "wires": []
     },
     {
-        "id": "8841bc4a.67149",
+        "id": "a98ac8b6.1c8b18",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1910.9166259765625,
-        "y": 842.0833740234375,
-        "z": "802a6e37.fb3c1",
+        "x": 1912.9166259765625,
+        "y": 904.0833740234375,
+        "z": "b4969602.e5a2a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "82255155.ccaef",
+        "id": "a967853.2e08a78",
         "type": "set",
         "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1600.9998779296875,
-        "y": 584.0833740234375,
-        "z": "802a6e37.fb3c1",
+        "x": 1575.9998779296875,
+        "y": 596.0833740234375,
+        "z": "b4969602.e5a2a8",
         "wires": []
     },
     {
-        "id": "565fc0b9.1ff1a",
+        "id": "44e1b1d0.b5bf9",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1437.9998779296875,
-        "y": 836.0833740234375,
-        "z": "802a6e37.fb3c1",
+        "x": 1406.9998779296875,
+        "y": 845.0833740234375,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "2939808a.b52ef",
-                "cd18f032.f6fef",
-                "bca33267.b186f"
+                "61a865a3.81374c",
+                "af2360f3.a1b32",
+                "c058b1a3.cafa7",
+                "d59d4575.f7aa08",
+                "97b68625.59c538"
             ]
         ]
     },
     {
-        "id": "cd18f032.f6fef",
+        "id": "72836a7a.768624",
         "type": "set",
         "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1604.1666259765625,
-        "y": 787.0833740234375,
-        "z": "802a6e37.fb3c1",
+        "x": 1938.1666259765625,
+        "y": 819.0833740234375,
+        "z": "b4969602.e5a2a8",
         "wires": []
     },
     {
-        "id": "fc8e86cf.976918",
+        "id": "93689f4a.8157",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 670.9999389648438,
-        "y": 640.0000610351562,
-        "z": "802a6e37.fb3c1",
+        "x": 645.9999389648438,
+        "y": 652.0000610351562,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "95e77813.ba9108"
+                "c92e96da.bead68"
             ]
         ]
     },
     {
-        "id": "60c18ca3.4f03c4",
+        "id": "3705b5ae.a55ada",
         "type": "set",
         "name": "set Defaults",
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
         "comments": "",
-        "x": 961.9999389648438,
-        "y": 599,
-        "z": "802a6e37.fb3c1",
+        "x": 936.9999389648438,
+        "y": 611,
+        "z": "b4969602.e5a2a8",
         "wires": []
     },
     {
-        "id": "95e77813.ba9108",
+        "id": "c92e96da.bead68",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 807.9999389648438,
-        "y": 634.0000610351562,
-        "z": "802a6e37.fb3c1",
+        "x": 782.9999389648438,
+        "y": 646.0000610351562,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "60c18ca3.4f03c4",
-                "8e974f56.dbd44"
+                "3705b5ae.a55ada",
+                "d4f3b77a.b39508"
             ]
         ]
     },
     {
-        "id": "fad67e1f.e709b",
+        "id": "889f84ed.e111e8",
         "type": "set",
         "name": "set default values",
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
+        "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": 440,
-        "y": 231,
-        "z": "802a6e37.fb3c1",
+        "x": 415,
+        "y": 243,
+        "z": "b4969602.e5a2a8",
         "wires": []
     },
     {
-        "id": "24f45898.65de18",
+        "id": "9e2047bf.84ca98",
         "type": "get-resource",
         "name": "get aai.generic-vnf ",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $upgrade-post-check-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
         "comments": "",
         "outputs": 1,
-        "x": 980,
-        "y": 407,
-        "z": "802a6e37.fb3c1",
+        "x": 955,
+        "y": 419,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "3a57fbc.0ac6d04"
+                "db67679b.d5f7f8"
             ]
         ]
     },
     {
-        "id": "3a57fbc.0ac6d04",
+        "id": "db67679b.d5f7f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1138.3907470703125,
-        "y": 405.28399658203125,
-        "z": "802a6e37.fb3c1",
+        "x": 1113.3907470703125,
+        "y": 417.28399658203125,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "721a47cc.cdf2d8"
+                "9f78147c.45b0d8"
             ]
         ]
     },
     {
-        "id": "8b5b2558.88c888",
+        "id": "3c8d18f4.57a768",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 368.9998779296875,
-        "y": 595,
-        "z": "802a6e37.fb3c1",
+        "x": 343.9998779296875,
+        "y": 607,
+        "z": "b4969602.e5a2a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a1aa3253.06afa",
+        "id": "983b7f00.0aa95",
         "type": "switchNode",
         "name": "switch pnf-flag",
         "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 422,
-        "y": 332,
-        "z": "802a6e37.fb3c1",
+        "x": 397,
+        "y": 344,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "9417db8c.51c568",
-                "9e3df3f5.2c2d9"
+                "6ab53366.6b679c",
+                "c2f80dd0.8d1"
             ]
         ]
     },
     {
-        "id": "f04f2fb5.8c0ca",
+        "id": "40652fca.65d24",
         "type": "execute",
         "name": "execute jsonStringToCtx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-post-check-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
         "comments": "",
         "outputs": 1,
-        "x": 454,
-        "y": 278,
-        "z": "802a6e37.fb3c1",
+        "x": 429,
+        "y": 290,
+        "z": "b4969602.e5a2a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "9417db8c.51c568",
+        "id": "6ab53366.6b679c",
         "type": "outcome",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 619,
-        "y": 311,
-        "z": "802a6e37.fb3c1",
+        "x": 594,
+        "y": 323,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "94353f3f.e7eee"
+                "b2f335c.b319ac8"
             ]
         ]
     },
     {
-        "id": "9e3df3f5.2c2d9",
+        "id": "c2f80dd0.8d1",
         "type": "outcome",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 618.9999389648438,
-        "y": 372,
-        "z": "802a6e37.fb3c1",
+        "x": 593.9999389648438,
+        "y": 384,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "95b6db3f.a43608"
+                "64084999.263e28"
             ]
         ]
     },
     {
-        "id": "95b6db3f.a43608",
+        "id": "64084999.263e28",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 766.9999389648438,
-        "y": 371,
-        "z": "802a6e37.fb3c1",
+        "x": 741.9999389648438,
+        "y": 383,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "24f45898.65de18",
-                "240a5e4b.ef6af2"
+                "9e2047bf.84ca98",
+                "1c2838e7.02c327"
             ]
         ]
     },
     {
-        "id": "94353f3f.e7eee",
+        "id": "b2f335c.b319ac8",
         "type": "set",
         "name": "set AnsibleReq",
-        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-post-check.playbookname`'/>\n",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-post-check.playbookname`'/>\n<parameter name='outputPayloadField' value=\"`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`\"/>\n",
         "comments": "",
-        "x": 780,
-        "y": 309,
-        "z": "802a6e37.fb3c1",
+        "x": 755,
+        "y": 321,
+        "z": "b4969602.e5a2a8",
         "wires": []
     },
     {
-        "id": "240a5e4b.ef6af2",
+        "id": "1c2838e7.02c327",
         "type": "execute",
         "name": "set playbookname",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-post-check.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 989,
-        "y": 351,
-        "z": "802a6e37.fb3c1",
+        "x": 964,
+        "y": 363,
+        "z": "b4969602.e5a2a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "e636c2ac.2dc0d",
+        "id": "43b098aa.2b8088",
         "type": "switchNode",
         "name": "switch playbookname",
         "xml": "<switch test='`$playbookname`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 419,
-        "y": 463,
-        "z": "802a6e37.fb3c1",
+        "x": 394,
+        "y": 475,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "a65bd4c9.27f638"
+                "f5a4d554.8310a8"
             ]
         ]
     },
     {
-        "id": "a65bd4c9.27f638",
+        "id": "f5a4d554.8310a8",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 590,
-        "y": 464,
-        "z": "802a6e37.fb3c1",
+        "x": 565,
+        "y": 476,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "286bc0d0.e5819"
+                "e3207caa.85b44"
             ]
         ]
     },
     {
-        "id": "286bc0d0.e5819",
+        "id": "e3207caa.85b44",
         "type": "set",
         "name": "set playbookname",
         "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-post-check.playbookname`'/>",
         "comments": "",
-        "x": 780,
-        "y": 463,
-        "z": "802a6e37.fb3c1",
+        "x": 755,
+        "y": 475,
+        "z": "b4969602.e5a2a8",
         "wires": []
     },
     {
-        "id": "89a1b60f.9a2848",
+        "id": "5c9efc94.d81d24",
         "type": "switchNode",
         "name": "switch nodelist",
         "xml": "<switch test='`$nodelist`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 409,
-        "y": 522,
-        "z": "802a6e37.fb3c1",
+        "x": 384,
+        "y": 534,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "10bd0563.dd89eb",
-                "9f1eacfe.fa54"
+                "77224991.c20a78",
+                "2deab8c5.642298"
             ]
         ]
     },
     {
-        "id": "10bd0563.dd89eb",
+        "id": "77224991.c20a78",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 589,
-        "y": 515,
-        "z": "802a6e37.fb3c1",
+        "x": 564,
+        "y": 527,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "f0ef60d3.f64f"
+                "3881d027.425ff"
             ]
         ]
     },
     {
-        "id": "f0ef60d3.f64f",
+        "id": "3881d027.425ff",
         "type": "set",
         "name": "set nodelist",
         "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
         "comments": "",
-        "x": 746,
-        "y": 529,
-        "z": "802a6e37.fb3c1",
+        "x": 721,
+        "y": 541,
+        "z": "b4969602.e5a2a8",
         "wires": []
     },
     {
-        "id": "9f1eacfe.fa54",
+        "id": "2deab8c5.642298",
         "type": "outcome",
         "name": "empty",
         "xml": "<outcome value=\"['']\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 588,
-        "y": 559,
-        "z": "802a6e37.fb3c1",
+        "x": 563,
+        "y": 571,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "f0ef60d3.f64f"
+                "3881d027.425ff"
             ]
         ]
     },
     {
-        "id": "26d43493.24ca8c",
+        "id": "153ed401.962ddc",
         "type": "switchNode",
         "name": "switch playbookname",
         "xml": "<switch test='`$playbookname`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1464,
-        "y": 394,
-        "z": "802a6e37.fb3c1",
+        "x": 1439,
+        "y": 406,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "ad0fd429.dd1178"
+                "3cfaf009.20065"
             ]
         ]
     },
     {
-        "id": "ad0fd429.dd1178",
+        "id": "3cfaf009.20065",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1642,
-        "y": 394,
-        "z": "802a6e37.fb3c1",
+        "x": 1617,
+        "y": 406,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "bbed41e1.ca0c4"
+                "8e725f1f.6662f"
             ]
         ]
     },
     {
-        "id": "3935df66.a3be5",
+        "id": "9e70216f.c9b2f",
         "type": "set",
         "name": "set nodelist",
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",
         "comments": "",
-        "x": 1437,
-        "y": 447,
-        "z": "802a6e37.fb3c1",
+        "x": 1412,
+        "y": 459,
+        "z": "b4969602.e5a2a8",
         "wires": []
     },
     {
-        "id": "721a47cc.cdf2d8",
+        "id": "9f78147c.45b0d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1267,
-        "y": 404,
-        "z": "802a6e37.fb3c1",
+        "x": 1242,
+        "y": 416,
+        "z": "b4969602.e5a2a8",
         "wires": [
             [
-                "26d43493.24ca8c",
-                "3935df66.a3be5"
+                "153ed401.962ddc",
+                "9e70216f.c9b2f"
             ]
         ]
     },
     {
-        "id": "bbed41e1.ca0c4",
+        "id": "8e725f1f.6662f",
         "type": "execute",
         "name": "set playbookname",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-post-check.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1814,
-        "y": 392,
-        "z": "802a6e37.fb3c1",
+        "x": 1789,
+        "y": 404,
+        "z": "b4969602.e5a2a8",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "af2360f3.a1b32",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='org.onap.appc.adapter.ansible.results' />\n\t<parameter name='outputPath' value='resultsJson' />\n\t<parameter name='isEscaped' value='false' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1616,
+        "y": 750,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c058b1a3.cafa7",
+        "type": "execute",
+        "name": "execute getAttributeValue",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='source' value=\"`'resultsJson' + $outputPayloadField`\" />\n\t<parameter name='outputPath' value='outputPayload' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1622,
+        "y": 793,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d59d4575.f7aa08",
+        "type": "switchNode",
+        "name": "switch outputPayload",
+        "xml": "<switch test='`$outputPayload`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1606,
+        "y": 840,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "676d5ce5.e9d864",
+                "8ecd1678.ebdff8"
+            ]
+        ]
+    },
+    {
+        "id": "676d5ce5.e9d864",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1783,
+        "y": 819,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "72836a7a.768624"
+            ]
+        ]
+    },
+    {
+        "id": "8ecd1678.ebdff8",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1782,
+        "y": 859,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "5f5e736e.9d3b8c"
+            ]
+        ]
+    },
+    {
+        "id": "5f5e736e.9d3b8c",
+        "type": "set",
+        "name": "set DmaapReq with payload",
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>",
+        "comments": "",
+        "x": 1980,
+        "y": 859,
+        "z": "b4969602.e5a2a8",
+        "wires": []
+    },
+    {
+        "id": "bd7deada.205038",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
+        "comments": "",
+        "x": 2322,
+        "y": 937,
+        "z": "b4969602.e5a2a8",
+        "wires": []
+    },
+    {
+        "id": "530e9d63.07dd34",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1788.000244140625,
+        "y": 958.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "aba50f21.a535d"
+            ]
+        ]
+    },
+    {
+        "id": "d6c0e471.9108d8",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1787.000244140625,
+        "y": 1034.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "801dd50e.8622c8"
+            ]
+        ]
+    },
+    {
+        "id": "97b68625.59c538",
+        "type": "switchNode",
+        "name": "switch outputPayload",
+        "xml": "<switch test='`$outputPayload`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1605.000244140625,
+        "y": 994.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "530e9d63.07dd34",
+                "d6c0e471.9108d8"
+            ]
+        ]
+    },
+    {
+        "id": "acbbf9db.eeba28",
+        "type": "returnSuccess",
+        "name": "return success with payload",
+        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='payload' value='`$outputPayload`'/>",
+        "comments": "",
+        "x": 2363.000244140625,
+        "y": 1018.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": []
+    },
+    {
+        "id": "aba50f21.a535d",
+        "type": "switchNode",
+        "name": "switch result code",
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1958.000244140625,
+        "y": 958.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "3ac4241b.62144c",
+                "c67e4b5c.d70a28"
+            ]
+        ]
+    },
+    {
+        "id": "801dd50e.8622c8",
+        "type": "switchNode",
+        "name": "switch result code",
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1958.000244140625,
+        "y": 1034.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "8dcd3ae3.608a58",
+                "a94e8dc6.52647"
+            ]
+        ]
+    },
+    {
+        "id": "657ecc9e.2687c4",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
+        "comments": "",
+        "x": 2316.000244140625,
+        "y": 974.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": []
+    },
+    {
+        "id": "52f49f6f.dcf4",
+        "type": "returnFailure",
+        "name": "return failure with payload",
+        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n<parameter name='payload' value='`$outputPayload`'/>",
+        "comments": "",
+        "x": 2359.000244140625,
+        "y": 1056.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": []
+    },
+    {
+        "id": "3ac4241b.62144c",
+        "type": "other",
+        "name": "outcome 400",
+        "xml": "<outcome value='400'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2146.000244140625,
+        "y": 936.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "bd7deada.205038"
+            ]
+        ]
+    },
+    {
+        "id": "c67e4b5c.d70a28",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2127.000244140625,
+        "y": 974.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "657ecc9e.2687c4"
+            ]
+        ]
+    },
+    {
+        "id": "8dcd3ae3.608a58",
+        "type": "other",
+        "name": "outcome 400",
+        "xml": "<outcome value='400'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2147.000244140625,
+        "y": 1018.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "acbbf9db.eeba28"
+            ]
+        ]
+    },
+    {
+        "id": "a94e8dc6.52647",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2129.000244140625,
+        "y": 1056.9999389648438,
+        "z": "b4969602.e5a2a8",
+        "wires": [
+            [
+                "52f49f6f.dcf4"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json b/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
index 08b896ec..0239c763 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
@@ -1,813 +1,1083 @@
 [
     {
-        "id": "dfc42d29.4066",
+        "id": "e17c1584.f756d8",
         "type": "method",
         "name": "upgrade-pre-check",
         "xml": "<method rpc='upgrade-pre-check' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 554,
-        "y": 86,
-        "z": "a5b492f8.99d13",
+        "x": 552,
+        "y": 67,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "dc3f6c8f.49cb4"
+                "4a691c8b.6b9db4"
             ]
         ]
     },
     {
-        "id": "ec3ea72c.b00d38",
+        "id": "1f7a861d.c2112a",
         "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": 341.99993896484375,
-        "y": 87,
-        "z": "a5b492f8.99d13",
+        "x": 339.99993896484375,
+        "y": 68,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "dfc42d29.4066"
+                "e17c1584.f756d8"
             ]
         ]
     },
     {
-        "id": "aa4b4733.b95e98",
+        "id": "bb18ce54.65a6d",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-pre-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 409.00001525878906,
-        "y": 694,
-        "z": "a5b492f8.99d13",
+        "x": 407.00001525878906,
+        "y": 675,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "eed23890.382f88",
-                "39c73cda.20f284",
-                "d5d4d9a.dfdee28"
+                "c6f98872.c067e8",
+                "5614f2d4.83759c",
+                "1beab9a5.7e2366"
             ]
         ]
     },
     {
-        "id": "c2461908.a56de8",
+        "id": "8e97cc56.5d143",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 808.9999389648438,
-        "y": 802.0000305175781,
-        "z": "a5b492f8.99d13",
+        "x": 806.9999389648438,
+        "y": 783.0000305175781,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "21b1a494.57eb8c",
-                "c0ddf646.939658",
-                "c13b6a1f.ac5838"
+                "d5d391c0.e33eb",
+                "96569d9a.8f849",
+                "8eb6da31.c976d8"
             ]
         ]
     },
     {
-        "id": "21b1a494.57eb8c",
+        "id": "d5d391c0.e33eb",
         "type": "other",
         "name": "outcome 500",
         "xml": "<outcome value='500'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 953.9999389648438,
-        "y": 800.0000381469727,
-        "z": "a5b492f8.99d13",
+        "x": 951.9999389648438,
+        "y": 781.0000381469727,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "c0fa5e3.de329a"
+                "261676ae.6c18ea"
             ]
         ]
     },
     {
-        "id": "c0ddf646.939658",
+        "id": "96569d9a.8f849",
         "type": "other",
         "name": "outcome 100",
         "xml": "<outcome value='100'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 950.9999389648438,
-        "y": 857.0000305175781,
-        "z": "a5b492f8.99d13",
+        "x": 948.9999389648438,
+        "y": 838.0000305175781,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "95b7bcea.2185b"
+                "a9aeb5d4.ad8218"
             ]
         ]
     },
     {
-        "id": "95b7bcea.2185b",
+        "id": "a9aeb5d4.ad8218",
         "type": "execute",
         "name": "execute reqExecResult",
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1138.9999389648438,
-        "y": 856.0000305175781,
-        "z": "a5b492f8.99d13",
+        "x": 1136.9999389648438,
+        "y": 837.0000305175781,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "205ffc13.4d2b24",
-                "c24e2446.933768"
+                "50e30f80.cb97b",
+                "f9b1e44f.cf0bf8"
             ]
         ]
     },
     {
-        "id": "39c73cda.20f284",
+        "id": "5614f2d4.83759c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 667.9999389648438,
-        "y": 715.0000915527344,
-        "z": "a5b492f8.99d13",
+        "x": 665.9999389648438,
+        "y": 696.0000915527344,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "c0fa5e3.de329a"
+                "261676ae.6c18ea"
             ]
         ]
     },
     {
-        "id": "eed23890.382f88",
+        "id": "c6f98872.c067e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 669.9999389648438,
-        "y": 767.0000610351562,
-        "z": "a5b492f8.99d13",
+        "x": 667.9999389648438,
+        "y": 748.0000610351562,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "c2461908.a56de8"
+                "8e97cc56.5d143"
             ]
         ]
     },
     {
-        "id": "205ffc13.4d2b24",
+        "id": "50e30f80.cb97b",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1307.9999389648438,
-        "y": 814.0000381469727,
-        "z": "a5b492f8.99d13",
+        "x": 1305.9998779296875,
+        "y": 819.0000610351562,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "c0fa5e3.de329a"
+                "7ac364bd.12e01c"
             ]
         ]
     },
     {
-        "id": "c13b6a1f.ac5838",
+        "id": "8eb6da31.c976d8",
         "type": "other",
         "name": "outcome 101",
         "xml": "<outcome value='101'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 950.9999389648438,
-        "y": 758.0000686645508,
-        "z": "a5b492f8.99d13",
+        "x": 948.9999389648438,
+        "y": 739.0000686645508,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "c0fa5e3.de329a"
+                "261676ae.6c18ea"
             ]
         ]
     },
     {
-        "id": "c24e2446.933768",
+        "id": "f9b1e44f.cf0bf8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1315.9998779296875,
-        "y": 862.0001220703125,
-        "z": "a5b492f8.99d13",
+        "x": 1309.9998779296875,
+        "y": 863.0001220703125,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "1b8bc484.4e584b"
+                "7ac364bd.12e01c"
             ]
         ]
     },
     {
-        "id": "425c7483.101a2c",
-        "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": 1609.9998779296875,
-        "y": 919.0000610351562,
-        "z": "a5b492f8.99d13",
-        "wires": []
-    },
-    {
-        "id": "d9f050b3.ea908",
+        "id": "a40759ed.63a388",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 157,
-        "y": 86,
-        "z": "a5b492f8.99d13",
+        "x": 155,
+        "y": 67,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "ec3ea72c.b00d38"
+                "1f7a861d.c2112a"
             ]
         ]
     },
     {
-        "id": "dc3f6c8f.49cb4",
+        "id": "4a691c8b.6b9db4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 154.91668701171875,
-        "y": 178.08334350585938,
-        "z": "a5b492f8.99d13",
+        "x": 152.91668701171875,
+        "y": 159.08334350585938,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "aa4b4733.b95e98",
-                "ad12ad52.0e14c",
-                "494bc731.2b3b38",
-                "e7275d95.288b8",
-                "790211fa.4ddc3",
-                "87c25306.3bca6",
-                "54a283d8.5df65c",
-                "1cee6cc7.a0f263"
+                "bb18ce54.65a6d",
+                "4f789742.ddd168",
+                "2f15d339.87cf0c",
+                "556d2c3e.217c14",
+                "905f1137.7562f",
+                "5cc58e7c.083a5",
+                "db896c60.3d19a",
+                "ae5d9d02.d1fe4"
             ]
         ]
     },
     {
-        "id": "ad12ad52.0e14c",
+        "id": "4f789742.ddd168",
         "type": "execute",
         "name": "execute Properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 453.0000305175781,
-        "y": 211.08334350585938,
-        "z": "a5b492f8.99d13",
+        "x": 451.0000305175781,
+        "y": 192.08334350585938,
+        "z": "df893cfa.16f38",
         "wires": [
             []
         ]
     },
     {
-        "id": "9aa2e4.6e1c5d2",
+        "id": "9f29e934.d196d8",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1619.9998779296875,
-        "y": 664.0834045410156,
-        "z": "a5b492f8.99d13",
+        "x": 1617.9998779296875,
+        "y": 645.0834045410156,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "fde058a0.d22348"
+                "eff6b07f.5f555"
             ]
         ]
     },
     {
-        "id": "fde058a0.d22348",
+        "id": "eff6b07f.5f555",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1789.9998168945312,
-        "y": 663.0834045410156,
-        "z": "a5b492f8.99d13",
+        "x": 1787.9998168945312,
+        "y": 644.0834045410156,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "ff5c4bc7.d7c748"
+                "39c1e046.0c9a2"
             ]
         ]
     },
     {
-        "id": "c0fa5e3.de329a",
+        "id": "261676ae.6c18ea",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1422.9998168945312,
-        "y": 688.0834045410156,
-        "z": "a5b492f8.99d13",
+        "x": 1420.9998168945312,
+        "y": 669.0834045410156,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "9aa2e4.6e1c5d2",
-                "16091a49.ebb886",
-                "320ba499.3a71fc"
+                "9f29e934.d196d8",
+                "20f5321f.fe2dee",
+                "b16d5209.3031f"
             ]
         ]
     },
     {
-        "id": "d1627c41.4a916",
+        "id": "dd99789.6491a88",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1620.4998779296875,
-        "y": 869.0833740234375,
-        "z": "a5b492f8.99d13",
+        "x": 1653.4998779296875,
+        "y": 911.0833740234375,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "cdd5a821.a26858"
+                "16bb547b.d2861c"
             ]
         ]
     },
     {
-        "id": "cdd5a821.a26858",
+        "id": "16bb547b.d2861c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1788.4998779296875,
-        "y": 869.0833740234375,
-        "z": "a5b492f8.99d13",
+        "x": 1838.4998779296875,
+        "y": 911.0833740234375,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "6834bf03.5aff8"
+                "95e8f51a.226ea8"
             ]
         ]
     },
     {
-        "id": "ff5c4bc7.d7c748",
+        "id": "39c1e046.0c9a2",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1909.9998779296875,
-        "y": 662.0833740234375,
-        "z": "a5b492f8.99d13",
+        "x": 1907.9998779296875,
+        "y": 643.0833740234375,
+        "z": "df893cfa.16f38",
         "wires": [
             []
         ]
     },
     {
-        "id": "16091a49.ebb886",
+        "id": "20f5321f.fe2dee",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
         "comments": "",
-        "x": 1601.91650390625,
-        "y": 715.0834045410156,
-        "z": "a5b492f8.99d13",
+        "x": 1599.91650390625,
+        "y": 696.0834045410156,
+        "z": "df893cfa.16f38",
         "wires": []
     },
     {
-        "id": "6834bf03.5aff8",
+        "id": "95e8f51a.226ea8",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1916.9166259765625,
-        "y": 869.0833740234375,
-        "z": "a5b492f8.99d13",
+        "x": 1970.9166259765625,
+        "y": 911.0833740234375,
+        "z": "df893cfa.16f38",
         "wires": [
             []
         ]
     },
     {
-        "id": "320ba499.3a71fc",
+        "id": "b16d5209.3031f",
         "type": "set",
         "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1606.9998779296875,
-        "y": 611.0833740234375,
-        "z": "a5b492f8.99d13",
+        "x": 1604.9998779296875,
+        "y": 592.0833740234375,
+        "z": "df893cfa.16f38",
         "wires": []
     },
     {
-        "id": "1b8bc484.4e584b",
+        "id": "7ac364bd.12e01c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1443.9998779296875,
-        "y": 863.0833740234375,
-        "z": "a5b492f8.99d13",
+        "x": 1441.9998779296875,
+        "y": 838.0833740234375,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "d1627c41.4a916",
-                "da2077e7.65e5f8",
-                "425c7483.101a2c"
+                "dd99789.6491a88",
+                "66ca1a2.98ef5e4",
+                "6f78d9df.0d3518",
+                "3c0a54ab.00262c",
+                "9977ea00.521808"
             ]
         ]
     },
     {
-        "id": "da2077e7.65e5f8",
+        "id": "b364bef1.e2765",
         "type": "set",
         "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1610.1666259765625,
-        "y": 814.0833740234375,
-        "z": "a5b492f8.99d13",
+        "x": 1995.1666259765625,
+        "y": 816.0833740234375,
+        "z": "df893cfa.16f38",
         "wires": []
     },
     {
-        "id": "d5d4d9a.dfdee28",
+        "id": "1beab9a5.7e2366",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 676.9999389648438,
-        "y": 667.0000610351562,
-        "z": "a5b492f8.99d13",
+        "x": 674.9999389648438,
+        "y": 648.0000610351562,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "c67639b8.92e2d8"
+                "dd0b1351.6bec5"
             ]
         ]
     },
     {
-        "id": "1707d581.de00aa",
+        "id": "6e45eb8e.292b44",
         "type": "set",
         "name": "set Defaults",
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
         "comments": "",
-        "x": 967.9999389648438,
-        "y": 626,
-        "z": "a5b492f8.99d13",
+        "x": 965.9999389648438,
+        "y": 607,
+        "z": "df893cfa.16f38",
         "wires": []
     },
     {
-        "id": "c67639b8.92e2d8",
+        "id": "dd0b1351.6bec5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 813.9999389648438,
-        "y": 661.0000610351562,
-        "z": "a5b492f8.99d13",
+        "x": 811.9999389648438,
+        "y": 642.0000610351562,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "1707d581.de00aa",
-                "c0fa5e3.de329a"
+                "6e45eb8e.292b44",
+                "261676ae.6c18ea"
             ]
         ]
     },
     {
-        "id": "494bc731.2b3b38",
+        "id": "2f15d339.87cf0c",
         "type": "set",
         "name": "set default values",
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
+        "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": 446,
-        "y": 258,
-        "z": "a5b492f8.99d13",
+        "x": 444,
+        "y": 239,
+        "z": "df893cfa.16f38",
         "wires": []
     },
     {
-        "id": "6e382fc2.9cf55",
+        "id": "3bd1d194.63001e",
         "type": "get-resource",
         "name": "get aai.generic-vnf ",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $upgrade-pre-check-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
         "comments": "",
         "outputs": 1,
-        "x": 986,
-        "y": 434,
-        "z": "a5b492f8.99d13",
+        "x": 984,
+        "y": 415,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "d143bfec.8f45b"
+                "d0549989.50cdf8"
             ]
         ]
     },
     {
-        "id": "d143bfec.8f45b",
+        "id": "d0549989.50cdf8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1144.3907470703125,
-        "y": 432.28399658203125,
-        "z": "a5b492f8.99d13",
+        "x": 1142.3907470703125,
+        "y": 413.28399658203125,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "19bb6647.2aa81a"
+                "50890a76.58d434"
             ]
         ]
     },
     {
-        "id": "54a283d8.5df65c",
+        "id": "db896c60.3d19a",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 374.9998779296875,
-        "y": 622,
-        "z": "a5b492f8.99d13",
+        "x": 372.9998779296875,
+        "y": 603,
+        "z": "df893cfa.16f38",
         "wires": [
             []
         ]
     },
     {
-        "id": "790211fa.4ddc3",
+        "id": "905f1137.7562f",
         "type": "switchNode",
         "name": "switch pnf-flag",
         "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 428,
-        "y": 359,
-        "z": "a5b492f8.99d13",
+        "x": 426,
+        "y": 340,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "3deb4f48.5eacb",
-                "33286dd4.94fc62"
+                "d4a98e23.62f9b",
+                "a403044b.ebc9f8"
             ]
         ]
     },
     {
-        "id": "e7275d95.288b8",
+        "id": "556d2c3e.217c14",
         "type": "execute",
         "name": "execute jsonStringToCtx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-pre-check-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
         "comments": "",
         "outputs": 1,
-        "x": 460,
-        "y": 305,
-        "z": "a5b492f8.99d13",
+        "x": 458,
+        "y": 286,
+        "z": "df893cfa.16f38",
         "wires": [
             []
         ]
     },
     {
-        "id": "3deb4f48.5eacb",
+        "id": "d4a98e23.62f9b",
         "type": "outcome",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 625,
-        "y": 338,
-        "z": "a5b492f8.99d13",
+        "x": 623,
+        "y": 319,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "cb346986.12dd48"
+                "582ec79b.faa468"
             ]
         ]
     },
     {
-        "id": "33286dd4.94fc62",
+        "id": "a403044b.ebc9f8",
         "type": "outcome",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 624.9999389648438,
-        "y": 399,
-        "z": "a5b492f8.99d13",
+        "x": 622.9999389648438,
+        "y": 380,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "3af30869.256818"
+                "3184e083.2b204"
             ]
         ]
     },
     {
-        "id": "3af30869.256818",
+        "id": "3184e083.2b204",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 772.9999389648438,
-        "y": 398,
-        "z": "a5b492f8.99d13",
+        "x": 770.9999389648438,
+        "y": 379,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "6e382fc2.9cf55",
-                "ce17fe7f.d3b68"
+                "3bd1d194.63001e",
+                "395906a2.acd1ea"
             ]
         ]
     },
     {
-        "id": "cb346986.12dd48",
+        "id": "582ec79b.faa468",
         "type": "set",
         "name": "set AnsibleReq",
-        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-pre-check.playbookname`'/>\n",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-pre-check.playbookname`'/>\n<parameter name='outputPayloadField' value=\"`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`\"/>\n",
         "comments": "",
-        "x": 786,
-        "y": 336,
-        "z": "a5b492f8.99d13",
+        "x": 784,
+        "y": 317,
+        "z": "df893cfa.16f38",
         "wires": []
     },
     {
-        "id": "ce17fe7f.d3b68",
+        "id": "395906a2.acd1ea",
         "type": "execute",
         "name": "set playbookname",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-pre-check.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 995,
-        "y": 378,
-        "z": "a5b492f8.99d13",
+        "x": 993,
+        "y": 359,
+        "z": "df893cfa.16f38",
         "wires": [
             []
         ]
     },
     {
-        "id": "87c25306.3bca6",
+        "id": "5cc58e7c.083a5",
         "type": "switchNode",
         "name": "switch playbookname",
         "xml": "<switch test='`$playbookname`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 425,
-        "y": 490,
-        "z": "a5b492f8.99d13",
+        "x": 423,
+        "y": 471,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "4b5ce9b.bbd8818"
+                "b9c121b9.01765"
             ]
         ]
     },
     {
-        "id": "4b5ce9b.bbd8818",
+        "id": "b9c121b9.01765",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 596,
-        "y": 491,
-        "z": "a5b492f8.99d13",
+        "x": 594,
+        "y": 472,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "7b056df1.6a5e34"
+                "96dc86e8.19da88"
             ]
         ]
     },
     {
-        "id": "7b056df1.6a5e34",
+        "id": "96dc86e8.19da88",
         "type": "set",
         "name": "set playbookname",
         "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>",
         "comments": "",
-        "x": 786,
-        "y": 490,
-        "z": "a5b492f8.99d13",
+        "x": 784,
+        "y": 471,
+        "z": "df893cfa.16f38",
         "wires": []
     },
     {
-        "id": "1cee6cc7.a0f263",
+        "id": "ae5d9d02.d1fe4",
         "type": "switchNode",
         "name": "switch nodelist",
         "xml": "<switch test='`$nodelist`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 415,
-        "y": 549,
-        "z": "a5b492f8.99d13",
+        "x": 413,
+        "y": 530,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "892b8fdd.f84ea",
-                "8e25ca9e.be6708"
+                "d47821da.1dd48",
+                "69b2cec2.dd018"
             ]
         ]
     },
     {
-        "id": "892b8fdd.f84ea",
+        "id": "d47821da.1dd48",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 595,
-        "y": 542,
-        "z": "a5b492f8.99d13",
+        "x": 593,
+        "y": 523,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "482863bc.936c5c"
+                "dce9b14d.bb77b"
             ]
         ]
     },
     {
-        "id": "482863bc.936c5c",
+        "id": "dce9b14d.bb77b",
         "type": "set",
         "name": "set nodelist",
         "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
         "comments": "",
-        "x": 752,
-        "y": 556,
-        "z": "a5b492f8.99d13",
+        "x": 750,
+        "y": 537,
+        "z": "df893cfa.16f38",
         "wires": []
     },
     {
-        "id": "8e25ca9e.be6708",
+        "id": "69b2cec2.dd018",
         "type": "outcome",
         "name": "empty",
         "xml": "<outcome value=\"['']\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 594,
-        "y": 586,
-        "z": "a5b492f8.99d13",
+        "x": 592,
+        "y": 567,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "482863bc.936c5c"
+                "dce9b14d.bb77b"
             ]
         ]
     },
     {
-        "id": "75287f66.d6424",
+        "id": "8d045871.31f638",
         "type": "switchNode",
         "name": "switch playbookname",
         "xml": "<switch test='`$playbookname`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1470,
-        "y": 421,
-        "z": "a5b492f8.99d13",
+        "x": 1468,
+        "y": 402,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "cf31ac68.a9966"
+                "ef1e7a17.621f38"
             ]
         ]
     },
     {
-        "id": "cf31ac68.a9966",
+        "id": "ef1e7a17.621f38",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648,
-        "y": 421,
-        "z": "a5b492f8.99d13",
+        "x": 1646,
+        "y": 402,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "822cf6dc.fbd318"
+                "862a6ea8.3ba16"
             ]
         ]
     },
     {
-        "id": "f5a8e69f.6d2868",
+        "id": "8543ebcf.2ead48",
         "type": "set",
         "name": "set nodelist",
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",
         "comments": "",
-        "x": 1443,
-        "y": 474,
-        "z": "a5b492f8.99d13",
+        "x": 1441,
+        "y": 455,
+        "z": "df893cfa.16f38",
         "wires": []
     },
     {
-        "id": "19bb6647.2aa81a",
+        "id": "50890a76.58d434",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1273,
-        "y": 431,
-        "z": "a5b492f8.99d13",
+        "x": 1271,
+        "y": 412,
+        "z": "df893cfa.16f38",
         "wires": [
             [
-                "75287f66.d6424",
-                "f5a8e69f.6d2868"
+                "8d045871.31f638",
+                "8543ebcf.2ead48"
             ]
         ]
     },
     {
-        "id": "822cf6dc.fbd318",
+        "id": "862a6ea8.3ba16",
         "type": "execute",
         "name": "set playbookname",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-pre-check.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1820,
-        "y": 419,
-        "z": "a5b492f8.99d13",
+        "x": 1818,
+        "y": 400,
+        "z": "df893cfa.16f38",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "66ca1a2.98ef5e4",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='org.onap.appc.adapter.ansible.results' />\n\t<parameter name='outputPath' value='resultsJson' />\n\t<parameter name='isEscaped' value='false' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1668,
+        "y": 744,
+        "z": "df893cfa.16f38",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "6f78d9df.0d3518",
+        "type": "execute",
+        "name": "execute getAttributeValue",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='source' value=\"`'resultsJson' + $outputPayloadField`\" />\n\t<parameter name='outputPath' value='outputPayload' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1674,
+        "y": 789,
+        "z": "df893cfa.16f38",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "3c0a54ab.00262c",
+        "type": "switchNode",
+        "name": "switch outputPayload",
+        "xml": "<switch test='`$outputPayload`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1660,
+        "y": 836,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "65b8d06e.2f308",
+                "db2edf05.5dbf2"
+            ]
+        ]
+    },
+    {
+        "id": "65b8d06e.2f308",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1838,
+        "y": 816,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "b364bef1.e2765"
+            ]
+        ]
+    },
+    {
+        "id": "db2edf05.5dbf2",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1839,
+        "y": 860,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "3b020d0b.edb822"
+            ]
+        ]
+    },
+    {
+        "id": "3b020d0b.edb822",
+        "type": "set",
+        "name": "set DmaapReq with payload",
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>",
+        "comments": "",
+        "x": 2036,
+        "y": 860,
+        "z": "df893cfa.16f38",
+        "wires": []
+    },
+    {
+        "id": "e583cc0b.79586",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
+        "comments": "",
+        "x": 2371,
+        "y": 946.9999389648438,
+        "z": "df893cfa.16f38",
+        "wires": []
+    },
+    {
+        "id": "b678b572.4bc6d8",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1837.000244140625,
+        "y": 968.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "bebb9bde.cadbc8"
+            ]
+        ]
+    },
+    {
+        "id": "e71f0e75.f5e6e",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1836.000244140625,
+        "y": 1044.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "a34ae1ab.50555"
+            ]
+        ]
+    },
+    {
+        "id": "9977ea00.521808",
+        "type": "switchNode",
+        "name": "switch outputPayload",
+        "xml": "<switch test='`$outputPayload`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1654.000244140625,
+        "y": 1004.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "b678b572.4bc6d8",
+                "e71f0e75.f5e6e"
+            ]
+        ]
+    },
+    {
+        "id": "c888915f.7e81c",
+        "type": "returnSuccess",
+        "name": "return success with payload",
+        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='payload' value='`$outputPayload`'/>",
+        "comments": "",
+        "x": 2412.000244140625,
+        "y": 1028.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": []
+    },
+    {
+        "id": "bebb9bde.cadbc8",
+        "type": "switchNode",
+        "name": "switch result code",
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2007.000244140625,
+        "y": 968.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "1b395046.b5f6",
+                "d4989dec.88a2e"
+            ]
+        ]
+    },
+    {
+        "id": "a34ae1ab.50555",
+        "type": "switchNode",
+        "name": "switch result code",
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2007.000244140625,
+        "y": 1044.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "8e9f2082.ee767",
+                "3b44f0c3.4b7c2"
+            ]
+        ]
+    },
+    {
+        "id": "5e9a3c.5f7e95c4",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
+        "comments": "",
+        "x": 2365.000244140625,
+        "y": 984.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": []
+    },
+    {
+        "id": "398f4135.fd470e",
+        "type": "returnFailure",
+        "name": "return failure with payload",
+        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n<parameter name='payload' value='`$outputPayload`'/>",
+        "comments": "",
+        "x": 2408.000244140625,
+        "y": 1066.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": []
+    },
+    {
+        "id": "1b395046.b5f6",
+        "type": "other",
+        "name": "outcome 400",
+        "xml": "<outcome value='400'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2195.000244140625,
+        "y": 946.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "e583cc0b.79586"
+            ]
+        ]
+    },
+    {
+        "id": "d4989dec.88a2e",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2176.000244140625,
+        "y": 984.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "5e9a3c.5f7e95c4"
+            ]
+        ]
+    },
+    {
+        "id": "8e9f2082.ee767",
+        "type": "other",
+        "name": "outcome 400",
+        "xml": "<outcome value='400'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2196.000244140625,
+        "y": 1028.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "c888915f.7e81c"
+            ]
+        ]
+    },
+    {
+        "id": "3b44f0c3.4b7c2",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2178.000244140625,
+        "y": 1066.9998779296875,
+        "z": "df893cfa.16f38",
+        "wires": [
+            [
+                "398f4135.fd470e"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
index 4a88aac4..b22f4715 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
@@ -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-post-check-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-post-check.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-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
-                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
-                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
-                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
-                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>
-                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                                        </set>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />
+                                            <parameter name='outputPath' value='resultsJson' />
+                                            <parameter name='isEscaped' value='false' />
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                            <parameter name='source' value="`'resultsJson' + $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-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                </set>
+                                            </outcome>
+                                            <outcome value='Other'>
+                                                <set>
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
+                                                </set>
+                                            </outcome>
+                                        </switch>
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />
@@ -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-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
-                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
-                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
-                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
-                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>
-                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                                        </set>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />
+                                            <parameter name='outputPath' value='resultsJson' />
+                                            <parameter name='isEscaped' value='false' />
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                            <parameter name='source' value="`'resultsJson' + $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-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                </set>
+                                            </outcome>
+                                            <outcome value='Other'>
+                                                <set>
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
+                                                </set>
+                                            </outcome>
+                                        </switch>
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />
@@ -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>
diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
index 6f89bfcf..89033222 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
@@ -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-pre-check-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-pre-check.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-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
-                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
-                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
-                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
-                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
-                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                                        </set>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />
+                                            <parameter name='outputPath' value='resultsJson' />
+                                            <parameter name='isEscaped' value='false' />
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                            <parameter name='source' value="`'resultsJson' + $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-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                </set>
+                                            </outcome>
+                                            <outcome value='Other'>
+                                                <set>
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
+                                                </set>
+                                            </outcome>
+                                        </switch>
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />
@@ -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-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
-                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
-                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
-                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
-                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
-                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                                        </set>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />
+                                            <parameter name='outputPath' value='resultsJson' />
+                                            <parameter name='isEscaped' value='false' />
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                            <parameter name='source' value="`'resultsJson' + $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-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                </set>
+                                            </outcome>
+                                            <outcome value='Other'>
+                                                <set>
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
+                                                </set>
+                                            </outcome>
+                                        </switch>
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />
@@ -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