8 files changed, 2333 insertions, 2876 deletions
diff --git a/installation/src/main/properties/lcm-dg.properties b/installation/src/main/properties/lcm-dg.properties
index 9906ada8..9f24ebc7 100644
--- a/installation/src/main/properties/lcm-dg.properties
+++ b/installation/src/main/properties/lcm-dg.properties
@@ -10,10 +10,10 @@ lcm.upgrade-post-check.playbookname=ansible_postcheck
 lcm.upgrade-software.playbookname=ansible_upgradesw
 restapi.templateDir=/opt/onap/sdnc/restapi/templates
 restapi.lcm.dmaap.publish.templatefile=lcm-dmaap-publish-template.json
-lcm.dmaap.url=http://mr.api.simpledemo.onap.org/events/SDNC-LCM-WRITE
-lcm.dmaap.user=admin
-lcm.dmaap.password=admin
+lcm.dmaap.url=http://mr.api.simpledemo.onap.org:3904/events/SDNC-LCM-WRITE
+lcm.dmaap.user=
+lcm.dmaap.password=
 lcm.dmaap.version=1.0
-lcm.dmaap.partition=SDNC-LCM-WRITE
+lcm.dmaap.partition=MSO
 lcm.dmaap.type=response
 
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 96210495..69573f4a 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,478 +1,478 @@
-[
-    {
-        "comments": "",
-        "id": "e4e70092.b7662",
-        "name": "upgrade-post-check",
-        "outputs": 1,
-        "type": "method",
-        "wires": [
-            [
-                "bb888dbc.8c45a8"
-            ]
-        ],
-        "x": 521,
-        "xml": "<method rpc='upgrade-post-check' mode='sync'>\n",
-        "y": 182,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "8bfd5b63.3e5f4",
-        "module": "LCM",
-        "name": "LCM ${project.version}",
-        "outputs": 1,
-        "type": "service-logic",
-        "version": "${project.version}",
-        "wires": [
-            [
-                "e4e70092.b7662"
-            ]
-        ],
-        "x": 308.99993896484375,
-        "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}'>",
-        "y": 183,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "5e5ee749.3bcc48",
-        "name": "execute AnsibleA.reqExec",
-        "outputs": 1,
-        "type": "execute",
-        "wires": [
-            [
-                "1634a5a.ed4b85a",
-                "957f4d84.2df1f",
-                "46d7a6a2.66c73"
-            ]
-        ],
-        "x": 309.00001525878906,
-        "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='`$prop.ansible.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='`$prop.lcm.upgrade-post-check.playbookname`'/>",
-        "y": 400,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "a6974c46.ebe7b8",
-        "name": "switch",
-        "outputs": 1,
-        "type": "switchNode",
-        "wires": [
-            [
-                "688b9000.f7d6e",
-                "6d4c7406.63e3a4",
-                "f9c039c.e2674c8"
-            ]
-        ],
-        "x": 610,
-        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
-        "y": 448,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "688b9000.f7d6e",
-        "name": "outcome 500",
-        "outputs": 1,
-        "type": "other",
-        "wires": [
-            [
-                "31c18e01.31d712"
-            ]
-        ],
-        "x": 755,
-        "xml": "<outcome value='500'>\n",
-        "y": 446.00000762939453,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "6d4c7406.63e3a4",
-        "name": "outcome 100",
-        "outputs": 1,
-        "type": "other",
-        "wires": [
-            [
-                "49c00e3.94ec7f"
-            ]
-        ],
-        "x": 758,
-        "xml": "<outcome value='100'>\n",
-        "y": 489.00003814697266,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "49c00e3.94ec7f",
-        "name": "execute reqExecResult",
-        "outputs": 1,
-        "type": "execute",
-        "wires": [
-            [
-                "23a74147.f18206",
-                "8fc99d96.bc351"
-            ]
-        ],
-        "x": 936.0000305175781,
-        "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='`$prop.lcm.upgrade-post-check.playbookname`'/>\n\t\n\n\n\n\n",
-        "y": 489.00003814697266,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "957f4d84.2df1f",
-        "name": "failure",
-        "outputs": 1,
-        "type": "failure",
-        "wires": [
-            [
-                "31c18e01.31d712"
-            ]
-        ],
-        "x": 501,
-        "xml": "<outcome value='failure'>\n",
-        "y": 357.0000305175781,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "1634a5a.ed4b85a",
-        "name": "other",
-        "outputs": 1,
-        "type": "other",
-        "wires": [
-            [
-                "a6974c46.ebe7b8"
-            ]
-        ],
-        "x": 503,
-        "xml": "<outcome value='Other'>\n",
-        "y": 409,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "23a74147.f18206",
-        "name": "failure",
-        "outputs": 1,
-        "type": "failure",
-        "wires": [
-            [
-                "31c18e01.31d712"
-            ]
-        ],
-        "x": 1097.0000610351562,
-        "xml": "<outcome value='failure'>\n",
-        "y": 466.00000762939453,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "f9c039c.e2674c8",
-        "name": "outcome 101",
-        "outputs": 1,
-        "type": "other",
-        "wires": [
-            [
-                "31c18e01.31d712"
-            ]
-        ],
-        "x": 752,
-        "xml": "<outcome value='101'>\n",
-        "y": 404.00003814697266,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "8fc99d96.bc351",
-        "name": "success",
-        "outputs": 1,
-        "type": "success",
-        "wires": [
-            [
-                "d1887396.9adf08"
-            ]
-        ],
-        "x": 1104.0000610351562,
-        "xml": "<outcome value='success'>\n",
-        "y": 514.0000381469727,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "6d18cbe4.797a4c",
-        "name": "return success",
-        "type": "returnSuccess",
-        "wires": [],
-        "x": 1386.9999389648438,
-        "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`'/>",
-        "y": 566.0000381469727,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "id": "12001730.eb4a51",
-        "name": "DGSTART",
-        "outputs": 1,
-        "type": "dgstart",
-        "wires": [
-            [
-                "8bfd5b63.3e5f4"
-            ]
-        ],
-        "x": 124,
-        "y": 182,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "atomic": "false",
-        "comments": "",
-        "id": "bb888dbc.8c45a8",
-        "name": "block",
-        "outputs": 1,
-        "type": "block",
-        "wires": [
-            [
-                "5e5ee749.3bcc48",
-                "a6d4fb87.681f68",
-                "b740ef3c.edfdc8"
-            ]
-        ],
-        "x": 119.91668701171875,
-        "xml": "<block>\n",
-        "y": 363.0833435058594,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "a6d4fb87.681f68",
-        "name": "execute Properties",
-        "outputs": 1,
-        "type": "execute",
-        "wires": [
-            []
-        ],
-        "x": 292.00001525878906,
-        "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",
-        "y": 321.0833435058594,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "cb67f90f.046f3",
-        "name": "execute DmaapMsg",
-        "outputs": 1,
-        "type": "execute",
-        "wires": [
-            [
-                "875f0b0e.0e6f7"
-            ]
-        ],
-        "x": 1104.0000610351562,
-        "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",
-        "y": 310.0833435058594,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "875f0b0e.0e6f7",
-        "name": "failure",
-        "outputs": 1,
-        "type": "failure",
-        "wires": [
-            [
-                "ffef3abf.fa3b28"
-            ]
-        ],
-        "x": 1274,
-        "xml": "<outcome value='failure'>\n",
-        "y": 309.0833435058594,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "atomic": "false",
-        "comments": "",
-        "id": "31c18e01.31d712",
-        "name": "block",
-        "outputs": 1,
-        "type": "block",
-        "wires": [
-            [
-                "cb67f90f.046f3",
-                "a0aa0de3.da3e58",
-                "ba94d9aa.311d58"
-            ]
-        ],
-        "x": 907,
-        "xml": "<block>\n",
-        "y": 334.0833435058594,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "49340dd8.256594",
-        "name": "execute DmaapMsg",
-        "outputs": 1,
-        "type": "execute",
-        "wires": [
-            [
-                "2488d4ee.ca9d2c"
-            ]
-        ],
-        "x": 1407.4999389648438,
-        "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",
-        "y": 515.0833511352539,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "2488d4ee.ca9d2c",
-        "name": "failure",
-        "outputs": 1,
-        "type": "failure",
-        "wires": [
-            [
-                "4d1cd7f3.31def8"
-            ]
-        ],
-        "x": 1567.4999389648438,
-        "xml": "<outcome value='failure'>\n",
-        "y": 515.0833511352539,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "ffef3abf.fa3b28",
-        "name": "record",
-        "outputs": 1,
-        "type": "record",
-        "wires": [
-            []
-        ],
-        "x": 1406,
-        "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'/>",
-        "y": 309.0833435058594,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "a0aa0de3.da3e58",
-        "name": "return failure",
-        "type": "returnFailure",
-        "wires": [],
-        "x": 1078.9166870117188,
-        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
-        "y": 347.0833435058594,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "4d1cd7f3.31def8",
-        "name": "record",
-        "outputs": 1,
-        "type": "record",
-        "wires": [
-            []
-        ],
-        "x": 1688.9166870117188,
-        "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'/>",
-        "y": 516.0833511352539,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "ba94d9aa.311d58",
-        "name": "set",
-        "type": "set",
-        "wires": [],
-        "x": 1056.0000610351562,
-        "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.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.originator-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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\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",
-        "y": 257.0833435058594,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "atomic": "false",
-        "comments": "",
-        "id": "d1887396.9adf08",
-        "name": "block",
-        "outputs": 1,
-        "type": "block",
-        "wires": [
-            [
-                "49340dd8.256594",
-                "2c76247f.67dc84",
-                "6d18cbe4.797a4c"
-            ]
-        ],
-        "x": 1236.9999389648438,
-        "xml": "<block>\n",
-        "y": 514.0833206176758,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "2c76247f.67dc84",
-        "name": "set",
-        "type": "set",
-        "wires": [],
-        "x": 1367.1666870117188,
-        "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.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.originator-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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\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",
-        "y": 467.0833511352539,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "46d7a6a2.66c73",
-        "name": "not-found",
-        "outputs": 1,
-        "type": "not-found",
-        "wires": [
-            [
-                "c55c0137.1972f8"
-            ]
-        ],
-        "x": 497,
-        "xml": "<outcome value='not-found'>\n",
-        "y": 310,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "5abbb598.ba8e2c",
-        "name": "set Defaults",
-        "type": "set",
-        "wires": [],
-        "x": 881,
-        "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",
-        "y": 257,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "atomic": "false",
-        "comments": "",
-        "id": "c55c0137.1972f8",
-        "name": "block",
-        "outputs": 1,
-        "type": "block",
-        "wires": [
-            [
-                "5abbb598.ba8e2c",
-                "31c18e01.31d712"
-            ]
-        ],
-        "x": 681,
-        "xml": "<block>\n",
-        "y": 302,
-        "z": "9bf3d460.112078"
-    },
-    {
-        "comments": "",
-        "id": "b740ef3c.edfdc8",
-        "name": "set default status value",
-        "type": "set",
-        "wires": [],
-        "x": 306,
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
-        "y": 361,
-        "z": "9bf3d460.112078"
-    }
-]
+[
+    {
+        "id": "f6682445.892ef8",
+        "type": "method",
+        "name": "upgrade-post-check",
+        "xml": "<method rpc='upgrade-post-check' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 548,
+        "y": 311,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "c20144c8.6587e8"
+            ]
+        ]
+    },
+    {
+        "id": "865e584e.0afff8",
+        "type": "service-logic",
+        "name": "LCM ${project.version}",
+        "module": "LCM",
+        "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": 312,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "f6682445.892ef8"
+            ]
+        ]
+    },
+    {
+        "id": "6c07ca37.928634",
+        "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='`$prop.ansible.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='`$prop.lcm.upgrade-post-check.playbookname`'/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 336.00001525878906,
+        "y": 529,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "b717870f.456598",
+                "b9c620c2.80061",
+                "72a5893f.c8a998"
+            ]
+        ]
+    },
+    {
+        "id": "4aba83c3.5ee0ec",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 637,
+        "y": 577,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "b9795048.eb4b6",
+                "70e3e20c.4b044c",
+                "4084a912.f7f808"
+            ]
+        ]
+    },
+    {
+        "id": "b9795048.eb4b6",
+        "type": "other",
+        "name": "outcome 500",
+        "xml": "<outcome value='500'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 782,
+        "y": 575.0000076293945,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "49899cde.495504"
+            ]
+        ]
+    },
+    {
+        "id": "70e3e20c.4b044c",
+        "type": "other",
+        "name": "outcome 100",
+        "xml": "<outcome value='100'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 785,
+        "y": 618.0000381469727,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "89fa06a6.e6a638"
+            ]
+        ]
+    },
+    {
+        "id": "89fa06a6.e6a638",
+        "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='`$prop.lcm.upgrade-post-check.playbookname`'/>\n\t\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 963.0000305175781,
+        "y": 618.0000381469727,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "7b63eafe.c8e3e4",
+                "1b4d4653.98c8ca"
+            ]
+        ]
+    },
+    {
+        "id": "b9c620c2.80061",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 528,
+        "y": 486.0000305175781,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "49899cde.495504"
+            ]
+        ]
+    },
+    {
+        "id": "b717870f.456598",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 530,
+        "y": 538,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "4aba83c3.5ee0ec"
+            ]
+        ]
+    },
+    {
+        "id": "7b63eafe.c8e3e4",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1124.0000610351562,
+        "y": 595.0000076293945,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "49899cde.495504"
+            ]
+        ]
+    },
+    {
+        "id": "4084a912.f7f808",
+        "type": "other",
+        "name": "outcome 101",
+        "xml": "<outcome value='101'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 779,
+        "y": 533.0000381469727,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "49899cde.495504"
+            ]
+        ]
+    },
+    {
+        "id": "1b4d4653.98c8ca",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1131.0000610351562,
+        "y": 643.0000381469727,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "f92faff8.6416c"
+            ]
+        ]
+    },
+    {
+        "id": "278a7129.c89b5e",
+        "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": 1413.9999389648438,
+        "y": 695.0000381469727,
+        "z": "559d4ed7.13584",
+        "wires": []
+    },
+    {
+        "id": "2fc40544.c90bfa",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 151,
+        "y": 311,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "865e584e.0afff8"
+            ]
+        ]
+    },
+    {
+        "id": "c20144c8.6587e8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 146.91668701171875,
+        "y": 492.0833435058594,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "6c07ca37.928634",
+                "285a76c5.92c0ea",
+                "1759857f.fa031b"
+            ]
+        ]
+    },
+    {
+        "id": "285a76c5.92c0ea",
+        "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": 319.00001525878906,
+        "y": 450.0833435058594,
+        "z": "559d4ed7.13584",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "247c4873.f4da88",
+        "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": 1131.0000610351562,
+        "y": 439.0833435058594,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "a0302f37.0a777"
+            ]
+        ]
+    },
+    {
+        "id": "a0302f37.0a777",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1301,
+        "y": 438.0833435058594,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "d28cf873.76fe18"
+            ]
+        ]
+    },
+    {
+        "id": "49899cde.495504",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 934,
+        "y": 463.0833435058594,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "247c4873.f4da88",
+                "d17577f9.361e58",
+                "a26c76c8.bafc18"
+            ]
+        ]
+    },
+    {
+        "id": "c96ded4.f8ab51",
+        "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": 1434.4999389648438,
+        "y": 644.0833511352539,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "dbeb9454.3f2438"
+            ]
+        ]
+    },
+    {
+        "id": "dbeb9454.3f2438",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1594.4999389648438,
+        "y": 644.0833511352539,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "ab882161.681b2"
+            ]
+        ]
+    },
+    {
+        "id": "d28cf873.76fe18",
+        "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": 1433,
+        "y": 438.0833435058594,
+        "z": "559d4ed7.13584",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d17577f9.361e58",
+        "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": 1105.9166870117188,
+        "y": 476.0833435058594,
+        "z": "559d4ed7.13584",
+        "wires": []
+    },
+    {
+        "id": "ab882161.681b2",
+        "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": 1715.9166870117188,
+        "y": 645.0833511352539,
+        "z": "559d4ed7.13584",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a26c76c8.bafc18",
+        "type": "set",
+        "name": "set",
+        "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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\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": 1083.0000610351562,
+        "y": 386.0833435058594,
+        "z": "559d4ed7.13584",
+        "wires": []
+    },
+    {
+        "id": "f92faff8.6416c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1263.9999389648438,
+        "y": 643.0833206176758,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "c96ded4.f8ab51",
+                "519209a.311b3f8",
+                "278a7129.c89b5e"
+            ]
+        ]
+    },
+    {
+        "id": "519209a.311b3f8",
+        "type": "set",
+        "name": "set",
+        "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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\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": 1394.1666870117188,
+        "y": 596.0833511352539,
+        "z": "559d4ed7.13584",
+        "wires": []
+    },
+    {
+        "id": "72a5893f.c8a998",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 524,
+        "y": 439,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "9871197b.1e3d18"
+            ]
+        ]
+    },
+    {
+        "id": "41214bd9.1f8ad4",
+        "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": 908,
+        "y": 386,
+        "z": "559d4ed7.13584",
+        "wires": []
+    },
+    {
+        "id": "9871197b.1e3d18",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 708,
+        "y": 431,
+        "z": "559d4ed7.13584",
+        "wires": [
+            [
+                "41214bd9.1f8ad4",
+                "49899cde.495504"
+            ]
+        ]
+    },
+    {
+        "id": "1759857f.fa031b",
+        "type": "set",
+        "name": "set default status value",
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
+        "comments": "",
+        "x": 333,
+        "y": 490,
+        "z": "559d4ed7.13584",
+        "wires": []
+    }
+]
+\ 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 56f7b2ba..ca713fba 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,478 +1,478 @@
-[
-    {
-        "comments": "",
-        "id": "7018ec36.4cc5ec",
-        "name": "upgrade-pre-check",
-        "outputs": 1,
-        "type": "method",
-        "wires": [
-            [
-                "7b5d3338.9d34a4"
-            ]
-        ],
-        "x": 531,
-        "xml": "<method rpc='upgrade-pre-check' mode='sync'>\n",
-        "y": 159,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "761735d6.a3ecec",
-        "module": "LCM",
-        "name": "LCM ${project.version}",
-        "outputs": 1,
-        "type": "service-logic",
-        "version": "${project.version}",
-        "wires": [
-            [
-                "7018ec36.4cc5ec"
-            ]
-        ],
-        "x": 318.99993896484375,
-        "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}'>",
-        "y": 160,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "df87797d.9a6da8",
-        "name": "execute AnsibleA.reqExec",
-        "outputs": 1,
-        "type": "execute",
-        "wires": [
-            [
-                "1f9baab1.f667bd",
-                "4dcb875e.05025",
-                "98923780.210838"
-            ]
-        ],
-        "x": 319.00001525878906,
-        "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='`$prop.ansible.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='`$prop.lcm.upgrade-pre-check.playbookname`'/>",
-        "y": 377,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "be5a404c.df63b",
-        "name": "switch",
-        "outputs": 1,
-        "type": "switchNode",
-        "wires": [
-            [
-                "a0717baa.0ad7c8",
-                "76b22e49.42c978",
-                "9040169.c537f68"
-            ]
-        ],
-        "x": 620,
-        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
-        "y": 425,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "a0717baa.0ad7c8",
-        "name": "outcome 500",
-        "outputs": 1,
-        "type": "other",
-        "wires": [
-            [
-                "ea274695.4ed0a"
-            ]
-        ],
-        "x": 765,
-        "xml": "<outcome value='500'>\n",
-        "y": 423.00000762939453,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "76b22e49.42c978",
-        "name": "outcome 100",
-        "outputs": 1,
-        "type": "other",
-        "wires": [
-            [
-                "f49ca07a.b8928"
-            ]
-        ],
-        "x": 768,
-        "xml": "<outcome value='100'>\n",
-        "y": 466.00003814697266,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "f49ca07a.b8928",
-        "name": "execute reqExecResult",
-        "outputs": 1,
-        "type": "execute",
-        "wires": [
-            [
-                "49baafab.739d7",
-                "225528dc.01ae88"
-            ]
-        ],
-        "x": 946.0000305175781,
-        "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='`$prop.lcm.upgrade-pre-check.playbookname`'/>\n\t\n\n\n\n\n",
-        "y": 466.00003814697266,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "4dcb875e.05025",
-        "name": "failure",
-        "outputs": 1,
-        "type": "failure",
-        "wires": [
-            [
-                "ea274695.4ed0a"
-            ]
-        ],
-        "x": 511,
-        "xml": "<outcome value='failure'>\n",
-        "y": 334.0000305175781,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "1f9baab1.f667bd",
-        "name": "other",
-        "outputs": 1,
-        "type": "other",
-        "wires": [
-            [
-                "be5a404c.df63b"
-            ]
-        ],
-        "x": 513,
-        "xml": "<outcome value='Other'>\n",
-        "y": 386,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "49baafab.739d7",
-        "name": "failure",
-        "outputs": 1,
-        "type": "failure",
-        "wires": [
-            [
-                "ea274695.4ed0a"
-            ]
-        ],
-        "x": 1107.0000610351562,
-        "xml": "<outcome value='failure'>\n",
-        "y": 443.00000762939453,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "9040169.c537f68",
-        "name": "outcome 101",
-        "outputs": 1,
-        "type": "other",
-        "wires": [
-            [
-                "ea274695.4ed0a"
-            ]
-        ],
-        "x": 762,
-        "xml": "<outcome value='101'>\n",
-        "y": 381.00003814697266,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "225528dc.01ae88",
-        "name": "success",
-        "outputs": 1,
-        "type": "success",
-        "wires": [
-            [
-                "6714b2b5.d30774"
-            ]
-        ],
-        "x": 1114.0000610351562,
-        "xml": "<outcome value='success'>\n",
-        "y": 491.00003814697266,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "a635bf9c.d50128",
-        "name": "return success",
-        "type": "returnSuccess",
-        "wires": [],
-        "x": 1396.9999389648438,
-        "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`'/>",
-        "y": 543.0000381469727,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "id": "cfce7550.eb4e38",
-        "name": "DGSTART",
-        "outputs": 1,
-        "type": "dgstart",
-        "wires": [
-            [
-                "761735d6.a3ecec"
-            ]
-        ],
-        "x": 134,
-        "y": 159,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "atomic": "false",
-        "comments": "",
-        "id": "7b5d3338.9d34a4",
-        "name": "block",
-        "outputs": 1,
-        "type": "block",
-        "wires": [
-            [
-                "df87797d.9a6da8",
-                "61c92510.8e1f44",
-                "88ad34a4.11ef"
-            ]
-        ],
-        "x": 129.91668701171875,
-        "xml": "<block>\n",
-        "y": 340.0833435058594,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "61c92510.8e1f44",
-        "name": "execute Properties",
-        "outputs": 1,
-        "type": "execute",
-        "wires": [
-            []
-        ],
-        "x": 303.00001525878906,
-        "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",
-        "y": 293.0833435058594,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "1b10ccd4.98611b",
-        "name": "execute DmaapMsg",
-        "outputs": 1,
-        "type": "execute",
-        "wires": [
-            [
-                "41a315d2.219cbc"
-            ]
-        ],
-        "x": 1114.0000610351562,
-        "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",
-        "y": 287.0833435058594,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "41a315d2.219cbc",
-        "name": "failure",
-        "outputs": 1,
-        "type": "failure",
-        "wires": [
-            [
-                "8cd3938a.e26c48"
-            ]
-        ],
-        "x": 1284,
-        "xml": "<outcome value='failure'>\n",
-        "y": 286.0833435058594,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "atomic": "false",
-        "comments": "",
-        "id": "ea274695.4ed0a",
-        "name": "block",
-        "outputs": 1,
-        "type": "block",
-        "wires": [
-            [
-                "1b10ccd4.98611b",
-                "bccd0081.01b13",
-                "7a021bb.f1ec464"
-            ]
-        ],
-        "x": 917,
-        "xml": "<block>\n",
-        "y": 311.0833435058594,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "bdd486fa.e9a568",
-        "name": "execute DmaapMsg",
-        "outputs": 1,
-        "type": "execute",
-        "wires": [
-            [
-                "9f6ebc1e.f5d92"
-            ]
-        ],
-        "x": 1417.4999389648438,
-        "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",
-        "y": 492.0833511352539,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "9f6ebc1e.f5d92",
-        "name": "failure",
-        "outputs": 1,
-        "type": "failure",
-        "wires": [
-            [
-                "570d9c94.41a1c4"
-            ]
-        ],
-        "x": 1577.4999389648438,
-        "xml": "<outcome value='failure'>\n",
-        "y": 492.0833511352539,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "8cd3938a.e26c48",
-        "name": "record",
-        "outputs": 1,
-        "type": "record",
-        "wires": [
-            []
-        ],
-        "x": 1416,
-        "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'/>",
-        "y": 286.0833435058594,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "bccd0081.01b13",
-        "name": "return failure",
-        "type": "returnFailure",
-        "wires": [],
-        "x": 1088.9166870117188,
-        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
-        "y": 324.0833435058594,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "570d9c94.41a1c4",
-        "name": "record",
-        "outputs": 1,
-        "type": "record",
-        "wires": [
-            []
-        ],
-        "x": 1698.9166870117188,
-        "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'/>",
-        "y": 493.0833511352539,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "7a021bb.f1ec464",
-        "name": "set",
-        "type": "set",
-        "wires": [],
-        "x": 1066.0000610351562,
-        "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.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.originator-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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\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",
-        "y": 234.08334350585938,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "atomic": "false",
-        "comments": "",
-        "id": "6714b2b5.d30774",
-        "name": "block",
-        "outputs": 1,
-        "type": "block",
-        "wires": [
-            [
-                "bdd486fa.e9a568",
-                "a28655e0.def7f8",
-                "a635bf9c.d50128"
-            ]
-        ],
-        "x": 1246.9999389648438,
-        "xml": "<block>\n",
-        "y": 491.0833206176758,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "a28655e0.def7f8",
-        "name": "set",
-        "type": "set",
-        "wires": [],
-        "x": 1377.1666870117188,
-        "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.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.originator-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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\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",
-        "y": 444.0833511352539,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "98923780.210838",
-        "name": "not-found",
-        "outputs": 1,
-        "type": "not-found",
-        "wires": [
-            [
-                "504babef.4c020c"
-            ]
-        ],
-        "x": 507,
-        "xml": "<outcome value='not-found'>\n",
-        "y": 287,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "4ab0c40.39584bc",
-        "name": "set Defaults",
-        "type": "set",
-        "wires": [],
-        "x": 891,
-        "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",
-        "y": 234,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "atomic": "false",
-        "comments": "",
-        "id": "504babef.4c020c",
-        "name": "block",
-        "outputs": 1,
-        "type": "block",
-        "wires": [
-            [
-                "4ab0c40.39584bc",
-                "ea274695.4ed0a"
-            ]
-        ],
-        "x": 691,
-        "xml": "<block>\n",
-        "y": 279,
-        "z": "c751ea25.6a3e48"
-    },
-    {
-        "comments": "",
-        "id": "88ad34a4.11ef",
-        "name": "set default status value",
-        "type": "set",
-        "wires": [],
-        "x": 312,
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
-        "y": 337,
-        "z": "c751ea25.6a3e48"
-    }
-]
+[
+    {
+        "id": "8f8b6a32.647e2",
+        "type": "method",
+        "name": "upgrade-pre-check",
+        "xml": "<method rpc='upgrade-pre-check' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 559,
+        "y": 294,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "7fd9ef18.f2ed78"
+            ]
+        ]
+    },
+    {
+        "id": "59a5c829.6824e",
+        "type": "service-logic",
+        "name": "LCM ${project.version}",
+        "module": "LCM",
+        "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": 346.99993896484375,
+        "y": 295,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "8f8b6a32.647e2"
+            ]
+        ]
+    },
+    {
+        "id": "a0bfd483.1d05a8",
+        "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='`$prop.ansible.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='`$prop.lcm.upgrade-pre-check.playbookname`'/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 347.00001525878906,
+        "y": 512,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "3faa8c0d.7c76dc",
+                "730a2ac.ac7a254",
+                "ff0c1a71.8db25"
+            ]
+        ]
+    },
+    {
+        "id": "7b8e8551.6739f4",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 648,
+        "y": 560,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "9997ad99.656ba",
+                "251aa2bd.3255ce",
+                "19061d90.32c37a"
+            ]
+        ]
+    },
+    {
+        "id": "9997ad99.656ba",
+        "type": "other",
+        "name": "outcome 500",
+        "xml": "<outcome value='500'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 793,
+        "y": 558.0000076293945,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "8b7c0757.979618"
+            ]
+        ]
+    },
+    {
+        "id": "251aa2bd.3255ce",
+        "type": "other",
+        "name": "outcome 100",
+        "xml": "<outcome value='100'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 796,
+        "y": 601.0000381469727,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "59f732a3.29a3dc"
+            ]
+        ]
+    },
+    {
+        "id": "59f732a3.29a3dc",
+        "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='`$prop.lcm.upgrade-pre-check.playbookname`'/>\n\t\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 974.0000305175781,
+        "y": 601.0000381469727,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "665399bc.90a228",
+                "9947c0c2.0bad38"
+            ]
+        ]
+    },
+    {
+        "id": "730a2ac.ac7a254",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 539,
+        "y": 469.0000305175781,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "8b7c0757.979618"
+            ]
+        ]
+    },
+    {
+        "id": "3faa8c0d.7c76dc",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 541,
+        "y": 521,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "7b8e8551.6739f4"
+            ]
+        ]
+    },
+    {
+        "id": "665399bc.90a228",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1135.0000610351562,
+        "y": 578.0000076293945,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "8b7c0757.979618"
+            ]
+        ]
+    },
+    {
+        "id": "19061d90.32c37a",
+        "type": "other",
+        "name": "outcome 101",
+        "xml": "<outcome value='101'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 790,
+        "y": 516.0000381469727,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "8b7c0757.979618"
+            ]
+        ]
+    },
+    {
+        "id": "9947c0c2.0bad38",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1142.0000610351562,
+        "y": 626.0000381469727,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "7e43b622.5535c8"
+            ]
+        ]
+    },
+    {
+        "id": "6a30a994.3ca8e8",
+        "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": 1424.9999389648438,
+        "y": 678.0000381469727,
+        "z": "8e82c78b.3253d8",
+        "wires": []
+    },
+    {
+        "id": "3123d7af.60a66",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 162,
+        "y": 294,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "59a5c829.6824e"
+            ]
+        ]
+    },
+    {
+        "id": "7fd9ef18.f2ed78",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 157.91668701171875,
+        "y": 475.0833435058594,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "a0bfd483.1d05a8",
+                "795753b1.362064",
+                "1872375f.c08bb1"
+            ]
+        ]
+    },
+    {
+        "id": "795753b1.362064",
+        "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": 331.00001525878906,
+        "y": 428.0833435058594,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "6dde91d9.2b278",
+        "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": 1142.0000610351562,
+        "y": 422.0833435058594,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "4c1e83c0.729474"
+            ]
+        ]
+    },
+    {
+        "id": "4c1e83c0.729474",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1312,
+        "y": 421.0833435058594,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "be504f4e.6e8158"
+            ]
+        ]
+    },
+    {
+        "id": "8b7c0757.979618",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 945,
+        "y": 446.0833435058594,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "6dde91d9.2b278",
+                "32e620d0.14aab8",
+                "8156d91e.66c9"
+            ]
+        ]
+    },
+    {
+        "id": "6078cfef.b6b9c",
+        "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": 1445.4999389648438,
+        "y": 627.0833511352539,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "287251c7.95902e"
+            ]
+        ]
+    },
+    {
+        "id": "287251c7.95902e",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1605.4999389648438,
+        "y": 627.0833511352539,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "dda83a49.a35b9"
+            ]
+        ]
+    },
+    {
+        "id": "be504f4e.6e8158",
+        "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": 1444,
+        "y": 421.0833435058594,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "32e620d0.14aab8",
+        "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": 1116.9166870117188,
+        "y": 459.0833435058594,
+        "z": "8e82c78b.3253d8",
+        "wires": []
+    },
+    {
+        "id": "dda83a49.a35b9",
+        "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": 1726.9166870117188,
+        "y": 628.0833511352539,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8156d91e.66c9",
+        "type": "set",
+        "name": "set",
+        "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\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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\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": 1094.0000610351562,
+        "y": 369.0833435058594,
+        "z": "8e82c78b.3253d8",
+        "wires": []
+    },
+    {
+        "id": "7e43b622.5535c8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1274.9999389648438,
+        "y": 626.0833206176758,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "6078cfef.b6b9c",
+                "6e5dc321.5d13f4",
+                "6a30a994.3ca8e8"
+            ]
+        ]
+    },
+    {
+        "id": "6e5dc321.5d13f4",
+        "type": "set",
+        "name": "set",
+        "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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\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": 1405.1666870117188,
+        "y": 579.0833511352539,
+        "z": "8e82c78b.3253d8",
+        "wires": []
+    },
+    {
+        "id": "ff0c1a71.8db25",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 535,
+        "y": 422,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "c12fad1e.df7a3"
+            ]
+        ]
+    },
+    {
+        "id": "fcf3a642.3a7fa",
+        "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": 919,
+        "y": 369,
+        "z": "8e82c78b.3253d8",
+        "wires": []
+    },
+    {
+        "id": "c12fad1e.df7a3",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 719,
+        "y": 414,
+        "z": "8e82c78b.3253d8",
+        "wires": [
+            [
+                "fcf3a642.3a7fa",
+                "8b7c0757.979618"
+            ]
+        ]
+    },
+    {
+        "id": "1872375f.c08bb1",
+        "type": "set",
+        "name": "set default status value",
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
+        "comments": "",
+        "x": 340,
+        "y": 472,
+        "z": "8e82c78b.3253d8",
+        "wires": []
+    }
+]
+\ No newline at end of file
diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-software.json b/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
index 348f108f..a239a2ed 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
@@ -1,478 +1,478 @@
-[
-    {
-        "comments": "",
-        "id": "e3957e37.35361",
-        "name": "upgrade-software",
-        "outputs": 1,
-        "type": "method",
-        "wires": [
-            [
-                "c5d4c45f.4457e"
-            ]
-        ],
-        "x": 506,
-        "xml": "<method rpc='upgrade-software' mode='sync'>\n",
-        "y": 196,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "5f2faaca.f39734",
-        "module": "LCM",
-        "name": "LCM ${project.version}",
-        "outputs": 1,
-        "type": "service-logic",
-        "version": "${project.version}",
-        "wires": [
-            [
-                "e3957e37.35361"
-            ]
-        ],
-        "x": 293.99993896484375,
-        "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}'>",
-        "y": 197,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "70dc7b0c.2f14e4",
-        "name": "execute AnsibleA.reqExec",
-        "outputs": 1,
-        "type": "execute",
-        "wires": [
-            [
-                "bc899025.fa2868",
-                "f27679b0.21ec",
-                "704e725e.7e874c"
-            ]
-        ],
-        "x": 294.00001525878906,
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-software-input.payload`'/>\n<parameter name='NodeList' value='`$prop.ansible.nodelist`'/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>",
-        "y": 414,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "e3dc71b8.c785c8",
-        "name": "switch",
-        "outputs": 1,
-        "type": "switchNode",
-        "wires": [
-            [
-                "86baeda9.1ff078",
-                "195ba453.c1b374",
-                "931e0cc5.50a74"
-            ]
-        ],
-        "x": 595,
-        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
-        "y": 462,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "86baeda9.1ff078",
-        "name": "outcome 500",
-        "outputs": 1,
-        "type": "other",
-        "wires": [
-            [
-                "d1ce272a.df817"
-            ]
-        ],
-        "x": 740,
-        "xml": "<outcome value='500'>\n",
-        "y": 460.00000762939453,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "195ba453.c1b374",
-        "name": "outcome 100",
-        "outputs": 1,
-        "type": "other",
-        "wires": [
-            [
-                "245ca838.b01f4"
-            ]
-        ],
-        "x": 743,
-        "xml": "<outcome value='100'>\n",
-        "y": 503.00003814697266,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "245ca838.b01f4",
-        "name": "execute reqExecResult",
-        "outputs": 1,
-        "type": "execute",
-        "wires": [
-            [
-                "b1d260a0.f027c8",
-                "7c135a2c.b77b1c"
-            ]
-        ],
-        "x": 921.0000305175781,
-        "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='`$prop.lcm.upgrade-software.playbookname`'/>\n\t\n\n\n\n\n",
-        "y": 503.00003814697266,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "f27679b0.21ec",
-        "name": "failure",
-        "outputs": 1,
-        "type": "failure",
-        "wires": [
-            [
-                "d1ce272a.df817"
-            ]
-        ],
-        "x": 486,
-        "xml": "<outcome value='failure'>\n",
-        "y": 371.0000305175781,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "bc899025.fa2868",
-        "name": "other",
-        "outputs": 1,
-        "type": "other",
-        "wires": [
-            [
-                "e3dc71b8.c785c8"
-            ]
-        ],
-        "x": 488,
-        "xml": "<outcome value='Other'>\n",
-        "y": 423,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "b1d260a0.f027c8",
-        "name": "failure",
-        "outputs": 1,
-        "type": "failure",
-        "wires": [
-            [
-                "d1ce272a.df817"
-            ]
-        ],
-        "x": 1082.0000610351562,
-        "xml": "<outcome value='failure'>\n",
-        "y": 480.00000762939453,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "931e0cc5.50a74",
-        "name": "outcome 101",
-        "outputs": 1,
-        "type": "other",
-        "wires": [
-            [
-                "d1ce272a.df817"
-            ]
-        ],
-        "x": 737,
-        "xml": "<outcome value='101'>\n",
-        "y": 418.00003814697266,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "7c135a2c.b77b1c",
-        "name": "success",
-        "outputs": 1,
-        "type": "success",
-        "wires": [
-            [
-                "a9adb7fd.3d4988"
-            ]
-        ],
-        "x": 1089.0000610351562,
-        "xml": "<outcome value='success'>\n",
-        "y": 528.0000381469727,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "6546fdb6.d892ac",
-        "name": "return success",
-        "type": "returnSuccess",
-        "wires": [],
-        "x": 1371.9999389648438,
-        "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`'/>",
-        "y": 580.0000381469727,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "id": "c7222a65.c32fa",
-        "name": "DGSTART",
-        "outputs": 1,
-        "type": "dgstart",
-        "wires": [
-            [
-                "5f2faaca.f39734"
-            ]
-        ],
-        "x": 109,
-        "y": 196,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "atomic": "false",
-        "comments": "",
-        "id": "c5d4c45f.4457e",
-        "name": "block",
-        "outputs": 1,
-        "type": "block",
-        "wires": [
-            [
-                "70dc7b0c.2f14e4",
-                "2144c479.557abc",
-                "2dcfb067.346e98"
-            ]
-        ],
-        "x": 104.91668701171875,
-        "xml": "<block>\n",
-        "y": 377.0833435058594,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "2144c479.557abc",
-        "name": "execute Properties",
-        "outputs": 1,
-        "type": "execute",
-        "wires": [
-            []
-        ],
-        "x": 279.00001525878906,
-        "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",
-        "y": 319.0833435058594,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "3ab47119.0770ce",
-        "name": "execute DmaapMsg",
-        "outputs": 1,
-        "type": "execute",
-        "wires": [
-            [
-                "29d7b192.efbf56"
-            ]
-        ],
-        "x": 1089.0000610351562,
-        "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",
-        "y": 324.0833435058594,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "29d7b192.efbf56",
-        "name": "failure",
-        "outputs": 1,
-        "type": "failure",
-        "wires": [
-            [
-                "3b3f2df3.e75202"
-            ]
-        ],
-        "x": 1259,
-        "xml": "<outcome value='failure'>\n",
-        "y": 323.0833435058594,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "atomic": "false",
-        "comments": "",
-        "id": "d1ce272a.df817",
-        "name": "block",
-        "outputs": 1,
-        "type": "block",
-        "wires": [
-            [
-                "3ab47119.0770ce",
-                "be81ce81.d8751",
-                "e34055b3.f4fc"
-            ]
-        ],
-        "x": 892,
-        "xml": "<block>\n",
-        "y": 348.0833435058594,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "d0e97f8b.a0a97",
-        "name": "execute DmaapMsg",
-        "outputs": 1,
-        "type": "execute",
-        "wires": [
-            [
-                "f13ad0f8.38e418"
-            ]
-        ],
-        "x": 1392.4999389648438,
-        "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",
-        "y": 529.0833511352539,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "f13ad0f8.38e418",
-        "name": "failure",
-        "outputs": 1,
-        "type": "failure",
-        "wires": [
-            [
-                "8b1d7157.857a38"
-            ]
-        ],
-        "x": 1552.4999389648438,
-        "xml": "<outcome value='failure'>\n",
-        "y": 529.0833511352539,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "3b3f2df3.e75202",
-        "name": "record",
-        "outputs": 1,
-        "type": "record",
-        "wires": [
-            []
-        ],
-        "x": 1391,
-        "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'/>",
-        "y": 323.0833435058594,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "be81ce81.d8751",
-        "name": "return failure",
-        "type": "returnFailure",
-        "wires": [],
-        "x": 1063.9166870117188,
-        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
-        "y": 361.0833435058594,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "8b1d7157.857a38",
-        "name": "record",
-        "outputs": 1,
-        "type": "record",
-        "wires": [
-            []
-        ],
-        "x": 1673.9166870117188,
-        "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'/>",
-        "y": 530.0833511352539,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "e34055b3.f4fc",
-        "name": "set",
-        "type": "set",
-        "wires": [],
-        "x": 1041.0000610351562,
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\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",
-        "y": 271.0833435058594,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "atomic": "false",
-        "comments": "",
-        "id": "a9adb7fd.3d4988",
-        "name": "block",
-        "outputs": 1,
-        "type": "block",
-        "wires": [
-            [
-                "d0e97f8b.a0a97",
-                "c5897c80.8110a",
-                "6546fdb6.d892ac"
-            ]
-        ],
-        "x": 1221.9999389648438,
-        "xml": "<block>\n",
-        "y": 528.0833206176758,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "c5897c80.8110a",
-        "name": "set",
-        "type": "set",
-        "wires": [],
-        "x": 1352.1666870117188,
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\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",
-        "y": 481.0833511352539,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "704e725e.7e874c",
-        "name": "not-found",
-        "outputs": 1,
-        "type": "not-found",
-        "wires": [
-            [
-                "28042a17.b7aa2e"
-            ]
-        ],
-        "x": 482,
-        "xml": "<outcome value='not-found'>\n",
-        "y": 324,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "e7d4edd8.d7f83",
-        "name": "set Defaults",
-        "type": "set",
-        "wires": [],
-        "x": 866,
-        "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",
-        "y": 271,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "atomic": "false",
-        "comments": "",
-        "id": "28042a17.b7aa2e",
-        "name": "block",
-        "outputs": 1,
-        "type": "block",
-        "wires": [
-            [
-                "e7d4edd8.d7f83",
-                "d1ce272a.df817"
-            ]
-        ],
-        "x": 666,
-        "xml": "<block>\n",
-        "y": 316,
-        "z": "455a25b6.fcbc5c"
-    },
-    {
-        "comments": "",
-        "id": "2dcfb067.346e98",
-        "name": "set default status value",
-        "type": "set",
-        "wires": [],
-        "x": 293,
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
-        "y": 363,
-        "z": "455a25b6.fcbc5c"
-    }
-]
+[
+    {
+        "id": "2189c37f.7d745c",
+        "type": "method",
+        "name": "upgrade-software",
+        "xml": "<method rpc='upgrade-software' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 524,
+        "y": 203,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "200bd935.5c4296"
+            ]
+        ]
+    },
+    {
+        "id": "33405b66.254a24",
+        "type": "service-logic",
+        "name": "LCM ${project.version}",
+        "module": "LCM",
+        "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": 311.99993896484375,
+        "y": 204,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "2189c37f.7d745c"
+            ]
+        ]
+    },
+    {
+        "id": "70d63640.e2d148",
+        "type": "execute",
+        "name": "execute AnsibleA.reqExec",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-software-input.payload`'/>\n<parameter name='NodeList' value='`$prop.ansible.nodelist`'/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 312.00001525878906,
+        "y": 421,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "a9686655.3f4ab8",
+                "22afa298.2efb1e",
+                "447f65a.9f7919c"
+            ]
+        ]
+    },
+    {
+        "id": "4a011b96.270794",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 613,
+        "y": 469,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "c0abf3c2.456f8",
+                "4d37ed5a.7d21b4",
+                "3dce5412.8af8ac"
+            ]
+        ]
+    },
+    {
+        "id": "c0abf3c2.456f8",
+        "type": "other",
+        "name": "outcome 500",
+        "xml": "<outcome value='500'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 758,
+        "y": 467.00000762939453,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "41ed13b3.d624bc"
+            ]
+        ]
+    },
+    {
+        "id": "4d37ed5a.7d21b4",
+        "type": "other",
+        "name": "outcome 100",
+        "xml": "<outcome value='100'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 761,
+        "y": 510.00003814697266,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "936b39d4.8b5a38"
+            ]
+        ]
+    },
+    {
+        "id": "936b39d4.8b5a38",
+        "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='`$prop.lcm.upgrade-software.playbookname`'/>\n\t\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 939.0000305175781,
+        "y": 510.00003814697266,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "ca460fcf.02e98",
+                "296c3998.c540f6"
+            ]
+        ]
+    },
+    {
+        "id": "22afa298.2efb1e",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 504,
+        "y": 378.0000305175781,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "41ed13b3.d624bc"
+            ]
+        ]
+    },
+    {
+        "id": "a9686655.3f4ab8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 506,
+        "y": 430,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "4a011b96.270794"
+            ]
+        ]
+    },
+    {
+        "id": "ca460fcf.02e98",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1100.0000610351562,
+        "y": 487.00000762939453,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "41ed13b3.d624bc"
+            ]
+        ]
+    },
+    {
+        "id": "3dce5412.8af8ac",
+        "type": "other",
+        "name": "outcome 101",
+        "xml": "<outcome value='101'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 755,
+        "y": 425.00003814697266,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "41ed13b3.d624bc"
+            ]
+        ]
+    },
+    {
+        "id": "296c3998.c540f6",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1107.0000610351562,
+        "y": 535.0000381469727,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "7b87f117.b4313"
+            ]
+        ]
+    },
+    {
+        "id": "94bc239f.d51ed",
+        "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": 1389.9999389648438,
+        "y": 587.0000381469727,
+        "z": "f89ff8f8.fd73f8",
+        "wires": []
+    },
+    {
+        "id": "1018873c.0eea29",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 127,
+        "y": 203,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "33405b66.254a24"
+            ]
+        ]
+    },
+    {
+        "id": "200bd935.5c4296",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 122.91668701171875,
+        "y": 384.0833435058594,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "70d63640.e2d148",
+                "da0d3fe2.9fb83",
+                "ff90e7e4.933fd8"
+            ]
+        ]
+    },
+    {
+        "id": "da0d3fe2.9fb83",
+        "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": 297.00001525878906,
+        "y": 326.0833435058594,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e9671ba3.d82fd8",
+        "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": 1107.0000610351562,
+        "y": 331.0833435058594,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "54800975.8a5fa8"
+            ]
+        ]
+    },
+    {
+        "id": "54800975.8a5fa8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1277,
+        "y": 330.0833435058594,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "a3e81bc7.85e588"
+            ]
+        ]
+    },
+    {
+        "id": "41ed13b3.d624bc",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 910,
+        "y": 355.0833435058594,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "e9671ba3.d82fd8",
+                "efa1ef26.9748",
+                "a558be34.99d0b"
+            ]
+        ]
+    },
+    {
+        "id": "62a61f1a.99219",
+        "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": 1410.4999389648438,
+        "y": 536.0833511352539,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "24389a0d.bab8f6"
+            ]
+        ]
+    },
+    {
+        "id": "24389a0d.bab8f6",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1570.4999389648438,
+        "y": 536.0833511352539,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "b8153372.37ed8"
+            ]
+        ]
+    },
+    {
+        "id": "a3e81bc7.85e588",
+        "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": 1409,
+        "y": 330.0833435058594,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "efa1ef26.9748",
+        "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": 1081.9166870117188,
+        "y": 368.0833435058594,
+        "z": "f89ff8f8.fd73f8",
+        "wires": []
+    },
+    {
+        "id": "b8153372.37ed8",
+        "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": 1691.9166870117188,
+        "y": 537.0833511352539,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a558be34.99d0b",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\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": 1059.0000610351562,
+        "y": 278.0833435058594,
+        "z": "f89ff8f8.fd73f8",
+        "wires": []
+    },
+    {
+        "id": "7b87f117.b4313",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1239.9999389648438,
+        "y": 535.0833206176758,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "62a61f1a.99219",
+                "5099c108.ef352",
+                "94bc239f.d51ed"
+            ]
+        ]
+    },
+    {
+        "id": "5099c108.ef352",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\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": 1370.1666870117188,
+        "y": 488.0833511352539,
+        "z": "f89ff8f8.fd73f8",
+        "wires": []
+    },
+    {
+        "id": "447f65a.9f7919c",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 500,
+        "y": 331,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "a4cded3a.e3895"
+            ]
+        ]
+    },
+    {
+        "id": "7586b55c.6c594c",
+        "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": 884,
+        "y": 278,
+        "z": "f89ff8f8.fd73f8",
+        "wires": []
+    },
+    {
+        "id": "a4cded3a.e3895",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 684,
+        "y": 323,
+        "z": "f89ff8f8.fd73f8",
+        "wires": [
+            [
+                "7586b55c.6c594c",
+                "41ed13b3.d624bc"
+            ]
+        ]
+    },
+    {
+        "id": "ff90e7e4.933fd8",
+        "type": "set",
+        "name": "set default status value",
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
+        "comments": "",
+        "x": 311,
+        "y": 370,
+        "z": "f89ff8f8.fd73f8",
+        "wires": []
+    }
+]
+\ 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 91c63c95..a883d60d 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
@@ -1,480 +1,299 @@
-<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}'>
-	<method rpc='upgrade-post-check' mode='sync'>
-		<block>
-			<execute
-				plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode'
-				method='readProperties'>
-				<parameter name='fileName'
-					value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />
-				<parameter name='contextPrefix' value='prop' />
-			</execute>
-			<set>
-				<parameter name='status.code' value='200' />
-				<parameter name='status.message'
-					value='unexpected return from DG' />
-			</set>
-			<execute
-				plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'
-				method='reqExec'>
-				<parameter name='AgentUrl'
-					value='`$prop.ansible.agenturl`' />
-				<parameter name='User' value='`$prop.ansible.user`' />
-				<parameter name='Password' value='`prop.ansible.password`' />
-				<parameter name='LocalParameters'
-					value='`$prop.ansible.lcm.localparameters`' />
-				<parameter name='EnvParameters'
-					value='`$upgrade-post-check-input.payload`' />
-				<parameter name='NodeList'
-					value='`$prop.ansible.nodelist`' />
-				<parameter name='Timeout' value='`$prop.ansible.timeout`' />
-				<parameter name='Version' value='`$prop.ansible.version`' />
-				<parameter name='Id'
-					value='`$upgrade-post-check-input.common-header.request-id`' />
-				<parameter name='PlaybookName'
-					value='`$prop.lcm.upgrade-post-check.playbookname`' />
-				<outcome value='not-found'>
-					<block>
-						<set>
-							<parameter
-								name='$org.onap.appc.adapter.ansible.result.code' value='401' />
-							<parameter name='org.onap.appc.adapter.ansible.message'
-								value='Ansible Adapter was not found' />
-						</set>
-						<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.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.originator-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.payload'
-									value='`$org.onap.appc.adapter.ansible.results`' />
-								<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.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`' />
-								<parameter name='restapiUser'
-									value='`$prop.lcm.dmaap.user`' />
-								<parameter name='restapiPassword'
-									value='`$prop.lcm.dmaap.password`' />
-								<parameter name='format' value='json' />
-								<parameter name='httpMethod' value='POST' />
-								<parameter name='contentType' value='application/json' />
-								<parameter name="responsePrefix" value="lcm" />
-								<outcome value='failure'>
-									<record
-										plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-										<parameter name="logger" value="message-log" />
-										<parameter name="field1"
-											value='Failed to Publish to DMaap' />
-									</record>
-								</outcome>
-							</execute>
-							<return status='failure'>
-								<parameter name='status.code' value='401' />
-								<parameter name='status.message'
-									value='`$org.onap.appc.adapter.ansible.message`' />
-							</return>
-						</block>
-					</block>
-				</outcome>
-				<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.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.originator-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.payload'
-								value='`$org.onap.appc.adapter.ansible.results`' />
-							<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.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`' />
-							<parameter name='restapiUser'
-								value='`$prop.lcm.dmaap.user`' />
-							<parameter name='restapiPassword'
-								value='`$prop.lcm.dmaap.password`' />
-							<parameter name='format' value='json' />
-							<parameter name='httpMethod' value='POST' />
-							<parameter name='contentType' value='application/json' />
-							<parameter name="responsePrefix" value="lcm" />
-							<outcome value='failure'>
-								<record
-									plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-									<parameter name="logger" value="message-log" />
-									<parameter name="field1"
-										value='Failed to Publish to DMaap' />
-								</record>
-							</outcome>
-						</execute>
-						<return status='failure'>
-							<parameter name='status.code' value='401' />
-							<parameter name='status.message'
-								value='`$org.onap.appc.adapter.ansible.message`' />
-						</return>
-					</block>
-				</outcome>
-				<outcome value='Other'>
-					<switch test="`$org.onap.appc.adapter.ansible.result.code`">
-						<outcome value='101'>
-							<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.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.originator-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.payload'
-										value='`$org.onap.appc.adapter.ansible.results`' />
-									<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.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`' />
-									<parameter name='restapiUser'
-										value='`$prop.lcm.dmaap.user`' />
-									<parameter name='restapiPassword'
-										value='`$prop.lcm.dmaap.password`' />
-									<parameter name='format' value='json' />
-									<parameter name='httpMethod' value='POST' />
-									<parameter name='contentType'
-										value='application/json' />
-									<parameter name="responsePrefix" value="lcm" />
-									<outcome value='failure'>
-										<record
-											plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-											<parameter name="logger" value="message-log" />
-											<parameter name="field1"
-												value='Failed to Publish to DMaap' />
-										</record>
-									</outcome>
-								</execute>
-								<return status='failure'>
-									<parameter name='status.code' value='401' />
-									<parameter name='status.message'
-										value='`$org.onap.appc.adapter.ansible.message`' />
-								</return>
-							</block>
-						</outcome>
-						<outcome value='500'>
-							<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.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.originator-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.payload'
-										value='`$org.onap.appc.adapter.ansible.results`' />
-									<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.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`' />
-									<parameter name='restapiUser'
-										value='`$prop.lcm.dmaap.user`' />
-									<parameter name='restapiPassword'
-										value='`$prop.lcm.dmaap.password`' />
-									<parameter name='format' value='json' />
-									<parameter name='httpMethod' value='POST' />
-									<parameter name='contentType'
-										value='application/json' />
-									<parameter name="responsePrefix" value="lcm" />
-									<outcome value='failure'>
-										<record
-											plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-											<parameter name="logger" value="message-log" />
-											<parameter name="field1"
-												value='Failed to Publish to DMaap' />
-										</record>
-									</outcome>
-								</execute>
-								<return status='failure'>
-									<parameter name='status.code' value='401' />
-									<parameter name='status.message'
-										value='`$org.onap.appc.adapter.ansible.message`' />
-								</return>
-							</block>
-						</outcome>
-						<outcome value='100'>
-							<execute
-								plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'
-								method='reqExecResult'>
-								<parameter name='AgentUrl'
-									value='`$prop.ansible.agenturl`' />
-								<parameter name='User' value='`$prop.ansible.user`' />
-								<parameter name='Password'
-									value='`$prop.ansible.password`' />
-								<parameter name='Id'
-									value='`$org.onap.appc.adapter.ansible.Id`' />
-								<parameter name='PlaybookName'
-									value='`$prop.lcm.upgrade-post-check.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.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.originator-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.payload'
-												value='`$org.onap.appc.adapter.ansible.results`' />
-											<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.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`' />
-											<parameter name='restapiUser'
-												value='`$prop.lcm.dmaap.user`' />
-											<parameter name='restapiPassword'
-												value='`$prop.lcm.dmaap.password`' />
-											<parameter name='format' value='json' />
-											<parameter name='httpMethod' value='POST' />
-											<parameter name='contentType'
-												value='application/json' />
-											<parameter name="responsePrefix" value="lcm" />
-											<outcome value='failure'>
-												<record
-													plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-													<parameter name="logger" value="message-log" />
-													<parameter name="field1"
-														value='Failed to Publish to DMaap' />
-												</record>
-											</outcome>
-										</execute>
-										<return status='failure'>
-											<parameter name='status.code' value='401' />
-											<parameter name='status.message'
-												value='`$org.onap.appc.adapter.ansible.message`' />
-										</return>
-									</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.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.originator-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.payload'
-												value='`$org.onap.appc.adapter.ansible.results`' />
-											<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.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`' />
-											<parameter name='restapiUser'
-												value='`$prop.lcm.dmaap.user`' />
-											<parameter name='restapiPassword'
-												value='`$prop.lcm.dmaap.password`' />
-											<parameter name='format' value='json' />
-											<parameter name='httpMethod' value='POST' />
-											<parameter name='contentType'
-												value='application/json' />
-											<parameter name="responsePrefix" value="lcm" />
-											<outcome value='failure'>
-												<record
-													plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-													<parameter name="logger" value="message-log" />
-													<parameter name="field1"
-														value='Failed to Publish to DMaap' />
-												</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>
-									</block>
-								</outcome>
-							</execute>
-						</outcome>
-					</switch>
-				</outcome>
-			</execute>
-		</block>
-	</method>
+<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}'>
+    <method rpc='upgrade-post-check' mode='sync'>
+        <block>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <set>
+                <parameter name='status.code' value='200' />
+                <parameter name='status.message' value='unexpected return from DG' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
+                <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
+                <parameter name='User' value='`$prop.ansible.user`'/>
+                <parameter name='Password' value='`prop.ansible.password`'/>
+                <parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>
+                <parameter name='EnvParameters' value='`$upgrade-post-check-input.payload`'/>
+                <parameter name='NodeList' value='`$prop.ansible.nodelist`'/>
+                <parameter name='Timeout' value='`$prop.ansible.timeout`'/>
+                <parameter name='Version' value='`$prop.ansible.version`'/>
+                <parameter name='Id' value='`$upgrade-post-check-input.common-header.request-id`'/>
+                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-post-check.playbookname`'/>
+                <outcome value='not-found'>
+                    <block>
+                        <set>
+                            <parameter name='$org.onap.appc.adapter.ansible.result.code' value='401'/>
+                            <parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>
+                        </set>
+                        <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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>
+                                <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.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`' />
+                                <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />
+                                <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />
+                                <parameter name='format' value='json' />
+                                <parameter name='httpMethod' value='POST' />
+                                <parameter name='contentType' value='application/json' />
+                                <parameter name="responsePrefix" value="lcm" />
+                                <outcome value='failure'>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                        <parameter name="logger" value="message-log"/>
+                                        <parameter name="field1" value='Failed to Publish to DMaap'/>
+                                    </record>
+                                </outcome>
+                            </execute>
+                            <return status='failure'>
+                                <parameter name='status.code' value='401' />
+                                <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                            </return>
+                        </block>
+                    </block>
+                </outcome>
+                <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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>
+                            <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.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`' />
+                            <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />
+                            <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />
+                            <parameter name='format' value='json' />
+                            <parameter name='httpMethod' value='POST' />
+                            <parameter name='contentType' value='application/json' />
+                            <parameter name="responsePrefix" value="lcm" />
+                            <outcome value='failure'>
+                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                    <parameter name="logger" value="message-log"/>
+                                    <parameter name="field1" value='Failed to Publish to DMaap'/>
+                                </record>
+                            </outcome>
+                        </execute>
+                        <return status='failure'>
+                            <parameter name='status.code' value='401' />
+                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                        </return>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+                        <outcome value='101'>
+                            <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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>
+                                    <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.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`' />
+                                    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />
+                                    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />
+                                    <parameter name='format' value='json' />
+                                    <parameter name='httpMethod' value='POST' />
+                                    <parameter name='contentType' value='application/json' />
+                                    <parameter name="responsePrefix" value="lcm" />
+                                    <outcome value='failure'>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log"/>
+                                            <parameter name="field1" value='Failed to Publish to DMaap'/>
+                                        </record>
+                                    </outcome>
+                                </execute>
+                                <return status='failure'>
+                                    <parameter name='status.code' value='401' />
+                                    <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                </return>
+                            </block>
+                        </outcome>
+                        <outcome value='500'>
+                            <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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>
+                                    <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.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`' />
+                                    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />
+                                    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />
+                                    <parameter name='format' value='json' />
+                                    <parameter name='httpMethod' value='POST' />
+                                    <parameter name='contentType' value='application/json' />
+                                    <parameter name="responsePrefix" value="lcm" />
+                                    <outcome value='failure'>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log"/>
+                                            <parameter name="field1" value='Failed to Publish to DMaap'/>
+                                        </record>
+                                    </outcome>
+                                </execute>
+                                <return status='failure'>
+                                    <parameter name='status.code' value='401' />
+                                    <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                </return>
+                            </block>
+                        </outcome>
+                        <outcome value='100'>
+                            <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >
+                                <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
+                                <parameter name='User' value='`$prop.ansible.user`'/>
+                                <parameter name='Password' value='`$prop.ansible.password`'/>
+                                <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
+                                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-post-check.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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>
+                                            <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.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`' />
+                                            <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />
+                                            <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />
+                                            <parameter name='format' value='json' />
+                                            <parameter name='httpMethod' value='POST' />
+                                            <parameter name='contentType' value='application/json' />
+                                            <parameter name="responsePrefix" value="lcm" />
+                                            <outcome value='failure'>
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                    <parameter name="logger" value="message-log"/>
+                                                    <parameter name="field1" value='Failed to Publish to DMaap'/>
+                                                </record>
+                                            </outcome>
+                                        </execute>
+                                        <return status='failure'>
+                                            <parameter name='status.code' value='401' />
+                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                        </return>
+                                    </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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>
+                                            <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.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`' />
+                                            <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />
+                                            <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />
+                                            <parameter name='format' value='json' />
+                                            <parameter name='httpMethod' value='POST' />
+                                            <parameter name='contentType' value='application/json' />
+                                            <parameter name="responsePrefix" value="lcm" />
+                                            <outcome value='failure'>
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                    <parameter name="logger" value="message-log"/>
+                                                    <parameter name="field1" value='Failed to Publish to DMaap'/>
+                                                </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>
+                                    </block>
+                                </outcome>
+                            </execute>
+                        </outcome>
+                    </switch>
+                </outcome>
+            </execute>
+        </block>
+    </method>
 </service-logic>
 \ No newline at end of file
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 ee3bbc9d..d60d2b36 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
@@ -1,480 +1,299 @@
-<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}'>
-	<method rpc='upgrade-pre-check' mode='sync'>
-		<block>
-			<execute
-				plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode'
-				method='readProperties'>
-				<parameter name='fileName'
-					value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />
-				<parameter name='contextPrefix' value='prop' />
-			</execute>
-			<set>
-				<parameter name='status.code' value='200' />
-				<parameter name='status.message'
-					value='unexpected return from DG' />
-			</set>
-			<execute
-				plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'
-				method='reqExec'>
-				<parameter name='AgentUrl'
-					value='`$prop.ansible.agenturl`' />
-				<parameter name='User' value='`$prop.ansible.user`' />
-				<parameter name='Password' value='`prop.ansible.password`' />
-				<parameter name='LocalParameters'
-					value='`$prop.ansible.lcm.localparameters`' />
-				<parameter name='EnvParameters'
-					value='`$upgrade-pre-check-input.payload`' />
-				<parameter name='NodeList'
-					value='`$prop.ansible.nodelist`' />
-				<parameter name='Timeout' value='`$prop.ansible.timeout`' />
-				<parameter name='Version' value='`$prop.ansible.version`' />
-				<parameter name='Id'
-					value='`$upgrade-pre-check-input.common-header.request-id`' />
-				<parameter name='PlaybookName'
-					value='`$prop.lcm.upgrade-pre-check.playbookname`' />
-				<outcome value='not-found'>
-					<block>
-						<set>
-							<parameter
-								name='org.onap.appc.adapter.ansible.result.code' value='401' />
-							<parameter name='org.onap.appc.adapter.ansible.message'
-								value='Ansible Adapter was not found' />
-						</set>
-						<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.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.originator-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.payload'
-									value='`$org.onap.appc.adapter.ansible.results`' />
-								<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.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`' />
-								<parameter name='restapiUser'
-									value='`$prop.lcm.dmaap.user`' />
-								<parameter name='restapiPassword'
-									value='`$prop.lcm.dmaap.password`' />
-								<parameter name='format' value='json' />
-								<parameter name='httpMethod' value='POST' />
-								<parameter name='contentType' value='application/json' />
-								<parameter name="responsePrefix" value="lcm" />
-								<outcome value='failure'>
-									<record
-										plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-										<parameter name="logger" value="message-log" />
-										<parameter name="field1"
-											value='Failed to Publish to DMaap' />
-									</record>
-								</outcome>
-							</execute>
-							<return status='failure'>
-								<parameter name='status.code' value='401' />
-								<parameter name='status.message'
-									value='`$org.onap.appc.adapter.ansible.message`' />
-							</return>
-						</block>
-					</block>
-				</outcome>
-				<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.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.originator-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.payload'
-								value='`$org.onap.appc.adapter.ansible.results`' />
-							<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.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`' />
-							<parameter name='restapiUser'
-								value='`$prop.lcm.dmaap.user`' />
-							<parameter name='restapiPassword'
-								value='`$prop.lcm.dmaap.password`' />
-							<parameter name='format' value='json' />
-							<parameter name='httpMethod' value='POST' />
-							<parameter name='contentType' value='application/json' />
-							<parameter name="responsePrefix" value="lcm" />
-							<outcome value='failure'>
-								<record
-									plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-									<parameter name="logger" value="message-log" />
-									<parameter name="field1"
-										value='Failed to Publish to DMaap' />
-								</record>
-							</outcome>
-						</execute>
-						<return status='failure'>
-							<parameter name='status.code' value='401' />
-							<parameter name='status.message'
-								value='`$org.onap.appc.adapter.ansible.message`' />
-						</return>
-					</block>
-				</outcome>
-				<outcome value='Other'>
-					<switch test="`$org.onap.appc.adapter.ansible.result.code`">
-						<outcome value='101'>
-							<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.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.originator-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.payload'
-										value='`$org.onap.appc.adapter.ansible.results`' />
-									<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.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`' />
-									<parameter name='restapiUser'
-										value='`$prop.lcm.dmaap.user`' />
-									<parameter name='restapiPassword'
-										value='`$prop.lcm.dmaap.password`' />
-									<parameter name='format' value='json' />
-									<parameter name='httpMethod' value='POST' />
-									<parameter name='contentType'
-										value='application/json' />
-									<parameter name="responsePrefix" value="lcm" />
-									<outcome value='failure'>
-										<record
-											plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-											<parameter name="logger" value="message-log" />
-											<parameter name="field1"
-												value='Failed to Publish to DMaap' />
-										</record>
-									</outcome>
-								</execute>
-								<return status='failure'>
-									<parameter name='status.code' value='401' />
-									<parameter name='status.message'
-										value='`$org.onap.appc.adapter.ansible.message`' />
-								</return>
-							</block>
-						</outcome>
-						<outcome value='500'>
-							<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.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.originator-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.payload'
-										value='`$org.onap.appc.adapter.ansible.results`' />
-									<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.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`' />
-									<parameter name='restapiUser'
-										value='`$prop.lcm.dmaap.user`' />
-									<parameter name='restapiPassword'
-										value='`$prop.lcm.dmaap.password`' />
-									<parameter name='format' value='json' />
-									<parameter name='httpMethod' value='POST' />
-									<parameter name='contentType'
-										value='application/json' />
-									<parameter name="responsePrefix" value="lcm" />
-									<outcome value='failure'>
-										<record
-											plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-											<parameter name="logger" value="message-log" />
-											<parameter name="field1"
-												value='Failed to Publish to DMaap' />
-										</record>
-									</outcome>
-								</execute>
-								<return status='failure'>
-									<parameter name='status.code' value='401' />
-									<parameter name='status.message'
-										value='`$org.onap.appc.adapter.ansible.message`' />
-								</return>
-							</block>
-						</outcome>
-						<outcome value='100'>
-							<execute
-								plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'
-								method='reqExecResult'>
-								<parameter name='AgentUrl'
-									value='`$prop.ansible.agenturl`' />
-								<parameter name='User' value='`$prop.ansible.user`' />
-								<parameter name='Password'
-									value='`$prop.ansible.password`' />
-								<parameter name='Id'
-									value='`$org.onap.appc.adapter.ansible.Id`' />
-								<parameter name='PlaybookName'
-									value='`$prop.lcm.upgrade-pre-check.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.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.originator-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.payload'
-												value='`$org.onap.appc.adapter.ansible.results`' />
-											<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.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`' />
-											<parameter name='restapiUser'
-												value='`$prop.lcm.dmaap.user`' />
-											<parameter name='restapiPassword'
-												value='`$prop.lcm.dmaap.password`' />
-											<parameter name='format' value='json' />
-											<parameter name='httpMethod' value='POST' />
-											<parameter name='contentType'
-												value='application/json' />
-											<parameter name="responsePrefix" value="lcm" />
-											<outcome value='failure'>
-												<record
-													plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-													<parameter name="logger" value="message-log" />
-													<parameter name="field1"
-														value='Failed to Publish to DMaap' />
-												</record>
-											</outcome>
-										</execute>
-										<return status='failure'>
-											<parameter name='status.code' value='401' />
-											<parameter name='status.message'
-												value='`$org.onap.appc.adapter.ansible.message`' />
-										</return>
-									</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.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.originator-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.payload'
-												value='`$org.onap.appc.adapter.ansible.results`' />
-											<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.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`' />
-											<parameter name='restapiUser'
-												value='`$prop.lcm.dmaap.user`' />
-											<parameter name='restapiPassword'
-												value='`$prop.lcm.dmaap.password`' />
-											<parameter name='format' value='json' />
-											<parameter name='httpMethod' value='POST' />
-											<parameter name='contentType'
-												value='application/json' />
-											<parameter name="responsePrefix" value="lcm" />
-											<outcome value='failure'>
-												<record
-													plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-													<parameter name="logger" value="message-log" />
-													<parameter name="field1"
-														value='Failed to Publish to DMaap' />
-												</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>
-									</block>
-								</outcome>
-							</execute>
-						</outcome>
-					</switch>
-				</outcome>
-			</execute>
-		</block>
-	</method>
+<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}'>
+    <method rpc='upgrade-pre-check' mode='sync'>
+        <block>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <set>
+                <parameter name='status.code' value='200' />
+                <parameter name='status.message' value='unexpected return from DG' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
+                <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
+                <parameter name='User' value='`$prop.ansible.user`'/>
+                <parameter name='Password' value='`prop.ansible.password`'/>
+                <parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>
+                <parameter name='EnvParameters' value='`$upgrade-pre-check-input.payload`'/>
+                <parameter name='NodeList' value='`$prop.ansible.nodelist`'/>
+                <parameter name='Timeout' value='`$prop.ansible.timeout`'/>
+                <parameter name='Version' value='`$prop.ansible.version`'/>
+                <parameter name='Id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
+                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>
+                <outcome value='not-found'>
+                    <block>
+                        <set>
+                            <parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>
+                            <parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>
+                        </set>
+                        <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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>
+                                <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.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`' />
+                                <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />
+                                <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />
+                                <parameter name='format' value='json' />
+                                <parameter name='httpMethod' value='POST' />
+                                <parameter name='contentType' value='application/json' />
+                                <parameter name="responsePrefix" value="lcm" />
+                                <outcome value='failure'>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                        <parameter name="logger" value="message-log"/>
+                                        <parameter name="field1" value='Failed to Publish to DMaap'/>
+                                    </record>
+                                </outcome>
+                            </execute>
+                            <return status='failure'>
+                                <parameter name='status.code' value='401' />
+                                <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                            </return>
+                        </block>
+                    </block>
+                </outcome>
+                <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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>
+                            <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.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`' />
+                            <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />
+                            <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />
+                            <parameter name='format' value='json' />
+                            <parameter name='httpMethod' value='POST' />
+                            <parameter name='contentType' value='application/json' />
+                            <parameter name="responsePrefix" value="lcm" />
+                            <outcome value='failure'>
+                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                    <parameter name="logger" value="message-log"/>
+                                    <parameter name="field1" value='Failed to Publish to DMaap'/>
+                                </record>
+                            </outcome>
+                        </execute>
+                        <return status='failure'>
+                            <parameter name='status.code' value='401' />
+                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                        </return>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+                        <outcome value='101'>
+                            <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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>
+                                    <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.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`' />
+                                    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />
+                                    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />
+                                    <parameter name='format' value='json' />
+                                    <parameter name='httpMethod' value='POST' />
+                                    <parameter name='contentType' value='application/json' />
+                                    <parameter name="responsePrefix" value="lcm" />
+                                    <outcome value='failure'>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log"/>
+                                            <parameter name="field1" value='Failed to Publish to DMaap'/>
+                                        </record>
+                                    </outcome>
+                                </execute>
+                                <return status='failure'>
+                                    <parameter name='status.code' value='401' />
+                                    <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                </return>
+                            </block>
+                        </outcome>
+                        <outcome value='500'>
+                            <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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>
+                                    <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.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`' />
+                                    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />
+                                    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />
+                                    <parameter name='format' value='json' />
+                                    <parameter name='httpMethod' value='POST' />
+                                    <parameter name='contentType' value='application/json' />
+                                    <parameter name="responsePrefix" value="lcm" />
+                                    <outcome value='failure'>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log"/>
+                                            <parameter name="field1" value='Failed to Publish to DMaap'/>
+                                        </record>
+                                    </outcome>
+                                </execute>
+                                <return status='failure'>
+                                    <parameter name='status.code' value='401' />
+                                    <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                </return>
+                            </block>
+                        </outcome>
+                        <outcome value='100'>
+                            <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >
+                                <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
+                                <parameter name='User' value='`$prop.ansible.user`'/>
+                                <parameter name='Password' value='`$prop.ansible.password`'/>
+                                <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
+                                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-pre-check.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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>
+                                            <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.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`' />
+                                            <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />
+                                            <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />
+                                            <parameter name='format' value='json' />
+                                            <parameter name='httpMethod' value='POST' />
+                                            <parameter name='contentType' value='application/json' />
+                                            <parameter name="responsePrefix" value="lcm" />
+                                            <outcome value='failure'>
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                    <parameter name="logger" value="message-log"/>
+                                                    <parameter name="field1" value='Failed to Publish to DMaap'/>
+                                                </record>
+                                            </outcome>
+                                        </execute>
+                                        <return status='failure'>
+                                            <parameter name='status.code' value='401' />
+                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                        </return>
+                                    </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.payload' value='`$org.onap.appc.adapter.ansible.results`'/>
+                                            <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.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`' />
+                                            <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />
+                                            <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />
+                                            <parameter name='format' value='json' />
+                                            <parameter name='httpMethod' value='POST' />
+                                            <parameter name='contentType' value='application/json' />
+                                            <parameter name="responsePrefix" value="lcm" />
+                                            <outcome value='failure'>
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                    <parameter name="logger" value="message-log"/>
+                                                    <parameter name="field1" value='Failed to Publish to DMaap'/>
+                                                </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>
+                                    </block>
+                                </outcome>
+                            </execute>
+                        </outcome>
+                    </switch>
+                </outcome>
+            </execute>
+        </block>
+    </method>
 </service-logic>
 \ No newline at end of file
diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
index 71ed77fd..843d51ab 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
@@ -1,480 +1,299 @@
-<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}'>
-	<method rpc='upgrade-software' mode='sync'>
-		<block>
-			<execute
-				plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode'
-				method='readProperties'>
-				<parameter name='fileName'
-					value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />
-				<parameter name='contextPrefix' value='prop' />
-			</execute>
-			<set>
-				<parameter name='status.code' value='200' />
-				<parameter name='status.message'
-					value='unexpected return from DG' />
-			</set>
-			<execute
-				plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'
-				method='reqExec'>
-				<parameter name='AgentUrl'
-					value='`$prop.ansible.agenturl`' />
-				<parameter name='User' value='`$prop.ansible.user`' />
-				<parameter name='Password' value='`prop.ansible.password`' />
-				<parameter name='LocalParameters'
-					value='`$prop.ansible.lcm.localparameters`' />
-				<parameter name='EnvParameters'
-					value='`$upgrade-software-input.payload`' />
-				<parameter name='NodeList'
-					value='`$prop.ansible.nodelist`' />
-				<parameter name='Timeout' value='`$prop.ansible.timeout`' />
-				<parameter name='Version' value='`$prop.ansible.version`' />
-				<parameter name='Id'
-					value='`$upgrade-software-input.common-header.request-id`' />
-				<parameter name='PlaybookName'
-					value='`$prop.lcm.upgrade-software.playbookname`' />
-				<outcome value='not-found'>
-					<block>
-						<set>
-							<parameter
-								name='$org.onap.appc.adapter.ansible.result.code' value='401' />
-							<parameter name='org.onap.appc.adapter.ansible.message'
-								value='Ansible Adapter was not found' />
-						</set>
-						<block>
-							<set>
-								<parameter name='lcm-dmaap.version'
-									value='`$prop.lcm.dmaap.version`' />
-								<parameter name='lcm-dmaap.correlation-id'
-									value='`$upgrade-software-input.common-header.sub-request-id`' />
-								<parameter name='lcm-dmaap.partition'
-									value='`$prop.lcm.dmaap.partition`' />
-								<parameter name='lcm-dmaap.rpc-name'
-									value='upgrade-software' />
-								<parameter name='lcm-dmaap.type'
-									value='`$prop.lcm.dmaap.type`' />
-								<parameter name='lcm-dmaap.timestamp'
-									value='`$upgrade-software-input.common-header.timestamp`' />
-								<parameter name='lcm-dmaap.api-ver'
-									value='`$upgrade-software-input.common-header.api-ver`' />
-								<parameter name='lcm-dmaap.originator-id'
-									value='`$upgrade-software-input.common-header.originator-id`' />
-								<parameter name='lcm-dmaap.request-id'
-									value='`$upgrade-software-input.common-header.originator-id`' />
-								<parameter name='lcm-dmaap.sub-request-id'
-									value='`$upgrade-software-input.common-header.sub-request-id`' />
-								<parameter name='lcm-dmaap.flags.mode'
-									value='`$upgrade-software-input.common-header.flags.mode`' />
-								<parameter name='lcm-dmaap.flags.force'
-									value='`$upgrade-software-input.common-header.flags.force`' />
-								<parameter name='lcm-dmaap.flags.ttl'
-									value='`$upgrade-software-input.common-header.flags.ttl`' />
-								<parameter name='lcm-dmaap.payload'
-									value='`$org.onap.appc.adapter.ansible.results`' />
-								<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.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`' />
-								<parameter name='restapiUser'
-									value='`$prop.lcm.dmaap.user`' />
-								<parameter name='restapiPassword'
-									value='`$prop.lcm.dmaap.password`' />
-								<parameter name='format' value='json' />
-								<parameter name='httpMethod' value='POST' />
-								<parameter name='contentType' value='application/json' />
-								<parameter name="responsePrefix" value="lcm" />
-								<outcome value='failure'>
-									<record
-										plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-										<parameter name="logger" value="message-log" />
-										<parameter name="field1"
-											value='Failed to Publish to DMaap' />
-									</record>
-								</outcome>
-							</execute>
-							<return status='failure'>
-								<parameter name='status.code' value='401' />
-								<parameter name='status.message'
-									value='`$org.onap.appc.adapter.ansible.message`' />
-							</return>
-						</block>
-					</block>
-				</outcome>
-				<outcome value='failure'>
-					<block>
-						<set>
-							<parameter name='lcm-dmaap.version'
-								value='`$prop.lcm.dmaap.version`' />
-							<parameter name='lcm-dmaap.correlation-id'
-								value='`$upgrade-software-input.common-header.sub-request-id`' />
-							<parameter name='lcm-dmaap.partition'
-								value='`$prop.lcm.dmaap.partition`' />
-							<parameter name='lcm-dmaap.rpc-name'
-								value='upgrade-software' />
-							<parameter name='lcm-dmaap.type'
-								value='`$prop.lcm.dmaap.type`' />
-							<parameter name='lcm-dmaap.timestamp'
-								value='`$upgrade-software-input.common-header.timestamp`' />
-							<parameter name='lcm-dmaap.api-ver'
-								value='`$upgrade-software-input.common-header.api-ver`' />
-							<parameter name='lcm-dmaap.originator-id'
-								value='`$upgrade-software-input.common-header.originator-id`' />
-							<parameter name='lcm-dmaap.request-id'
-								value='`$upgrade-software-input.common-header.originator-id`' />
-							<parameter name='lcm-dmaap.sub-request-id'
-								value='`$upgrade-software-input.common-header.sub-request-id`' />
-							<parameter name='lcm-dmaap.flags.mode'
-								value='`$upgrade-software-input.common-header.flags.mode`' />
-							<parameter name='lcm-dmaap.flags.force'
-								value='`$upgrade-software-input.common-header.flags.force`' />
-							<parameter name='lcm-dmaap.flags.ttl'
-								value='`$upgrade-software-input.common-header.flags.ttl`' />
-							<parameter name='lcm-dmaap.payload'
-								value='`$org.onap.appc.adapter.ansible.results`' />
-							<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.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`' />
-							<parameter name='restapiUser'
-								value='`$prop.lcm.dmaap.user`' />
-							<parameter name='restapiPassword'
-								value='`$prop.lcm.dmaap.password`' />
-							<parameter name='format' value='json' />
-							<parameter name='httpMethod' value='POST' />
-							<parameter name='contentType' value='application/json' />
-							<parameter name="responsePrefix" value="lcm" />
-							<outcome value='failure'>
-								<record
-									plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-									<parameter name="logger" value="message-log" />
-									<parameter name="field1"
-										value='Failed to Publish to DMaap' />
-								</record>
-							</outcome>
-						</execute>
-						<return status='failure'>
-							<parameter name='status.code' value='401' />
-							<parameter name='status.message'
-								value='`$org.onap.appc.adapter.ansible.message`' />
-						</return>
-					</block>
-				</outcome>
-				<outcome value='Other'>
-					<switch test="`$org.onap.appc.adapter.ansible.result.code`">
-						<outcome value='101'>
-							<block>
-								<set>
-									<parameter name='lcm-dmaap.version'
-										value='`$prop.lcm.dmaap.version`' />
-									<parameter name='lcm-dmaap.correlation-id'
-										value='`$upgrade-software-input.common-header.sub-request-id`' />
-									<parameter name='lcm-dmaap.partition'
-										value='`$prop.lcm.dmaap.partition`' />
-									<parameter name='lcm-dmaap.rpc-name'
-										value='upgrade-software' />
-									<parameter name='lcm-dmaap.type'
-										value='`$prop.lcm.dmaap.type`' />
-									<parameter name='lcm-dmaap.timestamp'
-										value='`$upgrade-software-input.common-header.timestamp`' />
-									<parameter name='lcm-dmaap.api-ver'
-										value='`$upgrade-software-input.common-header.api-ver`' />
-									<parameter name='lcm-dmaap.originator-id'
-										value='`$upgrade-software-input.common-header.originator-id`' />
-									<parameter name='lcm-dmaap.request-id'
-										value='`$upgrade-software-input.common-header.originator-id`' />
-									<parameter name='lcm-dmaap.sub-request-id'
-										value='`$upgrade-software-input.common-header.sub-request-id`' />
-									<parameter name='lcm-dmaap.flags.mode'
-										value='`$upgrade-software-input.common-header.flags.mode`' />
-									<parameter name='lcm-dmaap.flags.force'
-										value='`$upgrade-software-input.common-header.flags.force`' />
-									<parameter name='lcm-dmaap.flags.ttl'
-										value='`$upgrade-software-input.common-header.flags.ttl`' />
-									<parameter name='lcm-dmaap.payload'
-										value='`$org.onap.appc.adapter.ansible.results`' />
-									<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.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`' />
-									<parameter name='restapiUser'
-										value='`$prop.lcm.dmaap.user`' />
-									<parameter name='restapiPassword'
-										value='`$prop.lcm.dmaap.password`' />
-									<parameter name='format' value='json' />
-									<parameter name='httpMethod' value='POST' />
-									<parameter name='contentType'
-										value='application/json' />
-									<parameter name="responsePrefix" value="lcm" />
-									<outcome value='failure'>
-										<record
-											plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-											<parameter name="logger" value="message-log" />
-											<parameter name="field1"
-												value='Failed to Publish to DMaap' />
-										</record>
-									</outcome>
-								</execute>
-								<return status='failure'>
-									<parameter name='status.code' value='401' />
-									<parameter name='status.message'
-										value='`$org.onap.appc.adapter.ansible.message`' />
-								</return>
-							</block>
-						</outcome>
-						<outcome value='500'>
-							<block>
-								<set>
-									<parameter name='lcm-dmaap.version'
-										value='`$prop.lcm.dmaap.version`' />
-									<parameter name='lcm-dmaap.correlation-id'
-										value='`$upgrade-software-input.common-header.sub-request-id`' />
-									<parameter name='lcm-dmaap.partition'
-										value='`$prop.lcm.dmaap.partition`' />
-									<parameter name='lcm-dmaap.rpc-name'
-										value='upgrade-software' />
-									<parameter name='lcm-dmaap.type'
-										value='`$prop.lcm.dmaap.type`' />
-									<parameter name='lcm-dmaap.timestamp'
-										value='`$upgrade-software-input.common-header.timestamp`' />
-									<parameter name='lcm-dmaap.api-ver'
-										value='`$upgrade-software-input.common-header.api-ver`' />
-									<parameter name='lcm-dmaap.originator-id'
-										value='`$upgrade-software-input.common-header.originator-id`' />
-									<parameter name='lcm-dmaap.request-id'
-										value='`$upgrade-software-input.common-header.originator-id`' />
-									<parameter name='lcm-dmaap.sub-request-id'
-										value='`$upgrade-software-input.common-header.sub-request-id`' />
-									<parameter name='lcm-dmaap.flags.mode'
-										value='`$upgrade-software-input.common-header.flags.mode`' />
-									<parameter name='lcm-dmaap.flags.force'
-										value='`$upgrade-software-input.common-header.flags.force`' />
-									<parameter name='lcm-dmaap.flags.ttl'
-										value='`$upgrade-software-input.common-header.flags.ttl`' />
-									<parameter name='lcm-dmaap.payload'
-										value='`$org.onap.appc.adapter.ansible.results`' />
-									<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.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`' />
-									<parameter name='restapiUser'
-										value='`$prop.lcm.dmaap.user`' />
-									<parameter name='restapiPassword'
-										value='`$prop.lcm.dmaap.password`' />
-									<parameter name='format' value='json' />
-									<parameter name='httpMethod' value='POST' />
-									<parameter name='contentType'
-										value='application/json' />
-									<parameter name="responsePrefix" value="lcm" />
-									<outcome value='failure'>
-										<record
-											plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-											<parameter name="logger" value="message-log" />
-											<parameter name="field1"
-												value='Failed to Publish to DMaap' />
-										</record>
-									</outcome>
-								</execute>
-								<return status='failure'>
-									<parameter name='status.code' value='401' />
-									<parameter name='status.message'
-										value='`$org.onap.appc.adapter.ansible.message`' />
-								</return>
-							</block>
-						</outcome>
-						<outcome value='100'>
-							<execute
-								plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'
-								method='reqExecResult'>
-								<parameter name='AgentUrl'
-									value='`$prop.ansible.agenturl`' />
-								<parameter name='User' value='`$prop.ansible.user`' />
-								<parameter name='Password'
-									value='`$prop.ansible.password`' />
-								<parameter name='Id'
-									value='`$org.onap.appc.adapter.ansible.Id`' />
-								<parameter name='PlaybookName'
-									value='`$prop.lcm.upgrade-software.playbookname`' />
-
-
-
-
-
-								<outcome value='failure'>
-									<block>
-										<set>
-											<parameter name='lcm-dmaap.version'
-												value='`$prop.lcm.dmaap.version`' />
-											<parameter name='lcm-dmaap.correlation-id'
-												value='`$upgrade-software-input.common-header.sub-request-id`' />
-											<parameter name='lcm-dmaap.partition'
-												value='`$prop.lcm.dmaap.partition`' />
-											<parameter name='lcm-dmaap.rpc-name'
-												value='upgrade-software' />
-											<parameter name='lcm-dmaap.type'
-												value='`$prop.lcm.dmaap.type`' />
-											<parameter name='lcm-dmaap.timestamp'
-												value='`$upgrade-software-input.common-header.timestamp`' />
-											<parameter name='lcm-dmaap.api-ver'
-												value='`$upgrade-software-input.common-header.api-ver`' />
-											<parameter name='lcm-dmaap.originator-id'
-												value='`$upgrade-software-input.common-header.originator-id`' />
-											<parameter name='lcm-dmaap.request-id'
-												value='`$upgrade-software-input.common-header.originator-id`' />
-											<parameter name='lcm-dmaap.sub-request-id'
-												value='`$upgrade-software-input.common-header.sub-request-id`' />
-											<parameter name='lcm-dmaap.flags.mode'
-												value='`$upgrade-software-input.common-header.flags.mode`' />
-											<parameter name='lcm-dmaap.flags.force'
-												value='`$upgrade-software-input.common-header.flags.force`' />
-											<parameter name='lcm-dmaap.flags.ttl'
-												value='`$upgrade-software-input.common-header.flags.ttl`' />
-											<parameter name='lcm-dmaap.payload'
-												value='`$org.onap.appc.adapter.ansible.results`' />
-											<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.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`' />
-											<parameter name='restapiUser'
-												value='`$prop.lcm.dmaap.user`' />
-											<parameter name='restapiPassword'
-												value='`$prop.lcm.dmaap.password`' />
-											<parameter name='format' value='json' />
-											<parameter name='httpMethod' value='POST' />
-											<parameter name='contentType'
-												value='application/json' />
-											<parameter name="responsePrefix" value="lcm" />
-											<outcome value='failure'>
-												<record
-													plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-													<parameter name="logger" value="message-log" />
-													<parameter name="field1"
-														value='Failed to Publish to DMaap' />
-												</record>
-											</outcome>
-										</execute>
-										<return status='failure'>
-											<parameter name='status.code' value='401' />
-											<parameter name='status.message'
-												value='`$org.onap.appc.adapter.ansible.message`' />
-										</return>
-									</block>
-								</outcome>
-								<outcome value='success'>
-									<block>
-										<set>
-											<parameter name='lcm-dmaap.version'
-												value='`$prop.lcm.dmaap.version`' />
-											<parameter name='lcm-dmaap.correlation-id'
-												value='`$upgrade-software-input.common-header.sub-request-id`' />
-											<parameter name='lcm-dmaap.partition'
-												value='`$prop.lcm.dmaap.partition`' />
-											<parameter name='lcm-dmaap.rpc-name'
-												value='upgrade-software' />
-											<parameter name='lcm-dmaap.type'
-												value='`$prop.lcm.dmaap.type`' />
-											<parameter name='lcm-dmaap.timestamp'
-												value='`$upgrade-software-input.common-header.timestamp`' />
-											<parameter name='lcm-dmaap.api-ver'
-												value='`$upgrade-software-input.common-header.api-ver`' />
-											<parameter name='lcm-dmaap.originator-id'
-												value='`$upgrade-software-input.common-header.originator-id`' />
-											<parameter name='lcm-dmaap.request-id'
-												value='`$upgrade-software-input.common-header.originator-id`' />
-											<parameter name='lcm-dmaap.sub-request-id'
-												value='`$upgrade-software-input.common-header.sub-request-id`' />
-											<parameter name='lcm-dmaap.flags.mode'
-												value='`$upgrade-software-input.common-header.flags.mode`' />
-											<parameter name='lcm-dmaap.flags.force'
-												value='`$upgrade-software-input.common-header.flags.force`' />
-											<parameter name='lcm-dmaap.flags.ttl'
-												value='`$upgrade-software-input.common-header.flags.ttl`' />
-											<parameter name='lcm-dmaap.payload'
-												value='`$org.onap.appc.adapter.ansible.results`' />
-											<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.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`' />
-											<parameter name='restapiUser'
-												value='`$prop.lcm.dmaap.user`' />
-											<parameter name='restapiPassword'
-												value='`$prop.lcm.dmaap.password`' />
-											<parameter name='format' value='json' />
-											<parameter name='httpMethod' value='POST' />
-											<parameter name='contentType'
-												value='application/json' />
-											<parameter name="responsePrefix" value="lcm" />
-											<outcome value='failure'>
-												<record
-													plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-													<parameter name="logger" value="message-log" />
-													<parameter name="field1"
-														value='Failed to Publish to DMaap' />
-												</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>
-									</block>
-								</outcome>
-							</execute>
-						</outcome>
-					</switch>
-				</outcome>
-			</execute>
-		</block>
-	</method>
+<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}'>
+    <method rpc='upgrade-software' mode='sync'>
+        <block>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <set>
+                <parameter name='status.code' value='200' />
+                <parameter name='status.message' value='unexpected return from DG' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
+                <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
+                <parameter name='User' value='`$prop.ansible.user`'/>
+                <parameter name='Password' value='`prop.ansible.password`'/>
+                <parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>
+                <parameter name='EnvParameters' value='`$upgrade-software-input.payload`'/>
+                <parameter name='NodeList' value='`$prop.ansible.nodelist`'/>
+                <parameter name='Timeout' value='`$prop.ansible.timeout`'/>
+                <parameter name='Version' value='`$prop.ansible.version`'/>
+                <parameter name='Id' value='`$upgrade-software-input.common-header.request-id`'/>
+                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>
+                <outcome value='not-found'>
+                    <block>
+                        <set>
+                            <parameter name='$org.onap.appc.adapter.ansible.result.code' value='401'/>
+                            <parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>
+                        </set>
+                        <block>
+                            <set>
+                                <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
+                                <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
+                                <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
+                                <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
+                                <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
+                                <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
+                                <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
+                                <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
+                                <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
+                                <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>
+                                <parameter name='lcm-dmaap.payload' value='`$org.onap.appc.adapter.ansible.results`'/>
+                                <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.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`' />
+                                <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />
+                                <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />
+                                <parameter name='format' value='json' />
+                                <parameter name='httpMethod' value='POST' />
+                                <parameter name='contentType' value='application/json' />
+                                <parameter name="responsePrefix" value="lcm" />
+                                <outcome value='failure'>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                        <parameter name="logger" value="message-log"/>
+                                        <parameter name="field1" value='Failed to Publish to DMaap'/>
+                                    </record>
+                                </outcome>
+                            </execute>
+                            <return status='failure'>
+                                <parameter name='status.code' value='401' />
+                                <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                            </return>
+                        </block>
+                    </block>
+                </outcome>
+                <outcome value='failure'>
+                    <block>
+                        <set>
+                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
+                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
+                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
+                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
+                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
+                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
+                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
+                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
+                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
+                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>
+                            <parameter name='lcm-dmaap.payload' value='`$org.onap.appc.adapter.ansible.results`'/>
+                            <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.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`' />
+                            <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />
+                            <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />
+                            <parameter name='format' value='json' />
+                            <parameter name='httpMethod' value='POST' />
+                            <parameter name='contentType' value='application/json' />
+                            <parameter name="responsePrefix" value="lcm" />
+                            <outcome value='failure'>
+                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                    <parameter name="logger" value="message-log"/>
+                                    <parameter name="field1" value='Failed to Publish to DMaap'/>
+                                </record>
+                            </outcome>
+                        </execute>
+                        <return status='failure'>
+                            <parameter name='status.code' value='401' />
+                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                        </return>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+                        <outcome value='101'>
+                            <block>
+                                <set>
+                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
+                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
+                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
+                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
+                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
+                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
+                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
+                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
+                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
+                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>
+                                    <parameter name='lcm-dmaap.payload' value='`$org.onap.appc.adapter.ansible.results`'/>
+                                    <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.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`' />
+                                    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />
+                                    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />
+                                    <parameter name='format' value='json' />
+                                    <parameter name='httpMethod' value='POST' />
+                                    <parameter name='contentType' value='application/json' />
+                                    <parameter name="responsePrefix" value="lcm" />
+                                    <outcome value='failure'>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log"/>
+                                            <parameter name="field1" value='Failed to Publish to DMaap'/>
+                                        </record>
+                                    </outcome>
+                                </execute>
+                                <return status='failure'>
+                                    <parameter name='status.code' value='401' />
+                                    <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                </return>
+                            </block>
+                        </outcome>
+                        <outcome value='500'>
+                            <block>
+                                <set>
+                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
+                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
+                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
+                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
+                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
+                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
+                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
+                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
+                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
+                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>
+                                    <parameter name='lcm-dmaap.payload' value='`$org.onap.appc.adapter.ansible.results`'/>
+                                    <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.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`' />
+                                    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />
+                                    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />
+                                    <parameter name='format' value='json' />
+                                    <parameter name='httpMethod' value='POST' />
+                                    <parameter name='contentType' value='application/json' />
+                                    <parameter name="responsePrefix" value="lcm" />
+                                    <outcome value='failure'>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log"/>
+                                            <parameter name="field1" value='Failed to Publish to DMaap'/>
+                                        </record>
+                                    </outcome>
+                                </execute>
+                                <return status='failure'>
+                                    <parameter name='status.code' value='401' />
+                                    <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                </return>
+                            </block>
+                        </outcome>
+                        <outcome value='100'>
+                            <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >
+                                <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
+                                <parameter name='User' value='`$prop.ansible.user`'/>
+                                <parameter name='Password' value='`$prop.ansible.password`'/>
+                                <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
+                                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>
+                                <outcome value='failure'>
+                                    <block>
+                                        <set>
+                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
+                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
+                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
+                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
+                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
+                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
+                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
+                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
+                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
+                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>
+                                            <parameter name='lcm-dmaap.payload' value='`$org.onap.appc.adapter.ansible.results`'/>
+                                            <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.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`' />
+                                            <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />
+                                            <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />
+                                            <parameter name='format' value='json' />
+                                            <parameter name='httpMethod' value='POST' />
+                                            <parameter name='contentType' value='application/json' />
+                                            <parameter name="responsePrefix" value="lcm" />
+                                            <outcome value='failure'>
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                    <parameter name="logger" value="message-log"/>
+                                                    <parameter name="field1" value='Failed to Publish to DMaap'/>
+                                                </record>
+                                            </outcome>
+                                        </execute>
+                                        <return status='failure'>
+                                            <parameter name='status.code' value='401' />
+                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                        </return>
+                                    </block>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block>
+                                        <set>
+                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
+                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
+                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
+                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
+                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
+                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
+                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
+                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
+                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
+                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>
+                                            <parameter name='lcm-dmaap.payload' value='`$org.onap.appc.adapter.ansible.results`'/>
+                                            <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.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`' />
+                                            <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />
+                                            <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />
+                                            <parameter name='format' value='json' />
+                                            <parameter name='httpMethod' value='POST' />
+                                            <parameter name='contentType' value='application/json' />
+                                            <parameter name="responsePrefix" value="lcm" />
+                                            <outcome value='failure'>
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                    <parameter name="logger" value="message-log"/>
+                                                    <parameter name="field1" value='Failed to Publish to DMaap'/>
+                                                </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>
+                                    </block>
+                                </outcome>
+                            </execute>
+                        </outcome>
+                    </switch>
+                </outcome>
+            </execute>
+        </block>
+    </method>
 </service-logic>
 \ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/lcm-dmaap-publish-template.json b/platform-logic/restapi-templates/src/main/json/lcm-dmaap-publish-template.json
index d30aa06a..a061f634 100644
--- a/platform-logic/restapi-templates/src/main/json/lcm-dmaap-publish-template.json
+++ b/platform-logic/restapi-templates/src/main/json/lcm-dmaap-publish-template.json
@@ -9,7 +9,7 @@
             "common-header": {
                 "api-ver": ${lcm-dmaap.api-ver},
                 "flags": {
-                    "ttl": ${lcm-dmaap.flags.mode},
+                    "ttl": ${lcm-dmaap.flags.ttl},
                     "force": ${lcm-dmaap.flags.force},
                     "mode": ${lcm-dmaap.flags.mode}
                 },