update LCM DGs

allow many playbooks-various criteria for same LCM Action

Change-Id: Ie29b884d05d52635a532e1d5beb10e6db7d7287e
Issue-ID: SDNC-424
Signed-off-by: Agarwal, Ruchira(ra1926) <ra1926@att.com>
Former-commit-id: 134e3f8c3430e33eea0e4490e147a99559555bb1

diff --git a/installation/src/main/properties/lcm-dg.properties b/installation/src/main/properties/lcm-dg.properties
index 7cd9064..3c6920e 100644 (file)
--- a/installation/src/main/properties/lcm-dg.properties
+++ b/installation/src/main/properties/lcm-dg.properties
@@ -9,6 +9,9 @@ ansible.version=0.00
 lcm.upgrade-pre-check.playbookname=ansible_precheck
 lcm.upgrade-post-check.playbookname=ansible_postcheck
 lcm.upgrade-software.playbookname=ansible_upgradesw
+lcm.pnf.upgrade-pre-check.playbookname=ansible_precheck_pnf
+lcm.pnf.upgrade-post-check.playbookname=ansible_postcheck_pnf
+lcm.pnf.upgrade-software.playbookname=ansible_upgradesw_pnf
 lcm.quiesce-traffic.playbookname=ansible_quiescetraffic
 lcm.resume-traffic.playbookname=ansible_resumetraffic
 lcm.distribute-traffic.playbookname=ansible_distributetraffic

