Fix set nodelist in SW upgrade DGs

Change-Id: Ia789fcb16700f7c49f187b970daa114f8ae0eaf5
Issue-ID: SDNC-746
Signed-off-by: Marco Platania <platania@research.att.com>
Former-commit-id: 5431ff62543b099c6f3495454503bba06f03dfad

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 aad0514..18a63f2 100644 (file)
--- 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,1083 +1,813 @@
 [\r
     {\r
-        "id": "fe0acee3.b3d4f",\r
+        "id": "ab475552.d851d8",\r
         "type": "method",\r
         "name": "upgrade-post-check",\r
         "xml": "<method rpc='upgrade-post-check' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 523,\r
-        "y": 71,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 548,\r
+        "y": 59,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "88d3f9c3.91e818"\r
+                "356938f4.e6ef78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd69f330.0db38",\r
+        "id": "db22c5e0.c4b368",\r
         "type": "service-logic",\r
-        "name": "LCM ${project.version}",\r
+        "name": "LCM 1.4.5",\r
         "module": "LCM",\r
-        "version": "${project.version}",\r
+        "version": "1.4.5",\r
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='LCM' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 310.99993896484375,\r
-        "y": 72,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 335.99993896484375,\r
+        "y": 60,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "fe0acee3.b3d4f"\r
+                "ab475552.d851d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca77e1d2.5f235",\r
+        "id": "74883a0a.669d34",\r
         "type": "execute",\r
         "name": "execute AnsibleA.reqExec",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-post-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 378.00001525878906,\r
-        "y": 679,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 403.00001525878906,\r
+        "y": 667,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "98532a13.9e8648",\r
-                "300b9189.6839ae",\r
-                "93689f4a.8157"\r
+                "8efae65a.30c7b8",\r
+                "fdc248e2.dda948",\r
+                "fc8e86cf.976918"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "338f7649.ef4e9a",\r
+        "id": "ea8ede8a.5e5e7",\r
         "type": "switchNode",\r
         "name": "switch",\r
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 777.9999389648438,\r
-        "y": 787.0000305175781,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 802.9999389648438,\r
+        "y": 775.0000305175781,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "13e6fdd5.284672",\r
-                "558456ec.861628",\r
-                "d84c0d6b.4e961"\r
+                "ed747ae6.f82e38",\r
+                "d348a5a9.90bb58",\r
+                "606ee94e.547568"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13e6fdd5.284672",\r
+        "id": "ed747ae6.f82e38",\r
         "type": "other",\r
         "name": "outcome 500",\r
         "xml": "<outcome value='500'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 922.9999389648438,\r
-        "y": 785.0000381469727,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 947.9999389648438,\r
+        "y": 773.0000381469727,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "d4f3b77a.b39508"\r
+                "8e974f56.dbd44"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "558456ec.861628",\r
+        "id": "d348a5a9.90bb58",\r
         "type": "other",\r
         "name": "outcome 100",\r
         "xml": "<outcome value='100'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 919.9999389648438,\r
-        "y": 842.0000305175781,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 944.9999389648438,\r
+        "y": 830.0000305175781,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "a1c39fcf.a06c"\r
+                "5fe71ec4.57d62"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a1c39fcf.a06c",\r
+        "id": "5fe71ec4.57d62",\r
         "type": "execute",\r
         "name": "execute reqExecResult",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1107.9999389648438,\r
-        "y": 841.0000305175781,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 1132.9999389648438,\r
+        "y": 829.0000305175781,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "f58c60bb.b391f",\r
-                "b18d4538.e8ef28"\r
+                "484e1e77.a4c4c",\r
+                "ef7a898e.c55ae8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "300b9189.6839ae",\r
+        "id": "fdc248e2.dda948",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 636.9999389648438,\r
-        "y": 700.0000915527344,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 661.9999389648438,\r
+        "y": 688.0000915527344,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "d4f3b77a.b39508"\r
+                "8e974f56.dbd44"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "98532a13.9e8648",\r
+        "id": "8efae65a.30c7b8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 638.9999389648438,\r
-        "y": 752.0000610351562,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 663.9999389648438,\r
+        "y": 740.0000610351562,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "338f7649.ef4e9a"\r
+                "ea8ede8a.5e5e7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f58c60bb.b391f",\r
+        "id": "484e1e77.a4c4c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1278.9998779296875,\r
-        "y": 820.0000610351562,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 1301.9999389648438,\r
+        "y": 787.0000381469727,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "44e1b1d0.b5bf9"\r
+                "8e974f56.dbd44"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d84c0d6b.4e961",\r
+        "id": "606ee94e.547568",\r
         "type": "other",\r
         "name": "outcome 101",\r
         "xml": "<outcome value='101'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 919.9999389648438,\r
-        "y": 743.0000686645508,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 944.9999389648438,\r
+        "y": 731.0000686645508,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "d4f3b77a.b39508"\r
+                "8e974f56.dbd44"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b18d4538.e8ef28",\r
+        "id": "ef7a898e.c55ae8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1281.9998779296875,\r
-        "y": 871.0001220703125,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 1309.9998779296875,\r
+        "y": 835.0001220703125,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "44e1b1d0.b5bf9"\r
+                "565fc0b9.1ff1a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "67392fb2.3fda3",\r
+        "id": "bca33267.b186f",\r
+        "type": "returnSuccess",\r
+        "name": "return success",\r
+        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",\r
+        "comments": "",\r
+        "x": 1603.9998779296875,\r
+        "y": 892.0000610351562,\r
+        "z": "802a6e37.fb3c1",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "f3c40140.4762d",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 126,\r
-        "y": 71,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 151,\r
+        "y": 59,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "dd69f330.0db38"\r
+                "db22c5e0.c4b368"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "88d3f9c3.91e818",\r
+        "id": "356938f4.e6ef78",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 123.91668701171875,\r
-        "y": 163.08334350585938,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 148.91668701171875,\r
+        "y": 151.08334350585938,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "ca77e1d2.5f235",\r
-                "c7ec6050.45978",\r
-                "889f84ed.e111e8",\r
-                "40652fca.65d24",\r
-                "983b7f00.0aa95",\r
-                "43b098aa.2b8088",\r
-                "3c8d18f4.57a768",\r
-                "5c9efc94.d81d24"\r
+                "74883a0a.669d34",\r
+                "5f157934.113238",\r
+                "fad67e1f.e709b",\r
+                "f04f2fb5.8c0ca",\r
+                "a1aa3253.06afa",\r
+                "e636c2ac.2dc0d",\r
+                "8b5b2558.88c888",\r
+                "89a1b60f.9a2848"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c7ec6050.45978",\r
+        "id": "5f157934.113238",\r
         "type": "execute",\r
         "name": "execute Properties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 422.0000305175781,\r
-        "y": 196.08334350585938,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 447.0000305175781,\r
+        "y": 184.08334350585938,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d9d2286.379c4d8",\r
+        "id": "9c2d2fed.0688d",\r
         "type": "execute",\r
         "name": "execute DmaapMsg",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1588.9998779296875,\r
-        "y": 649.0834045410156,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 1613.9998779296875,\r
+        "y": 637.0834045410156,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "642ae55d.535a7c"\r
+                "789af377.cced2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "642ae55d.535a7c",\r
+        "id": "789af377.cced2c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1758.9998168945312,\r
-        "y": 648.0834045410156,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 1783.9998168945312,\r
+        "y": 636.0834045410156,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "7969554f.e56e0c"\r
+                "c75d24f.c2de2d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4f3b77a.b39508",\r
+        "id": "8e974f56.dbd44",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1391.9998168945312,\r
-        "y": 673.0834045410156,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 1416.9998168945312,\r
+        "y": 661.0834045410156,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "d9d2286.379c4d8",\r
-                "8a00ee98.85d8c",\r
-                "a967853.2e08a78"\r
+                "9c2d2fed.0688d",\r
+                "a0c3935d.9a935",\r
+                "82255155.ccaef"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61a865a3.81374c",\r
+        "id": "2939808a.b52ef",\r
         "type": "execute",\r
         "name": "execute DmaapMsg",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1600.4998779296875,\r
-        "y": 904.0833740234375,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 1614.4998779296875,\r
+        "y": 842.0833740234375,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "bf6e3414.ac0ab8"\r
+                "22bed4c.08b6a2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bf6e3414.ac0ab8",\r
+        "id": "22bed4c.08b6a2c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1782.4998779296875,\r
-        "y": 904.0833740234375,\r
-        "z": "b4969602.e5a2a8",\r
+        "y": 842.0833740234375,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "a98ac8b6.1c8b18"\r
+                "8841bc4a.67149"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7969554f.e56e0c",\r
+        "id": "c75d24f.c2de2d8",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1878.9998779296875,\r
-        "y": 647.0833740234375,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 1903.9998779296875,\r
+        "y": 635.0833740234375,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8a00ee98.85d8c",\r
+        "id": "a0c3935d.9a935",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",\r
         "comments": "",\r
-        "x": 1570.91650390625,\r
-        "y": 700.0834045410156,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 1595.91650390625,\r
+        "y": 688.0834045410156,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a98ac8b6.1c8b18",\r
+        "id": "8841bc4a.67149",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1912.9166259765625,\r
-        "y": 904.0833740234375,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 1910.9166259765625,\r
+        "y": 842.0833740234375,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a967853.2e08a78",\r
+        "id": "82255155.ccaef",\r
         "type": "set",\r
         "name": "set DmaapReq",\r
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",\r
         "comments": "",\r
-        "x": 1575.9998779296875,\r
-        "y": 596.0833740234375,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 1600.9998779296875,\r
+        "y": 584.0833740234375,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "44e1b1d0.b5bf9",\r
+        "id": "565fc0b9.1ff1a",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1406.9998779296875,\r
-        "y": 845.0833740234375,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 1437.9998779296875,\r
+        "y": 836.0833740234375,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "61a865a3.81374c",\r
-                "af2360f3.a1b32",\r
-                "c058b1a3.cafa7",\r
-                "d59d4575.f7aa08",\r
-                "97b68625.59c538"\r
+                "2939808a.b52ef",\r
+                "cd18f032.f6fef",\r
+                "bca33267.b186f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72836a7a.768624",\r
+        "id": "cd18f032.f6fef",\r
         "type": "set",\r
         "name": "set DmaapReq",\r
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",\r
         "comments": "",\r
-        "x": 1938.1666259765625,\r
-        "y": 819.0833740234375,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 1604.1666259765625,\r
+        "y": 787.0833740234375,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "93689f4a.8157",\r
+        "id": "fc8e86cf.976918",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 645.9999389648438,\r
-        "y": 652.0000610351562,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 670.9999389648438,\r
+        "y": 640.0000610351562,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "c92e96da.bead68"\r
+                "95e77813.ba9108"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3705b5ae.a55ada",\r
+        "id": "60c18ca3.4f03c4",\r
         "type": "set",\r
         "name": "set Defaults",\r
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",\r
         "comments": "",\r
-        "x": 936.9999389648438,\r
-        "y": 611,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 961.9999389648438,\r
+        "y": 599,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c92e96da.bead68",\r
+        "id": "95e77813.ba9108",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 782.9999389648438,\r
-        "y": 646.0000610351562,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 807.9999389648438,\r
+        "y": 634.0000610351562,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "3705b5ae.a55ada",\r
-                "d4f3b77a.b39508"\r
+                "60c18ca3.4f03c4",\r
+                "8e974f56.dbd44"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "889f84ed.e111e8",\r
+        "id": "fad67e1f.e709b",\r
         "type": "set",\r
         "name": "set default values",\r
         "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",\r
         "comments": "",\r
-        "x": 415,\r
-        "y": 243,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 440,\r
+        "y": 231,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9e2047bf.84ca98",\r
+        "id": "24f45898.65de18",\r
         "type": "get-resource",\r
         "name": "get aai.generic-vnf ",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $upgrade-post-check-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 955,\r
-        "y": 419,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 980,\r
+        "y": 407,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "db67679b.d5f7f8"\r
+                "3a57fbc.0ac6d04"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db67679b.d5f7f8",\r
+        "id": "3a57fbc.0ac6d04",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1113.3907470703125,\r
-        "y": 417.28399658203125,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 1138.3907470703125,\r
+        "y": 405.28399658203125,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "9f78147c.45b0d8"\r
+                "721a47cc.cdf2d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3c8d18f4.57a768",\r
+        "id": "8b5b2558.88c888",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 343.9998779296875,\r
-        "y": 607,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 368.9998779296875,\r
+        "y": 595,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "983b7f00.0aa95",\r
+        "id": "a1aa3253.06afa",\r
         "type": "switchNode",\r
         "name": "switch pnf-flag",\r
         "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 397,\r
-        "y": 344,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 422,\r
+        "y": 332,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "6ab53366.6b679c",\r
-                "c2f80dd0.8d1"\r
+                "9417db8c.51c568",\r
+                "9e3df3f5.2c2d9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40652fca.65d24",\r
+        "id": "f04f2fb5.8c0ca",\r
         "type": "execute",\r
         "name": "execute jsonStringToCtx",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-post-check-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 429,\r
-        "y": 290,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 454,\r
+        "y": 278,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6ab53366.6b679c",\r
+        "id": "9417db8c.51c568",\r
         "type": "outcome",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 594,\r
-        "y": 323,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 619,\r
+        "y": 311,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "b2f335c.b319ac8"\r
+                "94353f3f.e7eee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c2f80dd0.8d1",\r
+        "id": "9e3df3f5.2c2d9",\r
         "type": "outcome",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 593.9999389648438,\r
-        "y": 384,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 618.9999389648438,\r
+        "y": 372,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "64084999.263e28"\r
+                "95b6db3f.a43608"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64084999.263e28",\r
+        "id": "95b6db3f.a43608",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 741.9999389648438,\r
-        "y": 383,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 766.9999389648438,\r
+        "y": 371,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "9e2047bf.84ca98",\r
-                "1c2838e7.02c327"\r
+                "24f45898.65de18",\r
+                "240a5e4b.ef6af2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b2f335c.b319ac8",\r
+        "id": "94353f3f.e7eee",\r
         "type": "set",\r
         "name": "set AnsibleReq",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-post-check.playbookname`'/>\n",\r
         "comments": "",\r
-        "x": 755,\r
-        "y": 321,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 780,\r
+        "y": 309,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1c2838e7.02c327",\r
+        "id": "240a5e4b.ef6af2",\r
         "type": "execute",\r
         "name": "set playbookname",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-post-check.playbookname'`\" />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 964,\r
-        "y": 363,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 989,\r
+        "y": 351,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "43b098aa.2b8088",\r
+        "id": "e636c2ac.2dc0d",\r
         "type": "switchNode",\r
         "name": "switch playbookname",\r
         "xml": "<switch test='`$playbookname`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 394,\r
-        "y": 475,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 419,\r
+        "y": 463,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "f5a4d554.8310a8"\r
+                "a65bd4c9.27f638"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5a4d554.8310a8",\r
+        "id": "a65bd4c9.27f638",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 565,\r
-        "y": 476,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 590,\r
+        "y": 464,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "e3207caa.85b44"\r
+                "286bc0d0.e5819"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3207caa.85b44",\r
+        "id": "286bc0d0.e5819",\r
         "type": "set",\r
         "name": "set playbookname",\r
-        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-post-check.playbookname`'/>",\r
+        "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-post-check.playbookname`'/>",\r
         "comments": "",\r
-        "x": 755,\r
-        "y": 475,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 780,\r
+        "y": 463,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5c9efc94.d81d24",\r
+        "id": "89a1b60f.9a2848",\r
         "type": "switchNode",\r
         "name": "switch nodelist",\r
         "xml": "<switch test='`$nodelist`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 384,\r
-        "y": 534,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 409,\r
+        "y": 522,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "77224991.c20a78",\r
-                "2deab8c5.642298"\r
+                "10bd0563.dd89eb",\r
+                "9f1eacfe.fa54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "77224991.c20a78",\r
+        "id": "10bd0563.dd89eb",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 564,\r
-        "y": 527,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 589,\r
+        "y": 515,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "3881d027.425ff"\r
+                "f0ef60d3.f64f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3881d027.425ff",\r
+        "id": "f0ef60d3.f64f",\r
         "type": "set",\r
         "name": "set nodelist",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",\r
         "comments": "",\r
-        "x": 721,\r
-        "y": 541,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 746,\r
+        "y": 529,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2deab8c5.642298",\r
+        "id": "9f1eacfe.fa54",\r
         "type": "outcome",\r
         "name": "empty",\r
         "xml": "<outcome value=\"['']\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 563,\r
-        "y": 571,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 588,\r
+        "y": 559,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "3881d027.425ff"\r
+                "f0ef60d3.f64f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "153ed401.962ddc",\r
+        "id": "26d43493.24ca8c",\r
         "type": "switchNode",\r
         "name": "switch playbookname",\r
         "xml": "<switch test='`$playbookname`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1439,\r
-        "y": 406,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 1464,\r
+        "y": 394,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "3cfaf009.20065"\r
+                "ad0fd429.dd1178"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3cfaf009.20065",\r
+        "id": "ad0fd429.dd1178",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1617,\r
-        "y": 406,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 1642,\r
+        "y": 394,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "8e725f1f.6662f"\r
+                "bbed41e1.ca0c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9e70216f.c9b2f",\r
+        "id": "3935df66.a3be5",\r
         "type": "set",\r
         "name": "set nodelist",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",\r
         "comments": "",\r
-        "x": 1412,\r
-        "y": 459,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 1437,\r
+        "y": 447,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9f78147c.45b0d8",\r
+        "id": "721a47cc.cdf2d8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1242,\r
-        "y": 416,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 1267,\r
+        "y": 404,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             [\r
-                "153ed401.962ddc",\r
-                "9e70216f.c9b2f"\r
+                "26d43493.24ca8c",\r
+                "3935df66.a3be5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e725f1f.6662f",\r
+        "id": "bbed41e1.ca0c4",\r
         "type": "execute",\r
         "name": "set playbookname",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-post-check.playbookname'`\" />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1789,\r
-        "y": 404,\r
-        "z": "b4969602.e5a2a8",\r
+        "x": 1814,\r
+        "y": 392,\r
+        "z": "802a6e37.fb3c1",\r
         "wires": [\r
             []\r
         ]\r
-    },\r
-    {\r
-        "id": "af2360f3.a1b32",\r
-        "type": "execute",\r
-        "name": "execute jsonStringToCtx",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='org.onap.appc.adapter.ansible.results' />\n\t<parameter name='outputPath' value='resultsJson' />\n\t<parameter name='isEscaped' value='false' />\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1616,\r
-        "y": 750,\r
-        "z": "b4969602.e5a2a8",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "c058b1a3.cafa7",\r
-        "type": "execute",\r
-        "name": "execute getAttributeValue",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='source' value=\"`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`\" />\n\t<parameter name='outputPath' value='outputPayload' />",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1622,\r
-        "y": 793,\r
-        "z": "b4969602.e5a2a8",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "d59d4575.f7aa08",\r
-        "type": "switchNode",\r
-        "name": "switch outputPayload",\r
-        "xml": "<switch test='`$outputPayload`'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1606,\r
-        "y": 840,\r
-        "z": "b4969602.e5a2a8",\r
-        "wires": [\r
-            [\r
-                "676d5ce5.e9d864",\r
-                "8ecd1678.ebdff8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "676d5ce5.e9d864",\r
-        "type": "outcome",\r
-        "name": "null",\r
-        "xml": "<outcome value=''>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1783,\r
-        "y": 819,\r
-        "z": "b4969602.e5a2a8",\r
-        "wires": [\r
-            [\r
-                "72836a7a.768624"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "8ecd1678.ebdff8",\r
-        "type": "outcome",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1782,\r
-        "y": 859,\r
-        "z": "b4969602.e5a2a8",\r
-        "wires": [\r
-            [\r
-                "5f5e736e.9d3b8c"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "5f5e736e.9d3b8c",\r
-        "type": "set",\r
-        "name": "set DmaapReq with payload",\r
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>",\r
-        "comments": "",\r
-        "x": 1980,\r
-        "y": 859,\r
-        "z": "b4969602.e5a2a8",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "bd7deada.205038",\r
-        "type": "returnSuccess",\r
-        "name": "return success",\r
-        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",\r
-        "comments": "",\r
-        "x": 2322,\r
-        "y": 937,\r
-        "z": "b4969602.e5a2a8",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "530e9d63.07dd34",\r
-        "type": "outcome",\r
-        "name": "null",\r
-        "xml": "<outcome value=''>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1788.000244140625,\r
-        "y": 958.9999389648438,\r
-        "z": "b4969602.e5a2a8",\r
-        "wires": [\r
-            [\r
-                "aba50f21.a535d"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "d6c0e471.9108d8",\r
-        "type": "outcome",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1787.000244140625,\r
-        "y": 1034.9999389648438,\r
-        "z": "b4969602.e5a2a8",\r
-        "wires": [\r
-            [\r
-                "801dd50e.8622c8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "97b68625.59c538",\r
-        "type": "switchNode",\r
-        "name": "switch outputPayload",\r
-        "xml": "<switch test='`$outputPayload`'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1605.000244140625,\r
-        "y": 994.9999389648438,\r
-        "z": "b4969602.e5a2a8",\r
-        "wires": [\r
-            [\r
-                "530e9d63.07dd34",\r
-                "d6c0e471.9108d8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "acbbf9db.eeba28",\r
-        "type": "returnSuccess",\r
-        "name": "return success with payload",\r
-        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='payload' value='`$outputPayload`'/>",\r
-        "comments": "",\r
-        "x": 2363.000244140625,\r
-        "y": 1018.9999389648438,\r
-        "z": "b4969602.e5a2a8",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "aba50f21.a535d",\r
-        "type": "switchNode",\r
-        "name": "switch result code",\r
-        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1958.000244140625,\r
-        "y": 958.9999389648438,\r
-        "z": "b4969602.e5a2a8",\r
-        "wires": [\r
-            [\r
-                "3ac4241b.62144c",\r
-                "c67e4b5c.d70a28"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "801dd50e.8622c8",\r
-        "type": "switchNode",\r
-        "name": "switch result code",\r
-        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1958.000244140625,\r
-        "y": 1034.9999389648438,\r
-        "z": "b4969602.e5a2a8",\r
-        "wires": [\r
-            [\r
-                "8dcd3ae3.608a58",\r
-                "a94e8dc6.52647"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "657ecc9e.2687c4",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",\r
-        "comments": "",\r
-        "x": 2316.000244140625,\r
-        "y": 974.9999389648438,\r
-        "z": "b4969602.e5a2a8",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "52f49f6f.dcf4",\r
-        "type": "returnFailure",\r
-        "name": "return failure with payload",\r
-        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n<parameter name='payload' value='`$outputPayload`'/>",\r
-        "comments": "",\r
-        "x": 2359.000244140625,\r
-        "y": 1056.9999389648438,\r
-        "z": "b4969602.e5a2a8",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "3ac4241b.62144c",\r
-        "type": "other",\r
-        "name": "outcome 400",\r
-        "xml": "<outcome value='400'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2146.000244140625,\r
-        "y": 936.9999389648438,\r
-        "z": "b4969602.e5a2a8",\r
-        "wires": [\r
-            [\r
-                "bd7deada.205038"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "c67e4b5c.d70a28",\r
-        "type": "outcome",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2127.000244140625,\r
-        "y": 974.9999389648438,\r
-        "z": "b4969602.e5a2a8",\r
-        "wires": [\r
-            [\r
-                "657ecc9e.2687c4"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "8dcd3ae3.608a58",\r
-        "type": "other",\r
-        "name": "outcome 400",\r
-        "xml": "<outcome value='400'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2147.000244140625,\r
-        "y": 1018.9999389648438,\r
-        "z": "b4969602.e5a2a8",\r
-        "wires": [\r
-            [\r
-                "acbbf9db.eeba28"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "a94e8dc6.52647",\r
-        "type": "outcome",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2129.000244140625,\r
-        "y": 1056.9999389648438,\r
-        "z": "b4969602.e5a2a8",\r
-        "wires": [\r
-            [\r
-                "52f49f6f.dcf4"\r
-            ]\r
-        ]\r
     }\r
 ]
\ 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 aa78a91..08b896e 100644 (file)
--- 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,1083 +1,813 @@
 [\r
     {\r
-        "id": "e17c1584.f756d8",\r
+        "id": "dfc42d29.4066",\r
         "type": "method",\r
         "name": "upgrade-pre-check",\r
         "xml": "<method rpc='upgrade-pre-check' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 552,\r
-        "y": 67,\r
-        "z": "df893cfa.16f38",\r
+        "x": 554,\r
+        "y": 86,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "4a691c8b.6b9db4"\r
+                "dc3f6c8f.49cb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f7a861d.c2112a",\r
+        "id": "ec3ea72c.b00d38",\r
         "type": "service-logic",\r
-        "name": "LCM ${project.version}",\r
+        "name": "LCM 1.4.5",\r
         "module": "LCM",\r
-        "version": "${project.version}",\r
+        "version": "1.4.5",\r
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='LCM' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 339.99993896484375,\r
-        "y": 68,\r
-        "z": "df893cfa.16f38",\r
+        "x": 341.99993896484375,\r
+        "y": 87,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "e17c1584.f756d8"\r
+                "dfc42d29.4066"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bb18ce54.65a6d",\r
+        "id": "aa4b4733.b95e98",\r
         "type": "execute",\r
         "name": "execute AnsibleA.reqExec",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-pre-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 407.00001525878906,\r
-        "y": 675,\r
-        "z": "df893cfa.16f38",\r
+        "x": 409.00001525878906,\r
+        "y": 694,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "c6f98872.c067e8",\r
-                "5614f2d4.83759c",\r
-                "1beab9a5.7e2366"\r
+                "eed23890.382f88",\r
+                "39c73cda.20f284",\r
+                "d5d4d9a.dfdee28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e97cc56.5d143",\r
+        "id": "c2461908.a56de8",\r
         "type": "switchNode",\r
         "name": "switch",\r
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 806.9999389648438,\r
-        "y": 783.0000305175781,\r
-        "z": "df893cfa.16f38",\r
+        "x": 808.9999389648438,\r
+        "y": 802.0000305175781,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "d5d391c0.e33eb",\r
-                "96569d9a.8f849",\r
-                "8eb6da31.c976d8"\r
+                "21b1a494.57eb8c",\r
+                "c0ddf646.939658",\r
+                "c13b6a1f.ac5838"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d5d391c0.e33eb",\r
+        "id": "21b1a494.57eb8c",\r
         "type": "other",\r
         "name": "outcome 500",\r
         "xml": "<outcome value='500'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 951.9999389648438,\r
-        "y": 781.0000381469727,\r
-        "z": "df893cfa.16f38",\r
+        "x": 953.9999389648438,\r
+        "y": 800.0000381469727,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "261676ae.6c18ea"\r
+                "c0fa5e3.de329a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "96569d9a.8f849",\r
+        "id": "c0ddf646.939658",\r
         "type": "other",\r
         "name": "outcome 100",\r
         "xml": "<outcome value='100'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 948.9999389648438,\r
-        "y": 838.0000305175781,\r
-        "z": "df893cfa.16f38",\r
+        "x": 950.9999389648438,\r
+        "y": 857.0000305175781,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "a9aeb5d4.ad8218"\r
+                "95b7bcea.2185b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a9aeb5d4.ad8218",\r
+        "id": "95b7bcea.2185b",\r
         "type": "execute",\r
         "name": "execute reqExecResult",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1136.9999389648438,\r
-        "y": 837.0000305175781,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1138.9999389648438,\r
+        "y": 856.0000305175781,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "50e30f80.cb97b",\r
-                "f9b1e44f.cf0bf8"\r
+                "205ffc13.4d2b24",\r
+                "c24e2446.933768"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5614f2d4.83759c",\r
+        "id": "39c73cda.20f284",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 665.9999389648438,\r
-        "y": 696.0000915527344,\r
-        "z": "df893cfa.16f38",\r
+        "x": 667.9999389648438,\r
+        "y": 715.0000915527344,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "261676ae.6c18ea"\r
+                "c0fa5e3.de329a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c6f98872.c067e8",\r
+        "id": "eed23890.382f88",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 667.9999389648438,\r
-        "y": 748.0000610351562,\r
-        "z": "df893cfa.16f38",\r
+        "x": 669.9999389648438,\r
+        "y": 767.0000610351562,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "8e97cc56.5d143"\r
+                "c2461908.a56de8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50e30f80.cb97b",\r
+        "id": "205ffc13.4d2b24",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1305.9998779296875,\r
-        "y": 819.0000610351562,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1307.9999389648438,\r
+        "y": 814.0000381469727,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "7ac364bd.12e01c"\r
+                "c0fa5e3.de329a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8eb6da31.c976d8",\r
+        "id": "c13b6a1f.ac5838",\r
         "type": "other",\r
         "name": "outcome 101",\r
         "xml": "<outcome value='101'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 948.9999389648438,\r
-        "y": 739.0000686645508,\r
-        "z": "df893cfa.16f38",\r
+        "x": 950.9999389648438,\r
+        "y": 758.0000686645508,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "261676ae.6c18ea"\r
+                "c0fa5e3.de329a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9b1e44f.cf0bf8",\r
+        "id": "c24e2446.933768",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1309.9998779296875,\r
-        "y": 863.0001220703125,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1315.9998779296875,\r
+        "y": 862.0001220703125,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "7ac364bd.12e01c"\r
+                "1b8bc484.4e584b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a40759ed.63a388",\r
+        "id": "425c7483.101a2c",\r
+        "type": "returnSuccess",\r
+        "name": "return success",\r
+        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",\r
+        "comments": "",\r
+        "x": 1609.9998779296875,\r
+        "y": 919.0000610351562,\r
+        "z": "a5b492f8.99d13",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d9f050b3.ea908",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 155,\r
-        "y": 67,\r
-        "z": "df893cfa.16f38",\r
+        "x": 157,\r
+        "y": 86,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "1f7a861d.c2112a"\r
+                "ec3ea72c.b00d38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a691c8b.6b9db4",\r
+        "id": "dc3f6c8f.49cb4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 152.91668701171875,\r
-        "y": 159.08334350585938,\r
-        "z": "df893cfa.16f38",\r
+        "x": 154.91668701171875,\r
+        "y": 178.08334350585938,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "bb18ce54.65a6d",\r
-                "4f789742.ddd168",\r
-                "2f15d339.87cf0c",\r
-                "556d2c3e.217c14",\r
-                "905f1137.7562f",\r
-                "5cc58e7c.083a5",\r
-                "db896c60.3d19a",\r
-                "ae5d9d02.d1fe4"\r
+                "aa4b4733.b95e98",\r
+                "ad12ad52.0e14c",\r
+                "494bc731.2b3b38",\r
+                "e7275d95.288b8",\r
+                "790211fa.4ddc3",\r
+                "87c25306.3bca6",\r
+                "54a283d8.5df65c",\r
+                "1cee6cc7.a0f263"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f789742.ddd168",\r
+        "id": "ad12ad52.0e14c",\r
         "type": "execute",\r
         "name": "execute Properties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 451.0000305175781,\r
-        "y": 192.08334350585938,\r
-        "z": "df893cfa.16f38",\r
+        "x": 453.0000305175781,\r
+        "y": 211.08334350585938,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9f29e934.d196d8",\r
+        "id": "9aa2e4.6e1c5d2",\r
         "type": "execute",\r
         "name": "execute DmaapMsg",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1617.9998779296875,\r
-        "y": 645.0834045410156,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1619.9998779296875,\r
+        "y": 664.0834045410156,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "eff6b07f.5f555"\r
+                "fde058a0.d22348"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eff6b07f.5f555",\r
+        "id": "fde058a0.d22348",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1787.9998168945312,\r
-        "y": 644.0834045410156,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1789.9998168945312,\r
+        "y": 663.0834045410156,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "39c1e046.0c9a2"\r
+                "ff5c4bc7.d7c748"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "261676ae.6c18ea",\r
+        "id": "c0fa5e3.de329a",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1420.9998168945312,\r
-        "y": 669.0834045410156,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1422.9998168945312,\r
+        "y": 688.0834045410156,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "9f29e934.d196d8",\r
-                "20f5321f.fe2dee",\r
-                "b16d5209.3031f"\r
+                "9aa2e4.6e1c5d2",\r
+                "16091a49.ebb886",\r
+                "320ba499.3a71fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd99789.6491a88",\r
+        "id": "d1627c41.4a916",\r
         "type": "execute",\r
         "name": "execute DmaapMsg",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1653.4998779296875,\r
-        "y": 911.0833740234375,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1620.4998779296875,\r
+        "y": 869.0833740234375,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "16bb547b.d2861c"\r
+                "cdd5a821.a26858"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "16bb547b.d2861c",\r
+        "id": "cdd5a821.a26858",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1838.4998779296875,\r
-        "y": 911.0833740234375,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1788.4998779296875,\r
+        "y": 869.0833740234375,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "95e8f51a.226ea8"\r
+                "6834bf03.5aff8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39c1e046.0c9a2",\r
+        "id": "ff5c4bc7.d7c748",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1907.9998779296875,\r
-        "y": 643.0833740234375,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1909.9998779296875,\r
+        "y": 662.0833740234375,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "20f5321f.fe2dee",\r
+        "id": "16091a49.ebb886",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",\r
         "comments": "",\r
-        "x": 1599.91650390625,\r
-        "y": 696.0834045410156,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1601.91650390625,\r
+        "y": 715.0834045410156,\r
+        "z": "a5b492f8.99d13",\r
         "wires": []\r
     },\r
     {\r
-        "id": "95e8f51a.226ea8",\r
+        "id": "6834bf03.5aff8",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1970.9166259765625,\r
-        "y": 911.0833740234375,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1916.9166259765625,\r
+        "y": 869.0833740234375,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b16d5209.3031f",\r
+        "id": "320ba499.3a71fc",\r
         "type": "set",\r
         "name": "set DmaapReq",\r
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",\r
         "comments": "",\r
-        "x": 1604.9998779296875,\r
-        "y": 592.0833740234375,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1606.9998779296875,\r
+        "y": 611.0833740234375,\r
+        "z": "a5b492f8.99d13",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7ac364bd.12e01c",\r
+        "id": "1b8bc484.4e584b",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1441.9998779296875,\r
-        "y": 838.0833740234375,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1443.9998779296875,\r
+        "y": 863.0833740234375,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "dd99789.6491a88",\r
-                "66ca1a2.98ef5e4",\r
-                "6f78d9df.0d3518",\r
-                "3c0a54ab.00262c",\r
-                "9977ea00.521808"\r
+                "d1627c41.4a916",\r
+                "da2077e7.65e5f8",\r
+                "425c7483.101a2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b364bef1.e2765",\r
+        "id": "da2077e7.65e5f8",\r
         "type": "set",\r
         "name": "set DmaapReq",\r
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",\r
         "comments": "",\r
-        "x": 1995.1666259765625,\r
-        "y": 816.0833740234375,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1610.1666259765625,\r
+        "y": 814.0833740234375,\r
+        "z": "a5b492f8.99d13",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1beab9a5.7e2366",\r
+        "id": "d5d4d9a.dfdee28",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 674.9999389648438,\r
-        "y": 648.0000610351562,\r
-        "z": "df893cfa.16f38",\r
+        "x": 676.9999389648438,\r
+        "y": 667.0000610351562,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "dd0b1351.6bec5"\r
+                "c67639b8.92e2d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6e45eb8e.292b44",\r
+        "id": "1707d581.de00aa",\r
         "type": "set",\r
         "name": "set Defaults",\r
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",\r
         "comments": "",\r
-        "x": 965.9999389648438,\r
-        "y": 607,\r
-        "z": "df893cfa.16f38",\r
+        "x": 967.9999389648438,\r
+        "y": 626,\r
+        "z": "a5b492f8.99d13",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dd0b1351.6bec5",\r
+        "id": "c67639b8.92e2d8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 811.9999389648438,\r
-        "y": 642.0000610351562,\r
-        "z": "df893cfa.16f38",\r
+        "x": 813.9999389648438,\r
+        "y": 661.0000610351562,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "6e45eb8e.292b44",\r
-                "261676ae.6c18ea"\r
+                "1707d581.de00aa",\r
+                "c0fa5e3.de329a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2f15d339.87cf0c",\r
+        "id": "494bc731.2b3b38",\r
         "type": "set",\r
         "name": "set default values",\r
         "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",\r
         "comments": "",\r
-        "x": 444,\r
-        "y": 239,\r
-        "z": "df893cfa.16f38",\r
+        "x": 446,\r
+        "y": 258,\r
+        "z": "a5b492f8.99d13",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3bd1d194.63001e",\r
+        "id": "6e382fc2.9cf55",\r
         "type": "get-resource",\r
         "name": "get aai.generic-vnf ",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $upgrade-pre-check-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 984,\r
-        "y": 415,\r
-        "z": "df893cfa.16f38",\r
+        "x": 986,\r
+        "y": 434,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "d0549989.50cdf8"\r
+                "d143bfec.8f45b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d0549989.50cdf8",\r
+        "id": "d143bfec.8f45b",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1142.3907470703125,\r
-        "y": 413.28399658203125,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1144.3907470703125,\r
+        "y": 432.28399658203125,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "50890a76.58d434"\r
+                "19bb6647.2aa81a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db896c60.3d19a",\r
+        "id": "54a283d8.5df65c",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 372.9998779296875,\r
-        "y": 603,\r
-        "z": "df893cfa.16f38",\r
+        "x": 374.9998779296875,\r
+        "y": 622,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "905f1137.7562f",\r
+        "id": "790211fa.4ddc3",\r
         "type": "switchNode",\r
         "name": "switch pnf-flag",\r
         "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 426,\r
-        "y": 340,\r
-        "z": "df893cfa.16f38",\r
+        "x": 428,\r
+        "y": 359,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "d4a98e23.62f9b",\r
-                "a403044b.ebc9f8"\r
+                "3deb4f48.5eacb",\r
+                "33286dd4.94fc62"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "556d2c3e.217c14",\r
+        "id": "e7275d95.288b8",\r
         "type": "execute",\r
         "name": "execute jsonStringToCtx",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-pre-check-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 458,\r
-        "y": 286,\r
-        "z": "df893cfa.16f38",\r
+        "x": 460,\r
+        "y": 305,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d4a98e23.62f9b",\r
+        "id": "3deb4f48.5eacb",\r
         "type": "outcome",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 623,\r
-        "y": 319,\r
-        "z": "df893cfa.16f38",\r
+        "x": 625,\r
+        "y": 338,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "582ec79b.faa468"\r
+                "cb346986.12dd48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a403044b.ebc9f8",\r
+        "id": "33286dd4.94fc62",\r
         "type": "outcome",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 622.9999389648438,\r
-        "y": 380,\r
-        "z": "df893cfa.16f38",\r
+        "x": 624.9999389648438,\r
+        "y": 399,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "3184e083.2b204"\r
+                "3af30869.256818"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3184e083.2b204",\r
+        "id": "3af30869.256818",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 770.9999389648438,\r
-        "y": 379,\r
-        "z": "df893cfa.16f38",\r
+        "x": 772.9999389648438,\r
+        "y": 398,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "3bd1d194.63001e",\r
-                "395906a2.acd1ea"\r
+                "6e382fc2.9cf55",\r
+                "ce17fe7f.d3b68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "582ec79b.faa468",\r
+        "id": "cb346986.12dd48",\r
         "type": "set",\r
         "name": "set AnsibleReq",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-pre-check.playbookname`'/>\n",\r
         "comments": "",\r
-        "x": 784,\r
-        "y": 317,\r
-        "z": "df893cfa.16f38",\r
+        "x": 786,\r
+        "y": 336,\r
+        "z": "a5b492f8.99d13",\r
         "wires": []\r
     },\r
     {\r
-        "id": "395906a2.acd1ea",\r
+        "id": "ce17fe7f.d3b68",\r
         "type": "execute",\r
         "name": "set playbookname",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-pre-check.playbookname'`\" />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 993,\r
-        "y": 359,\r
-        "z": "df893cfa.16f38",\r
+        "x": 995,\r
+        "y": 378,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5cc58e7c.083a5",\r
+        "id": "87c25306.3bca6",\r
         "type": "switchNode",\r
         "name": "switch playbookname",\r
         "xml": "<switch test='`$playbookname`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 423,\r
-        "y": 471,\r
-        "z": "df893cfa.16f38",\r
+        "x": 425,\r
+        "y": 490,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "b9c121b9.01765"\r
+                "4b5ce9b.bbd8818"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9c121b9.01765",\r
+        "id": "4b5ce9b.bbd8818",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 594,\r
-        "y": 472,\r
-        "z": "df893cfa.16f38",\r
+        "x": 596,\r
+        "y": 491,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "96dc86e8.19da88"\r
+                "7b056df1.6a5e34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "96dc86e8.19da88",\r
+        "id": "7b056df1.6a5e34",\r
         "type": "set",\r
         "name": "set playbookname",\r
-        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>",\r
+        "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>",\r
         "comments": "",\r
-        "x": 784,\r
-        "y": 471,\r
-        "z": "df893cfa.16f38",\r
+        "x": 786,\r
+        "y": 490,\r
+        "z": "a5b492f8.99d13",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ae5d9d02.d1fe4",\r
+        "id": "1cee6cc7.a0f263",\r
         "type": "switchNode",\r
         "name": "switch nodelist",\r
         "xml": "<switch test='`$nodelist`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 413,\r
-        "y": 530,\r
-        "z": "df893cfa.16f38",\r
+        "x": 415,\r
+        "y": 549,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "d47821da.1dd48",\r
-                "69b2cec2.dd018"\r
+                "892b8fdd.f84ea",\r
+                "8e25ca9e.be6708"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d47821da.1dd48",\r
+        "id": "892b8fdd.f84ea",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 593,\r
-        "y": 523,\r
-        "z": "df893cfa.16f38",\r
+        "x": 595,\r
+        "y": 542,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "dce9b14d.bb77b"\r
+                "482863bc.936c5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dce9b14d.bb77b",\r
+        "id": "482863bc.936c5c",\r
         "type": "set",\r
         "name": "set nodelist",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",\r
         "comments": "",\r
-        "x": 750,\r
-        "y": 537,\r
-        "z": "df893cfa.16f38",\r
+        "x": 752,\r
+        "y": 556,\r
+        "z": "a5b492f8.99d13",\r
         "wires": []\r
     },\r
     {\r
-        "id": "69b2cec2.dd018",\r
+        "id": "8e25ca9e.be6708",\r
         "type": "outcome",\r
         "name": "empty",\r
         "xml": "<outcome value=\"['']\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 592,\r
-        "y": 567,\r
-        "z": "df893cfa.16f38",\r
+        "x": 594,\r
+        "y": 586,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "dce9b14d.bb77b"\r
+                "482863bc.936c5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8d045871.31f638",\r
+        "id": "75287f66.d6424",\r
         "type": "switchNode",\r
         "name": "switch playbookname",\r
         "xml": "<switch test='`$playbookname`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1468,\r
-        "y": 402,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1470,\r
+        "y": 421,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "ef1e7a17.621f38"\r
+                "cf31ac68.a9966"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef1e7a17.621f38",\r
+        "id": "cf31ac68.a9966",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1646,\r
-        "y": 402,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1648,\r
+        "y": 421,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "862a6ea8.3ba16"\r
+                "822cf6dc.fbd318"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8543ebcf.2ead48",\r
+        "id": "f5a8e69f.6d2868",\r
         "type": "set",\r
         "name": "set nodelist",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",\r
         "comments": "",\r
-        "x": 1441,\r
-        "y": 455,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1443,\r
+        "y": 474,\r
+        "z": "a5b492f8.99d13",\r
         "wires": []\r
     },\r
     {\r
-        "id": "50890a76.58d434",\r
+        "id": "19bb6647.2aa81a",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1271,\r
-        "y": 412,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1273,\r
+        "y": 431,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             [\r
-                "8d045871.31f638",\r
-                "8543ebcf.2ead48"\r
+                "75287f66.d6424",\r
+                "f5a8e69f.6d2868"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "862a6ea8.3ba16",\r
+        "id": "822cf6dc.fbd318",\r
         "type": "execute",\r
         "name": "set playbookname",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-pre-check.playbookname'`\" />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1818,\r
-        "y": 400,\r
-        "z": "df893cfa.16f38",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "66ca1a2.98ef5e4",\r
-        "type": "execute",\r
-        "name": "execute jsonStringToCtx",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='org.onap.appc.adapter.ansible.results' />\n\t<parameter name='outputPath' value='resultsJson' />\n\t<parameter name='isEscaped' value='false' />\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1668,\r
-        "y": 744,\r
-        "z": "df893cfa.16f38",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "6f78d9df.0d3518",\r
-        "type": "execute",\r
-        "name": "execute getAttributeValue",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='source' value=\"`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`\" />\n\t<parameter name='outputPath' value='outputPayload' />",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1674,\r
-        "y": 789,\r
-        "z": "df893cfa.16f38",\r
+        "x": 1820,\r
+        "y": 419,\r
+        "z": "a5b492f8.99d13",\r
         "wires": [\r
             []\r
         ]\r
-    },\r
-    {\r
-        "id": "3c0a54ab.00262c",\r
-        "type": "switchNode",\r
-        "name": "switch outputPayload",\r
-        "xml": "<switch test='`$outputPayload`'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1660,\r
-        "y": 836,\r
-        "z": "df893cfa.16f38",\r
-        "wires": [\r
-            [\r
-                "65b8d06e.2f308",\r
-                "db2edf05.5dbf2"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "65b8d06e.2f308",\r
-        "type": "outcome",\r
-        "name": "null",\r
-        "xml": "<outcome value=''>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1838,\r
-        "y": 816,\r
-        "z": "df893cfa.16f38",\r
-        "wires": [\r
-            [\r
-                "b364bef1.e2765"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "db2edf05.5dbf2",\r
-        "type": "outcome",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1839,\r
-        "y": 860,\r
-        "z": "df893cfa.16f38",\r
-        "wires": [\r
-            [\r
-                "3b020d0b.edb822"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "3b020d0b.edb822",\r
-        "type": "set",\r
-        "name": "set DmaapReq with payload",\r
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>",\r
-        "comments": "",\r
-        "x": 2036,\r
-        "y": 860,\r
-        "z": "df893cfa.16f38",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "e583cc0b.79586",\r
-        "type": "returnSuccess",\r
-        "name": "return success",\r
-        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",\r
-        "comments": "",\r
-        "x": 2371,\r
-        "y": 946.9999389648438,\r
-        "z": "df893cfa.16f38",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "b678b572.4bc6d8",\r
-        "type": "outcome",\r
-        "name": "null",\r
-        "xml": "<outcome value=''>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1837.000244140625,\r
-        "y": 968.9998779296875,\r
-        "z": "df893cfa.16f38",\r
-        "wires": [\r
-            [\r
-                "bebb9bde.cadbc8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "e71f0e75.f5e6e",\r
-        "type": "outcome",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1836.000244140625,\r
-        "y": 1044.9998779296875,\r
-        "z": "df893cfa.16f38",\r
-        "wires": [\r
-            [\r
-                "a34ae1ab.50555"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "9977ea00.521808",\r
-        "type": "switchNode",\r
-        "name": "switch outputPayload",\r
-        "xml": "<switch test='`$outputPayload`'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1654.000244140625,\r
-        "y": 1004.9998779296875,\r
-        "z": "df893cfa.16f38",\r
-        "wires": [\r
-            [\r
-                "b678b572.4bc6d8",\r
-                "e71f0e75.f5e6e"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "c888915f.7e81c",\r
-        "type": "returnSuccess",\r
-        "name": "return success with payload",\r
-        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='payload' value='`$outputPayload`'/>",\r
-        "comments": "",\r
-        "x": 2412.000244140625,\r
-        "y": 1028.9998779296875,\r
-        "z": "df893cfa.16f38",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "bebb9bde.cadbc8",\r
-        "type": "switchNode",\r
-        "name": "switch result code",\r
-        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2007.000244140625,\r
-        "y": 968.9998779296875,\r
-        "z": "df893cfa.16f38",\r
-        "wires": [\r
-            [\r
-                "1b395046.b5f6",\r
-                "d4989dec.88a2e"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "a34ae1ab.50555",\r
-        "type": "switchNode",\r
-        "name": "switch result code",\r
-        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2007.000244140625,\r
-        "y": 1044.9998779296875,\r
-        "z": "df893cfa.16f38",\r
-        "wires": [\r
-            [\r
-                "8e9f2082.ee767",\r
-                "3b44f0c3.4b7c2"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "5e9a3c.5f7e95c4",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",\r
-        "comments": "",\r
-        "x": 2365.000244140625,\r
-        "y": 984.9998779296875,\r
-        "z": "df893cfa.16f38",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "398f4135.fd470e",\r
-        "type": "returnFailure",\r
-        "name": "return failure with payload",\r
-        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n<parameter name='payload' value='`$outputPayload`'/>",\r
-        "comments": "",\r
-        "x": 2408.000244140625,\r
-        "y": 1066.9998779296875,\r
-        "z": "df893cfa.16f38",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "1b395046.b5f6",\r
-        "type": "other",\r
-        "name": "outcome 400",\r
-        "xml": "<outcome value='400'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2195.000244140625,\r
-        "y": 946.9998779296875,\r
-        "z": "df893cfa.16f38",\r
-        "wires": [\r
-            [\r
-                "e583cc0b.79586"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "d4989dec.88a2e",\r
-        "type": "outcome",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2176.000244140625,\r
-        "y": 984.9998779296875,\r
-        "z": "df893cfa.16f38",\r
-        "wires": [\r
-            [\r
-                "5e9a3c.5f7e95c4"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "8e9f2082.ee767",\r
-        "type": "other",\r
-        "name": "outcome 400",\r
-        "xml": "<outcome value='400'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2196.000244140625,\r
-        "y": 1028.9998779296875,\r
-        "z": "df893cfa.16f38",\r
-        "wires": [\r
-            [\r
-                "c888915f.7e81c"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "3b44f0c3.4b7c2",\r
-        "type": "outcome",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2178.000244140625,\r
-        "y": 1066.9998779296875,\r
-        "z": "df893cfa.16f38",\r
-        "wires": [\r
-            [\r
-                "398f4135.fd470e"\r
-            ]\r
-        ]\r
     }\r
 ]
\ 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 0ddbf91..656abb4 100644 (file)
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
@@ -1,811 +1,811 @@
 [\r
     {\r
-        "id": "fab0f7ed.c486b8",\r
+        "id": "d52a9fe6.4a061",\r
         "type": "method",\r
         "name": "upgrade-software",\r
         "xml": "<method rpc='upgrade-software' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 480,\r
-        "y": 147,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 544,\r
+        "y": 52,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "5ccc8e8d.06e5"\r
+                "8be92af7.e48088"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c791eb8.0072b",\r
+        "id": "b090596a.f30168",\r
         "type": "service-logic",\r
-        "name": "LCM ${project.version}",\r
+        "name": "LCM 1.4.5",\r
         "module": "LCM",\r
-        "version": "${project.version}",\r
+        "version": "1.4.5",\r
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='LCM' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 267.99993896484375,\r
-        "y": 148,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 331.99993896484375,\r
+        "y": 53,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "fab0f7ed.c486b8"\r
+                "d52a9fe6.4a061"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3503ece1.d7ad14",\r
+        "id": "2f057096.50046",\r
         "type": "execute",\r
         "name": "execute AnsibleA.reqExec",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-software-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 335.00001525878906,\r
-        "y": 755,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 399.00001525878906,\r
+        "y": 660,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "734b2c42.973ee4",\r
-                "bb8a76ca.fb7058",\r
-                "a457fe79.46497"\r
+                "f4a52a80.3301f8",\r
+                "4c3969ef.3ad0e8",\r
+                "519ffe08.0c9b3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f17ff2aa.67075",\r
+        "id": "5a208b8c.11bad4",\r
         "type": "switchNode",\r
         "name": "switch",\r
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 734.9999389648438,\r
-        "y": 863.0000305175781,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 798.9999389648438,\r
+        "y": 768.0000305175781,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "7ad5787f.1c20f8",\r
-                "b6f779a3.cc7ed8",\r
-                "f695f05e.abf31"\r
+                "e1869f29.6536c",\r
+                "43f57bf1.626ff4",\r
+                "c32ffe89.d048e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ad5787f.1c20f8",\r
+        "id": "e1869f29.6536c",\r
         "type": "other",\r
         "name": "outcome 500",\r
         "xml": "<outcome value='500'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 879.9999389648438,\r
-        "y": 861.0000381469727,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 943.9999389648438,\r
+        "y": 766.0000381469727,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "2b54a991.b17b16"\r
+                "398fd4fb.d6173c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b6f779a3.cc7ed8",\r
+        "id": "43f57bf1.626ff4",\r
         "type": "other",\r
         "name": "outcome 100",\r
         "xml": "<outcome value='100'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 876.9999389648438,\r
-        "y": 918.0000305175781,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 940.9999389648438,\r
+        "y": 823.0000305175781,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "1a65bc45.b2fcb4"\r
+                "f88fcab6.006eb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a65bc45.b2fcb4",\r
+        "id": "f88fcab6.006eb8",\r
         "type": "execute",\r
         "name": "execute reqExecResult",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1064.9999389648438,\r
-        "y": 917.0000305175781,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1128.9999389648438,\r
+        "y": 822.0000305175781,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "5b0d24c6.9eb0ac",\r
-                "2b5e4322.1d495c"\r
+                "73432b98.4b25e4",\r
+                "bd487c1a.8c998"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bb8a76ca.fb7058",\r
+        "id": "4c3969ef.3ad0e8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 593.9999389648438,\r
-        "y": 776.0000915527344,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 657.9999389648438,\r
+        "y": 681.0000915527344,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "2b54a991.b17b16"\r
+                "398fd4fb.d6173c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "734b2c42.973ee4",\r
+        "id": "f4a52a80.3301f8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 595.9999389648438,\r
-        "y": 828.0000610351562,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 659.9999389648438,\r
+        "y": 733.0000610351562,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "f17ff2aa.67075"\r
+                "5a208b8c.11bad4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5b0d24c6.9eb0ac",\r
+        "id": "73432b98.4b25e4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1233.9999389648438,\r
-        "y": 875.0000381469727,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1297.9999389648438,\r
+        "y": 780.0000381469727,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "2b54a991.b17b16"\r
+                "398fd4fb.d6173c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f695f05e.abf31",\r
+        "id": "c32ffe89.d048e",\r
         "type": "other",\r
         "name": "outcome 101",\r
         "xml": "<outcome value='101'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 876.9999389648438,\r
-        "y": 819.0000686645508,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 940.9999389648438,\r
+        "y": 724.0000686645508,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "2b54a991.b17b16"\r
+                "398fd4fb.d6173c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b5e4322.1d495c",\r
+        "id": "bd487c1a.8c998",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1241.9998779296875,\r
-        "y": 923.0001220703125,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1305.9998779296875,\r
+        "y": 828.0001220703125,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "db1e6d62.a1404"\r
+                "adb9b1a6.61eb5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c1a2b259.11e46",\r
+        "id": "2b291cab.721924",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",\r
         "comments": "",\r
-        "x": 1535.9998779296875,\r
-        "y": 980.0000610351562,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1599.9998779296875,\r
+        "y": 885.0000610351562,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "566f9779.c05d38",\r
+        "id": "db787a9a.5729a8",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 83,\r
-        "y": 147,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 147,\r
+        "y": 52,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "5c791eb8.0072b"\r
+                "b090596a.f30168"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ccc8e8d.06e5",\r
+        "id": "8be92af7.e48088",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 80.91668701171875,\r
-        "y": 239.08334350585938,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 144.91668701171875,\r
+        "y": 144.08334350585938,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "3503ece1.d7ad14",\r
-                "dc18f7c9.2e4ac8",\r
-                "814875d2.cac108",\r
-                "e9d89bdf.30f7a8",\r
-                "69e97f86.e07ef",\r
-                "fa9a8e1f.bba53",\r
-                "baba22fc.1ceb5",\r
-                "81510405.ca8868"\r
+                "2f057096.50046",\r
+                "f86ff952.0492a8",\r
+                "e1e7ef0d.bad94",\r
+                "3f387094.3465e",\r
+                "1f8f1867.c1cf08",\r
+                "4e2df025.06262",\r
+                "690e9c9d.3aca34",\r
+                "3ebaf64f.5a6c4a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dc18f7c9.2e4ac8",\r
+        "id": "f86ff952.0492a8",\r
         "type": "execute",\r
         "name": "execute Properties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 379.0000305175781,\r
-        "y": 272.0833435058594,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 443.0000305175781,\r
+        "y": 177.08334350585938,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "70d1c79a.089af8",\r
+        "id": "70a47606.d49438",\r
         "type": "execute",\r
         "name": "execute DmaapMsg",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1545.9998779296875,\r
-        "y": 725.0834045410156,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1609.9998779296875,\r
+        "y": 630.0834045410156,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "d776c76b.1dd188"\r
+                "34ac5379.9a844c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d776c76b.1dd188",\r
+        "id": "34ac5379.9a844c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1715.9998168945312,\r
-        "y": 724.0834045410156,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1779.9998168945312,\r
+        "y": 629.0834045410156,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "eac6c260.d11fc"\r
+                "fb390c18.77a19"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b54a991.b17b16",\r
+        "id": "398fd4fb.d6173c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1348.9998168945312,\r
-        "y": 749.0834045410156,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1412.9998168945312,\r
+        "y": 654.0834045410156,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "70d1c79a.089af8",\r
-                "7970fcd5.6f11b4",\r
-                "3d8934f9.d0339c"\r
+                "70a47606.d49438",\r
+                "d82deaf3.a98988",\r
+                "df7a754d.479a48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e790e11b.4f947",\r
+        "id": "add47742.421838",\r
         "type": "execute",\r
         "name": "execute DmaapMsg",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1546.4998779296875,\r
-        "y": 930.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1610.4998779296875,\r
+        "y": 835.0833740234375,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "2e13891.034f576"\r
+                "5ad46d9d.c433d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e13891.034f576",\r
+        "id": "5ad46d9d.c433d4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1714.4998779296875,\r
-        "y": 930.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1778.4998779296875,\r
+        "y": 835.0833740234375,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "30475e40.9b8be2"\r
+                "a1c42905.fff878"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eac6c260.d11fc",\r
+        "id": "fb390c18.77a19",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1835.9998779296875,\r
-        "y": 723.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1899.9998779296875,\r
+        "y": 628.0833740234375,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7970fcd5.6f11b4",\r
+        "id": "d82deaf3.a98988",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",\r
         "comments": "",\r
-        "x": 1527.91650390625,\r
-        "y": 776.0834045410156,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1591.91650390625,\r
+        "y": 681.0834045410156,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "30475e40.9b8be2",\r
+        "id": "a1c42905.fff878",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1842.9166259765625,\r
-        "y": 930.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1906.9166259765625,\r
+        "y": 835.0833740234375,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3d8934f9.d0339c",\r
+        "id": "df7a754d.479a48",\r
         "type": "set",\r
         "name": "set DmaapReq",\r
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",\r
         "comments": "",\r
-        "x": 1532.9998779296875,\r
-        "y": 672.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1596.9998779296875,\r
+        "y": 577.0833740234375,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "db1e6d62.a1404",\r
+        "id": "adb9b1a6.61eb5",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1369.9998779296875,\r
-        "y": 924.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1433.9998779296875,\r
+        "y": 829.0833740234375,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "e790e11b.4f947",\r
-                "3a3f1d44.898da2",\r
-                "c1a2b259.11e46"\r
+                "add47742.421838",\r
+                "ff897b1a.9583f8",\r
+                "2b291cab.721924"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a3f1d44.898da2",\r
+        "id": "ff897b1a.9583f8",\r
         "type": "set",\r
         "name": "set DmaapReq",\r
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",\r
         "comments": "",\r
-        "x": 1536.1666259765625,\r
-        "y": 875.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1600.1666259765625,\r
+        "y": 780.0833740234375,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a457fe79.46497",\r
+        "id": "519ffe08.0c9b3",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 602.9999389648438,\r
-        "y": 728.0000610351562,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 666.9999389648438,\r
+        "y": 633.0000610351562,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "3d4c2c9a.7b1324"\r
+                "e32c4a6d.892558"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d512629f.bc625",\r
+        "id": "8405f654.a242a8",\r
         "type": "set",\r
         "name": "set Defaults",\r
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",\r
         "comments": "",\r
-        "x": 893.9999389648438,\r
-        "y": 687,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 957.9999389648438,\r
+        "y": 592,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3d4c2c9a.7b1324",\r
+        "id": "e32c4a6d.892558",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 739.9999389648438,\r
-        "y": 722.0000610351562,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 803.9999389648438,\r
+        "y": 627.0000610351562,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "d512629f.bc625",\r
-                "2b54a991.b17b16"\r
+                "8405f654.a242a8",\r
+                "398fd4fb.d6173c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "814875d2.cac108",\r
+        "id": "e1e7ef0d.bad94",\r
         "type": "set",\r
         "name": "set default values",\r
         "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",\r
         "comments": "",\r
-        "x": 372,\r
-        "y": 319,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 436,\r
+        "y": 224,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "442dbdff.6dfcb4",\r
+        "id": "62ae5ec1.69479",\r
         "type": "get-resource",\r
         "name": "get aai.generic-vnf ",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $upgrade-software-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 912,\r
-        "y": 495,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 978,\r
+        "y": 415,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "1e57cb28.122ad5"\r
+                "45f13d8e.2baab4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e57cb28.122ad5",\r
+        "id": "45f13d8e.2baab4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1070.3907470703125,\r
-        "y": 493.28399658203125,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1134.3907470703125,\r
+        "y": 398.28399658203125,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "5a65efc0.bf413"\r
+                "374bb3b9.6cefec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "baba22fc.1ceb5",\r
+        "id": "690e9c9d.3aca34",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 300.9998779296875,\r
-        "y": 683,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 364.9998779296875,\r
+        "y": 588,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "69e97f86.e07ef",\r
+        "id": "1f8f1867.c1cf08",\r
         "type": "switchNode",\r
         "name": "switch pnf-flag",\r
         "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 354,\r
-        "y": 420,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 418,\r
+        "y": 325,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "e43265e9.4c7f38",\r
-                "d78c93da.7125f"\r
+                "5b32bef7.b059e",\r
+                "f5bcff23.7649a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9d89bdf.30f7a8",\r
+        "id": "3f387094.3465e",\r
         "type": "execute",\r
         "name": "execute jsonStringToCtx",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-software-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 386,\r
-        "y": 366,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 450,\r
+        "y": 271,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e43265e9.4c7f38",\r
+        "id": "5b32bef7.b059e",\r
         "type": "outcome",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 551,\r
-        "y": 399,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 615,\r
+        "y": 304,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "abbc4ae4.be5328"\r
+                "a02f543f.407778"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d78c93da.7125f",\r
+        "id": "f5bcff23.7649a",\r
         "type": "outcome",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 550.9999389648438,\r
-        "y": 460,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 614.9999389648438,\r
+        "y": 365,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "f68ee407.ca6d88"\r
+                "4ae3a7c9.907f18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f68ee407.ca6d88",\r
+        "id": "4ae3a7c9.907f18",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 698.9999389648438,\r
-        "y": 459,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 762.9999389648438,\r
+        "y": 364,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "442dbdff.6dfcb4",\r
-                "80c560bb.eea5f"\r
+                "62ae5ec1.69479",\r
+                "fc28a02d.cc248"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "abbc4ae4.be5328",\r
+        "id": "a02f543f.407778",\r
         "type": "set",\r
         "name": "set AnsibleReq",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-software.playbookname`'/>\n",\r
         "comments": "",\r
-        "x": 712,\r
-        "y": 397,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 776,\r
+        "y": 302,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "80c560bb.eea5f",\r
+        "id": "fc28a02d.cc248",\r
         "type": "execute",\r
         "name": "set playbookname",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-software.playbookname'`\" />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 921,\r
-        "y": 439,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 976,\r
+        "y": 312,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fa9a8e1f.bba53",\r
+        "id": "4e2df025.06262",\r
         "type": "switchNode",\r
         "name": "switch playbookname",\r
         "xml": "<switch test='`$playbookname`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 351,\r
-        "y": 551,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 415,\r
+        "y": 456,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "1a5624d2.74e98b"\r
+                "6164fda7.628474"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a5624d2.74e98b",\r
+        "id": "6164fda7.628474",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 522,\r
-        "y": 552,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 586,\r
+        "y": 457,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "524c17a1.30fbf8"\r
+                "789294b0.3e8a8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "524c17a1.30fbf8",\r
+        "id": "789294b0.3e8a8c",\r
         "type": "set",\r
         "name": "set playbookname",\r
-        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-software.playbookname`'/>",\r
+        "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-software.playbookname`'/>",\r
         "comments": "",\r
-        "x": 712,\r
-        "y": 551,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 776,\r
+        "y": 456,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "81510405.ca8868",\r
+        "id": "3ebaf64f.5a6c4a",\r
         "type": "switchNode",\r
         "name": "switch nodelist",\r
         "xml": "<switch test='`$nodelist`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 341,\r
-        "y": 610,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 405,\r
+        "y": 515,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "7a126f.d2de2d9",\r
-                "8743a074.e8506"\r
+                "12193ca9.50e163",\r
+                "8146ae4e.2b29b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a126f.d2de2d9",\r
+        "id": "12193ca9.50e163",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 521,\r
-        "y": 603,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 585,\r
+        "y": 508,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "c954af6f.c34df"\r
+                "b589f932.9ec108"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c954af6f.c34df",\r
+        "id": "b589f932.9ec108",\r
         "type": "set",\r
         "name": "set nodelist",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",\r
         "comments": "",\r
-        "x": 678,\r
-        "y": 617,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 742,\r
+        "y": 522,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8743a074.e8506",\r
+        "id": "8146ae4e.2b29b",\r
         "type": "outcome",\r
         "name": "empty",\r
         "xml": "<outcome value=\"['']\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 520,\r
-        "y": 647,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 584,\r
+        "y": 552,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "c954af6f.c34df"\r
+                "b589f932.9ec108"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90b2891b.001708",\r
+        "id": "94498b41.794368",\r
         "type": "switchNode",\r
         "name": "switch playbookname",\r
         "xml": "<switch test='`$playbookname`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1396,\r
-        "y": 482,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1460,\r
+        "y": 387,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "c9dd0d76.432f7"\r
+                "975c4b05.0f6d08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9dd0d76.432f7",\r
+        "id": "975c4b05.0f6d08",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1574,\r
-        "y": 482,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1638,\r
+        "y": 387,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "6ea15b2b.d9cd74"\r
+                "eee08f4b.ee327"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9706bdee.6acf9",\r
+        "id": "7c4590ff.245c9",\r
         "type": "set",\r
         "name": "set nodelist",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",\r
         "comments": "",\r
-        "x": 1369,\r
-        "y": 535,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1433,\r
+        "y": 440,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5a65efc0.bf413",\r
+        "id": "374bb3b9.6cefec",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1199,\r
-        "y": 492,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1263,\r
+        "y": 397,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             [\r
-                "90b2891b.001708",\r
-                "9706bdee.6acf9"\r
+                "94498b41.794368",\r
+                "7c4590ff.245c9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ea15b2b.d9cd74",\r
+        "id": "eee08f4b.ee327",\r
         "type": "execute",\r
         "name": "set playbookname",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-software.playbookname'`\" />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1746,\r
-        "y": 480,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1810,\r
+        "y": 385,\r
+        "z": "d0eb0cbd.ae56e",\r
         "wires": [\r
             []\r
         ]\r

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 a772373..4a88aac 100644 (file)
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
@@ -57,7 +57,6 @@
             <switch test='`$playbookname`'>\r
                 <outcome value=''>\r
                     <set>\r
-                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
                         <parameter name='playbookname' value='`$prop.lcm.upgrade-post-check.playbookname`'/>\r
                     </set>\r
                 </outcome>\r
@@ -271,56 +270,23 @@
                                 <parameter name='PlaybookName' value='`$playbookname`'/>\r
                                 <outcome value='failure'>\r
                                     <block>\r
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
-                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />\r
-                                            <parameter name='outputPath' value='resultsJson' />\r
-                                            <parameter name='isEscaped' value='false' />\r
-                                        </execute>\r
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
-                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />\r
-                                            <parameter name='outputPath' value='outputPayload' />\r
-                                        </execute>\r
-                                        <switch test='`$outputPayload`'>\r
-                                            <outcome value=''>\r
-                                                <set>\r
-                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
-                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>\r
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
-                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\r
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\r
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\r
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
-                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\r
-                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                                </set>\r
-                                            </outcome>\r
-                                            <outcome value='Other'>\r
-                                                <set>\r
-                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
-                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>\r
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
-                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\r
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\r
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\r
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
-                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\r
-                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>\r
-                                                </set>\r
-                                            </outcome>\r
-                                        </switch>\r
+                                        <set>\r
+                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>\r
+                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\r
+                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\r
+                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\r
+                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
+                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
+                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
+                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\r
+                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\r
+                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\r
+                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                        </set>\r
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
@@ -337,96 +303,31 @@
                                                 </record>\r
                                             </outcome>\r
                                         </execute>\r
-                                        <switch test='`$outputPayload`'>\r
-                                            <outcome value=''>\r
-                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
-                                                    <outcome value='400'>\r
-                                                        <return status='success'>\r
-                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                                        </return>\r
-                                                    </outcome>\r
-                                                    <outcome value='Other'>\r
-                                                        <return status='failure'>\r
-                                                            <parameter name='status.code' value='401' />\r
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
-                                                        </return>\r
-                                                    </outcome>\r
-                                                </switch>\r
-                                            </outcome>\r
-                                            <outcome value='Other'>\r
-                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
-                                                    <outcome value='400'>\r
-                                                        <return status='success'>\r
-                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                                            <parameter name='payload' value='`$outputPayload`'/>\r
-                                                        </return>\r
-                                                    </outcome>\r
-                                                    <outcome value='Other'>\r
-                                                        <return status='failure'>\r
-                                                            <parameter name='status.code' value='401' />\r
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
-                                                            <parameter name='payload' value='`$outputPayload`'/>\r
-                                                        </return>\r
-                                                    </outcome>\r
-                                                </switch>\r
-                                            </outcome>\r
-                                        </switch>\r
+                                        <return status='failure'>\r
+                                            <parameter name='status.code' value='401' />\r
+                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                        </return>\r
                                     </block>\r
                                 </outcome>\r
                                 <outcome value='success'>\r
                                     <block>\r
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
-                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />\r
-                                            <parameter name='outputPath' value='resultsJson' />\r
-                                            <parameter name='isEscaped' value='false' />\r
-                                        </execute>\r
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
-                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />\r
-                                            <parameter name='outputPath' value='outputPayload' />\r
-                                        </execute>\r
-                                        <switch test='`$outputPayload`'>\r
-                                            <outcome value=''>\r
-                                                <set>\r
-                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
-                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>\r
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
-                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\r
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\r
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\r
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
-                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\r
-                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                                </set>\r
-                                            </outcome>\r
-                                            <outcome value='Other'>\r
-                                                <set>\r
-                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
-                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>\r
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
-                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\r
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\r
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\r
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
-                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\r
-                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>\r
-                                                </set>\r
-                                            </outcome>\r
-                                        </switch>\r
+                                        <set>\r
+                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>\r
+                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\r
+                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\r
+                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\r
+                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
+                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
+                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
+                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\r
+                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\r
+                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\r
+                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                        </set>\r
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
@@ -443,42 +344,10 @@
                                                 </record>\r
                                             </outcome>\r
                                         </execute>\r
-                                        <switch test='`$outputPayload`'>\r
-                                            <outcome value=''>\r
-                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
-                                                    <outcome value='400'>\r
-                                                        <return status='success'>\r
-                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                                        </return>\r
-                                                    </outcome>\r
-                                                    <outcome value='Other'>\r
-                                                        <return status='failure'>\r
-                                                            <parameter name='status.code' value='401' />\r
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
-                                                        </return>\r
-                                                    </outcome>\r
-                                                </switch>\r
-                                            </outcome>\r
-                                            <outcome value='Other'>\r
-                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
-                                                    <outcome value='400'>\r
-                                                        <return status='success'>\r
-                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                                            <parameter name='payload' value='`$outputPayload`'/>\r
-                                                        </return>\r
-                                                    </outcome>\r
-                                                    <outcome value='Other'>\r
-                                                        <return status='failure'>\r
-                                                            <parameter name='status.code' value='401' />\r
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
-                                                            <parameter name='payload' value='`$outputPayload`'/>\r
-                                                        </return>\r
-                                                    </outcome>\r
-                                                </switch>\r
-                                            </outcome>\r
-                                        </switch>\r
+                                        <return status='success'>\r
+                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                        </return>\r
                                     </block>\r
                                 </outcome>\r
                             </execute>\r

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 28f7048..6f89bfc 100644 (file)
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
@@ -57,7 +57,6 @@
             <switch test='`$playbookname`'>\r
                 <outcome value=''>\r
                     <set>\r
-                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
                         <parameter name='playbookname' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>\r
                     </set>\r
                 </outcome>\r
@@ -271,56 +270,23 @@
                                 <parameter name='PlaybookName' value='`$playbookname`'/>\r
                                 <outcome value='failure'>\r
                                     <block>\r
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
-                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />\r
-                                            <parameter name='outputPath' value='resultsJson' />\r
-                                            <parameter name='isEscaped' value='false' />\r
-                                        </execute>\r
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
-                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />\r
-                                            <parameter name='outputPath' value='outputPayload' />\r
-                                        </execute>\r
-                                        <switch test='`$outputPayload`'>\r
-                                            <outcome value=''>\r
-                                                <set>\r
-                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
-                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>\r
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
-                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\r
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\r
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\r
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\r
-                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\r
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\r
-                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                                </set>\r
-                                            </outcome>\r
-                                            <outcome value='Other'>\r
-                                                <set>\r
-                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
-                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>\r
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
-                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\r
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\r
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\r
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\r
-                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\r
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\r
-                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>\r
-                                                </set>\r
-                                            </outcome>\r
-                                        </switch>\r
+                                        <set>\r
+                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>\r
+                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\r
+                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\r
+                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\r
+                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\r
+                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\r
+                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\r
+                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\r
+                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\r
+                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\r
+                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                        </set>\r
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
@@ -337,96 +303,31 @@
                                                 </record>\r
                                             </outcome>\r
                                         </execute>\r
-                                        <switch test='`$outputPayload`'>\r
-                                            <outcome value=''>\r
-                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
-                                                    <outcome value='400'>\r
-                                                        <return status='success'>\r
-                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                                        </return>\r
-                                                    </outcome>\r
-                                                    <outcome value='Other'>\r
-                                                        <return status='failure'>\r
-                                                            <parameter name='status.code' value='401' />\r
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
-                                                        </return>\r
-                                                    </outcome>\r
-                                                </switch>\r
-                                            </outcome>\r
-                                            <outcome value='Other'>\r
-                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
-                                                    <outcome value='400'>\r
-                                                        <return status='success'>\r
-                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                                            <parameter name='payload' value='`$outputPayload`'/>\r
-                                                        </return>\r
-                                                    </outcome>\r
-                                                    <outcome value='Other'>\r
-                                                        <return status='failure'>\r
-                                                            <parameter name='status.code' value='401' />\r
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
-                                                            <parameter name='payload' value='`$outputPayload`'/>\r
-                                                        </return>\r
-                                                    </outcome>\r
-                                                </switch>\r
-                                            </outcome>\r
-                                        </switch>\r
+                                        <return status='failure'>\r
+                                            <parameter name='status.code' value='401' />\r
+                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                        </return>\r
                                     </block>\r
                                 </outcome>\r
                                 <outcome value='success'>\r
                                     <block>\r
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
-                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />\r
-                                            <parameter name='outputPath' value='resultsJson' />\r
-                                            <parameter name='isEscaped' value='false' />\r
-                                        </execute>\r
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
-                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />\r
-                                            <parameter name='outputPath' value='outputPayload' />\r
-                                        </execute>\r
-                                        <switch test='`$outputPayload`'>\r
-                                            <outcome value=''>\r
-                                                <set>\r
-                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
-                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>\r
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
-                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\r
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\r
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\r
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\r
-                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\r
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\r
-                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                                </set>\r
-                                            </outcome>\r
-                                            <outcome value='Other'>\r
-                                                <set>\r
-                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
-                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>\r
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
-                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\r
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\r
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\r
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\r
-                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\r
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\r
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\r
-                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>\r
-                                                </set>\r
-                                            </outcome>\r
-                                        </switch>\r
+                                        <set>\r
+                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>\r
+                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\r
+                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\r
+                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\r
+                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\r
+                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\r
+                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\r
+                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\r
+                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\r
+                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\r
+                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                        </set>\r
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
@@ -443,42 +344,10 @@
                                                 </record>\r
                                             </outcome>\r
                                         </execute>\r
-                                        <switch test='`$outputPayload`'>\r
-                                            <outcome value=''>\r
-                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
-                                                    <outcome value='400'>\r
-                                                        <return status='success'>\r
-                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                                        </return>\r
-                                                    </outcome>\r
-                                                    <outcome value='Other'>\r
-                                                        <return status='failure'>\r
-                                                            <parameter name='status.code' value='401' />\r
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
-                                                        </return>\r
-                                                    </outcome>\r
-                                                </switch>\r
-                                            </outcome>\r
-                                            <outcome value='Other'>\r
-                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
-                                                    <outcome value='400'>\r
-                                                        <return status='success'>\r
-                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                                            <parameter name='payload' value='`$outputPayload`'/>\r
-                                                        </return>\r
-                                                    </outcome>\r
-                                                    <outcome value='Other'>\r
-                                                        <return status='failure'>\r
-                                                            <parameter name='status.code' value='401' />\r
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
-                                                            <parameter name='payload' value='`$outputPayload`'/>\r
-                                                        </return>\r
-                                                    </outcome>\r
-                                                </switch>\r
-                                            </outcome>\r
-                                        </switch>\r
+                                        <return status='success'>\r
+                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                        </return>\r
                                     </block>\r
                                 </outcome>\r
                             </execute>\r

diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
index 1a72c47..e4f818f 100644 (file)
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
@@ -57,7 +57,6 @@
             <switch test='`$playbookname`'>\r
                 <outcome value=''>\r
                     <set>\r
-                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
                         <parameter name='playbookname' value='`$prop.lcm.upgrade-software.playbookname`'/>\r
                     </set>\r
                 </outcome>\r