diff --git a/platform-logic/lcm/src/main/json/LCM_distribute-traffic.json b/platform-logic/lcm/src/main/json/LCM_distribute-traffic.json
index 30ee561..fcd3d4f 100755 (executable)
--- a/platform-logic/lcm/src/main/json/LCM_distribute-traffic.json
+++ b/platform-logic/lcm/src/main/json/LCM_distribute-traffic.json
@@ -1,22 +1,22 @@
 [\r
     {\r
-        "id": "1a420388.7ce24c",\r
+        "id": "fab0f7ed.c486b8",\r
         "type": "method",\r
         "name": "distribute-traffic",\r
         "xml": "<method rpc='distribute-traffic' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 550,\r
-        "y": 102,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 480,\r
+        "y": 147,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "e635fd5d.f4087"\r
+                "5ccc8e8d.06e5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c220826b.91906",\r
+        "id": "5c791eb8.0072b",\r
         "type": "service-logic",\r
         "name": "LCM ${project.version}",\r
         "module": "LCM",\r
@@ -24,528 +24,788 @@
         "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": 337.99993896484375,\r
-        "y": 103,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 267.99993896484375,\r
+        "y": 148,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "1a420388.7ce24c"\r
+                "fab0f7ed.c486b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "810e1e54.dec1c",\r
+        "id": "3503ece1.d7ad14",\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='`$distribute-traffic-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='`$distribute-traffic-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.distribute-traffic.playbookname`'/>",\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='`$distribute-traffic-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='`$distribute-traffic-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 345.00001525878906,\r
-        "y": 379,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 335.00001525878906,\r
+        "y": 755,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "f279f5b8.9d49b8",\r
-                "895a0a53.e12ea8",\r
-                "fa759954.4e2068"\r
+                "734b2c42.973ee4",\r
+                "bb8a76ca.fb7058",\r
+                "a457fe79.46497"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7db5396.7b5f1",\r
+        "id": "f17ff2aa.67075",\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": 690.9999389648438,\r
-        "y": 530.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 734.9999389648438,\r
+        "y": 863.0000305175781,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "bc5a2382.4973",\r
-                "84f0dd88.8438",\r
-                "ffd4aab1.e3c4b8"\r
+                "7ad5787f.1c20f8",\r
+                "b6f779a3.cc7ed8",\r
+                "f695f05e.abf31"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc5a2382.4973",\r
+        "id": "7ad5787f.1c20f8",\r
         "type": "other",\r
         "name": "outcome 500",\r
         "xml": "<outcome value='500'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 835.9999389648438,\r
-        "y": 528.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 879.9999389648438,\r
+        "y": 861.0000381469727,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84f0dd88.8438",\r
+        "id": "b6f779a3.cc7ed8",\r
         "type": "other",\r
         "name": "outcome 100",\r
         "xml": "<outcome value='100'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 838.9999389648438,\r
-        "y": 571.0000610351562,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 876.9999389648438,\r
+        "y": 918.0000305175781,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "f44a47b3.3aa128"\r
+                "1a65bc45.b2fcb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f44a47b3.3aa128",\r
+        "id": "1a65bc45.b2fcb4",\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='`$prop.lcm.distribute-traffic.playbookname`'/>\n\t\n\n\n\n\n",\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": 1025.9999389648438,\r
-        "y": 570.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1064.9999389648438,\r
+        "y": 917.0000305175781,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "dd2fe7e6.957248",\r
-                "6913b982.6c9bb8"\r
+                "5b0d24c6.9eb0ac",\r
+                "2b5e4322.1d495c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "895a0a53.e12ea8",\r
+        "id": "bb8a76ca.fb7058",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 581.9999389648438,\r
-        "y": 439.0000534057617,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 593.9999389648438,\r
+        "y": 776.0000915527344,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f279f5b8.9d49b8",\r
+        "id": "734b2c42.973ee4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 583.9999389648438,\r
-        "y": 491.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 595.9999389648438,\r
+        "y": 828.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "f7db5396.7b5f1"\r
+                "f17ff2aa.67075"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd2fe7e6.957248",\r
+        "id": "5b0d24c6.9eb0ac",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1189.9999389648438,\r
-        "y": 542.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1233.9999389648438,\r
+        "y": 875.0000381469727,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffd4aab1.e3c4b8",\r
+        "id": "f695f05e.abf31",\r
         "type": "other",\r
         "name": "outcome 101",\r
         "xml": "<outcome value='101'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 832.9999389648438,\r
-        "y": 486.00006103515625,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 876.9999389648438,\r
+        "y": 819.0000686645508,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6913b982.6c9bb8",\r
+        "id": "2b5e4322.1d495c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1191.9999389648438,\r
-        "y": 597.0000915527344,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1241.9998779296875,\r
+        "y": 923.0001220703125,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "14c8dea1.b5b7a1"\r
+                "db1e6d62.a1404"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a32993f8.f8215",\r
+        "id": "c1a2b259.11e46",\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": 1467.9998779296875,\r
-        "y": 648.0000610351562,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1535.9998779296875,\r
+        "y": 980.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d8c3f83d.d0b9d8",\r
+        "id": "566f9779.c05d38",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 153,\r
-        "y": 102,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 83,\r
+        "y": 147,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "c220826b.91906"\r
+                "5c791eb8.0072b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e635fd5d.f4087",\r
+        "id": "5ccc8e8d.06e5",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 139.91668701171875,\r
-        "y": 241.08334350585938,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 80.91668701171875,\r
+        "y": 239.08334350585938,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "810e1e54.dec1c",\r
-                "ee1802be.c5c18",\r
-                "e8d3b31a.f46c6",\r
-                "4d7f56db.9375c8"\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
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee1802be.c5c18",\r
+        "id": "dc18f7c9.2e4ac8",\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": 328.00001525878906,\r
-        "y": 225.08334350585938,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 379.0000305175781,\r
+        "y": 272.0833435058594,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3830f5d4.87f1aa",\r
+        "id": "70d1c79a.089af8",\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": 1222.9999389648438,\r
-        "y": 371.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1545.9998779296875,\r
+        "y": 725.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "1566d659.a0655a"\r
+                "d776c76b.1dd188"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1566d659.a0655a",\r
+        "id": "d776c76b.1dd188",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1392.9998779296875,\r
-        "y": 370.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1715.9998168945312,\r
+        "y": 724.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "22f8bfd0.6139e"\r
+                "eac6c260.d11fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80cc4946.3f0f78",\r
+        "id": "2b54a991.b17b16",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1025.9998779296875,\r
-        "y": 395.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1348.9998168945312,\r
+        "y": 749.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "3830f5d4.87f1aa",\r
-                "fedbb5e6.fb3c28",\r
-                "898f667e.daf2e8"\r
+                "70d1c79a.089af8",\r
+                "7970fcd5.6f11b4",\r
+                "3d8934f9.d0339c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ce48bed.5b7c74",\r
+        "id": "e790e11b.4f947",\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": 1488.4998779296875,\r
-        "y": 597.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1546.4998779296875,\r
+        "y": 930.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "37e7fa80.2728b6"\r
+                "2e13891.034f576"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37e7fa80.2728b6",\r
+        "id": "2e13891.034f576",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1648.4998779296875,\r
-        "y": 597.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1714.4998779296875,\r
+        "y": 930.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "47c7511a.dd8fe"\r
+                "30475e40.9b8be2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22f8bfd0.6139e",\r
+        "id": "eac6c260.d11fc",\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": 1524.9998779296875,\r
-        "y": 370.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1835.9998779296875,\r
+        "y": 723.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fedbb5e6.fb3c28",\r
+        "id": "7970fcd5.6f11b4",\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": 1197.9165649414062,\r
-        "y": 408.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1527.91650390625,\r
+        "y": 776.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "47c7511a.dd8fe",\r
+        "id": "30475e40.9b8be2",\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": 1769.9166259765625,\r
-        "y": 598.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1842.9166259765625,\r
+        "y": 930.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "898f667e.daf2e8",\r
+        "id": "3d8934f9.d0339c",\r
         "type": "set",\r
-        "name": "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=\"`$distribute-traffic-input.common-header.request-id + '-' + $distribute-traffic-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='distribute-traffic'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$distribute-traffic-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$distribute-traffic-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$distribute-traffic-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$distribute-traffic-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$distribute-traffic-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$distribute-traffic-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$distribute-traffic-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$distribute-traffic-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": 1174.9999389648438,\r
-        "y": 318.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1532.9998779296875,\r
+        "y": 672.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "14c8dea1.b5b7a1",\r
+        "id": "db1e6d62.a1404",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1317.9998779296875,\r
-        "y": 596.0833435058594,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1369.9998779296875,\r
+        "y": 924.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "7ce48bed.5b7c74",\r
-                "70a28c6a.563d24",\r
-                "a32993f8.f8215"\r
+                "e790e11b.4f947",\r
+                "3a3f1d44.898da2",\r
+                "c1a2b259.11e46"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70a28c6a.563d24",\r
+        "id": "3a3f1d44.898da2",\r
         "type": "set",\r
-        "name": "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=\"`$distribute-traffic-input.common-header.request-id + '-' + $distribute-traffic-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='distribute-traffic'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$distribute-traffic-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$distribute-traffic-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$distribute-traffic-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$distribute-traffic-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$distribute-traffic-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$distribute-traffic-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$distribute-traffic-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$distribute-traffic-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": 1448.1666259765625,\r
-        "y": 549.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1536.1666259765625,\r
+        "y": 875.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fa759954.4e2068",\r
+        "id": "a457fe79.46497",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 577.9999389648438,\r
-        "y": 392.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 602.9999389648438,\r
+        "y": 728.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "ed41675d.59c088"\r
+                "3d4c2c9a.7b1324"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "756c2e53.ca6d7",\r
+        "id": "d512629f.bc625",\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": 1009.9999389648438,\r
-        "y": 297.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 893.9999389648438,\r
+        "y": 687,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ed41675d.59c088",\r
+        "id": "3d4c2c9a.7b1324",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 761.9999389648438,\r
-        "y": 384.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 739.9999389648438,\r
+        "y": 722.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "756c2e53.ca6d7",\r
-                "80cc4946.3f0f78"\r
+                "d512629f.bc625",\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8d3b31a.f46c6",\r
+        "id": "814875d2.cac108",\r
         "type": "set",\r
-        "name": "set default status value",\r
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",\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": 336,\r
-        "y": 269,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 372,\r
+        "y": 319,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4d7f56db.9375c8",\r
+        "id": "442dbdff.6dfcb4",\r
         "type": "get-resource",\r
-        "name": "get aai.generic-vnf by vnf-id",\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 = $distribute-traffic-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 349.0000305175781,\r
-        "y": 325,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 912,\r
+        "y": 495,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "fa69a126.2a554",\r
-                "f9cb9963.f9e368"\r
+                "1e57cb28.122ad5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa69a126.2a554",\r
-        "type": "failure",\r
+        "id": "1e57cb28.122ad5",\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
+        "wires": [\r
+            [\r
+                "5a65efc0.bf413"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "baba22fc.1ceb5",\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
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "69e97f86.e07ef",\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
+        "wires": [\r
+            [\r
+                "e43265e9.4c7f38",\r
+                "d78c93da.7125f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e9d89bdf.30f7a8",\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='distribute-traffic-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
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "e43265e9.4c7f38",\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
+        "wires": [\r
+            [\r
+                "abbc4ae4.be5328"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d78c93da.7125f",\r
+        "type": "outcome",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 589.86083984375,\r
-        "y": 312.53564453125,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 550.9999389648438,\r
+        "y": 460,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "2d1a88c6.11f9d8"\r
+                "f68ee407.ca6d88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9cb9963.f9e368",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
+        "id": "f68ee407.ca6d88",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 591.3908081054688,\r
-        "y": 260.28399658203125,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 698.9999389648438,\r
+        "y": 459,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "c4d4de4d.3e19f"\r
+                "442dbdff.6dfcb4",\r
+                "80c560bb.eea5f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c4d4de4d.3e19f",\r
+        "id": "abbc4ae4.be5328",\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.distribute-traffic.playbookname`'/>\n",\r
+        "comments": "",\r
+        "x": 712,\r
+        "y": 397,\r
+        "z": "50de34e0.ace54c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "80c560bb.eea5f",\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 + '.distribute-traffic.playbookname'`\" />\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 921,\r
+        "y": 439,\r
+        "z": "50de34e0.ace54c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "fa9a8e1f.bba53",\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
+        "wires": [\r
+            [\r
+                "1a5624d2.74e98b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1a5624d2.74e98b",\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
+        "wires": [\r
+            [\r
+                "524c17a1.30fbf8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "524c17a1.30fbf8",\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.distribute-traffic.playbookname`'/>",\r
+        "comments": "",\r
+        "x": 712,\r
+        "y": 551,\r
+        "z": "50de34e0.ace54c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "81510405.ca8868",\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
+        "wires": [\r
+            [\r
+                "7a126f.d2de2d9",\r
+                "8743a074.e8506"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7a126f.d2de2d9",\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
+        "wires": [\r
+            [\r
+                "c954af6f.c34df"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c954af6f.c34df",\r
         "type": "set",\r
         "name": "set nodelist",\r
-        "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`\"/>\n",\r
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",\r
         "comments": "",\r
-        "x": 740.3908081054688,\r
-        "y": 259.28399658203125,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 678,\r
+        "y": 617,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2d1a88c6.11f9d8",\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='VNF not found in AAI. Nodelist retrieved from config'/>",\r
+        "id": "8743a074.e8506",\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
+        "wires": [\r
+            [\r
+                "c954af6f.c34df"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "90b2891b.001708",\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
+        "wires": [\r
+            [\r
+                "c9dd0d76.432f7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c9dd0d76.432f7",\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
+        "wires": [\r
+            [\r
+                "6ea15b2b.d9cd74"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9706bdee.6acf9",\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
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5a65efc0.bf413",\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
+        "wires": [\r
+            [\r
+                "90b2891b.001708",\r
+                "9706bdee.6acf9"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6ea15b2b.d9cd74",\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 + '.distribute-traffic.playbookname'`\" />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 736,\r
-        "y": 312,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1746,\r
+        "y": 480,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r

diff --git a/platform-logic/lcm/src/main/json/LCM_lock.json b/platform-logic/lcm/src/main/json/LCM_lock.json
index 32f1f8c..dea68fa 100644 (file)
--- a/platform-logic/lcm/src/main/json/LCM_lock.json
+++ b/platform-logic/lcm/src/main/json/LCM_lock.json
@@ -1,194 +1,164 @@
-[
-    {
-        "id": "85add9d3.6d38c8",
-        "type": "method",
-        "name": "lock",
-        "xml": "<method rpc='lock' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 535.5,
-        "y": 83,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "a726273f.d4087"
-            ]
-        ]
-    },
-    {
-        "id": "6cc2acd4.57558c",
-        "type": "service-logic",
-        "name": "LCM ${project.version}",
-        "module": "LCM",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='LCM' version='${project.version}'>",
-        "outputs": 1,
-        "x": 306.49993896484375,
-        "y": 84,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "85add9d3.6d38c8"
-            ]
-        ]
-    },
-    {
-        "id": "3b5bd72a.fb19f8",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Lock Mock returns success'/>",
-        "comments": "",
-        "x": 388.5,
-        "y": 472,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    },
-    {
-        "id": "7bee7647.02e808",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 103.5,
-        "y": 83,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "6cc2acd4.57558c"
-            ]
-        ]
-    },
-    {
-        "id": "a726273f.d4087",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 139.41668701171875,
-        "y": 237.08334350585938,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "c733c1eb.f6dc98",
-                "8a3a4a22.8cd238",
-                "5c905e45.08ff1",
-                "ff16f6f7.bb02d",
-                "3b5bd72a.fb19f8"
-            ]
-        ]
-    },
-    {
-        "id": "c733c1eb.f6dc98",
-        "type": "execute",
-        "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 426.5,
-        "y": 222.08334350585938,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ff16f6f7.bb02d",
-        "type": "execute",
-        "name": "execute DmaapMsg",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 402.5,
-        "y": 399.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "4150232b.d9de94"
-            ]
-        ]
-    },
-    {
-        "id": "4150232b.d9de94",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 611.5,
-        "y": 397.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "1c38db15.1f052d"
-            ]
-        ]
-    },
-    {
-        "id": "f6eb674d.c21",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1506.9999389648438,
-        "y": 415.0833511352539,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "db43d1c.5a1cab"
-            ]
-        ]
-    },
-    {
-        "id": "1c38db15.1f052d",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 771.5,
-        "y": 397.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "db43d1c.5a1cab",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1628.4166870117188,
-        "y": 416.0833511352539,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5c905e45.08ff1",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$lock-input.common-header.request-id + '-' + $lock-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='lock'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$lock-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$lock-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$lock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$lock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$lock-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$lock-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$lock-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$lock-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Lock Mock returns success'/>\n",
-        "comments": "",
-        "x": 374.5,
-        "y": 331.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    },
-    {
-        "id": "8a3a4a22.8cd238",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
-        "comments": "",
-        "x": 428.5,
-        "y": 274,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    }
-]
+[\r
+    {\r
+        "id": "c36c1e82.e47c",\r
+        "type": "method",\r
+        "name": "lock",\r
+        "xml": "<method rpc='lock' mode='sync'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 530,\r
+        "y": 121,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "ea26f1ed.e963b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4c2264b2.81a61c",\r
+        "type": "service-logic",\r
+        "name": "LCM ${project.version}",\r
+        "module": "LCM",\r
+        "version": "${project.version}",\r
+        "comments": "",\r
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='LCM' version='${project.version}'>",\r
+        "outputs": 1,\r
+        "x": 300.99993896484375,\r
+        "y": 122,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "c36c1e82.e47c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a3360ab0.ce42c8",\r
+        "type": "returnSuccess",\r
+        "name": "return success",\r
+        "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Lock Mock returns success'/>",\r
+        "comments": "",\r
+        "x": 383,\r
+        "y": 510,\r
+        "z": "a439ae77.f8998",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "7e67863d.7c42f8",\r
+        "type": "dgstart",\r
+        "name": "DGSTART",\r
+        "outputs": 1,\r
+        "x": 98,\r
+        "y": 121,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "4c2264b2.81a61c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ea26f1ed.e963b",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 133.91668701171875,\r
+        "y": 275.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "f1d5fb31.fa3878",\r
+                "625601b.39b33",\r
+                "786cf009.ea481",\r
+                "cd184491.d656e8",\r
+                "a3360ab0.ce42c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f1d5fb31.fa3878",\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": 421,\r
+        "y": 260.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "cd184491.d656e8",\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": 397,\r
+        "y": 437.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "91133c94.04e29"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "91133c94.04e29",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 606,\r
+        "y": 435.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "f3b86bb6.9cf808"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f3b86bb6.9cf808",\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": 766,\r
+        "y": 435.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "786cf009.ea481",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$lock-input.common-header.request-id + '-' + $lock-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='lock'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$lock-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$lock-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$lock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$lock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$lock-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$lock-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$lock-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$lock-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Lock Mock returns success'/>\n",\r
+        "comments": "",\r
+        "x": 369,\r
+        "y": 369.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "625601b.39b33",\r
+        "type": "set",\r
+        "name": "set default status value",\r
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",\r
+        "comments": "",\r
+        "x": 423,\r
+        "y": 312,\r
+        "z": "a439ae77.f8998",\r
+        "wires": []\r
+    }\r
+]
\ No newline at end of file

diff --git a/platform-logic/lcm/src/main/json/LCM_quiesce-traffic.json b/platform-logic/lcm/src/main/json/LCM_quiesce-traffic.json
index b88d314..d6f757a 100644 (file)
--- a/platform-logic/lcm/src/main/json/LCM_quiesce-traffic.json
+++ b/platform-logic/lcm/src/main/json/LCM_quiesce-traffic.json
@@ -1,22 +1,22 @@
 [\r
     {\r
-        "id": "1a420388.7ce24c",\r
+        "id": "fab0f7ed.c486b8",\r
         "type": "method",\r
         "name": "quiesce-traffic",\r
         "xml": "<method rpc='quiesce-traffic' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 550,\r
-        "y": 102,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 480,\r
+        "y": 147,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "e635fd5d.f4087"\r
+                "5ccc8e8d.06e5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c220826b.91906",\r
+        "id": "5c791eb8.0072b",\r
         "type": "service-logic",\r
         "name": "LCM ${project.version}",\r
         "module": "LCM",\r
@@ -24,528 +24,788 @@
         "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": 337.99993896484375,\r
-        "y": 103,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 267.99993896484375,\r
+        "y": 148,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "1a420388.7ce24c"\r
+                "fab0f7ed.c486b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "810e1e54.dec1c",\r
+        "id": "3503ece1.d7ad14",\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='`$quiesce-traffic-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='`$quiesce-traffic-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.quiesce-traffic.playbookname`'/>",\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='`$quiesce-traffic-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='`$quiesce-traffic-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 345.00001525878906,\r
-        "y": 379,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 335.00001525878906,\r
+        "y": 755,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "f279f5b8.9d49b8",\r
-                "895a0a53.e12ea8",\r
-                "fa759954.4e2068"\r
+                "734b2c42.973ee4",\r
+                "bb8a76ca.fb7058",\r
+                "a457fe79.46497"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7db5396.7b5f1",\r
+        "id": "f17ff2aa.67075",\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": 690.9999389648438,\r
-        "y": 530.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 734.9999389648438,\r
+        "y": 863.0000305175781,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "bc5a2382.4973",\r
-                "84f0dd88.8438",\r
-                "ffd4aab1.e3c4b8"\r
+                "7ad5787f.1c20f8",\r
+                "b6f779a3.cc7ed8",\r
+                "f695f05e.abf31"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc5a2382.4973",\r
+        "id": "7ad5787f.1c20f8",\r
         "type": "other",\r
         "name": "outcome 500",\r
         "xml": "<outcome value='500'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 835.9999389648438,\r
-        "y": 528.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 879.9999389648438,\r
+        "y": 861.0000381469727,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84f0dd88.8438",\r
+        "id": "b6f779a3.cc7ed8",\r
         "type": "other",\r
         "name": "outcome 100",\r
         "xml": "<outcome value='100'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 838.9999389648438,\r
-        "y": 571.0000610351562,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 876.9999389648438,\r
+        "y": 918.0000305175781,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "f44a47b3.3aa128"\r
+                "1a65bc45.b2fcb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f44a47b3.3aa128",\r
+        "id": "1a65bc45.b2fcb4",\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='`$prop.lcm.quiesce-traffic.playbookname`'/>\n\t\n\n\n\n\n",\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": 1025.9999389648438,\r
-        "y": 570.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1064.9999389648438,\r
+        "y": 917.0000305175781,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "dd2fe7e6.957248",\r
-                "6913b982.6c9bb8"\r
+                "5b0d24c6.9eb0ac",\r
+                "2b5e4322.1d495c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "895a0a53.e12ea8",\r
+        "id": "bb8a76ca.fb7058",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 581.9999389648438,\r
-        "y": 439.0000534057617,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 593.9999389648438,\r
+        "y": 776.0000915527344,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f279f5b8.9d49b8",\r
+        "id": "734b2c42.973ee4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 583.9999389648438,\r
-        "y": 491.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 595.9999389648438,\r
+        "y": 828.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "f7db5396.7b5f1"\r
+                "f17ff2aa.67075"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd2fe7e6.957248",\r
+        "id": "5b0d24c6.9eb0ac",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1189.9999389648438,\r
-        "y": 542.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1233.9999389648438,\r
+        "y": 875.0000381469727,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffd4aab1.e3c4b8",\r
+        "id": "f695f05e.abf31",\r
         "type": "other",\r
         "name": "outcome 101",\r
         "xml": "<outcome value='101'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 832.9999389648438,\r
-        "y": 486.00006103515625,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 876.9999389648438,\r
+        "y": 819.0000686645508,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6913b982.6c9bb8",\r
+        "id": "2b5e4322.1d495c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1191.9999389648438,\r
-        "y": 597.0000915527344,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1241.9998779296875,\r
+        "y": 923.0001220703125,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "14c8dea1.b5b7a1"\r
+                "db1e6d62.a1404"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a32993f8.f8215",\r
+        "id": "c1a2b259.11e46",\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": 1467.9998779296875,\r
-        "y": 648.0000610351562,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1535.9998779296875,\r
+        "y": 980.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d8c3f83d.d0b9d8",\r
+        "id": "566f9779.c05d38",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 153,\r
-        "y": 102,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 83,\r
+        "y": 147,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "c220826b.91906"\r
+                "5c791eb8.0072b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e635fd5d.f4087",\r
+        "id": "5ccc8e8d.06e5",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 139.91668701171875,\r
-        "y": 241.08334350585938,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 80.91668701171875,\r
+        "y": 239.08334350585938,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "810e1e54.dec1c",\r
-                "ee1802be.c5c18",\r
-                "e8d3b31a.f46c6",\r
-                "4d7f56db.9375c8"\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
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee1802be.c5c18",\r
+        "id": "dc18f7c9.2e4ac8",\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": 328.00001525878906,\r
-        "y": 225.08334350585938,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 379.0000305175781,\r
+        "y": 272.0833435058594,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3830f5d4.87f1aa",\r
+        "id": "70d1c79a.089af8",\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": 1222.9999389648438,\r
-        "y": 371.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1545.9998779296875,\r
+        "y": 725.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "1566d659.a0655a"\r
+                "d776c76b.1dd188"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1566d659.a0655a",\r
+        "id": "d776c76b.1dd188",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1392.9998779296875,\r
-        "y": 370.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1715.9998168945312,\r
+        "y": 724.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "22f8bfd0.6139e"\r
+                "eac6c260.d11fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80cc4946.3f0f78",\r
+        "id": "2b54a991.b17b16",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1025.9998779296875,\r
-        "y": 395.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1348.9998168945312,\r
+        "y": 749.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "3830f5d4.87f1aa",\r
-                "fedbb5e6.fb3c28",\r
-                "898f667e.daf2e8"\r
+                "70d1c79a.089af8",\r
+                "7970fcd5.6f11b4",\r
+                "3d8934f9.d0339c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ce48bed.5b7c74",\r
+        "id": "e790e11b.4f947",\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": 1488.4998779296875,\r
-        "y": 597.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1546.4998779296875,\r
+        "y": 930.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "37e7fa80.2728b6"\r
+                "2e13891.034f576"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37e7fa80.2728b6",\r
+        "id": "2e13891.034f576",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1648.4998779296875,\r
-        "y": 597.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1714.4998779296875,\r
+        "y": 930.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "47c7511a.dd8fe"\r
+                "30475e40.9b8be2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22f8bfd0.6139e",\r
+        "id": "eac6c260.d11fc",\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": 1524.9998779296875,\r
-        "y": 370.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1835.9998779296875,\r
+        "y": 723.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fedbb5e6.fb3c28",\r
+        "id": "7970fcd5.6f11b4",\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": 1197.9165649414062,\r
-        "y": 408.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1527.91650390625,\r
+        "y": 776.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "47c7511a.dd8fe",\r
+        "id": "30475e40.9b8be2",\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": 1769.9166259765625,\r
-        "y": 598.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1842.9166259765625,\r
+        "y": 930.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "898f667e.daf2e8",\r
+        "id": "3d8934f9.d0339c",\r
         "type": "set",\r
-        "name": "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=\"`$quiesce-traffic-input.common-header.request-id + '-' + $quiesce-traffic-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='quiesce-traffic'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$quiesce-traffic-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$quiesce-traffic-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$quiesce-traffic-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$quiesce-traffic-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$quiesce-traffic-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$quiesce-traffic-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$quiesce-traffic-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$quiesce-traffic-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": 1174.9999389648438,\r
-        "y": 318.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1532.9998779296875,\r
+        "y": 672.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "14c8dea1.b5b7a1",\r
+        "id": "db1e6d62.a1404",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1317.9998779296875,\r
-        "y": 596.0833435058594,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1369.9998779296875,\r
+        "y": 924.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "7ce48bed.5b7c74",\r
-                "70a28c6a.563d24",\r
-                "a32993f8.f8215"\r
+                "e790e11b.4f947",\r
+                "3a3f1d44.898da2",\r
+                "c1a2b259.11e46"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70a28c6a.563d24",\r
+        "id": "3a3f1d44.898da2",\r
         "type": "set",\r
-        "name": "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=\"`$quiesce-traffic-input.common-header.request-id + '-' + $quiesce-traffic-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='quiesce-traffic'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$quiesce-traffic-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$quiesce-traffic-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$quiesce-traffic-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$quiesce-traffic-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$quiesce-traffic-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$quiesce-traffic-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$quiesce-traffic-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$quiesce-traffic-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": 1448.1666259765625,\r
-        "y": 549.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1536.1666259765625,\r
+        "y": 875.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fa759954.4e2068",\r
+        "id": "a457fe79.46497",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 577.9999389648438,\r
-        "y": 392.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 602.9999389648438,\r
+        "y": 728.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "ed41675d.59c088"\r
+                "3d4c2c9a.7b1324"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "756c2e53.ca6d7",\r
+        "id": "d512629f.bc625",\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": 1009.9999389648438,\r
-        "y": 297.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 893.9999389648438,\r
+        "y": 687,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ed41675d.59c088",\r
+        "id": "3d4c2c9a.7b1324",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 761.9999389648438,\r
-        "y": 384.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 739.9999389648438,\r
+        "y": 722.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "756c2e53.ca6d7",\r
-                "80cc4946.3f0f78"\r
+                "d512629f.bc625",\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8d3b31a.f46c6",\r
+        "id": "814875d2.cac108",\r
         "type": "set",\r
-        "name": "set default status value",\r
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",\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": 336,\r
-        "y": 269,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 372,\r
+        "y": 319,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4d7f56db.9375c8",\r
+        "id": "442dbdff.6dfcb4",\r
         "type": "get-resource",\r
-        "name": "get aai.generic-vnf by vnf-id",\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 = $quiesce-traffic-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 349.0000305175781,\r
-        "y": 325,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 912,\r
+        "y": 495,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "fa69a126.2a554",\r
-                "f9cb9963.f9e368"\r
+                "1e57cb28.122ad5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa69a126.2a554",\r
-        "type": "failure",\r
+        "id": "1e57cb28.122ad5",\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
+        "wires": [\r
+            [\r
+                "5a65efc0.bf413"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "baba22fc.1ceb5",\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
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "69e97f86.e07ef",\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
+        "wires": [\r
+            [\r
+                "e43265e9.4c7f38",\r
+                "d78c93da.7125f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e9d89bdf.30f7a8",\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='quiesce-traffic-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
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "e43265e9.4c7f38",\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
+        "wires": [\r
+            [\r
+                "abbc4ae4.be5328"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d78c93da.7125f",\r
+        "type": "outcome",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 589.86083984375,\r
-        "y": 312.53564453125,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 550.9999389648438,\r
+        "y": 460,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "2d1a88c6.11f9d8"\r
+                "f68ee407.ca6d88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9cb9963.f9e368",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
+        "id": "f68ee407.ca6d88",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 591.3908081054688,\r
-        "y": 260.28399658203125,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 698.9999389648438,\r
+        "y": 459,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "c4d4de4d.3e19f"\r
+                "442dbdff.6dfcb4",\r
+                "80c560bb.eea5f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c4d4de4d.3e19f",\r
+        "id": "abbc4ae4.be5328",\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.quiesce-traffic.playbookname`'/>\n",\r
+        "comments": "",\r
+        "x": 712,\r
+        "y": 397,\r
+        "z": "50de34e0.ace54c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "80c560bb.eea5f",\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 + '.quiesce-traffic.playbookname'`\" />\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 921,\r
+        "y": 439,\r
+        "z": "50de34e0.ace54c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "fa9a8e1f.bba53",\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
+        "wires": [\r
+            [\r
+                "1a5624d2.74e98b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1a5624d2.74e98b",\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
+        "wires": [\r
+            [\r
+                "524c17a1.30fbf8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "524c17a1.30fbf8",\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.quiesce-traffic.playbookname`'/>",\r
+        "comments": "",\r
+        "x": 712,\r
+        "y": 551,\r
+        "z": "50de34e0.ace54c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "81510405.ca8868",\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
+        "wires": [\r
+            [\r
+                "7a126f.d2de2d9",\r
+                "8743a074.e8506"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7a126f.d2de2d9",\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
+        "wires": [\r
+            [\r
+                "c954af6f.c34df"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c954af6f.c34df",\r
         "type": "set",\r
         "name": "set nodelist",\r
-        "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`\"/>\n",\r
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",\r
         "comments": "",\r
-        "x": 740.3908081054688,\r
-        "y": 259.28399658203125,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 678,\r
+        "y": 617,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2d1a88c6.11f9d8",\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='VNF not found in AAI. Nodelist retrieved from config'/>",\r
+        "id": "8743a074.e8506",\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
+        "wires": [\r
+            [\r
+                "c954af6f.c34df"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "90b2891b.001708",\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
+        "wires": [\r
+            [\r
+                "c9dd0d76.432f7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c9dd0d76.432f7",\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
+        "wires": [\r
+            [\r
+                "6ea15b2b.d9cd74"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9706bdee.6acf9",\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
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5a65efc0.bf413",\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
+        "wires": [\r
+            [\r
+                "90b2891b.001708",\r
+                "9706bdee.6acf9"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6ea15b2b.d9cd74",\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 + '.quiesce-traffic.playbookname'`\" />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 736,\r
-        "y": 312,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1746,\r
+        "y": 480,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r

diff --git a/platform-logic/lcm/src/main/json/LCM_resume-traffic.json b/platform-logic/lcm/src/main/json/LCM_resume-traffic.json
index 6024d14..405e58b 100644 (file)
--- a/platform-logic/lcm/src/main/json/LCM_resume-traffic.json
+++ b/platform-logic/lcm/src/main/json/LCM_resume-traffic.json
@@ -1,22 +1,22 @@
 [\r
     {\r
-        "id": "1a420388.7ce24c",\r
+        "id": "fab0f7ed.c486b8",\r
         "type": "method",\r
         "name": "resume-traffic",\r
         "xml": "<method rpc='resume-traffic' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 550,\r
-        "y": 102,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 480,\r
+        "y": 147,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "e635fd5d.f4087"\r
+                "5ccc8e8d.06e5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c220826b.91906",\r
+        "id": "5c791eb8.0072b",\r
         "type": "service-logic",\r
         "name": "LCM ${project.version}",\r
         "module": "LCM",\r
@@ -24,528 +24,788 @@
         "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": 337.99993896484375,\r
-        "y": 103,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 267.99993896484375,\r
+        "y": 148,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "1a420388.7ce24c"\r
+                "fab0f7ed.c486b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "810e1e54.dec1c",\r
+        "id": "3503ece1.d7ad14",\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='`$resume-traffic-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='`$resume-traffic-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.resume-traffic.playbookname`'/>",\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='`$resume-traffic-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='`$resume-traffic-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 345.00001525878906,\r
-        "y": 379,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 335.00001525878906,\r
+        "y": 755,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "f279f5b8.9d49b8",\r
-                "895a0a53.e12ea8",\r
-                "fa759954.4e2068"\r
+                "734b2c42.973ee4",\r
+                "bb8a76ca.fb7058",\r
+                "a457fe79.46497"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7db5396.7b5f1",\r
+        "id": "f17ff2aa.67075",\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": 690.9999389648438,\r
-        "y": 530.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 734.9999389648438,\r
+        "y": 863.0000305175781,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "bc5a2382.4973",\r
-                "84f0dd88.8438",\r
-                "ffd4aab1.e3c4b8"\r
+                "7ad5787f.1c20f8",\r
+                "b6f779a3.cc7ed8",\r
+                "f695f05e.abf31"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc5a2382.4973",\r
+        "id": "7ad5787f.1c20f8",\r
         "type": "other",\r
         "name": "outcome 500",\r
         "xml": "<outcome value='500'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 835.9999389648438,\r
-        "y": 528.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 879.9999389648438,\r
+        "y": 861.0000381469727,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84f0dd88.8438",\r
+        "id": "b6f779a3.cc7ed8",\r
         "type": "other",\r
         "name": "outcome 100",\r
         "xml": "<outcome value='100'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 838.9999389648438,\r
-        "y": 571.0000610351562,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 876.9999389648438,\r
+        "y": 918.0000305175781,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "f44a47b3.3aa128"\r
+                "1a65bc45.b2fcb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f44a47b3.3aa128",\r
+        "id": "1a65bc45.b2fcb4",\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='`$prop.lcm.resume-traffic.playbookname`'/>\n\t\n\n\n\n\n",\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": 1025.9999389648438,\r
-        "y": 570.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1064.9999389648438,\r
+        "y": 917.0000305175781,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "dd2fe7e6.957248",\r
-                "6913b982.6c9bb8"\r
+                "5b0d24c6.9eb0ac",\r
+                "2b5e4322.1d495c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "895a0a53.e12ea8",\r
+        "id": "bb8a76ca.fb7058",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 581.9999389648438,\r
-        "y": 439.0000534057617,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 593.9999389648438,\r
+        "y": 776.0000915527344,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f279f5b8.9d49b8",\r
+        "id": "734b2c42.973ee4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 583.9999389648438,\r
-        "y": 491.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 595.9999389648438,\r
+        "y": 828.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "f7db5396.7b5f1"\r
+                "f17ff2aa.67075"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd2fe7e6.957248",\r
+        "id": "5b0d24c6.9eb0ac",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1189.9999389648438,\r
-        "y": 542.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1233.9999389648438,\r
+        "y": 875.0000381469727,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffd4aab1.e3c4b8",\r
+        "id": "f695f05e.abf31",\r
         "type": "other",\r
         "name": "outcome 101",\r
         "xml": "<outcome value='101'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 832.9999389648438,\r
-        "y": 486.00006103515625,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 876.9999389648438,\r
+        "y": 819.0000686645508,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6913b982.6c9bb8",\r
+        "id": "2b5e4322.1d495c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1191.9999389648438,\r
-        "y": 597.0000915527344,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1241.9998779296875,\r
+        "y": 923.0001220703125,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "14c8dea1.b5b7a1"\r
+                "db1e6d62.a1404"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a32993f8.f8215",\r
+        "id": "c1a2b259.11e46",\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": 1467.9998779296875,\r
-        "y": 648.0000610351562,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1535.9998779296875,\r
+        "y": 980.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d8c3f83d.d0b9d8",\r
+        "id": "566f9779.c05d38",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 153,\r
-        "y": 102,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 83,\r
+        "y": 147,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "c220826b.91906"\r
+                "5c791eb8.0072b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e635fd5d.f4087",\r
+        "id": "5ccc8e8d.06e5",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 139.91668701171875,\r
-        "y": 241.08334350585938,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 80.91668701171875,\r
+        "y": 239.08334350585938,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "810e1e54.dec1c",\r
-                "ee1802be.c5c18",\r
-                "e8d3b31a.f46c6",\r
-                "4d7f56db.9375c8"\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
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee1802be.c5c18",\r
+        "id": "dc18f7c9.2e4ac8",\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": 328.00001525878906,\r
-        "y": 225.08334350585938,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 379.0000305175781,\r
+        "y": 272.0833435058594,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3830f5d4.87f1aa",\r
+        "id": "70d1c79a.089af8",\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": 1222.9999389648438,\r
-        "y": 371.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1545.9998779296875,\r
+        "y": 725.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "1566d659.a0655a"\r
+                "d776c76b.1dd188"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1566d659.a0655a",\r
+        "id": "d776c76b.1dd188",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1392.9998779296875,\r
-        "y": 370.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1715.9998168945312,\r
+        "y": 724.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "22f8bfd0.6139e"\r
+                "eac6c260.d11fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80cc4946.3f0f78",\r
+        "id": "2b54a991.b17b16",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1025.9998779296875,\r
-        "y": 395.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1348.9998168945312,\r
+        "y": 749.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "3830f5d4.87f1aa",\r
-                "fedbb5e6.fb3c28",\r
-                "898f667e.daf2e8"\r
+                "70d1c79a.089af8",\r
+                "7970fcd5.6f11b4",\r
+                "3d8934f9.d0339c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ce48bed.5b7c74",\r
+        "id": "e790e11b.4f947",\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": 1488.4998779296875,\r
-        "y": 597.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1546.4998779296875,\r
+        "y": 930.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "37e7fa80.2728b6"\r
+                "2e13891.034f576"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37e7fa80.2728b6",\r
+        "id": "2e13891.034f576",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1648.4998779296875,\r
-        "y": 597.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1714.4998779296875,\r
+        "y": 930.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "47c7511a.dd8fe"\r
+                "30475e40.9b8be2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22f8bfd0.6139e",\r
+        "id": "eac6c260.d11fc",\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": 1524.9998779296875,\r
-        "y": 370.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1835.9998779296875,\r
+        "y": 723.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fedbb5e6.fb3c28",\r
+        "id": "7970fcd5.6f11b4",\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": 1197.9165649414062,\r
-        "y": 408.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1527.91650390625,\r
+        "y": 776.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "47c7511a.dd8fe",\r
+        "id": "30475e40.9b8be2",\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": 1769.9166259765625,\r
-        "y": 598.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1842.9166259765625,\r
+        "y": 930.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "898f667e.daf2e8",\r
+        "id": "3d8934f9.d0339c",\r
         "type": "set",\r
-        "name": "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=\"`$resume-traffic-input.common-header.request-id + '-' + $resume-traffic-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='resume-traffic'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$resume-traffic-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$resume-traffic-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$resume-traffic-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$resume-traffic-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$resume-traffic-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$resume-traffic-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$resume-traffic-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$resume-traffic-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": 1174.9999389648438,\r
-        "y": 318.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1532.9998779296875,\r
+        "y": 672.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "14c8dea1.b5b7a1",\r
+        "id": "db1e6d62.a1404",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1317.9998779296875,\r
-        "y": 596.0833435058594,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1369.9998779296875,\r
+        "y": 924.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "7ce48bed.5b7c74",\r
-                "70a28c6a.563d24",\r
-                "a32993f8.f8215"\r
+                "e790e11b.4f947",\r
+                "3a3f1d44.898da2",\r
+                "c1a2b259.11e46"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70a28c6a.563d24",\r
+        "id": "3a3f1d44.898da2",\r
         "type": "set",\r
-        "name": "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=\"`$resume-traffic-input.common-header.request-id + '-' + $resume-traffic-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='resume-traffic'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$resume-traffic-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$resume-traffic-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$resume-traffic-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$resume-traffic-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$resume-traffic-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$resume-traffic-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$resume-traffic-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$resume-traffic-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": 1448.1666259765625,\r
-        "y": 549.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1536.1666259765625,\r
+        "y": 875.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fa759954.4e2068",\r
+        "id": "a457fe79.46497",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 577.9999389648438,\r
-        "y": 392.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 602.9999389648438,\r
+        "y": 728.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "ed41675d.59c088"\r
+                "3d4c2c9a.7b1324"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "756c2e53.ca6d7",\r
+        "id": "d512629f.bc625",\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": 1009.9999389648438,\r
-        "y": 297.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 893.9999389648438,\r
+        "y": 687,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ed41675d.59c088",\r
+        "id": "3d4c2c9a.7b1324",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 761.9999389648438,\r
-        "y": 384.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 739.9999389648438,\r
+        "y": 722.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "756c2e53.ca6d7",\r
-                "80cc4946.3f0f78"\r
+                "d512629f.bc625",\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8d3b31a.f46c6",\r
+        "id": "814875d2.cac108",\r
         "type": "set",\r
-        "name": "set default status value",\r
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",\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": 336,\r
-        "y": 269,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 372,\r
+        "y": 319,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4d7f56db.9375c8",\r
+        "id": "442dbdff.6dfcb4",\r
         "type": "get-resource",\r
-        "name": "get aai.generic-vnf by vnf-id",\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 = $resume-traffic-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 349.0000305175781,\r
-        "y": 325,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 912,\r
+        "y": 495,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "fa69a126.2a554",\r
-                "f9cb9963.f9e368"\r
+                "1e57cb28.122ad5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa69a126.2a554",\r
-        "type": "failure",\r
+        "id": "1e57cb28.122ad5",\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
+        "wires": [\r
+            [\r
+                "5a65efc0.bf413"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "baba22fc.1ceb5",\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
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "69e97f86.e07ef",\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
+        "wires": [\r
+            [\r
+                "e43265e9.4c7f38",\r
+                "d78c93da.7125f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e9d89bdf.30f7a8",\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='resume-traffic-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
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "e43265e9.4c7f38",\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
+        "wires": [\r
+            [\r
+                "abbc4ae4.be5328"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d78c93da.7125f",\r
+        "type": "outcome",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 589.86083984375,\r
-        "y": 312.53564453125,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 550.9999389648438,\r
+        "y": 460,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "2d1a88c6.11f9d8"\r
+                "f68ee407.ca6d88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9cb9963.f9e368",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
+        "id": "f68ee407.ca6d88",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 591.3908081054688,\r
-        "y": 260.28399658203125,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 698.9999389648438,\r
+        "y": 459,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "c4d4de4d.3e19f"\r
+                "442dbdff.6dfcb4",\r
+                "80c560bb.eea5f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c4d4de4d.3e19f",\r
+        "id": "abbc4ae4.be5328",\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.resume-traffic.playbookname`'/>\n",\r
+        "comments": "",\r
+        "x": 712,\r
+        "y": 397,\r
+        "z": "50de34e0.ace54c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "80c560bb.eea5f",\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 + '.resume-traffic.playbookname'`\" />\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 921,\r
+        "y": 439,\r
+        "z": "50de34e0.ace54c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "fa9a8e1f.bba53",\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
+        "wires": [\r
+            [\r
+                "1a5624d2.74e98b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1a5624d2.74e98b",\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
+        "wires": [\r
+            [\r
+                "524c17a1.30fbf8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "524c17a1.30fbf8",\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.resume-traffic.playbookname`'/>",\r
+        "comments": "",\r
+        "x": 712,\r
+        "y": 551,\r
+        "z": "50de34e0.ace54c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "81510405.ca8868",\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
+        "wires": [\r
+            [\r
+                "7a126f.d2de2d9",\r
+                "8743a074.e8506"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7a126f.d2de2d9",\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
+        "wires": [\r
+            [\r
+                "c954af6f.c34df"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c954af6f.c34df",\r
         "type": "set",\r
         "name": "set nodelist",\r
-        "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`\"/>\n",\r
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",\r
         "comments": "",\r
-        "x": 740.3908081054688,\r
-        "y": 259.28399658203125,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 678,\r
+        "y": 617,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2d1a88c6.11f9d8",\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='VNF not found in AAI. Nodelist retrieved from config'/>",\r
+        "id": "8743a074.e8506",\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
+        "wires": [\r
+            [\r
+                "c954af6f.c34df"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "90b2891b.001708",\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
+        "wires": [\r
+            [\r
+                "c9dd0d76.432f7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c9dd0d76.432f7",\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
+        "wires": [\r
+            [\r
+                "6ea15b2b.d9cd74"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9706bdee.6acf9",\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
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5a65efc0.bf413",\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
+        "wires": [\r
+            [\r
+                "90b2891b.001708",\r
+                "9706bdee.6acf9"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6ea15b2b.d9cd74",\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 + '.resume-traffic.playbookname'`\" />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 736,\r
-        "y": 312,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1746,\r
+        "y": 480,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r

diff --git a/platform-logic/lcm/src/main/json/LCM_snapshot.json b/platform-logic/lcm/src/main/json/LCM_snapshot.json
index 549425c..76bb844 100644 (file)
--- a/platform-logic/lcm/src/main/json/LCM_snapshot.json
+++ b/platform-logic/lcm/src/main/json/LCM_snapshot.json
@@ -1,194 +1,164 @@
-[
-    {
-        "id": "85add9d3.6d38c8",
-        "type": "method",
-        "name": "snapshot",
-        "xml": "<method rpc='snapshot' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 535.5,
-        "y": 83,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "a726273f.d4087"
-            ]
-        ]
-    },
-    {
-        "id": "6cc2acd4.57558c",
-        "type": "service-logic",
-        "name": "LCM ${project.version}",
-        "module": "LCM",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='LCM' version='${project.version}'>",
-        "outputs": 1,
-        "x": 306.49993896484375,
-        "y": 84,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "85add9d3.6d38c8"
-            ]
-        ]
-    },
-    {
-        "id": "3b5bd72a.fb19f8",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Lock Mock returns success'/>",
-        "comments": "",
-        "x": 388.5,
-        "y": 472,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    },
-    {
-        "id": "7bee7647.02e808",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 103.5,
-        "y": 83,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "6cc2acd4.57558c"
-            ]
-        ]
-    },
-    {
-        "id": "a726273f.d4087",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 139.41668701171875,
-        "y": 237.08334350585938,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "c733c1eb.f6dc98",
-                "8a3a4a22.8cd238",
-                "5c905e45.08ff1",
-                "ff16f6f7.bb02d",
-                "3b5bd72a.fb19f8"
-            ]
-        ]
-    },
-    {
-        "id": "c733c1eb.f6dc98",
-        "type": "execute",
-        "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 426.5,
-        "y": 222.08334350585938,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ff16f6f7.bb02d",
-        "type": "execute",
-        "name": "execute DmaapMsg",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 402.5,
-        "y": 399.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "4150232b.d9de94"
-            ]
-        ]
-    },
-    {
-        "id": "4150232b.d9de94",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 611.5,
-        "y": 397.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "1c38db15.1f052d"
-            ]
-        ]
-    },
-    {
-        "id": "f6eb674d.c21",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1506.9999389648438,
-        "y": 415.0833511352539,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "db43d1c.5a1cab"
-            ]
-        ]
-    },
-    {
-        "id": "1c38db15.1f052d",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 771.5,
-        "y": 397.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "db43d1c.5a1cab",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1628.4166870117188,
-        "y": 416.0833511352539,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5c905e45.08ff1",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$snapshot-input.common-header.request-id + '-' + $snapshot-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='snapshot'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$snapshot-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$snapshot-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$snapshot-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$snapshot-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$snapshot-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$snapshot-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$snapshot-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$snapshot-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Snapshot Mock returns success'/>\n",
-        "comments": "",
-        "x": 374.5,
-        "y": 331.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    },
-    {
-        "id": "8a3a4a22.8cd238",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
-        "comments": "",
-        "x": 428.5,
-        "y": 274,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    }
-]
+[\r
+    {\r
+        "id": "c36c1e82.e47c",\r
+        "type": "method",\r
+        "name": "snapshot",\r
+        "xml": "<method rpc='snapshot' mode='sync'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 530,\r
+        "y": 121,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "ea26f1ed.e963b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4c2264b2.81a61c",\r
+        "type": "service-logic",\r
+        "name": "LCM ${project.version}",\r
+        "module": "LCM",\r
+        "version": "${project.version}",\r
+        "comments": "",\r
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='LCM' version='${project.version}'>",\r
+        "outputs": 1,\r
+        "x": 300.99993896484375,\r
+        "y": 122,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "c36c1e82.e47c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a3360ab0.ce42c8",\r
+        "type": "returnSuccess",\r
+        "name": "return success",\r
+        "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Snapshot Mock returns success'/>",\r
+        "comments": "",\r
+        "x": 383,\r
+        "y": 510,\r
+        "z": "a439ae77.f8998",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "7e67863d.7c42f8",\r
+        "type": "dgstart",\r
+        "name": "DGSTART",\r
+        "outputs": 1,\r
+        "x": 98,\r
+        "y": 121,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "4c2264b2.81a61c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ea26f1ed.e963b",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 133.91668701171875,\r
+        "y": 275.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "f1d5fb31.fa3878",\r
+                "625601b.39b33",\r
+                "786cf009.ea481",\r
+                "cd184491.d656e8",\r
+                "a3360ab0.ce42c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f1d5fb31.fa3878",\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": 421,\r
+        "y": 260.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "cd184491.d656e8",\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": 397,\r
+        "y": 437.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "91133c94.04e29"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "91133c94.04e29",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 606,\r
+        "y": 435.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "f3b86bb6.9cf808"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f3b86bb6.9cf808",\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": 766,\r
+        "y": 435.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "786cf009.ea481",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$snapshot-input.common-header.request-id + '-' + $snapshot-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='snapshot'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$snapshot-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$snapshot-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$snapshot-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$snapshot-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$snapshot-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$snapshot-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$snapshot-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$snapshot-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Snapshot Mock returns success'/>\n",\r
+        "comments": "",\r
+        "x": 369,\r
+        "y": 369.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "625601b.39b33",\r
+        "type": "set",\r
+        "name": "set default status value",\r
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",\r
+        "comments": "",\r
+        "x": 423,\r
+        "y": 312,\r
+        "z": "a439ae77.f8998",\r
+        "wires": []\r
+    }\r
+]
\ No newline at end of file

diff --git a/platform-logic/lcm/src/main/json/LCM_unlock.json b/platform-logic/lcm/src/main/json/LCM_unlock.json
index 827259d..98d391d 100644 (file)
--- a/platform-logic/lcm/src/main/json/LCM_unlock.json
+++ b/platform-logic/lcm/src/main/json/LCM_unlock.json
@@ -1,194 +1,164 @@
-[
-    {
-        "id": "85add9d3.6d38c8",
-        "type": "method",
-        "name": "unlock",
-        "xml": "<method rpc='unlock' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 535.5,
-        "y": 83,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "a726273f.d4087"
-            ]
-        ]
-    },
-    {
-        "id": "6cc2acd4.57558c",
-        "type": "service-logic",
-        "name": "LCM ${project.version}",
-        "module": "LCM",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='LCM' version='${project.version}'>",
-        "outputs": 1,
-        "x": 306.49993896484375,
-        "y": 84,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "85add9d3.6d38c8"
-            ]
-        ]
-    },
-    {
-        "id": "3b5bd72a.fb19f8",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Unlock Mock returns success'/>",
-        "comments": "",
-        "x": 388.5,
-        "y": 472,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    },
-    {
-        "id": "7bee7647.02e808",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 103.5,
-        "y": 83,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "6cc2acd4.57558c"
-            ]
-        ]
-    },
-    {
-        "id": "a726273f.d4087",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 139.41668701171875,
-        "y": 237.08334350585938,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "c733c1eb.f6dc98",
-                "8a3a4a22.8cd238",
-                "5c905e45.08ff1",
-                "ff16f6f7.bb02d",
-                "3b5bd72a.fb19f8"
-            ]
-        ]
-    },
-    {
-        "id": "c733c1eb.f6dc98",
-        "type": "execute",
-        "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 426.5,
-        "y": 222.08334350585938,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ff16f6f7.bb02d",
-        "type": "execute",
-        "name": "execute DmaapMsg",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 402.5,
-        "y": 399.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "4150232b.d9de94"
-            ]
-        ]
-    },
-    {
-        "id": "4150232b.d9de94",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 611.5,
-        "y": 397.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "1c38db15.1f052d"
-            ]
-        ]
-    },
-    {
-        "id": "f6eb674d.c21",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1506.9999389648438,
-        "y": 415.0833511352539,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "db43d1c.5a1cab"
-            ]
-        ]
-    },
-    {
-        "id": "1c38db15.1f052d",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 771.5,
-        "y": 397.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "db43d1c.5a1cab",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1628.4166870117188,
-        "y": 416.0833511352539,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5c905e45.08ff1",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$unlock-input.common-header.request-id + '-' + $unlock-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='unlock'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$unlock-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$unlock-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$unlock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$unlock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$unlock-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$unlock-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$unlock-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$unlock-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Lock Mock returns success'/>\n",
-        "comments": "",
-        "x": 374.5,
-        "y": 331.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    },
-    {
-        "id": "8a3a4a22.8cd238",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
-        "comments": "",
-        "x": 428.5,
-        "y": 274,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    }
-]
+[\r
+    {\r
+        "id": "c36c1e82.e47c",\r
+        "type": "method",\r
+        "name": "unlock",\r
+        "xml": "<method rpc='unlock' mode='sync'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 530,\r
+        "y": 121,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "ea26f1ed.e963b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4c2264b2.81a61c",\r
+        "type": "service-logic",\r
+        "name": "LCM ${project.version}",\r
+        "module": "LCM",\r
+        "version": "${project.version}",\r
+        "comments": "",\r
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='LCM' version='${project.version}'>",\r
+        "outputs": 1,\r
+        "x": 300.99993896484375,\r
+        "y": 122,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "c36c1e82.e47c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a3360ab0.ce42c8",\r
+        "type": "returnSuccess",\r
+        "name": "return success",\r
+        "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Unlock Mock returns success'/>",\r
+        "comments": "",\r
+        "x": 383,\r
+        "y": 510,\r
+        "z": "a439ae77.f8998",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "7e67863d.7c42f8",\r
+        "type": "dgstart",\r
+        "name": "DGSTART",\r
+        "outputs": 1,\r
+        "x": 98,\r
+        "y": 121,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "4c2264b2.81a61c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ea26f1ed.e963b",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 133.91668701171875,\r
+        "y": 275.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "f1d5fb31.fa3878",\r
+                "625601b.39b33",\r
+                "786cf009.ea481",\r
+                "cd184491.d656e8",\r
+                "a3360ab0.ce42c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f1d5fb31.fa3878",\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": 421,\r
+        "y": 260.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "cd184491.d656e8",\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": 397,\r
+        "y": 437.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "91133c94.04e29"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "91133c94.04e29",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 606,\r
+        "y": 435.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "f3b86bb6.9cf808"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f3b86bb6.9cf808",\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": 766,\r
+        "y": 435.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "786cf009.ea481",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$unlock-input.common-header.request-id + '-' + $unlock-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='unlock'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$unlock-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$unlock-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$unlock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$unlock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$unlock-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$unlock-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$unlock-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$unlock-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Unlock Mock returns success'/>\n",\r
+        "comments": "",\r
+        "x": 369,\r
+        "y": 369.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "625601b.39b33",\r
+        "type": "set",\r
+        "name": "set default status value",\r
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",\r
+        "comments": "",\r
+        "x": 423,\r
+        "y": 312,\r
+        "z": "a439ae77.f8998",\r
+        "wires": []\r
+    }\r
+]
\ No newline at end of file

diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-backup.json b/platform-logic/lcm/src/main/json/LCM_upgrade-backup.json
index 42534d6..d45b3d1 100644 (file)
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-backup.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-backup.json
@@ -1,194 +1,164 @@
-[
-    {
-        "id": "85add9d3.6d38c8",
-        "type": "method",
-        "name": "upgrade-backup",
-        "xml": "<method rpc='upgrade-backup' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 535.5,
-        "y": 83,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "a726273f.d4087"
-            ]
-        ]
-    },
-    {
-        "id": "6cc2acd4.57558c",
-        "type": "service-logic",
-        "name": "LCM ${project.version}",
-        "module": "LCM",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='LCM' version='${project.version}'>",
-        "outputs": 1,
-        "x": 306.49993896484375,
-        "y": 84,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "85add9d3.6d38c8"
-            ]
-        ]
-    },
-    {
-        "id": "3b5bd72a.fb19f8",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Lock Mock returns success'/>",
-        "comments": "",
-        "x": 388.5,
-        "y": 472,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    },
-    {
-        "id": "7bee7647.02e808",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 103.5,
-        "y": 83,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "6cc2acd4.57558c"
-            ]
-        ]
-    },
-    {
-        "id": "a726273f.d4087",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 139.41668701171875,
-        "y": 237.08334350585938,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "c733c1eb.f6dc98",
-                "8a3a4a22.8cd238",
-                "5c905e45.08ff1",
-                "ff16f6f7.bb02d",
-                "3b5bd72a.fb19f8"
-            ]
-        ]
-    },
-    {
-        "id": "c733c1eb.f6dc98",
-        "type": "execute",
-        "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 426.5,
-        "y": 222.08334350585938,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ff16f6f7.bb02d",
-        "type": "execute",
-        "name": "execute DmaapMsg",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 402.5,
-        "y": 399.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "4150232b.d9de94"
-            ]
-        ]
-    },
-    {
-        "id": "4150232b.d9de94",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 611.5,
-        "y": 397.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "1c38db15.1f052d"
-            ]
-        ]
-    },
-    {
-        "id": "f6eb674d.c21",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1506.9999389648438,
-        "y": 415.0833511352539,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "db43d1c.5a1cab"
-            ]
-        ]
-    },
-    {
-        "id": "1c38db15.1f052d",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 771.5,
-        "y": 397.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "db43d1c.5a1cab",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1628.4166870117188,
-        "y": 416.0833511352539,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5c905e45.08ff1",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-backup-input.common-header.request-id + '-' + $upgrade-backup-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-backup'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-backup-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-backup-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-backup-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-backup-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-backup-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-backup-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-backup-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-backup-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Upgrade-backup Mock returns success'/>\n",
-        "comments": "",
-        "x": 374.5,
-        "y": 331.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    },
-    {
-        "id": "8a3a4a22.8cd238",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
-        "comments": "",
-        "x": 428.5,
-        "y": 274,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    }
-]
+[\r
+    {\r
+        "id": "c36c1e82.e47c",\r
+        "type": "method",\r
+        "name": "upgrade-backup",\r
+        "xml": "<method rpc='upgrade-backup' mode='sync'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 530,\r
+        "y": 121,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "ea26f1ed.e963b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4c2264b2.81a61c",\r
+        "type": "service-logic",\r
+        "name": "LCM ${project.version}",\r
+        "module": "LCM",\r
+        "version": "${project.version}",\r
+        "comments": "",\r
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='LCM' version='${project.version}'>",\r
+        "outputs": 1,\r
+        "x": 300.99993896484375,\r
+        "y": 122,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "c36c1e82.e47c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a3360ab0.ce42c8",\r
+        "type": "returnSuccess",\r
+        "name": "return success",\r
+        "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Upgrade-backup Mock returns success'/>",\r
+        "comments": "",\r
+        "x": 383,\r
+        "y": 510,\r
+        "z": "a439ae77.f8998",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "7e67863d.7c42f8",\r
+        "type": "dgstart",\r
+        "name": "DGSTART",\r
+        "outputs": 1,\r
+        "x": 98,\r
+        "y": 121,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "4c2264b2.81a61c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ea26f1ed.e963b",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 133.91668701171875,\r
+        "y": 275.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "f1d5fb31.fa3878",\r
+                "625601b.39b33",\r
+                "786cf009.ea481",\r
+                "cd184491.d656e8",\r
+                "a3360ab0.ce42c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f1d5fb31.fa3878",\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": 421,\r
+        "y": 260.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "cd184491.d656e8",\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": 397,\r
+        "y": 437.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "91133c94.04e29"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "91133c94.04e29",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 606,\r
+        "y": 435.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            [\r
+                "f3b86bb6.9cf808"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f3b86bb6.9cf808",\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": 766,\r
+        "y": 435.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "786cf009.ea481",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-backup-input.common-header.request-id + '-' + $upgrade-backup-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-backup'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-backup-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-backup-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-backup-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-backup-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-backup-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-backup-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-backup-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-backup-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Upgrade-backup Mock returns success'/>\n",\r
+        "comments": "",\r
+        "x": 369,\r
+        "y": 369.0833435058594,\r
+        "z": "a439ae77.f8998",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "625601b.39b33",\r
+        "type": "set",\r
+        "name": "set default status value",\r
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",\r
+        "comments": "",\r
+        "x": 423,\r
+        "y": 312,\r
+        "z": "a439ae77.f8998",\r
+        "wires": []\r
+    }\r
+]
\ No newline at end of file

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 60fe6a6..3808648 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,22 +1,22 @@
 [\r
     {\r
-        "id": "1a420388.7ce24c",\r
+        "id": "fab0f7ed.c486b8",\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": 550,\r
-        "y": 102,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 480,\r
+        "y": 147,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "e635fd5d.f4087"\r
+                "5ccc8e8d.06e5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c220826b.91906",\r
+        "id": "5c791eb8.0072b",\r
         "type": "service-logic",\r
         "name": "LCM ${project.version}",\r
         "module": "LCM",\r
@@ -24,528 +24,788 @@
         "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": 337.99993896484375,\r
-        "y": 103,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 267.99993896484375,\r
+        "y": 148,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "1a420388.7ce24c"\r
+                "fab0f7ed.c486b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "810e1e54.dec1c",\r
+        "id": "3503ece1.d7ad14",\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='`$prop.lcm.upgrade-post-check.playbookname`'/>",\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": 345.00001525878906,\r
-        "y": 379,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 335.00001525878906,\r
+        "y": 755,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "f279f5b8.9d49b8",\r
-                "895a0a53.e12ea8",\r
-                "fa759954.4e2068"\r
+                "734b2c42.973ee4",\r
+                "bb8a76ca.fb7058",\r
+                "a457fe79.46497"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7db5396.7b5f1",\r
+        "id": "f17ff2aa.67075",\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": 690.9999389648438,\r
-        "y": 530.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 734.9999389648438,\r
+        "y": 863.0000305175781,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "bc5a2382.4973",\r
-                "84f0dd88.8438",\r
-                "ffd4aab1.e3c4b8"\r
+                "7ad5787f.1c20f8",\r
+                "b6f779a3.cc7ed8",\r
+                "f695f05e.abf31"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc5a2382.4973",\r
+        "id": "7ad5787f.1c20f8",\r
         "type": "other",\r
         "name": "outcome 500",\r
         "xml": "<outcome value='500'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 835.9999389648438,\r
-        "y": 528.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 879.9999389648438,\r
+        "y": 861.0000381469727,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84f0dd88.8438",\r
+        "id": "b6f779a3.cc7ed8",\r
         "type": "other",\r
         "name": "outcome 100",\r
         "xml": "<outcome value='100'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 838.9999389648438,\r
-        "y": 571.0000610351562,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 876.9999389648438,\r
+        "y": 918.0000305175781,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "f44a47b3.3aa128"\r
+                "1a65bc45.b2fcb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f44a47b3.3aa128",\r
+        "id": "1a65bc45.b2fcb4",\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='`$prop.lcm.upgrade-post-check.playbookname`'/>\n\t\n\n\n\n\n",\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": 1025.9999389648438,\r
-        "y": 570.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1064.9999389648438,\r
+        "y": 917.0000305175781,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "dd2fe7e6.957248",\r
-                "6913b982.6c9bb8"\r
+                "5b0d24c6.9eb0ac",\r
+                "2b5e4322.1d495c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "895a0a53.e12ea8",\r
+        "id": "bb8a76ca.fb7058",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 581.9999389648438,\r
-        "y": 439.0000534057617,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 593.9999389648438,\r
+        "y": 776.0000915527344,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f279f5b8.9d49b8",\r
+        "id": "734b2c42.973ee4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 583.9999389648438,\r
-        "y": 491.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 595.9999389648438,\r
+        "y": 828.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "f7db5396.7b5f1"\r
+                "f17ff2aa.67075"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd2fe7e6.957248",\r
+        "id": "5b0d24c6.9eb0ac",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1189.9999389648438,\r
-        "y": 542.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1233.9999389648438,\r
+        "y": 875.0000381469727,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffd4aab1.e3c4b8",\r
+        "id": "f695f05e.abf31",\r
         "type": "other",\r
         "name": "outcome 101",\r
         "xml": "<outcome value='101'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 832.9999389648438,\r
-        "y": 486.00006103515625,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 876.9999389648438,\r
+        "y": 819.0000686645508,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6913b982.6c9bb8",\r
+        "id": "2b5e4322.1d495c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1191.9999389648438,\r
-        "y": 597.0000915527344,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1241.9998779296875,\r
+        "y": 923.0001220703125,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "14c8dea1.b5b7a1"\r
+                "db1e6d62.a1404"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a32993f8.f8215",\r
+        "id": "c1a2b259.11e46",\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": 1467.9998779296875,\r
-        "y": 648.0000610351562,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1535.9998779296875,\r
+        "y": 980.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d8c3f83d.d0b9d8",\r
+        "id": "566f9779.c05d38",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 153,\r
-        "y": 102,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 83,\r
+        "y": 147,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "c220826b.91906"\r
+                "5c791eb8.0072b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e635fd5d.f4087",\r
+        "id": "5ccc8e8d.06e5",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 139.91668701171875,\r
-        "y": 241.08334350585938,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 80.91668701171875,\r
+        "y": 239.08334350585938,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "810e1e54.dec1c",\r
-                "ee1802be.c5c18",\r
-                "e8d3b31a.f46c6",\r
-                "4d7f56db.9375c8"\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
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee1802be.c5c18",\r
+        "id": "dc18f7c9.2e4ac8",\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": 328.00001525878906,\r
-        "y": 225.08334350585938,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 379.0000305175781,\r
+        "y": 272.0833435058594,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3830f5d4.87f1aa",\r
+        "id": "70d1c79a.089af8",\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": 1222.9999389648438,\r
-        "y": 371.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1545.9998779296875,\r
+        "y": 725.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "1566d659.a0655a"\r
+                "d776c76b.1dd188"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1566d659.a0655a",\r
+        "id": "d776c76b.1dd188",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1392.9998779296875,\r
-        "y": 370.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1715.9998168945312,\r
+        "y": 724.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "22f8bfd0.6139e"\r
+                "eac6c260.d11fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80cc4946.3f0f78",\r
+        "id": "2b54a991.b17b16",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1025.9998779296875,\r
-        "y": 395.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1348.9998168945312,\r
+        "y": 749.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "3830f5d4.87f1aa",\r
-                "fedbb5e6.fb3c28",\r
-                "898f667e.daf2e8"\r
+                "70d1c79a.089af8",\r
+                "7970fcd5.6f11b4",\r
+                "3d8934f9.d0339c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ce48bed.5b7c74",\r
+        "id": "e790e11b.4f947",\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": 1488.4998779296875,\r
-        "y": 597.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1546.4998779296875,\r
+        "y": 930.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "37e7fa80.2728b6"\r
+                "2e13891.034f576"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37e7fa80.2728b6",\r
+        "id": "2e13891.034f576",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1648.4998779296875,\r
-        "y": 597.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1714.4998779296875,\r
+        "y": 930.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "47c7511a.dd8fe"\r
+                "30475e40.9b8be2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22f8bfd0.6139e",\r
+        "id": "eac6c260.d11fc",\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": 1524.9998779296875,\r
-        "y": 370.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1835.9998779296875,\r
+        "y": 723.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fedbb5e6.fb3c28",\r
+        "id": "7970fcd5.6f11b4",\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": 1197.9165649414062,\r
-        "y": 408.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1527.91650390625,\r
+        "y": 776.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "47c7511a.dd8fe",\r
+        "id": "30475e40.9b8be2",\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": 1769.9166259765625,\r
-        "y": 598.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1842.9166259765625,\r
+        "y": 930.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "898f667e.daf2e8",\r
+        "id": "3d8934f9.d0339c",\r
         "type": "set",\r
-        "name": "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": 1174.9999389648438,\r
-        "y": 318.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1532.9998779296875,\r
+        "y": 672.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "14c8dea1.b5b7a1",\r
+        "id": "db1e6d62.a1404",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1317.9998779296875,\r
-        "y": 596.0833435058594,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1369.9998779296875,\r
+        "y": 924.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "7ce48bed.5b7c74",\r
-                "70a28c6a.563d24",\r
-                "a32993f8.f8215"\r
+                "e790e11b.4f947",\r
+                "3a3f1d44.898da2",\r
+                "c1a2b259.11e46"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70a28c6a.563d24",\r
+        "id": "3a3f1d44.898da2",\r
         "type": "set",\r
-        "name": "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": 1448.1666259765625,\r
-        "y": 549.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1536.1666259765625,\r
+        "y": 875.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fa759954.4e2068",\r
+        "id": "a457fe79.46497",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 577.9999389648438,\r
-        "y": 392.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 602.9999389648438,\r
+        "y": 728.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "ed41675d.59c088"\r
+                "3d4c2c9a.7b1324"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "756c2e53.ca6d7",\r
+        "id": "d512629f.bc625",\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": 1009.9999389648438,\r
-        "y": 297.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 893.9999389648438,\r
+        "y": 687,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ed41675d.59c088",\r
+        "id": "3d4c2c9a.7b1324",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 761.9999389648438,\r
-        "y": 384.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 739.9999389648438,\r
+        "y": 722.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "756c2e53.ca6d7",\r
-                "80cc4946.3f0f78"\r
+                "d512629f.bc625",\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8d3b31a.f46c6",\r
+        "id": "814875d2.cac108",\r
         "type": "set",\r
-        "name": "set default status value",\r
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",\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": 336,\r
-        "y": 269,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 372,\r
+        "y": 319,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4d7f56db.9375c8",\r
+        "id": "442dbdff.6dfcb4",\r
         "type": "get-resource",\r
-        "name": "get aai.generic-vnf by vnf-id",\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": 349.0000305175781,\r
-        "y": 325,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 912,\r
+        "y": 495,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "fa69a126.2a554",\r
-                "f9cb9963.f9e368"\r
+                "1e57cb28.122ad5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa69a126.2a554",\r
-        "type": "failure",\r
+        "id": "1e57cb28.122ad5",\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
+        "wires": [\r
+            [\r
+                "5a65efc0.bf413"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "baba22fc.1ceb5",\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
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "69e97f86.e07ef",\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
+        "wires": [\r
+            [\r
+                "e43265e9.4c7f38",\r
+                "d78c93da.7125f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e9d89bdf.30f7a8",\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": 386,\r
+        "y": 366,\r
+        "z": "50de34e0.ace54c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "e43265e9.4c7f38",\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
+        "wires": [\r
+            [\r
+                "abbc4ae4.be5328"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d78c93da.7125f",\r
+        "type": "outcome",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 589.86083984375,\r
-        "y": 312.53564453125,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 550.9999389648438,\r
+        "y": 460,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "2d1a88c6.11f9d8"\r
+                "f68ee407.ca6d88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9cb9963.f9e368",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
+        "id": "f68ee407.ca6d88",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 591.3908081054688,\r
-        "y": 260.28399658203125,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 698.9999389648438,\r
+        "y": 459,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "c4d4de4d.3e19f"\r
+                "442dbdff.6dfcb4",\r
+                "80c560bb.eea5f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c4d4de4d.3e19f",\r
+        "id": "abbc4ae4.be5328",\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": 712,\r
+        "y": 397,\r
+        "z": "50de34e0.ace54c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "80c560bb.eea5f",\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": 921,\r
+        "y": 439,\r
+        "z": "50de34e0.ace54c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "fa9a8e1f.bba53",\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
+        "wires": [\r
+            [\r
+                "1a5624d2.74e98b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1a5624d2.74e98b",\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
+        "wires": [\r
+            [\r
+                "524c17a1.30fbf8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "524c17a1.30fbf8",\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
+        "comments": "",\r
+        "x": 712,\r
+        "y": 551,\r
+        "z": "50de34e0.ace54c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "81510405.ca8868",\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
+        "wires": [\r
+            [\r
+                "7a126f.d2de2d9",\r
+                "8743a074.e8506"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7a126f.d2de2d9",\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
+        "wires": [\r
+            [\r
+                "c954af6f.c34df"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c954af6f.c34df",\r
         "type": "set",\r
         "name": "set nodelist",\r
-        "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`\"/>\n",\r
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",\r
         "comments": "",\r
-        "x": 740.3908081054688,\r
-        "y": 259.28399658203125,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 678,\r
+        "y": 617,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2d1a88c6.11f9d8",\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='VNF not found in AAI. Nodelist retrieved from config'/>",\r
+        "id": "8743a074.e8506",\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
+        "wires": [\r
+            [\r
+                "c954af6f.c34df"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "90b2891b.001708",\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
+        "wires": [\r
+            [\r
+                "c9dd0d76.432f7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c9dd0d76.432f7",\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
+        "wires": [\r
+            [\r
+                "6ea15b2b.d9cd74"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9706bdee.6acf9",\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
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5a65efc0.bf413",\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
+        "wires": [\r
+            [\r
+                "90b2891b.001708",\r
+                "9706bdee.6acf9"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6ea15b2b.d9cd74",\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": 736,\r
-        "y": 312,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1746,\r
+        "y": 480,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r

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 4f39f48..8657b53 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,22 +1,22 @@
 [\r
     {\r
-        "id": "1a420388.7ce24c",\r
+        "id": "fab0f7ed.c486b8",\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": 550,\r
-        "y": 102,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 480,\r
+        "y": 147,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "e635fd5d.f4087"\r
+                "5ccc8e8d.06e5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c220826b.91906",\r
+        "id": "5c791eb8.0072b",\r
         "type": "service-logic",\r
         "name": "LCM ${project.version}",\r
         "module": "LCM",\r
@@ -24,528 +24,788 @@
         "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": 337.99993896484375,\r
-        "y": 103,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 267.99993896484375,\r
+        "y": 148,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "1a420388.7ce24c"\r
+                "fab0f7ed.c486b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "810e1e54.dec1c",\r
+        "id": "3503ece1.d7ad14",\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='`$prop.lcm.upgrade-pre-check.playbookname`'/>",\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": 345.00001525878906,\r
-        "y": 379,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 335.00001525878906,\r
+        "y": 755,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "f279f5b8.9d49b8",\r
-                "895a0a53.e12ea8",\r
-                "fa759954.4e2068"\r
+                "734b2c42.973ee4",\r
+                "bb8a76ca.fb7058",\r
+                "a457fe79.46497"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7db5396.7b5f1",\r
+        "id": "f17ff2aa.67075",\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": 690.9999389648438,\r
-        "y": 530.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 734.9999389648438,\r
+        "y": 863.0000305175781,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "bc5a2382.4973",\r
-                "84f0dd88.8438",\r
-                "ffd4aab1.e3c4b8"\r
+                "7ad5787f.1c20f8",\r
+                "b6f779a3.cc7ed8",\r
+                "f695f05e.abf31"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc5a2382.4973",\r
+        "id": "7ad5787f.1c20f8",\r
         "type": "other",\r
         "name": "outcome 500",\r
         "xml": "<outcome value='500'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 835.9999389648438,\r
-        "y": 528.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 879.9999389648438,\r
+        "y": 861.0000381469727,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84f0dd88.8438",\r
+        "id": "b6f779a3.cc7ed8",\r
         "type": "other",\r
         "name": "outcome 100",\r
         "xml": "<outcome value='100'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 838.9999389648438,\r
-        "y": 571.0000610351562,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 876.9999389648438,\r
+        "y": 918.0000305175781,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "f44a47b3.3aa128"\r
+                "1a65bc45.b2fcb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f44a47b3.3aa128",\r
+        "id": "1a65bc45.b2fcb4",\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='`$prop.lcm.upgrade-pre-check.playbookname`'/>\n\t\n\n\n\n\n",\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": 1025.9999389648438,\r
-        "y": 570.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1064.9999389648438,\r
+        "y": 917.0000305175781,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "dd2fe7e6.957248",\r
-                "6913b982.6c9bb8"\r
+                "5b0d24c6.9eb0ac",\r
+                "2b5e4322.1d495c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "895a0a53.e12ea8",\r
+        "id": "bb8a76ca.fb7058",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 581.9999389648438,\r
-        "y": 439.0000534057617,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 593.9999389648438,\r
+        "y": 776.0000915527344,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f279f5b8.9d49b8",\r
+        "id": "734b2c42.973ee4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 583.9999389648438,\r
-        "y": 491.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 595.9999389648438,\r
+        "y": 828.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "f7db5396.7b5f1"\r
+                "f17ff2aa.67075"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd2fe7e6.957248",\r
+        "id": "5b0d24c6.9eb0ac",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1189.9999389648438,\r
-        "y": 542.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1233.9999389648438,\r
+        "y": 875.0000381469727,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffd4aab1.e3c4b8",\r
+        "id": "f695f05e.abf31",\r
         "type": "other",\r
         "name": "outcome 101",\r
         "xml": "<outcome value='101'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 832.9999389648438,\r
-        "y": 486.00006103515625,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 876.9999389648438,\r
+        "y": 819.0000686645508,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6913b982.6c9bb8",\r
+        "id": "2b5e4322.1d495c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1191.9999389648438,\r
-        "y": 597.0000915527344,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1241.9998779296875,\r
+        "y": 923.0001220703125,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "14c8dea1.b5b7a1"\r
+                "db1e6d62.a1404"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a32993f8.f8215",\r
+        "id": "c1a2b259.11e46",\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": 1467.9998779296875,\r
-        "y": 648.0000610351562,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1535.9998779296875,\r
+        "y": 980.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d8c3f83d.d0b9d8",\r
+        "id": "566f9779.c05d38",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 153,\r
-        "y": 102,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 83,\r
+        "y": 147,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "c220826b.91906"\r
+                "5c791eb8.0072b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e635fd5d.f4087",\r
+        "id": "5ccc8e8d.06e5",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 139.91668701171875,\r
-        "y": 241.08334350585938,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 80.91668701171875,\r
+        "y": 239.08334350585938,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "810e1e54.dec1c",\r
-                "ee1802be.c5c18",\r
-                "e8d3b31a.f46c6",\r
-                "4d7f56db.9375c8"\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
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee1802be.c5c18",\r
+        "id": "dc18f7c9.2e4ac8",\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": 328.00001525878906,\r
-        "y": 225.08334350585938,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 379.0000305175781,\r
+        "y": 272.0833435058594,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3830f5d4.87f1aa",\r
+        "id": "70d1c79a.089af8",\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": 1222.9999389648438,\r
-        "y": 371.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1545.9998779296875,\r
+        "y": 725.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "1566d659.a0655a"\r
+                "d776c76b.1dd188"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1566d659.a0655a",\r
+        "id": "d776c76b.1dd188",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1392.9998779296875,\r
-        "y": 370.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1715.9998168945312,\r
+        "y": 724.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "22f8bfd0.6139e"\r
+                "eac6c260.d11fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80cc4946.3f0f78",\r
+        "id": "2b54a991.b17b16",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1025.9998779296875,\r
-        "y": 395.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1348.9998168945312,\r
+        "y": 749.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "3830f5d4.87f1aa",\r
-                "fedbb5e6.fb3c28",\r
-                "898f667e.daf2e8"\r
+                "70d1c79a.089af8",\r
+                "7970fcd5.6f11b4",\r
+                "3d8934f9.d0339c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ce48bed.5b7c74",\r
+        "id": "e790e11b.4f947",\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": 1488.4998779296875,\r
-        "y": 597.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1546.4998779296875,\r
+        "y": 930.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "37e7fa80.2728b6"\r
+                "2e13891.034f576"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37e7fa80.2728b6",\r
+        "id": "2e13891.034f576",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1648.4998779296875,\r
-        "y": 597.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1714.4998779296875,\r
+        "y": 930.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "47c7511a.dd8fe"\r
+                "30475e40.9b8be2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22f8bfd0.6139e",\r
+        "id": "eac6c260.d11fc",\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": 1524.9998779296875,\r
-        "y": 370.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1835.9998779296875,\r
+        "y": 723.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fedbb5e6.fb3c28",\r
+        "id": "7970fcd5.6f11b4",\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": 1197.9165649414062,\r
-        "y": 408.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1527.91650390625,\r
+        "y": 776.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "47c7511a.dd8fe",\r
+        "id": "30475e40.9b8be2",\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": 1769.9166259765625,\r
-        "y": 598.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1842.9166259765625,\r
+        "y": 930.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "898f667e.daf2e8",\r
+        "id": "3d8934f9.d0339c",\r
         "type": "set",\r
-        "name": "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": 1174.9999389648438,\r
-        "y": 318.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1532.9998779296875,\r
+        "y": 672.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "14c8dea1.b5b7a1",\r
+        "id": "db1e6d62.a1404",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1317.9998779296875,\r
-        "y": 596.0833435058594,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1369.9998779296875,\r
+        "y": 924.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "7ce48bed.5b7c74",\r
-                "70a28c6a.563d24",\r
-                "a32993f8.f8215"\r
+                "e790e11b.4f947",\r
+                "3a3f1d44.898da2",\r
+                "c1a2b259.11e46"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70a28c6a.563d24",\r
+        "id": "3a3f1d44.898da2",\r
         "type": "set",\r
-        "name": "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": 1448.1666259765625,\r
-        "y": 549.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1536.1666259765625,\r
+        "y": 875.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fa759954.4e2068",\r
+        "id": "a457fe79.46497",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 577.9999389648438,\r
-        "y": 392.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 602.9999389648438,\r
+        "y": 728.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "ed41675d.59c088"\r
+                "3d4c2c9a.7b1324"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "756c2e53.ca6d7",\r
+        "id": "d512629f.bc625",\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": 1009.9999389648438,\r
-        "y": 297.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 893.9999389648438,\r
+        "y": 687,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ed41675d.59c088",\r
+        "id": "3d4c2c9a.7b1324",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 761.9999389648438,\r
-        "y": 384.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 739.9999389648438,\r
+        "y": 722.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "756c2e53.ca6d7",\r
-                "80cc4946.3f0f78"\r
+                "d512629f.bc625",\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8d3b31a.f46c6",\r
+        "id": "814875d2.cac108",\r
         "type": "set",\r
-        "name": "set default status value",\r
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",\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": 336,\r
-        "y": 269,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 372,\r
+        "y": 319,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4d7f56db.9375c8",\r
+        "id": "442dbdff.6dfcb4",\r
         "type": "get-resource",\r
-        "name": "get aai.generic-vnf by vnf-id",\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": 349.0000305175781,\r
-        "y": 325,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 912,\r
+        "y": 495,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "fa69a126.2a554",\r
-                "f9cb9963.f9e368"\r
+                "1e57cb28.122ad5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa69a126.2a554",\r
-        "type": "failure",\r
+        "id": "1e57cb28.122ad5",\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
+        "wires": [\r
+            [\r
+                "5a65efc0.bf413"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "baba22fc.1ceb5",\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
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "69e97f86.e07ef",\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
+        "wires": [\r
+            [\r
+                "e43265e9.4c7f38",\r
+                "d78c93da.7125f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e9d89bdf.30f7a8",\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": 386,\r
+        "y": 366,\r
+        "z": "50de34e0.ace54c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "e43265e9.4c7f38",\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
+        "wires": [\r
+            [\r
+                "abbc4ae4.be5328"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d78c93da.7125f",\r
+        "type": "outcome",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 589.86083984375,\r
-        "y": 312.53564453125,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 550.9999389648438,\r
+        "y": 460,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "2d1a88c6.11f9d8"\r
+                "f68ee407.ca6d88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9cb9963.f9e368",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
+        "id": "f68ee407.ca6d88",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 591.3908081054688,\r
-        "y": 260.28399658203125,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 698.9999389648438,\r
+        "y": 459,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "c4d4de4d.3e19f"\r
+                "442dbdff.6dfcb4",\r
+                "80c560bb.eea5f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c4d4de4d.3e19f",\r
+        "id": "abbc4ae4.be5328",\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": 712,\r
+        "y": 397,\r
+        "z": "50de34e0.ace54c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "80c560bb.eea5f",\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": 921,\r
+        "y": 439,\r
+        "z": "50de34e0.ace54c",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "fa9a8e1f.bba53",\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
+        "wires": [\r
+            [\r
+                "1a5624d2.74e98b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1a5624d2.74e98b",\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
+        "wires": [\r
+            [\r
+                "524c17a1.30fbf8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "524c17a1.30fbf8",\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
+        "comments": "",\r
+        "x": 712,\r
+        "y": 551,\r
+        "z": "50de34e0.ace54c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "81510405.ca8868",\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
+        "wires": [\r
+            [\r
+                "7a126f.d2de2d9",\r
+                "8743a074.e8506"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7a126f.d2de2d9",\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
+        "wires": [\r
+            [\r
+                "c954af6f.c34df"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c954af6f.c34df",\r
         "type": "set",\r
         "name": "set nodelist",\r
-        "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`\"/>\n",\r
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",\r
         "comments": "",\r
-        "x": 740.3908081054688,\r
-        "y": 259.28399658203125,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 678,\r
+        "y": 617,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2d1a88c6.11f9d8",\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='VNF not found in AAI. Nodelist retrieved from config'/>",\r
+        "id": "8743a074.e8506",\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
+        "wires": [\r
+            [\r
+                "c954af6f.c34df"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "90b2891b.001708",\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
+        "wires": [\r
+            [\r
+                "c9dd0d76.432f7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c9dd0d76.432f7",\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
+        "wires": [\r
+            [\r
+                "6ea15b2b.d9cd74"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9706bdee.6acf9",\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
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5a65efc0.bf413",\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
+        "wires": [\r
+            [\r
+                "90b2891b.001708",\r
+                "9706bdee.6acf9"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6ea15b2b.d9cd74",\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": 736,\r
-        "y": 312,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1746,\r
+        "y": 480,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r

diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-software.json b/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
index 95e0638..0ddbf91 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,22 +1,22 @@
 [\r
     {\r
-        "id": "1a420388.7ce24c",\r
+        "id": "fab0f7ed.c486b8",\r
         "type": "method",\r
         "name": "upgrade-software",\r
         "xml": "<method rpc='upgrade-software' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 550,\r
-        "y": 102,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 480,\r
+        "y": 147,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "e635fd5d.f4087"\r
+                "5ccc8e8d.06e5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c220826b.91906",\r
+        "id": "5c791eb8.0072b",\r
         "type": "service-logic",\r
         "name": "LCM ${project.version}",\r
         "module": "LCM",\r
@@ -24,528 +24,788 @@
         "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": 337.99993896484375,\r
-        "y": 103,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 267.99993896484375,\r
+        "y": 148,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "1a420388.7ce24c"\r
+                "fab0f7ed.c486b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "810e1e54.dec1c",\r
+        "id": "3503ece1.d7ad14",\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='`$prop.lcm.upgrade-software.playbookname`'/>",\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": 345.00001525878906,\r
-        "y": 379,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 335.00001525878906,\r
+        "y": 755,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "f279f5b8.9d49b8",\r
-                "895a0a53.e12ea8",\r
-                "fa759954.4e2068"\r
+                "734b2c42.973ee4",\r
+                "bb8a76ca.fb7058",\r
+                "a457fe79.46497"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7db5396.7b5f1",\r
+        "id": "f17ff2aa.67075",\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": 690.9999389648438,\r
-        "y": 530.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 734.9999389648438,\r
+        "y": 863.0000305175781,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "bc5a2382.4973",\r
-                "84f0dd88.8438",\r
-                "ffd4aab1.e3c4b8"\r
+                "7ad5787f.1c20f8",\r
+                "b6f779a3.cc7ed8",\r
+                "f695f05e.abf31"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc5a2382.4973",\r
+        "id": "7ad5787f.1c20f8",\r
         "type": "other",\r
         "name": "outcome 500",\r
         "xml": "<outcome value='500'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 835.9999389648438,\r
-        "y": 528.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 879.9999389648438,\r
+        "y": 861.0000381469727,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84f0dd88.8438",\r
+        "id": "b6f779a3.cc7ed8",\r
         "type": "other",\r
         "name": "outcome 100",\r
         "xml": "<outcome value='100'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 838.9999389648438,\r
-        "y": 571.0000610351562,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 876.9999389648438,\r
+        "y": 918.0000305175781,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "f44a47b3.3aa128"\r
+                "1a65bc45.b2fcb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f44a47b3.3aa128",\r
+        "id": "1a65bc45.b2fcb4",\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='`$prop.lcm.upgrade-software.playbookname`'/>\n\t\n\n\n\n\n",\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": 1025.9999389648438,\r
-        "y": 570.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1064.9999389648438,\r
+        "y": 917.0000305175781,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "dd2fe7e6.957248",\r
-                "6913b982.6c9bb8"\r
+                "5b0d24c6.9eb0ac",\r
+                "2b5e4322.1d495c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "895a0a53.e12ea8",\r
+        "id": "bb8a76ca.fb7058",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 581.9999389648438,\r
-        "y": 439.0000534057617,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 593.9999389648438,\r
+        "y": 776.0000915527344,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f279f5b8.9d49b8",\r
+        "id": "734b2c42.973ee4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 583.9999389648438,\r
-        "y": 491.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 595.9999389648438,\r
+        "y": 828.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "f7db5396.7b5f1"\r
+                "f17ff2aa.67075"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd2fe7e6.957248",\r
+        "id": "5b0d24c6.9eb0ac",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1189.9999389648438,\r
-        "y": 542.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1233.9999389648438,\r
+        "y": 875.0000381469727,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffd4aab1.e3c4b8",\r
+        "id": "f695f05e.abf31",\r
         "type": "other",\r
         "name": "outcome 101",\r
         "xml": "<outcome value='101'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 832.9999389648438,\r
-        "y": 486.00006103515625,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 876.9999389648438,\r
+        "y": 819.0000686645508,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "80cc4946.3f0f78"\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6913b982.6c9bb8",\r
+        "id": "2b5e4322.1d495c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1191.9999389648438,\r
-        "y": 597.0000915527344,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1241.9998779296875,\r
+        "y": 923.0001220703125,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "14c8dea1.b5b7a1"\r
+                "db1e6d62.a1404"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a32993f8.f8215",\r
+        "id": "c1a2b259.11e46",\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": 1467.9998779296875,\r
-        "y": 648.0000610351562,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1535.9998779296875,\r
+        "y": 980.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d8c3f83d.d0b9d8",\r
+        "id": "566f9779.c05d38",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 153,\r
-        "y": 102,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 83,\r
+        "y": 147,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "c220826b.91906"\r
+                "5c791eb8.0072b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e635fd5d.f4087",\r
+        "id": "5ccc8e8d.06e5",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 139.91668701171875,\r
-        "y": 241.08334350585938,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 80.91668701171875,\r
+        "y": 239.08334350585938,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "810e1e54.dec1c",\r
-                "ee1802be.c5c18",\r
-                "e8d3b31a.f46c6",\r
-                "4d7f56db.9375c8"\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
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee1802be.c5c18",\r
+        "id": "dc18f7c9.2e4ac8",\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": 328.00001525878906,\r
-        "y": 225.08334350585938,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 379.0000305175781,\r
+        "y": 272.0833435058594,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3830f5d4.87f1aa",\r
+        "id": "70d1c79a.089af8",\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": 1222.9999389648438,\r
-        "y": 371.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1545.9998779296875,\r
+        "y": 725.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "1566d659.a0655a"\r
+                "d776c76b.1dd188"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1566d659.a0655a",\r
+        "id": "d776c76b.1dd188",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1392.9998779296875,\r
-        "y": 370.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1715.9998168945312,\r
+        "y": 724.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "22f8bfd0.6139e"\r
+                "eac6c260.d11fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80cc4946.3f0f78",\r
+        "id": "2b54a991.b17b16",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1025.9998779296875,\r
-        "y": 395.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1348.9998168945312,\r
+        "y": 749.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "3830f5d4.87f1aa",\r
-                "fedbb5e6.fb3c28",\r
-                "898f667e.daf2e8"\r
+                "70d1c79a.089af8",\r
+                "7970fcd5.6f11b4",\r
+                "3d8934f9.d0339c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ce48bed.5b7c74",\r
+        "id": "e790e11b.4f947",\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": 1488.4998779296875,\r
-        "y": 597.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1546.4998779296875,\r
+        "y": 930.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "37e7fa80.2728b6"\r
+                "2e13891.034f576"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37e7fa80.2728b6",\r
+        "id": "2e13891.034f576",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1648.4998779296875,\r
-        "y": 597.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1714.4998779296875,\r
+        "y": 930.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "47c7511a.dd8fe"\r
+                "30475e40.9b8be2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22f8bfd0.6139e",\r
+        "id": "eac6c260.d11fc",\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": 1524.9998779296875,\r
-        "y": 370.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1835.9998779296875,\r
+        "y": 723.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fedbb5e6.fb3c28",\r
+        "id": "7970fcd5.6f11b4",\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": 1197.9165649414062,\r
-        "y": 408.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1527.91650390625,\r
+        "y": 776.0834045410156,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "47c7511a.dd8fe",\r
+        "id": "30475e40.9b8be2",\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": 1769.9166259765625,\r
-        "y": 598.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1842.9166259765625,\r
+        "y": 930.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "898f667e.daf2e8",\r
+        "id": "3d8934f9.d0339c",\r
         "type": "set",\r
-        "name": "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": 1174.9999389648438,\r
-        "y": 318.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1532.9998779296875,\r
+        "y": 672.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "14c8dea1.b5b7a1",\r
+        "id": "db1e6d62.a1404",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1317.9998779296875,\r
-        "y": 596.0833435058594,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1369.9998779296875,\r
+        "y": 924.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "7ce48bed.5b7c74",\r
-                "70a28c6a.563d24",\r
-                "a32993f8.f8215"\r
+                "e790e11b.4f947",\r
+                "3a3f1d44.898da2",\r
+                "c1a2b259.11e46"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70a28c6a.563d24",\r
+        "id": "3a3f1d44.898da2",\r
         "type": "set",\r
-        "name": "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": 1448.1666259765625,\r
-        "y": 549.0833740234375,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1536.1666259765625,\r
+        "y": 875.0833740234375,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fa759954.4e2068",\r
+        "id": "a457fe79.46497",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 577.9999389648438,\r
-        "y": 392.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 602.9999389648438,\r
+        "y": 728.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "ed41675d.59c088"\r
+                "3d4c2c9a.7b1324"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "756c2e53.ca6d7",\r
+        "id": "d512629f.bc625",\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": 1009.9999389648438,\r
-        "y": 297.0000305175781,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 893.9999389648438,\r
+        "y": 687,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ed41675d.59c088",\r
+        "id": "3d4c2c9a.7b1324",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 761.9999389648438,\r
-        "y": 384.0000228881836,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 739.9999389648438,\r
+        "y": 722.0000610351562,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "756c2e53.ca6d7",\r
-                "80cc4946.3f0f78"\r
+                "d512629f.bc625",\r
+                "2b54a991.b17b16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8d3b31a.f46c6",\r
+        "id": "814875d2.cac108",\r
         "type": "set",\r
-        "name": "set default status value",\r
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",\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": 336,\r
-        "y": 269,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 372,\r
+        "y": 319,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4d7f56db.9375c8",\r
+        "id": "442dbdff.6dfcb4",\r
         "type": "get-resource",\r
-        "name": "get aai.generic-vnf by vnf-id",\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": 349.0000305175781,\r
-        "y": 325,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 912,\r
+        "y": 495,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "fa69a126.2a554",\r
-                "f9cb9963.f9e368"\r
+                "1e57cb28.122ad5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa69a126.2a554",\r
-        "type": "failure",\r
+        "id": "1e57cb28.122ad5",\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
+        "wires": [\r
+            [\r
+                "5a65efc0.bf413"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "baba22fc.1ceb5",\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
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "69e97f86.e07ef",\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
+        "wires": [\r
+            [\r
+                "e43265e9.4c7f38",\r
+                "d78c93da.7125f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e9d89bdf.30f7a8",\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
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "e43265e9.4c7f38",\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
+        "wires": [\r
+            [\r
+                "abbc4ae4.be5328"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d78c93da.7125f",\r
+        "type": "outcome",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 589.86083984375,\r
-        "y": 312.53564453125,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 550.9999389648438,\r
+        "y": 460,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "2d1a88c6.11f9d8"\r
+                "f68ee407.ca6d88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9cb9963.f9e368",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
+        "id": "f68ee407.ca6d88",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 591.3908081054688,\r
-        "y": 260.28399658203125,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 698.9999389648438,\r
+        "y": 459,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             [\r
-                "c4d4de4d.3e19f"\r
+                "442dbdff.6dfcb4",\r
+                "80c560bb.eea5f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c4d4de4d.3e19f",\r
+        "id": "abbc4ae4.be5328",\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
+        "wires": []\r
+    },\r
+    {\r
+        "id": "80c560bb.eea5f",\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
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "fa9a8e1f.bba53",\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
+        "wires": [\r
+            [\r
+                "1a5624d2.74e98b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1a5624d2.74e98b",\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
+        "wires": [\r
+            [\r
+                "524c17a1.30fbf8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "524c17a1.30fbf8",\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
+        "comments": "",\r
+        "x": 712,\r
+        "y": 551,\r
+        "z": "50de34e0.ace54c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "81510405.ca8868",\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
+        "wires": [\r
+            [\r
+                "7a126f.d2de2d9",\r
+                "8743a074.e8506"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7a126f.d2de2d9",\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
+        "wires": [\r
+            [\r
+                "c954af6f.c34df"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c954af6f.c34df",\r
         "type": "set",\r
         "name": "set nodelist",\r
-        "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`\"/>\n",\r
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",\r
         "comments": "",\r
-        "x": 740.3908081054688,\r
-        "y": 259.28399658203125,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 678,\r
+        "y": 617,\r
+        "z": "50de34e0.ace54c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2d1a88c6.11f9d8",\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='VNF not found in AAI. Nodelist retrieved from config'/>",\r
+        "id": "8743a074.e8506",\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
+        "wires": [\r
+            [\r
+                "c954af6f.c34df"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "90b2891b.001708",\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
+        "wires": [\r
+            [\r
+                "c9dd0d76.432f7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c9dd0d76.432f7",\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
+        "wires": [\r
+            [\r
+                "6ea15b2b.d9cd74"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9706bdee.6acf9",\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
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5a65efc0.bf413",\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
+        "wires": [\r
+            [\r
+                "90b2891b.001708",\r
+                "9706bdee.6acf9"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6ea15b2b.d9cd74",\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": 736,\r
-        "y": 312,\r
-        "z": "af8f5cdd.6e4de",\r
+        "x": 1746,\r
+        "y": 480,\r
+        "z": "50de34e0.ace54c",\r
         "wires": [\r
             []\r
         ]\r

diff --git a/platform-logic/lcm/src/main/xml/LCM_distribute-traffic.xml b/platform-logic/lcm/src/main/xml/LCM_distribute-traffic.xml
index d83d149..9b550d3 100755 (executable)
--- a/platform-logic/lcm/src/main/xml/LCM_distribute-traffic.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_distribute-traffic.xml
@@ -10,26 +10,75 @@
             <set>\r
                 <parameter name='status.code' value='200' />\r
                 <parameter name='status.message' value='unexpected return from DG' />\r
-                <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                <parameter name='quote' value="'" />\r
             </set>\r
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
+                <parameter name='source' value='distribute-traffic-input.payload' />\r
+                <parameter name='outputPath' value='payloadJson' />\r
+                <parameter name='isEscaped' value='true' />\r
+            </execute>\r
+            <switch test='`$payloadJson.pnf-flag`'>\r
+                <outcome value='true'>\r
+                    <set>\r
+                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>\r
+                        <parameter name='playbookname' value='`$prop.lcm.pnf.distribute-traffic.playbookname`'/>\r
+                    </set>\r
+                </outcome>\r
+                <outcome value='Other'>\r
+                    <block>\r
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                            <parameter name='outputPath' value='playbookname' />\r
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.distribute-traffic.playbookname'`" />\r
+                        </execute>\r
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
        resource="generic-vnf" \r
                key="generic-vnf.vnf-id = $distribute-traffic-input.action-identifiers.vnf-id" \r
                local-only="false" \r
                pfx='aai.generic-vnf'>\r
-                <outcome value='success'>\r
+                            <outcome value='success'>\r
+                                <block>\r
+                                    <switch test='`$playbookname`'>\r
+                                        <outcome value=''>\r
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                                                <parameter name='outputPath' value='playbookname' />\r
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.distribute-traffic.playbookname'`" />\r
+                                            </execute>\r
+                                        </outcome>\r
+                                    </switch>\r
+                                    <set>\r
+                                        <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`"/>\r
+                                    </set>\r
+                                </block>\r
+                            </outcome>\r
+                        </get-resource>\r
+                    </block>\r
+                </outcome>\r
+            </switch>\r
+            <switch test='`$playbookname`'>\r
+                <outcome value=''>\r
                     <set>\r
-                        <parameter name='quote' value="'" />\r
-                        <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`"/>\r
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                        <parameter name='playbookname' value='`$prop.lcm.distribute-traffic.playbookname`'/>\r
                     </set>\r
                 </outcome>\r
-                <outcome value='Other'>\r
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
-                        <parameter name="logger" value="message-log"/>\r
-                        <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>\r
-                    </record>\r
+            </switch>\r
+            <switch test='`$nodelist`'>\r
+                <outcome value=''>\r
+                    <set>\r
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                    </set>\r
+                </outcome>\r
+                <outcome value="['']">\r
+                    <set>\r
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                    </set>\r
                 </outcome>\r
-            </get-resource>\r
+            </switch>\r
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                <parameter name="logger" value="message-log"/>\r
+                <parameter name="field1" value='`$playbookname`'/>\r
+                <parameter name="field2" value='`$nodelist`'/>\r
+            </record>\r
             <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\r
                 <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\r
                 <parameter name='User' value='`$prop.ansible.user`'/>\r
@@ -40,7 +89,7 @@
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>\r
                 <parameter name='Version' value='`$prop.ansible.version`'/>\r
                 <parameter name='Id' value='`$distribute-traffic-input.common-header.request-id`'/>\r
-                <parameter name='PlaybookName' value='`$prop.lcm.distribute-traffic.playbookname`'/>\r
+                <parameter name='PlaybookName' value='`$playbookname`'/>\r
                 <outcome value='not-found'>\r
                     <block>\r
                         <set>\r
@@ -219,7 +268,7 @@
                                 <parameter name='User' value='`$prop.ansible.user`'/>\r
                                 <parameter name='Password' value='`$prop.ansible.password`'/>\r
                                 <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\r
-                                <parameter name='PlaybookName' value='`$prop.lcm.distribute-traffic.playbookname`'/>\r
+                                <parameter name='PlaybookName' value='`$playbookname`'/>\r
                                 <outcome value='failure'>\r
                                     <block>\r
                                         <set>\r

diff --git a/platform-logic/lcm/src/main/xml/LCM_quiesce-traffic.xml b/platform-logic/lcm/src/main/xml/LCM_quiesce-traffic.xml
index 9503899..36eec1d 100644 (file)
--- a/platform-logic/lcm/src/main/xml/LCM_quiesce-traffic.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_quiesce-traffic.xml
@@ -10,26 +10,75 @@
             <set>\r
                 <parameter name='status.code' value='200' />\r
                 <parameter name='status.message' value='unexpected return from DG' />\r
-                <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                <parameter name='quote' value="'" />\r
             </set>\r
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
+                <parameter name='source' value='quiesce-traffic-input.payload' />\r
+                <parameter name='outputPath' value='payloadJson' />\r
+                <parameter name='isEscaped' value='true' />\r
+            </execute>\r
+            <switch test='`$payloadJson.pnf-flag`'>\r
+                <outcome value='true'>\r
+                    <set>\r
+                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>\r
+                        <parameter name='playbookname' value='`$prop.lcm.pnf.quiesce-traffic.playbookname`'/>\r
+                    </set>\r
+                </outcome>\r
+                <outcome value='Other'>\r
+                    <block>\r
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                            <parameter name='outputPath' value='playbookname' />\r
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.quiesce-traffic.playbookname'`" />\r
+                        </execute>\r
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
        resource="generic-vnf" \r
                key="generic-vnf.vnf-id = $quiesce-traffic-input.action-identifiers.vnf-id" \r
                local-only="false" \r
                pfx='aai.generic-vnf'>\r
-                <outcome value='success'>\r
+                            <outcome value='success'>\r
+                                <block>\r
+                                    <switch test='`$playbookname`'>\r
+                                        <outcome value=''>\r
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                                                <parameter name='outputPath' value='playbookname' />\r
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.quiesce-traffic.playbookname'`" />\r
+                                            </execute>\r
+                                        </outcome>\r
+                                    </switch>\r
+                                    <set>\r
+                                        <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`"/>\r
+                                    </set>\r
+                                </block>\r
+                            </outcome>\r
+                        </get-resource>\r
+                    </block>\r
+                </outcome>\r
+            </switch>\r
+            <switch test='`$playbookname`'>\r
+                <outcome value=''>\r
                     <set>\r
-                        <parameter name='quote' value="'" />\r
-                        <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`"/>\r
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                        <parameter name='playbookname' value='`$prop.lcm.quiesce-traffic.playbookname`'/>\r
                     </set>\r
                 </outcome>\r
-                <outcome value='Other'>\r
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
-                        <parameter name="logger" value="message-log"/>\r
-                        <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>\r
-                    </record>\r
+            </switch>\r
+            <switch test='`$nodelist`'>\r
+                <outcome value=''>\r
+                    <set>\r
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                    </set>\r
+                </outcome>\r
+                <outcome value="['']">\r
+                    <set>\r
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                    </set>\r
                 </outcome>\r
-            </get-resource>\r
+            </switch>\r
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                <parameter name="logger" value="message-log"/>\r
+                <parameter name="field1" value='`$playbookname`'/>\r
+                <parameter name="field2" value='`$nodelist`'/>\r
+            </record>\r
             <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\r
                 <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\r
                 <parameter name='User' value='`$prop.ansible.user`'/>\r
@@ -40,7 +89,7 @@
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>\r
                 <parameter name='Version' value='`$prop.ansible.version`'/>\r
                 <parameter name='Id' value='`$quiesce-traffic-input.common-header.request-id`'/>\r
-                <parameter name='PlaybookName' value='`$prop.lcm.quiesce-traffic.playbookname`'/>\r
+                <parameter name='PlaybookName' value='`$playbookname`'/>\r
                 <outcome value='not-found'>\r
                     <block>\r
                         <set>\r
@@ -219,7 +268,7 @@
                                 <parameter name='User' value='`$prop.ansible.user`'/>\r
                                 <parameter name='Password' value='`$prop.ansible.password`'/>\r
                                 <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\r
-                                <parameter name='PlaybookName' value='`$prop.lcm.quiesce-traffic.playbookname`'/>\r
+                                <parameter name='PlaybookName' value='`$playbookname`'/>\r
                                 <outcome value='failure'>\r
                                     <block>\r
                                         <set>\r

diff --git a/platform-logic/lcm/src/main/xml/LCM_resume-traffic.xml b/platform-logic/lcm/src/main/xml/LCM_resume-traffic.xml
index 54d35bd..9d2795b 100644 (file)
--- a/platform-logic/lcm/src/main/xml/LCM_resume-traffic.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_resume-traffic.xml
@@ -10,26 +10,75 @@
             <set>\r
                 <parameter name='status.code' value='200' />\r
                 <parameter name='status.message' value='unexpected return from DG' />\r
-                <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                <parameter name='quote' value="'" />\r
             </set>\r
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
+                <parameter name='source' value='resume-traffic-input.payload' />\r
+                <parameter name='outputPath' value='payloadJson' />\r
+                <parameter name='isEscaped' value='true' />\r
+            </execute>\r
+            <switch test='`$payloadJson.pnf-flag`'>\r
+                <outcome value='true'>\r
+                    <set>\r
+                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>\r
+                        <parameter name='playbookname' value='`$prop.lcm.pnf.resume-traffic.playbookname`'/>\r
+                    </set>\r
+                </outcome>\r
+                <outcome value='Other'>\r
+                    <block>\r
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                            <parameter name='outputPath' value='playbookname' />\r
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.resume-traffic.playbookname'`" />\r
+                        </execute>\r
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
        resource="generic-vnf" \r
                key="generic-vnf.vnf-id = $resume-traffic-input.action-identifiers.vnf-id" \r
                local-only="false" \r
                pfx='aai.generic-vnf'>\r
-                <outcome value='success'>\r
+                            <outcome value='success'>\r
+                                <block>\r
+                                    <switch test='`$playbookname`'>\r
+                                        <outcome value=''>\r
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                                                <parameter name='outputPath' value='playbookname' />\r
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.resume-traffic.playbookname'`" />\r
+                                            </execute>\r
+                                        </outcome>\r
+                                    </switch>\r
+                                    <set>\r
+                                        <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`"/>\r
+                                    </set>\r
+                                </block>\r
+                            </outcome>\r
+                        </get-resource>\r
+                    </block>\r
+                </outcome>\r
+            </switch>\r
+            <switch test='`$playbookname`'>\r
+                <outcome value=''>\r
                     <set>\r
-                        <parameter name='quote' value="'" />\r
-                        <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`"/>\r
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                        <parameter name='playbookname' value='`$prop.lcm.resume-traffic.playbookname`'/>\r
                     </set>\r
                 </outcome>\r
-                <outcome value='Other'>\r
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
-                        <parameter name="logger" value="message-log"/>\r
-                        <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>\r
-                    </record>\r
+            </switch>\r
+            <switch test='`$nodelist`'>\r
+                <outcome value=''>\r
+                    <set>\r
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                    </set>\r
+                </outcome>\r
+                <outcome value="['']">\r
+                    <set>\r
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                    </set>\r
                 </outcome>\r
-            </get-resource>\r
+            </switch>\r
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                <parameter name="logger" value="message-log"/>\r
+                <parameter name="field1" value='`$playbookname`'/>\r
+                <parameter name="field2" value='`$nodelist`'/>\r
+            </record>\r
             <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\r
                 <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\r
                 <parameter name='User' value='`$prop.ansible.user`'/>\r
@@ -40,7 +89,7 @@
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>\r
                 <parameter name='Version' value='`$prop.ansible.version`'/>\r
                 <parameter name='Id' value='`$resume-traffic-input.common-header.request-id`'/>\r
-                <parameter name='PlaybookName' value='`$prop.lcm.resume-traffic.playbookname`'/>\r
+                <parameter name='PlaybookName' value='`$playbookname`'/>\r
                 <outcome value='not-found'>\r
                     <block>\r
                         <set>\r
@@ -219,7 +268,7 @@
                                 <parameter name='User' value='`$prop.ansible.user`'/>\r
                                 <parameter name='Password' value='`$prop.ansible.password`'/>\r
                                 <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\r
-                                <parameter name='PlaybookName' value='`$prop.lcm.resume-traffic.playbookname`'/>\r
+                                <parameter name='PlaybookName' value='`$playbookname`'/>\r
                                 <outcome value='failure'>\r
                                     <block>\r
                                         <set>\r

diff --git a/platform-logic/lcm/src/main/xml/LCM_snapshot.xml b/platform-logic/lcm/src/main/xml/LCM_snapshot.xml
index 4284f40..73d0885 100644 (file)
--- a/platform-logic/lcm/src/main/xml/LCM_snapshot.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_snapshot.xml
@@ -50,4 +50,4 @@
             </return>\r
         </block>\r
     </method>\r
-</service-logic>\r
+</service-logic>
\ No newline at end of file

diff --git a/platform-logic/lcm/src/main/xml/LCM_unlock.xml b/platform-logic/lcm/src/main/xml/LCM_unlock.xml
index 37c36a0..f524af4 100644 (file)
--- a/platform-logic/lcm/src/main/xml/LCM_unlock.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_unlock.xml
@@ -26,7 +26,7 @@
                 <parameter name='lcm-dmaap.flags.force' value='`$unlock-input.common-header.flags.force`'/>\r
                 <parameter name='lcm-dmaap.flags.ttl' value='`$unlock-input.common-header.flags.ttl`'/>\r
                 <parameter name='lcm-dmaap.status.code' value='400' />\r
-                <parameter name='lcm-dmaap.status.message' value='SDNC UnLock Mock returns success'/>\r
+                <parameter name='lcm-dmaap.status.message' value='SDNC Unlock Mock returns success'/>\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
@@ -46,8 +46,8 @@
             </execute>\r
             <return status='success'>\r
                 <parameter name='status.code' value='400' />\r
-                <parameter name='status.message' value='SDNC UnLock Mock returns success'/>\r
+                <parameter name='status.message' value='SDNC Unlock Mock returns success'/>\r
             </return>\r
         </block>\r
     </method>\r
-</service-logic>\r
+</service-logic>
\ No newline at end of file

diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-backup.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-backup.xml
index 4b9ef5c..39eb341 100644 (file)
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-backup.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-backup.xml
@@ -26,7 +26,7 @@
                 <parameter name='lcm-dmaap.flags.force' value='`$upgrade-backup-input.common-header.flags.force`'/>\r
                 <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-backup-input.common-header.flags.ttl`'/>\r
                 <parameter name='lcm-dmaap.status.code' value='400' />\r
-                <parameter name='lcm-dmaap.status.message' value='SDNC Lock Mock returns success'/>\r
+                <parameter name='lcm-dmaap.status.message' value='SDNC Upgrade-backup Mock returns success'/>\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
@@ -46,8 +46,8 @@
             </execute>\r
             <return status='success'>\r
                 <parameter name='status.code' value='400' />\r
-                <parameter name='status.message' value='SDNC Lock Mock returns success'/>\r
+                <parameter name='status.message' value='SDNC Upgrade-backup Mock returns success'/>\r
             </return>\r
         </block>\r
     </method>\r
-</service-logic>\r
+</service-logic>
\ No newline at end of file

diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
index 50301a7..3338f1c 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
@@ -10,26 +10,75 @@
             <set>\r
                 <parameter name='status.code' value='200' />\r
                 <parameter name='status.message' value='unexpected return from DG' />\r
-                <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                <parameter name='quote' value="'" />\r
             </set>\r
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
+                <parameter name='source' value='upgrade-post-check-input.payload' />\r
+                <parameter name='outputPath' value='payloadJson' />\r
+                <parameter name='isEscaped' value='true' />\r
+            </execute>\r
+            <switch test='`$payloadJson.pnf-flag`'>\r
+                <outcome value='true'>\r
+                    <set>\r
+                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>\r
+                        <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-post-check.playbookname`'/>\r
+                    </set>\r
+                </outcome>\r
+                <outcome value='Other'>\r
+                    <block>\r
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                            <parameter name='outputPath' value='playbookname' />\r
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-post-check.playbookname'`" />\r
+                        </execute>\r
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
        resource="generic-vnf" \r
                key="generic-vnf.vnf-id = $upgrade-post-check-input.action-identifiers.vnf-id" \r
                local-only="false" \r
                pfx='aai.generic-vnf'>\r
-                <outcome value='success'>\r
+                            <outcome value='success'>\r
+                                <block>\r
+                                    <switch test='`$playbookname`'>\r
+                                        <outcome value=''>\r
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                                                <parameter name='outputPath' value='playbookname' />\r
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-post-check.playbookname'`" />\r
+                                            </execute>\r
+                                        </outcome>\r
+                                    </switch>\r
+                                    <set>\r
+                                        <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`"/>\r
+                                    </set>\r
+                                </block>\r
+                            </outcome>\r
+                        </get-resource>\r
+                    </block>\r
+                </outcome>\r
+            </switch>\r
+            <switch test='`$playbookname`'>\r
+                <outcome value=''>\r
                     <set>\r
-                        <parameter name='quote' value="'" />\r
-                        <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`"/>\r
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                        <parameter name='playbookname' value='`$prop.lcm.upgrade-post-check.playbookname`'/>\r
                     </set>\r
                 </outcome>\r
-                <outcome value='Other'>\r
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
-                        <parameter name="logger" value="message-log"/>\r
-                        <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>\r
-                    </record>\r
+            </switch>\r
+            <switch test='`$nodelist`'>\r
+                <outcome value=''>\r
+                    <set>\r
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                    </set>\r
+                </outcome>\r
+                <outcome value="['']">\r
+                    <set>\r
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                    </set>\r
                 </outcome>\r
-            </get-resource>\r
+            </switch>\r
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                <parameter name="logger" value="message-log"/>\r
+                <parameter name="field1" value='`$playbookname`'/>\r
+                <parameter name="field2" value='`$nodelist`'/>\r
+            </record>\r
             <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\r
                 <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\r
                 <parameter name='User' value='`$prop.ansible.user`'/>\r
@@ -40,7 +89,7 @@
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>\r
                 <parameter name='Version' value='`$prop.ansible.version`'/>\r
                 <parameter name='Id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
-                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-post-check.playbookname`'/>\r
+                <parameter name='PlaybookName' value='`$playbookname`'/>\r
                 <outcome value='not-found'>\r
                     <block>\r
                         <set>\r
@@ -219,7 +268,7 @@
                                 <parameter name='User' value='`$prop.ansible.user`'/>\r
                                 <parameter name='Password' value='`$prop.ansible.password`'/>\r
                                 <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\r
-                                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-post-check.playbookname`'/>\r
+                                <parameter name='PlaybookName' value='`$playbookname`'/>\r
                                 <outcome value='failure'>\r
                                     <block>\r
                                         <set>\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 c0947ca..1bf68e5 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
@@ -10,26 +10,75 @@
             <set>\r
                 <parameter name='status.code' value='200' />\r
                 <parameter name='status.message' value='unexpected return from DG' />\r
-                <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                <parameter name='quote' value="'" />\r
             </set>\r
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
+                <parameter name='source' value='upgrade-pre-check-input.payload' />\r
+                <parameter name='outputPath' value='payloadJson' />\r
+                <parameter name='isEscaped' value='true' />\r
+            </execute>\r
+            <switch test='`$payloadJson.pnf-flag`'>\r
+                <outcome value='true'>\r
+                    <set>\r
+                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>\r
+                        <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-pre-check.playbookname`'/>\r
+                    </set>\r
+                </outcome>\r
+                <outcome value='Other'>\r
+                    <block>\r
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                            <parameter name='outputPath' value='playbookname' />\r
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-pre-check.playbookname'`" />\r
+                        </execute>\r
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
        resource="generic-vnf" \r
                key="generic-vnf.vnf-id = $upgrade-pre-check-input.action-identifiers.vnf-id" \r
                local-only="false" \r
                pfx='aai.generic-vnf'>\r
-                <outcome value='success'>\r
+                            <outcome value='success'>\r
+                                <block>\r
+                                    <switch test='`$playbookname`'>\r
+                                        <outcome value=''>\r
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                                                <parameter name='outputPath' value='playbookname' />\r
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-pre-check.playbookname'`" />\r
+                                            </execute>\r
+                                        </outcome>\r
+                                    </switch>\r
+                                    <set>\r
+                                        <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`"/>\r
+                                    </set>\r
+                                </block>\r
+                            </outcome>\r
+                        </get-resource>\r
+                    </block>\r
+                </outcome>\r
+            </switch>\r
+            <switch test='`$playbookname`'>\r
+                <outcome value=''>\r
                     <set>\r
-                        <parameter name='quote' value="'" />\r
-                        <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`"/>\r
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                        <parameter name='playbookname' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>\r
                     </set>\r
                 </outcome>\r
-                <outcome value='Other'>\r
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
-                        <parameter name="logger" value="message-log"/>\r
-                        <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>\r
-                    </record>\r
+            </switch>\r
+            <switch test='`$nodelist`'>\r
+                <outcome value=''>\r
+                    <set>\r
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                    </set>\r
+                </outcome>\r
+                <outcome value="['']">\r
+                    <set>\r
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                    </set>\r
                 </outcome>\r
-            </get-resource>\r
+            </switch>\r
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                <parameter name="logger" value="message-log"/>\r
+                <parameter name="field1" value='`$playbookname`'/>\r
+                <parameter name="field2" value='`$nodelist`'/>\r
+            </record>\r
             <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\r
                 <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\r
                 <parameter name='User' value='`$prop.ansible.user`'/>\r
@@ -40,7 +89,7 @@
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>\r
                 <parameter name='Version' value='`$prop.ansible.version`'/>\r
                 <parameter name='Id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\r
-                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>\r
+                <parameter name='PlaybookName' value='`$playbookname`'/>\r
                 <outcome value='not-found'>\r
                     <block>\r
                         <set>\r
@@ -219,7 +268,7 @@
                                 <parameter name='User' value='`$prop.ansible.user`'/>\r
                                 <parameter name='Password' value='`$prop.ansible.password`'/>\r
                                 <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\r
-                                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>\r
+                                <parameter name='PlaybookName' value='`$playbookname`'/>\r
                                 <outcome value='failure'>\r
                                     <block>\r
                                         <set>\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 252b438..1a72c47 100644 (file)
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
@@ -10,26 +10,75 @@
             <set>\r
                 <parameter name='status.code' value='200' />\r
                 <parameter name='status.message' value='unexpected return from DG' />\r
-                <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                <parameter name='quote' value="'" />\r
             </set>\r
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
+                <parameter name='source' value='upgrade-software-input.payload' />\r
+                <parameter name='outputPath' value='payloadJson' />\r
+                <parameter name='isEscaped' value='true' />\r
+            </execute>\r
+            <switch test='`$payloadJson.pnf-flag`'>\r
+                <outcome value='true'>\r
+                    <set>\r
+                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>\r
+                        <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-software.playbookname`'/>\r
+                    </set>\r
+                </outcome>\r
+                <outcome value='Other'>\r
+                    <block>\r
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                            <parameter name='outputPath' value='playbookname' />\r
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-software.playbookname'`" />\r
+                        </execute>\r
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
        resource="generic-vnf" \r
                key="generic-vnf.vnf-id = $upgrade-software-input.action-identifiers.vnf-id" \r
                local-only="false" \r
                pfx='aai.generic-vnf'>\r
-                <outcome value='success'>\r
+                            <outcome value='success'>\r
+                                <block>\r
+                                    <switch test='`$playbookname`'>\r
+                                        <outcome value=''>\r
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                                                <parameter name='outputPath' value='playbookname' />\r
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-software.playbookname'`" />\r
+                                            </execute>\r
+                                        </outcome>\r
+                                    </switch>\r
+                                    <set>\r
+                                        <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`"/>\r
+                                    </set>\r
+                                </block>\r
+                            </outcome>\r
+                        </get-resource>\r
+                    </block>\r
+                </outcome>\r
+            </switch>\r
+            <switch test='`$playbookname`'>\r
+                <outcome value=''>\r
                     <set>\r
-                        <parameter name='quote' value="'" />\r
-                        <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`"/>\r
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                        <parameter name='playbookname' value='`$prop.lcm.upgrade-software.playbookname`'/>\r
                     </set>\r
                 </outcome>\r
-                <outcome value='Other'>\r
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
-                        <parameter name="logger" value="message-log"/>\r
-                        <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>\r
-                    </record>\r
+            </switch>\r
+            <switch test='`$nodelist`'>\r
+                <outcome value=''>\r
+                    <set>\r
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                    </set>\r
+                </outcome>\r
+                <outcome value="['']">\r
+                    <set>\r
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
+                    </set>\r
                 </outcome>\r
-            </get-resource>\r
+            </switch>\r
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                <parameter name="logger" value="message-log"/>\r
+                <parameter name="field1" value='`$playbookname`'/>\r
+                <parameter name="field2" value='`$nodelist`'/>\r
+            </record>\r
             <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\r
                 <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\r
                 <parameter name='User' value='`$prop.ansible.user`'/>\r
@@ -40,7 +89,7 @@
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>\r
                 <parameter name='Version' value='`$prop.ansible.version`'/>\r
                 <parameter name='Id' value='`$upgrade-software-input.common-header.request-id`'/>\r
-                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>\r
+                <parameter name='PlaybookName' value='`$playbookname`'/>\r
                 <outcome value='not-found'>\r
                     <block>\r
                         <set>\r
@@ -219,7 +268,7 @@
                                 <parameter name='User' value='`$prop.ansible.user`'/>\r
                                 <parameter name='Password' value='`$prop.ansible.password`'/>\r
                                 <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\r
-                                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>\r
+                                <parameter name='PlaybookName' value='`$playbookname`'/>\r
                                 <outcome value='failure'>\r
                                     <block>\r
                                         <set>\r