diff --git a/installation/sdnc/src/main/resources/ipam.data.dump b/installation/sdnc/src/main/resources/ipam.data.dump
index 7371077..934fdc9 100644
--- a/installation/sdnc/src/main/resources/ipam.data.dump
+++ b/installation/sdnc/src/main/resources/ipam.data.dump
@@ -40,7 +40,7 @@
 
 LOCK TABLES `IPAM_IP_POOL` WRITE;
 /*!40000 ALTER TABLE `IPAM_IP_POOL` DISABLE KEYS */;
-INSERT INTO `IPAM_IP_POOL` VALUES (1,'2018-08-17 20:15:12',3,'10.0.0.0/8',4,'ACTIVE','IP Pool for ONAP - general purpose'),(2,'2018-08-17 20:19:29',2,'192.168.10.0/24',4,'ACTIVE','IP Pool for unprotected network - vFW use case'),(3,'2018-08-17 20:20:08',1,'192.168.20.0/24',4,'ACTIVE','IP Pool for protected network - vFW use case');
+INSERT INTO `IPAM_IP_POOL` VALUES (1,'2018-08-17 20:15:12',3,'10.0.0.0/8',4,'ACTIVE','private'),(2,'2018-08-17 20:19:29',2,'192.168.10.0/24',4,'ACTIVE','unprotected'),(3,'2018-08-17 20:20:08',1,'192.168.20.0/24',4,'ACTIVE','protected');
 /*!40000 ALTER TABLE `IPAM_IP_POOL` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -85,4 +85,4 @@
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2018-08-24 13:02:09
\ No newline at end of file
+-- Dump completed on 2018-08-24 13:02:09
diff --git a/installation/src/main/properties/lcm-dg.properties b/installation/src/main/properties/lcm-dg.properties
index 7cd9064..3c6920e 100644
--- a/installation/src/main/properties/lcm-dg.properties
+++ b/installation/src/main/properties/lcm-dg.properties
@@ -9,6 +9,9 @@
 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
--- 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 @@
 [
     {
-        "id": "1a420388.7ce24c",
+        "id": "fab0f7ed.c486b8",
         "type": "method",
         "name": "distribute-traffic",
         "xml": "<method rpc='distribute-traffic' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 550,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 480,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "e635fd5d.f4087"
+                "5ccc8e8d.06e5"
             ]
         ]
     },
     {
-        "id": "c220826b.91906",
+        "id": "5c791eb8.0072b",
         "type": "service-logic",
         "name": "LCM ${project.version}",
         "module": "LCM",
@@ -24,528 +24,788 @@
         "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": 337.99993896484375,
-        "y": 103,
-        "z": "af8f5cdd.6e4de",
+        "x": 267.99993896484375,
+        "y": 148,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1a420388.7ce24c"
+                "fab0f7ed.c486b8"
             ]
         ]
     },
     {
-        "id": "810e1e54.dec1c",
+        "id": "3503ece1.d7ad14",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$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`'/>",
+        "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`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 345.00001525878906,
-        "y": 379,
-        "z": "af8f5cdd.6e4de",
+        "x": 335.00001525878906,
+        "y": 755,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f279f5b8.9d49b8",
-                "895a0a53.e12ea8",
-                "fa759954.4e2068"
+                "734b2c42.973ee4",
+                "bb8a76ca.fb7058",
+                "a457fe79.46497"
             ]
         ]
     },
     {
-        "id": "f7db5396.7b5f1",
+        "id": "f17ff2aa.67075",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 690.9999389648438,
-        "y": 530.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 734.9999389648438,
+        "y": 863.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "bc5a2382.4973",
-                "84f0dd88.8438",
-                "ffd4aab1.e3c4b8"
+                "7ad5787f.1c20f8",
+                "b6f779a3.cc7ed8",
+                "f695f05e.abf31"
             ]
         ]
     },
     {
-        "id": "bc5a2382.4973",
+        "id": "7ad5787f.1c20f8",
         "type": "other",
         "name": "outcome 500",
         "xml": "<outcome value='500'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 835.9999389648438,
-        "y": 528.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 879.9999389648438,
+        "y": 861.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "84f0dd88.8438",
+        "id": "b6f779a3.cc7ed8",
         "type": "other",
         "name": "outcome 100",
         "xml": "<outcome value='100'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 838.9999389648438,
-        "y": 571.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 918.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f44a47b3.3aa128"
+                "1a65bc45.b2fcb4"
             ]
         ]
     },
     {
-        "id": "f44a47b3.3aa128",
+        "id": "1a65bc45.b2fcb4",
         "type": "execute",
         "name": "execute reqExecResult",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.distribute-traffic.playbookname`'/>\n\t\n\n\n\n\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9999389648438,
-        "y": 570.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1064.9999389648438,
+        "y": 917.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "dd2fe7e6.957248",
-                "6913b982.6c9bb8"
+                "5b0d24c6.9eb0ac",
+                "2b5e4322.1d495c"
             ]
         ]
     },
     {
-        "id": "895a0a53.e12ea8",
+        "id": "bb8a76ca.fb7058",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 581.9999389648438,
-        "y": 439.0000534057617,
-        "z": "af8f5cdd.6e4de",
+        "x": 593.9999389648438,
+        "y": 776.0000915527344,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "f279f5b8.9d49b8",
+        "id": "734b2c42.973ee4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 583.9999389648438,
-        "y": 491.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 595.9999389648438,
+        "y": 828.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f7db5396.7b5f1"
+                "f17ff2aa.67075"
             ]
         ]
     },
     {
-        "id": "dd2fe7e6.957248",
+        "id": "5b0d24c6.9eb0ac",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1189.9999389648438,
-        "y": 542.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1233.9999389648438,
+        "y": 875.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "ffd4aab1.e3c4b8",
+        "id": "f695f05e.abf31",
         "type": "other",
         "name": "outcome 101",
         "xml": "<outcome value='101'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 832.9999389648438,
-        "y": 486.00006103515625,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 819.0000686645508,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "6913b982.6c9bb8",
+        "id": "2b5e4322.1d495c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1191.9999389648438,
-        "y": 597.0000915527344,
-        "z": "af8f5cdd.6e4de",
+        "x": 1241.9998779296875,
+        "y": 923.0001220703125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "14c8dea1.b5b7a1"
+                "db1e6d62.a1404"
             ]
         ]
     },
     {
-        "id": "a32993f8.f8215",
+        "id": "c1a2b259.11e46",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
         "comments": "",
-        "x": 1467.9998779296875,
-        "y": 648.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 1535.9998779296875,
+        "y": 980.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "d8c3f83d.d0b9d8",
+        "id": "566f9779.c05d38",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 153,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 83,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c220826b.91906"
+                "5c791eb8.0072b"
             ]
         ]
     },
     {
-        "id": "e635fd5d.f4087",
+        "id": "5ccc8e8d.06e5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 139.91668701171875,
-        "y": 241.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 80.91668701171875,
+        "y": 239.08334350585938,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "810e1e54.dec1c",
-                "ee1802be.c5c18",
-                "e8d3b31a.f46c6",
-                "4d7f56db.9375c8"
+                "3503ece1.d7ad14",
+                "dc18f7c9.2e4ac8",
+                "814875d2.cac108",
+                "e9d89bdf.30f7a8",
+                "69e97f86.e07ef",
+                "fa9a8e1f.bba53",
+                "baba22fc.1ceb5",
+                "81510405.ca8868"
             ]
         ]
     },
     {
-        "id": "ee1802be.c5c18",
+        "id": "dc18f7c9.2e4ac8",
         "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": 328.00001525878906,
-        "y": 225.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 379.0000305175781,
+        "y": 272.0833435058594,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "3830f5d4.87f1aa",
+        "id": "70d1c79a.089af8",
         "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": 1222.9999389648438,
-        "y": 371.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1545.9998779296875,
+        "y": 725.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1566d659.a0655a"
+                "d776c76b.1dd188"
             ]
         ]
     },
     {
-        "id": "1566d659.a0655a",
+        "id": "d776c76b.1dd188",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1392.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1715.9998168945312,
+        "y": 724.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "22f8bfd0.6139e"
+                "eac6c260.d11fc"
             ]
         ]
     },
     {
-        "id": "80cc4946.3f0f78",
+        "id": "2b54a991.b17b16",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9998779296875,
-        "y": 395.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1348.9998168945312,
+        "y": 749.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "3830f5d4.87f1aa",
-                "fedbb5e6.fb3c28",
-                "898f667e.daf2e8"
+                "70d1c79a.089af8",
+                "7970fcd5.6f11b4",
+                "3d8934f9.d0339c"
             ]
         ]
     },
     {
-        "id": "7ce48bed.5b7c74",
+        "id": "e790e11b.4f947",
         "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": 1488.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1546.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "37e7fa80.2728b6"
+                "2e13891.034f576"
             ]
         ]
     },
     {
-        "id": "37e7fa80.2728b6",
+        "id": "2e13891.034f576",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1714.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "47c7511a.dd8fe"
+                "30475e40.9b8be2"
             ]
         ]
     },
     {
-        "id": "22f8bfd0.6139e",
+        "id": "eac6c260.d11fc",
         "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": 1524.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1835.9998779296875,
+        "y": 723.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "fedbb5e6.fb3c28",
+        "id": "7970fcd5.6f11b4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
         "comments": "",
-        "x": 1197.9165649414062,
-        "y": 408.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1527.91650390625,
+        "y": 776.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "47c7511a.dd8fe",
+        "id": "30475e40.9b8be2",
         "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": 1769.9166259765625,
-        "y": 598.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1842.9166259765625,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "898f667e.daf2e8",
+        "id": "3d8934f9.d0339c",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$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",
         "comments": "",
-        "x": 1174.9999389648438,
-        "y": 318.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1532.9998779296875,
+        "y": 672.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "14c8dea1.b5b7a1",
+        "id": "db1e6d62.a1404",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1317.9998779296875,
-        "y": 596.0833435058594,
-        "z": "af8f5cdd.6e4de",
+        "x": 1369.9998779296875,
+        "y": 924.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "7ce48bed.5b7c74",
-                "70a28c6a.563d24",
-                "a32993f8.f8215"
+                "e790e11b.4f947",
+                "3a3f1d44.898da2",
+                "c1a2b259.11e46"
             ]
         ]
     },
     {
-        "id": "70a28c6a.563d24",
+        "id": "3a3f1d44.898da2",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$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",
         "comments": "",
-        "x": 1448.1666259765625,
-        "y": 549.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1536.1666259765625,
+        "y": 875.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "fa759954.4e2068",
+        "id": "a457fe79.46497",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 577.9999389648438,
-        "y": 392.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 602.9999389648438,
+        "y": 728.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "ed41675d.59c088"
+                "3d4c2c9a.7b1324"
             ]
         ]
     },
     {
-        "id": "756c2e53.ca6d7",
+        "id": "d512629f.bc625",
         "type": "set",
         "name": "set Defaults",
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
         "comments": "",
-        "x": 1009.9999389648438,
-        "y": 297.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 893.9999389648438,
+        "y": 687,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "ed41675d.59c088",
+        "id": "3d4c2c9a.7b1324",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 761.9999389648438,
-        "y": 384.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 739.9999389648438,
+        "y": 722.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "756c2e53.ca6d7",
-                "80cc4946.3f0f78"
+                "d512629f.bc625",
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "e8d3b31a.f46c6",
+        "id": "814875d2.cac108",
         "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<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "name": "set default values",
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
         "comments": "",
-        "x": 336,
-        "y": 269,
-        "z": "af8f5cdd.6e4de",
+        "x": 372,
+        "y": 319,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "4d7f56db.9375c8",
+        "id": "442dbdff.6dfcb4",
         "type": "get-resource",
-        "name": "get aai.generic-vnf by vnf-id",
+        "name": "get aai.generic-vnf ",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $distribute-traffic-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
         "comments": "",
         "outputs": 1,
-        "x": 349.0000305175781,
-        "y": 325,
-        "z": "af8f5cdd.6e4de",
+        "x": 912,
+        "y": 495,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "fa69a126.2a554",
-                "f9cb9963.f9e368"
+                "1e57cb28.122ad5"
             ]
         ]
     },
     {
-        "id": "fa69a126.2a554",
-        "type": "failure",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 589.86083984375,
-        "y": 312.53564453125,
-        "z": "af8f5cdd.6e4de",
-        "wires": [
-            [
-                "2d1a88c6.11f9d8"
-            ]
-        ]
-    },
-    {
-        "id": "f9cb9963.f9e368",
+        "id": "1e57cb28.122ad5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 591.3908081054688,
-        "y": 260.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "x": 1070.3907470703125,
+        "y": 493.28399658203125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c4d4de4d.3e19f"
+                "5a65efc0.bf413"
             ]
         ]
     },
     {
-        "id": "c4d4de4d.3e19f",
-        "type": "set",
-        "name": "set nodelist",
-        "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "id": "baba22fc.1ceb5",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
         "comments": "",
-        "x": 740.3908081054688,
-        "y": 259.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "outputs": 1,
+        "x": 300.9998779296875,
+        "y": 683,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "69e97f86.e07ef",
+        "type": "switchNode",
+        "name": "switch pnf-flag",
+        "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 354,
+        "y": 420,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "e43265e9.4c7f38",
+                "d78c93da.7125f"
+            ]
+        ]
+    },
+    {
+        "id": "e9d89bdf.30f7a8",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "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' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 386,
+        "y": 366,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e43265e9.4c7f38",
+        "type": "outcome",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 551,
+        "y": 399,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "abbc4ae4.be5328"
+            ]
+        ]
+    },
+    {
+        "id": "d78c93da.7125f",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 550.9999389648438,
+        "y": 460,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "f68ee407.ca6d88"
+            ]
+        ]
+    },
+    {
+        "id": "f68ee407.ca6d88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 698.9999389648438,
+        "y": 459,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "442dbdff.6dfcb4",
+                "80c560bb.eea5f"
+            ]
+        ]
+    },
+    {
+        "id": "abbc4ae4.be5328",
+        "type": "set",
+        "name": "set AnsibleReq",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.distribute-traffic.playbookname`'/>\n",
+        "comments": "",
+        "x": 712,
+        "y": 397,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "2d1a88c6.11f9d8",
-        "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='VNF not found in AAI. Nodelist retrieved from config'/>",
+        "id": "80c560bb.eea5f",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.distribute-traffic.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 736,
-        "y": 312,
-        "z": "af8f5cdd.6e4de",
+        "x": 921,
+        "y": 439,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fa9a8e1f.bba53",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 351,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "1a5624d2.74e98b"
+            ]
+        ]
+    },
+    {
+        "id": "1a5624d2.74e98b",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 522,
+        "y": 552,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "524c17a1.30fbf8"
+            ]
+        ]
+    },
+    {
+        "id": "524c17a1.30fbf8",
+        "type": "set",
+        "name": "set playbookname",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.distribute-traffic.playbookname`'/>",
+        "comments": "",
+        "x": 712,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "81510405.ca8868",
+        "type": "switchNode",
+        "name": "switch nodelist",
+        "xml": "<switch test='`$nodelist`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 341,
+        "y": 610,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "7a126f.d2de2d9",
+                "8743a074.e8506"
+            ]
+        ]
+    },
+    {
+        "id": "7a126f.d2de2d9",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 521,
+        "y": 603,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "c954af6f.c34df",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "comments": "",
+        "x": 678,
+        "y": 617,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "8743a074.e8506",
+        "type": "outcome",
+        "name": "empty",
+        "xml": "<outcome value=\"['']\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 520,
+        "y": 647,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "90b2891b.001708",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1396,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c9dd0d76.432f7"
+            ]
+        ]
+    },
+    {
+        "id": "c9dd0d76.432f7",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1574,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "6ea15b2b.d9cd74"
+            ]
+        ]
+    },
+    {
+        "id": "9706bdee.6acf9",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "comments": "",
+        "x": 1369,
+        "y": 535,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "5a65efc0.bf413",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1199,
+        "y": 492,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "90b2891b.001708",
+                "9706bdee.6acf9"
+            ]
+        ]
+    },
+    {
+        "id": "6ea15b2b.d9cd74",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.distribute-traffic.playbookname'`\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1746,
+        "y": 480,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
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
--- 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": []
-    }
-]
+[
+    {
+        "id": "c36c1e82.e47c",
+        "type": "method",
+        "name": "lock",
+        "xml": "<method rpc='lock' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 530,
+        "y": 121,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "ea26f1ed.e963b"
+            ]
+        ]
+    },
+    {
+        "id": "4c2264b2.81a61c",
+        "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": 300.99993896484375,
+        "y": 122,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "c36c1e82.e47c"
+            ]
+        ]
+    },
+    {
+        "id": "a3360ab0.ce42c8",
+        "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": 383,
+        "y": 510,
+        "z": "a439ae77.f8998",
+        "wires": []
+    },
+    {
+        "id": "7e67863d.7c42f8",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 98,
+        "y": 121,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "4c2264b2.81a61c"
+            ]
+        ]
+    },
+    {
+        "id": "ea26f1ed.e963b",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 133.91668701171875,
+        "y": 275.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "f1d5fb31.fa3878",
+                "625601b.39b33",
+                "786cf009.ea481",
+                "cd184491.d656e8",
+                "a3360ab0.ce42c8"
+            ]
+        ]
+    },
+    {
+        "id": "f1d5fb31.fa3878",
+        "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": 421,
+        "y": 260.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "cd184491.d656e8",
+        "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": 397,
+        "y": 437.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "91133c94.04e29"
+            ]
+        ]
+    },
+    {
+        "id": "91133c94.04e29",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 606,
+        "y": 435.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "f3b86bb6.9cf808"
+            ]
+        ]
+    },
+    {
+        "id": "f3b86bb6.9cf808",
+        "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": 766,
+        "y": 435.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "786cf009.ea481",
+        "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": 369,
+        "y": 369.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": []
+    },
+    {
+        "id": "625601b.39b33",
+        "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": 423,
+        "y": 312,
+        "z": "a439ae77.f8998",
+        "wires": []
+    }
+]
\ 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
--- 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 @@
 [
     {
-        "id": "1a420388.7ce24c",
+        "id": "fab0f7ed.c486b8",
         "type": "method",
         "name": "quiesce-traffic",
         "xml": "<method rpc='quiesce-traffic' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 550,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 480,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "e635fd5d.f4087"
+                "5ccc8e8d.06e5"
             ]
         ]
     },
     {
-        "id": "c220826b.91906",
+        "id": "5c791eb8.0072b",
         "type": "service-logic",
         "name": "LCM ${project.version}",
         "module": "LCM",
@@ -24,528 +24,788 @@
         "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": 337.99993896484375,
-        "y": 103,
-        "z": "af8f5cdd.6e4de",
+        "x": 267.99993896484375,
+        "y": 148,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1a420388.7ce24c"
+                "fab0f7ed.c486b8"
             ]
         ]
     },
     {
-        "id": "810e1e54.dec1c",
+        "id": "3503ece1.d7ad14",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$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`'/>",
+        "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`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 345.00001525878906,
-        "y": 379,
-        "z": "af8f5cdd.6e4de",
+        "x": 335.00001525878906,
+        "y": 755,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f279f5b8.9d49b8",
-                "895a0a53.e12ea8",
-                "fa759954.4e2068"
+                "734b2c42.973ee4",
+                "bb8a76ca.fb7058",
+                "a457fe79.46497"
             ]
         ]
     },
     {
-        "id": "f7db5396.7b5f1",
+        "id": "f17ff2aa.67075",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 690.9999389648438,
-        "y": 530.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 734.9999389648438,
+        "y": 863.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "bc5a2382.4973",
-                "84f0dd88.8438",
-                "ffd4aab1.e3c4b8"
+                "7ad5787f.1c20f8",
+                "b6f779a3.cc7ed8",
+                "f695f05e.abf31"
             ]
         ]
     },
     {
-        "id": "bc5a2382.4973",
+        "id": "7ad5787f.1c20f8",
         "type": "other",
         "name": "outcome 500",
         "xml": "<outcome value='500'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 835.9999389648438,
-        "y": 528.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 879.9999389648438,
+        "y": 861.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "84f0dd88.8438",
+        "id": "b6f779a3.cc7ed8",
         "type": "other",
         "name": "outcome 100",
         "xml": "<outcome value='100'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 838.9999389648438,
-        "y": 571.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 918.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f44a47b3.3aa128"
+                "1a65bc45.b2fcb4"
             ]
         ]
     },
     {
-        "id": "f44a47b3.3aa128",
+        "id": "1a65bc45.b2fcb4",
         "type": "execute",
         "name": "execute reqExecResult",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.quiesce-traffic.playbookname`'/>\n\t\n\n\n\n\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9999389648438,
-        "y": 570.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1064.9999389648438,
+        "y": 917.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "dd2fe7e6.957248",
-                "6913b982.6c9bb8"
+                "5b0d24c6.9eb0ac",
+                "2b5e4322.1d495c"
             ]
         ]
     },
     {
-        "id": "895a0a53.e12ea8",
+        "id": "bb8a76ca.fb7058",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 581.9999389648438,
-        "y": 439.0000534057617,
-        "z": "af8f5cdd.6e4de",
+        "x": 593.9999389648438,
+        "y": 776.0000915527344,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "f279f5b8.9d49b8",
+        "id": "734b2c42.973ee4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 583.9999389648438,
-        "y": 491.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 595.9999389648438,
+        "y": 828.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f7db5396.7b5f1"
+                "f17ff2aa.67075"
             ]
         ]
     },
     {
-        "id": "dd2fe7e6.957248",
+        "id": "5b0d24c6.9eb0ac",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1189.9999389648438,
-        "y": 542.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1233.9999389648438,
+        "y": 875.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "ffd4aab1.e3c4b8",
+        "id": "f695f05e.abf31",
         "type": "other",
         "name": "outcome 101",
         "xml": "<outcome value='101'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 832.9999389648438,
-        "y": 486.00006103515625,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 819.0000686645508,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "6913b982.6c9bb8",
+        "id": "2b5e4322.1d495c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1191.9999389648438,
-        "y": 597.0000915527344,
-        "z": "af8f5cdd.6e4de",
+        "x": 1241.9998779296875,
+        "y": 923.0001220703125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "14c8dea1.b5b7a1"
+                "db1e6d62.a1404"
             ]
         ]
     },
     {
-        "id": "a32993f8.f8215",
+        "id": "c1a2b259.11e46",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
         "comments": "",
-        "x": 1467.9998779296875,
-        "y": 648.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 1535.9998779296875,
+        "y": 980.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "d8c3f83d.d0b9d8",
+        "id": "566f9779.c05d38",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 153,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 83,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c220826b.91906"
+                "5c791eb8.0072b"
             ]
         ]
     },
     {
-        "id": "e635fd5d.f4087",
+        "id": "5ccc8e8d.06e5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 139.91668701171875,
-        "y": 241.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 80.91668701171875,
+        "y": 239.08334350585938,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "810e1e54.dec1c",
-                "ee1802be.c5c18",
-                "e8d3b31a.f46c6",
-                "4d7f56db.9375c8"
+                "3503ece1.d7ad14",
+                "dc18f7c9.2e4ac8",
+                "814875d2.cac108",
+                "e9d89bdf.30f7a8",
+                "69e97f86.e07ef",
+                "fa9a8e1f.bba53",
+                "baba22fc.1ceb5",
+                "81510405.ca8868"
             ]
         ]
     },
     {
-        "id": "ee1802be.c5c18",
+        "id": "dc18f7c9.2e4ac8",
         "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": 328.00001525878906,
-        "y": 225.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 379.0000305175781,
+        "y": 272.0833435058594,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "3830f5d4.87f1aa",
+        "id": "70d1c79a.089af8",
         "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": 1222.9999389648438,
-        "y": 371.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1545.9998779296875,
+        "y": 725.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1566d659.a0655a"
+                "d776c76b.1dd188"
             ]
         ]
     },
     {
-        "id": "1566d659.a0655a",
+        "id": "d776c76b.1dd188",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1392.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1715.9998168945312,
+        "y": 724.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "22f8bfd0.6139e"
+                "eac6c260.d11fc"
             ]
         ]
     },
     {
-        "id": "80cc4946.3f0f78",
+        "id": "2b54a991.b17b16",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9998779296875,
-        "y": 395.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1348.9998168945312,
+        "y": 749.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "3830f5d4.87f1aa",
-                "fedbb5e6.fb3c28",
-                "898f667e.daf2e8"
+                "70d1c79a.089af8",
+                "7970fcd5.6f11b4",
+                "3d8934f9.d0339c"
             ]
         ]
     },
     {
-        "id": "7ce48bed.5b7c74",
+        "id": "e790e11b.4f947",
         "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": 1488.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1546.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "37e7fa80.2728b6"
+                "2e13891.034f576"
             ]
         ]
     },
     {
-        "id": "37e7fa80.2728b6",
+        "id": "2e13891.034f576",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1714.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "47c7511a.dd8fe"
+                "30475e40.9b8be2"
             ]
         ]
     },
     {
-        "id": "22f8bfd0.6139e",
+        "id": "eac6c260.d11fc",
         "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": 1524.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1835.9998779296875,
+        "y": 723.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "fedbb5e6.fb3c28",
+        "id": "7970fcd5.6f11b4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
         "comments": "",
-        "x": 1197.9165649414062,
-        "y": 408.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1527.91650390625,
+        "y": 776.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "47c7511a.dd8fe",
+        "id": "30475e40.9b8be2",
         "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": 1769.9166259765625,
-        "y": 598.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1842.9166259765625,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "898f667e.daf2e8",
+        "id": "3d8934f9.d0339c",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$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",
         "comments": "",
-        "x": 1174.9999389648438,
-        "y": 318.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1532.9998779296875,
+        "y": 672.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "14c8dea1.b5b7a1",
+        "id": "db1e6d62.a1404",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1317.9998779296875,
-        "y": 596.0833435058594,
-        "z": "af8f5cdd.6e4de",
+        "x": 1369.9998779296875,
+        "y": 924.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "7ce48bed.5b7c74",
-                "70a28c6a.563d24",
-                "a32993f8.f8215"
+                "e790e11b.4f947",
+                "3a3f1d44.898da2",
+                "c1a2b259.11e46"
             ]
         ]
     },
     {
-        "id": "70a28c6a.563d24",
+        "id": "3a3f1d44.898da2",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$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",
         "comments": "",
-        "x": 1448.1666259765625,
-        "y": 549.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1536.1666259765625,
+        "y": 875.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "fa759954.4e2068",
+        "id": "a457fe79.46497",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 577.9999389648438,
-        "y": 392.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 602.9999389648438,
+        "y": 728.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "ed41675d.59c088"
+                "3d4c2c9a.7b1324"
             ]
         ]
     },
     {
-        "id": "756c2e53.ca6d7",
+        "id": "d512629f.bc625",
         "type": "set",
         "name": "set Defaults",
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
         "comments": "",
-        "x": 1009.9999389648438,
-        "y": 297.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 893.9999389648438,
+        "y": 687,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "ed41675d.59c088",
+        "id": "3d4c2c9a.7b1324",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 761.9999389648438,
-        "y": 384.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 739.9999389648438,
+        "y": 722.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "756c2e53.ca6d7",
-                "80cc4946.3f0f78"
+                "d512629f.bc625",
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "e8d3b31a.f46c6",
+        "id": "814875d2.cac108",
         "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<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "name": "set default values",
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
         "comments": "",
-        "x": 336,
-        "y": 269,
-        "z": "af8f5cdd.6e4de",
+        "x": 372,
+        "y": 319,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "4d7f56db.9375c8",
+        "id": "442dbdff.6dfcb4",
         "type": "get-resource",
-        "name": "get aai.generic-vnf by vnf-id",
+        "name": "get aai.generic-vnf ",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $quiesce-traffic-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
         "comments": "",
         "outputs": 1,
-        "x": 349.0000305175781,
-        "y": 325,
-        "z": "af8f5cdd.6e4de",
+        "x": 912,
+        "y": 495,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "fa69a126.2a554",
-                "f9cb9963.f9e368"
+                "1e57cb28.122ad5"
             ]
         ]
     },
     {
-        "id": "fa69a126.2a554",
-        "type": "failure",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 589.86083984375,
-        "y": 312.53564453125,
-        "z": "af8f5cdd.6e4de",
-        "wires": [
-            [
-                "2d1a88c6.11f9d8"
-            ]
-        ]
-    },
-    {
-        "id": "f9cb9963.f9e368",
+        "id": "1e57cb28.122ad5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 591.3908081054688,
-        "y": 260.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "x": 1070.3907470703125,
+        "y": 493.28399658203125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c4d4de4d.3e19f"
+                "5a65efc0.bf413"
             ]
         ]
     },
     {
-        "id": "c4d4de4d.3e19f",
-        "type": "set",
-        "name": "set nodelist",
-        "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "id": "baba22fc.1ceb5",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
         "comments": "",
-        "x": 740.3908081054688,
-        "y": 259.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "outputs": 1,
+        "x": 300.9998779296875,
+        "y": 683,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "69e97f86.e07ef",
+        "type": "switchNode",
+        "name": "switch pnf-flag",
+        "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 354,
+        "y": 420,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "e43265e9.4c7f38",
+                "d78c93da.7125f"
+            ]
+        ]
+    },
+    {
+        "id": "e9d89bdf.30f7a8",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "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' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 386,
+        "y": 366,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e43265e9.4c7f38",
+        "type": "outcome",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 551,
+        "y": 399,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "abbc4ae4.be5328"
+            ]
+        ]
+    },
+    {
+        "id": "d78c93da.7125f",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 550.9999389648438,
+        "y": 460,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "f68ee407.ca6d88"
+            ]
+        ]
+    },
+    {
+        "id": "f68ee407.ca6d88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 698.9999389648438,
+        "y": 459,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "442dbdff.6dfcb4",
+                "80c560bb.eea5f"
+            ]
+        ]
+    },
+    {
+        "id": "abbc4ae4.be5328",
+        "type": "set",
+        "name": "set AnsibleReq",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.quiesce-traffic.playbookname`'/>\n",
+        "comments": "",
+        "x": 712,
+        "y": 397,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "2d1a88c6.11f9d8",
-        "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='VNF not found in AAI. Nodelist retrieved from config'/>",
+        "id": "80c560bb.eea5f",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.quiesce-traffic.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 736,
-        "y": 312,
-        "z": "af8f5cdd.6e4de",
+        "x": 921,
+        "y": 439,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fa9a8e1f.bba53",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 351,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "1a5624d2.74e98b"
+            ]
+        ]
+    },
+    {
+        "id": "1a5624d2.74e98b",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 522,
+        "y": 552,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "524c17a1.30fbf8"
+            ]
+        ]
+    },
+    {
+        "id": "524c17a1.30fbf8",
+        "type": "set",
+        "name": "set playbookname",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.quiesce-traffic.playbookname`'/>",
+        "comments": "",
+        "x": 712,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "81510405.ca8868",
+        "type": "switchNode",
+        "name": "switch nodelist",
+        "xml": "<switch test='`$nodelist`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 341,
+        "y": 610,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "7a126f.d2de2d9",
+                "8743a074.e8506"
+            ]
+        ]
+    },
+    {
+        "id": "7a126f.d2de2d9",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 521,
+        "y": 603,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "c954af6f.c34df",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "comments": "",
+        "x": 678,
+        "y": 617,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "8743a074.e8506",
+        "type": "outcome",
+        "name": "empty",
+        "xml": "<outcome value=\"['']\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 520,
+        "y": 647,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "90b2891b.001708",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1396,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c9dd0d76.432f7"
+            ]
+        ]
+    },
+    {
+        "id": "c9dd0d76.432f7",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1574,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "6ea15b2b.d9cd74"
+            ]
+        ]
+    },
+    {
+        "id": "9706bdee.6acf9",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "comments": "",
+        "x": 1369,
+        "y": 535,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "5a65efc0.bf413",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1199,
+        "y": 492,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "90b2891b.001708",
+                "9706bdee.6acf9"
+            ]
+        ]
+    },
+    {
+        "id": "6ea15b2b.d9cd74",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.quiesce-traffic.playbookname'`\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1746,
+        "y": 480,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
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
--- 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 @@
 [
     {
-        "id": "1a420388.7ce24c",
+        "id": "fab0f7ed.c486b8",
         "type": "method",
         "name": "resume-traffic",
         "xml": "<method rpc='resume-traffic' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 550,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 480,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "e635fd5d.f4087"
+                "5ccc8e8d.06e5"
             ]
         ]
     },
     {
-        "id": "c220826b.91906",
+        "id": "5c791eb8.0072b",
         "type": "service-logic",
         "name": "LCM ${project.version}",
         "module": "LCM",
@@ -24,528 +24,788 @@
         "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": 337.99993896484375,
-        "y": 103,
-        "z": "af8f5cdd.6e4de",
+        "x": 267.99993896484375,
+        "y": 148,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1a420388.7ce24c"
+                "fab0f7ed.c486b8"
             ]
         ]
     },
     {
-        "id": "810e1e54.dec1c",
+        "id": "3503ece1.d7ad14",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$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`'/>",
+        "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`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 345.00001525878906,
-        "y": 379,
-        "z": "af8f5cdd.6e4de",
+        "x": 335.00001525878906,
+        "y": 755,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f279f5b8.9d49b8",
-                "895a0a53.e12ea8",
-                "fa759954.4e2068"
+                "734b2c42.973ee4",
+                "bb8a76ca.fb7058",
+                "a457fe79.46497"
             ]
         ]
     },
     {
-        "id": "f7db5396.7b5f1",
+        "id": "f17ff2aa.67075",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 690.9999389648438,
-        "y": 530.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 734.9999389648438,
+        "y": 863.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "bc5a2382.4973",
-                "84f0dd88.8438",
-                "ffd4aab1.e3c4b8"
+                "7ad5787f.1c20f8",
+                "b6f779a3.cc7ed8",
+                "f695f05e.abf31"
             ]
         ]
     },
     {
-        "id": "bc5a2382.4973",
+        "id": "7ad5787f.1c20f8",
         "type": "other",
         "name": "outcome 500",
         "xml": "<outcome value='500'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 835.9999389648438,
-        "y": 528.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 879.9999389648438,
+        "y": 861.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "84f0dd88.8438",
+        "id": "b6f779a3.cc7ed8",
         "type": "other",
         "name": "outcome 100",
         "xml": "<outcome value='100'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 838.9999389648438,
-        "y": 571.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 918.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f44a47b3.3aa128"
+                "1a65bc45.b2fcb4"
             ]
         ]
     },
     {
-        "id": "f44a47b3.3aa128",
+        "id": "1a65bc45.b2fcb4",
         "type": "execute",
         "name": "execute reqExecResult",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.resume-traffic.playbookname`'/>\n\t\n\n\n\n\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9999389648438,
-        "y": 570.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1064.9999389648438,
+        "y": 917.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "dd2fe7e6.957248",
-                "6913b982.6c9bb8"
+                "5b0d24c6.9eb0ac",
+                "2b5e4322.1d495c"
             ]
         ]
     },
     {
-        "id": "895a0a53.e12ea8",
+        "id": "bb8a76ca.fb7058",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 581.9999389648438,
-        "y": 439.0000534057617,
-        "z": "af8f5cdd.6e4de",
+        "x": 593.9999389648438,
+        "y": 776.0000915527344,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "f279f5b8.9d49b8",
+        "id": "734b2c42.973ee4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 583.9999389648438,
-        "y": 491.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 595.9999389648438,
+        "y": 828.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f7db5396.7b5f1"
+                "f17ff2aa.67075"
             ]
         ]
     },
     {
-        "id": "dd2fe7e6.957248",
+        "id": "5b0d24c6.9eb0ac",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1189.9999389648438,
-        "y": 542.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1233.9999389648438,
+        "y": 875.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "ffd4aab1.e3c4b8",
+        "id": "f695f05e.abf31",
         "type": "other",
         "name": "outcome 101",
         "xml": "<outcome value='101'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 832.9999389648438,
-        "y": 486.00006103515625,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 819.0000686645508,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "6913b982.6c9bb8",
+        "id": "2b5e4322.1d495c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1191.9999389648438,
-        "y": 597.0000915527344,
-        "z": "af8f5cdd.6e4de",
+        "x": 1241.9998779296875,
+        "y": 923.0001220703125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "14c8dea1.b5b7a1"
+                "db1e6d62.a1404"
             ]
         ]
     },
     {
-        "id": "a32993f8.f8215",
+        "id": "c1a2b259.11e46",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
         "comments": "",
-        "x": 1467.9998779296875,
-        "y": 648.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 1535.9998779296875,
+        "y": 980.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "d8c3f83d.d0b9d8",
+        "id": "566f9779.c05d38",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 153,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 83,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c220826b.91906"
+                "5c791eb8.0072b"
             ]
         ]
     },
     {
-        "id": "e635fd5d.f4087",
+        "id": "5ccc8e8d.06e5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 139.91668701171875,
-        "y": 241.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 80.91668701171875,
+        "y": 239.08334350585938,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "810e1e54.dec1c",
-                "ee1802be.c5c18",
-                "e8d3b31a.f46c6",
-                "4d7f56db.9375c8"
+                "3503ece1.d7ad14",
+                "dc18f7c9.2e4ac8",
+                "814875d2.cac108",
+                "e9d89bdf.30f7a8",
+                "69e97f86.e07ef",
+                "fa9a8e1f.bba53",
+                "baba22fc.1ceb5",
+                "81510405.ca8868"
             ]
         ]
     },
     {
-        "id": "ee1802be.c5c18",
+        "id": "dc18f7c9.2e4ac8",
         "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": 328.00001525878906,
-        "y": 225.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 379.0000305175781,
+        "y": 272.0833435058594,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "3830f5d4.87f1aa",
+        "id": "70d1c79a.089af8",
         "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": 1222.9999389648438,
-        "y": 371.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1545.9998779296875,
+        "y": 725.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1566d659.a0655a"
+                "d776c76b.1dd188"
             ]
         ]
     },
     {
-        "id": "1566d659.a0655a",
+        "id": "d776c76b.1dd188",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1392.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1715.9998168945312,
+        "y": 724.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "22f8bfd0.6139e"
+                "eac6c260.d11fc"
             ]
         ]
     },
     {
-        "id": "80cc4946.3f0f78",
+        "id": "2b54a991.b17b16",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9998779296875,
-        "y": 395.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1348.9998168945312,
+        "y": 749.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "3830f5d4.87f1aa",
-                "fedbb5e6.fb3c28",
-                "898f667e.daf2e8"
+                "70d1c79a.089af8",
+                "7970fcd5.6f11b4",
+                "3d8934f9.d0339c"
             ]
         ]
     },
     {
-        "id": "7ce48bed.5b7c74",
+        "id": "e790e11b.4f947",
         "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": 1488.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1546.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "37e7fa80.2728b6"
+                "2e13891.034f576"
             ]
         ]
     },
     {
-        "id": "37e7fa80.2728b6",
+        "id": "2e13891.034f576",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1714.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "47c7511a.dd8fe"
+                "30475e40.9b8be2"
             ]
         ]
     },
     {
-        "id": "22f8bfd0.6139e",
+        "id": "eac6c260.d11fc",
         "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": 1524.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1835.9998779296875,
+        "y": 723.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "fedbb5e6.fb3c28",
+        "id": "7970fcd5.6f11b4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
         "comments": "",
-        "x": 1197.9165649414062,
-        "y": 408.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1527.91650390625,
+        "y": 776.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "47c7511a.dd8fe",
+        "id": "30475e40.9b8be2",
         "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": 1769.9166259765625,
-        "y": 598.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1842.9166259765625,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "898f667e.daf2e8",
+        "id": "3d8934f9.d0339c",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$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",
         "comments": "",
-        "x": 1174.9999389648438,
-        "y": 318.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1532.9998779296875,
+        "y": 672.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "14c8dea1.b5b7a1",
+        "id": "db1e6d62.a1404",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1317.9998779296875,
-        "y": 596.0833435058594,
-        "z": "af8f5cdd.6e4de",
+        "x": 1369.9998779296875,
+        "y": 924.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "7ce48bed.5b7c74",
-                "70a28c6a.563d24",
-                "a32993f8.f8215"
+                "e790e11b.4f947",
+                "3a3f1d44.898da2",
+                "c1a2b259.11e46"
             ]
         ]
     },
     {
-        "id": "70a28c6a.563d24",
+        "id": "3a3f1d44.898da2",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$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",
         "comments": "",
-        "x": 1448.1666259765625,
-        "y": 549.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1536.1666259765625,
+        "y": 875.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "fa759954.4e2068",
+        "id": "a457fe79.46497",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 577.9999389648438,
-        "y": 392.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 602.9999389648438,
+        "y": 728.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "ed41675d.59c088"
+                "3d4c2c9a.7b1324"
             ]
         ]
     },
     {
-        "id": "756c2e53.ca6d7",
+        "id": "d512629f.bc625",
         "type": "set",
         "name": "set Defaults",
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
         "comments": "",
-        "x": 1009.9999389648438,
-        "y": 297.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 893.9999389648438,
+        "y": 687,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "ed41675d.59c088",
+        "id": "3d4c2c9a.7b1324",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 761.9999389648438,
-        "y": 384.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 739.9999389648438,
+        "y": 722.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "756c2e53.ca6d7",
-                "80cc4946.3f0f78"
+                "d512629f.bc625",
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "e8d3b31a.f46c6",
+        "id": "814875d2.cac108",
         "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<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "name": "set default values",
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
         "comments": "",
-        "x": 336,
-        "y": 269,
-        "z": "af8f5cdd.6e4de",
+        "x": 372,
+        "y": 319,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "4d7f56db.9375c8",
+        "id": "442dbdff.6dfcb4",
         "type": "get-resource",
-        "name": "get aai.generic-vnf by vnf-id",
+        "name": "get aai.generic-vnf ",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $resume-traffic-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
         "comments": "",
         "outputs": 1,
-        "x": 349.0000305175781,
-        "y": 325,
-        "z": "af8f5cdd.6e4de",
+        "x": 912,
+        "y": 495,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "fa69a126.2a554",
-                "f9cb9963.f9e368"
+                "1e57cb28.122ad5"
             ]
         ]
     },
     {
-        "id": "fa69a126.2a554",
-        "type": "failure",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 589.86083984375,
-        "y": 312.53564453125,
-        "z": "af8f5cdd.6e4de",
-        "wires": [
-            [
-                "2d1a88c6.11f9d8"
-            ]
-        ]
-    },
-    {
-        "id": "f9cb9963.f9e368",
+        "id": "1e57cb28.122ad5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 591.3908081054688,
-        "y": 260.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "x": 1070.3907470703125,
+        "y": 493.28399658203125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c4d4de4d.3e19f"
+                "5a65efc0.bf413"
             ]
         ]
     },
     {
-        "id": "c4d4de4d.3e19f",
-        "type": "set",
-        "name": "set nodelist",
-        "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "id": "baba22fc.1ceb5",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
         "comments": "",
-        "x": 740.3908081054688,
-        "y": 259.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "outputs": 1,
+        "x": 300.9998779296875,
+        "y": 683,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "69e97f86.e07ef",
+        "type": "switchNode",
+        "name": "switch pnf-flag",
+        "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 354,
+        "y": 420,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "e43265e9.4c7f38",
+                "d78c93da.7125f"
+            ]
+        ]
+    },
+    {
+        "id": "e9d89bdf.30f7a8",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "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' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 386,
+        "y": 366,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e43265e9.4c7f38",
+        "type": "outcome",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 551,
+        "y": 399,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "abbc4ae4.be5328"
+            ]
+        ]
+    },
+    {
+        "id": "d78c93da.7125f",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 550.9999389648438,
+        "y": 460,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "f68ee407.ca6d88"
+            ]
+        ]
+    },
+    {
+        "id": "f68ee407.ca6d88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 698.9999389648438,
+        "y": 459,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "442dbdff.6dfcb4",
+                "80c560bb.eea5f"
+            ]
+        ]
+    },
+    {
+        "id": "abbc4ae4.be5328",
+        "type": "set",
+        "name": "set AnsibleReq",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.resume-traffic.playbookname`'/>\n",
+        "comments": "",
+        "x": 712,
+        "y": 397,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "2d1a88c6.11f9d8",
-        "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='VNF not found in AAI. Nodelist retrieved from config'/>",
+        "id": "80c560bb.eea5f",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.resume-traffic.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 736,
-        "y": 312,
-        "z": "af8f5cdd.6e4de",
+        "x": 921,
+        "y": 439,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fa9a8e1f.bba53",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 351,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "1a5624d2.74e98b"
+            ]
+        ]
+    },
+    {
+        "id": "1a5624d2.74e98b",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 522,
+        "y": 552,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "524c17a1.30fbf8"
+            ]
+        ]
+    },
+    {
+        "id": "524c17a1.30fbf8",
+        "type": "set",
+        "name": "set playbookname",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.resume-traffic.playbookname`'/>",
+        "comments": "",
+        "x": 712,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "81510405.ca8868",
+        "type": "switchNode",
+        "name": "switch nodelist",
+        "xml": "<switch test='`$nodelist`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 341,
+        "y": 610,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "7a126f.d2de2d9",
+                "8743a074.e8506"
+            ]
+        ]
+    },
+    {
+        "id": "7a126f.d2de2d9",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 521,
+        "y": 603,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "c954af6f.c34df",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "comments": "",
+        "x": 678,
+        "y": 617,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "8743a074.e8506",
+        "type": "outcome",
+        "name": "empty",
+        "xml": "<outcome value=\"['']\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 520,
+        "y": 647,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "90b2891b.001708",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1396,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c9dd0d76.432f7"
+            ]
+        ]
+    },
+    {
+        "id": "c9dd0d76.432f7",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1574,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "6ea15b2b.d9cd74"
+            ]
+        ]
+    },
+    {
+        "id": "9706bdee.6acf9",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "comments": "",
+        "x": 1369,
+        "y": 535,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "5a65efc0.bf413",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1199,
+        "y": 492,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "90b2891b.001708",
+                "9706bdee.6acf9"
+            ]
+        ]
+    },
+    {
+        "id": "6ea15b2b.d9cd74",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.resume-traffic.playbookname'`\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1746,
+        "y": 480,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
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
--- 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": []
-    }
-]
+[
+    {
+        "id": "c36c1e82.e47c",
+        "type": "method",
+        "name": "snapshot",
+        "xml": "<method rpc='snapshot' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 530,
+        "y": 121,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "ea26f1ed.e963b"
+            ]
+        ]
+    },
+    {
+        "id": "4c2264b2.81a61c",
+        "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": 300.99993896484375,
+        "y": 122,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "c36c1e82.e47c"
+            ]
+        ]
+    },
+    {
+        "id": "a3360ab0.ce42c8",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Snapshot Mock returns success'/>",
+        "comments": "",
+        "x": 383,
+        "y": 510,
+        "z": "a439ae77.f8998",
+        "wires": []
+    },
+    {
+        "id": "7e67863d.7c42f8",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 98,
+        "y": 121,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "4c2264b2.81a61c"
+            ]
+        ]
+    },
+    {
+        "id": "ea26f1ed.e963b",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 133.91668701171875,
+        "y": 275.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "f1d5fb31.fa3878",
+                "625601b.39b33",
+                "786cf009.ea481",
+                "cd184491.d656e8",
+                "a3360ab0.ce42c8"
+            ]
+        ]
+    },
+    {
+        "id": "f1d5fb31.fa3878",
+        "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": 421,
+        "y": 260.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "cd184491.d656e8",
+        "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": 397,
+        "y": 437.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "91133c94.04e29"
+            ]
+        ]
+    },
+    {
+        "id": "91133c94.04e29",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 606,
+        "y": 435.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "f3b86bb6.9cf808"
+            ]
+        ]
+    },
+    {
+        "id": "f3b86bb6.9cf808",
+        "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": 766,
+        "y": 435.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "786cf009.ea481",
+        "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": 369,
+        "y": 369.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": []
+    },
+    {
+        "id": "625601b.39b33",
+        "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": 423,
+        "y": 312,
+        "z": "a439ae77.f8998",
+        "wires": []
+    }
+]
\ 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
--- 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": []
-    }
-]
+[
+    {
+        "id": "c36c1e82.e47c",
+        "type": "method",
+        "name": "unlock",
+        "xml": "<method rpc='unlock' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 530,
+        "y": 121,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "ea26f1ed.e963b"
+            ]
+        ]
+    },
+    {
+        "id": "4c2264b2.81a61c",
+        "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": 300.99993896484375,
+        "y": 122,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "c36c1e82.e47c"
+            ]
+        ]
+    },
+    {
+        "id": "a3360ab0.ce42c8",
+        "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": 383,
+        "y": 510,
+        "z": "a439ae77.f8998",
+        "wires": []
+    },
+    {
+        "id": "7e67863d.7c42f8",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 98,
+        "y": 121,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "4c2264b2.81a61c"
+            ]
+        ]
+    },
+    {
+        "id": "ea26f1ed.e963b",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 133.91668701171875,
+        "y": 275.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "f1d5fb31.fa3878",
+                "625601b.39b33",
+                "786cf009.ea481",
+                "cd184491.d656e8",
+                "a3360ab0.ce42c8"
+            ]
+        ]
+    },
+    {
+        "id": "f1d5fb31.fa3878",
+        "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": 421,
+        "y": 260.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "cd184491.d656e8",
+        "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": 397,
+        "y": 437.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "91133c94.04e29"
+            ]
+        ]
+    },
+    {
+        "id": "91133c94.04e29",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 606,
+        "y": 435.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "f3b86bb6.9cf808"
+            ]
+        ]
+    },
+    {
+        "id": "f3b86bb6.9cf808",
+        "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": 766,
+        "y": 435.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "786cf009.ea481",
+        "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 Unlock Mock returns success'/>\n",
+        "comments": "",
+        "x": 369,
+        "y": 369.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": []
+    },
+    {
+        "id": "625601b.39b33",
+        "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": 423,
+        "y": 312,
+        "z": "a439ae77.f8998",
+        "wires": []
+    }
+]
\ 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
--- 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": []
-    }
-]
+[
+    {
+        "id": "c36c1e82.e47c",
+        "type": "method",
+        "name": "upgrade-backup",
+        "xml": "<method rpc='upgrade-backup' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 530,
+        "y": 121,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "ea26f1ed.e963b"
+            ]
+        ]
+    },
+    {
+        "id": "4c2264b2.81a61c",
+        "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": 300.99993896484375,
+        "y": 122,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "c36c1e82.e47c"
+            ]
+        ]
+    },
+    {
+        "id": "a3360ab0.ce42c8",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Upgrade-backup Mock returns success'/>",
+        "comments": "",
+        "x": 383,
+        "y": 510,
+        "z": "a439ae77.f8998",
+        "wires": []
+    },
+    {
+        "id": "7e67863d.7c42f8",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 98,
+        "y": 121,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "4c2264b2.81a61c"
+            ]
+        ]
+    },
+    {
+        "id": "ea26f1ed.e963b",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 133.91668701171875,
+        "y": 275.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "f1d5fb31.fa3878",
+                "625601b.39b33",
+                "786cf009.ea481",
+                "cd184491.d656e8",
+                "a3360ab0.ce42c8"
+            ]
+        ]
+    },
+    {
+        "id": "f1d5fb31.fa3878",
+        "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": 421,
+        "y": 260.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "cd184491.d656e8",
+        "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": 397,
+        "y": 437.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "91133c94.04e29"
+            ]
+        ]
+    },
+    {
+        "id": "91133c94.04e29",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 606,
+        "y": 435.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "f3b86bb6.9cf808"
+            ]
+        ]
+    },
+    {
+        "id": "f3b86bb6.9cf808",
+        "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": 766,
+        "y": 435.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "786cf009.ea481",
+        "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": 369,
+        "y": 369.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": []
+    },
+    {
+        "id": "625601b.39b33",
+        "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": 423,
+        "y": 312,
+        "z": "a439ae77.f8998",
+        "wires": []
+    }
+]
\ 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
--- 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 @@
 [
     {
-        "id": "1a420388.7ce24c",
+        "id": "fab0f7ed.c486b8",
         "type": "method",
         "name": "upgrade-post-check",
         "xml": "<method rpc='upgrade-post-check' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 550,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 480,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "e635fd5d.f4087"
+                "5ccc8e8d.06e5"
             ]
         ]
     },
     {
-        "id": "c220826b.91906",
+        "id": "5c791eb8.0072b",
         "type": "service-logic",
         "name": "LCM ${project.version}",
         "module": "LCM",
@@ -24,528 +24,788 @@
         "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": 337.99993896484375,
-        "y": 103,
-        "z": "af8f5cdd.6e4de",
+        "x": 267.99993896484375,
+        "y": 148,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1a420388.7ce24c"
+                "fab0f7ed.c486b8"
             ]
         ]
     },
     {
-        "id": "810e1e54.dec1c",
+        "id": "3503ece1.d7ad14",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-post-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.upgrade-post-check.playbookname`'/>",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-post-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 345.00001525878906,
-        "y": 379,
-        "z": "af8f5cdd.6e4de",
+        "x": 335.00001525878906,
+        "y": 755,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f279f5b8.9d49b8",
-                "895a0a53.e12ea8",
-                "fa759954.4e2068"
+                "734b2c42.973ee4",
+                "bb8a76ca.fb7058",
+                "a457fe79.46497"
             ]
         ]
     },
     {
-        "id": "f7db5396.7b5f1",
+        "id": "f17ff2aa.67075",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 690.9999389648438,
-        "y": 530.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 734.9999389648438,
+        "y": 863.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "bc5a2382.4973",
-                "84f0dd88.8438",
-                "ffd4aab1.e3c4b8"
+                "7ad5787f.1c20f8",
+                "b6f779a3.cc7ed8",
+                "f695f05e.abf31"
             ]
         ]
     },
     {
-        "id": "bc5a2382.4973",
+        "id": "7ad5787f.1c20f8",
         "type": "other",
         "name": "outcome 500",
         "xml": "<outcome value='500'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 835.9999389648438,
-        "y": 528.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 879.9999389648438,
+        "y": 861.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "84f0dd88.8438",
+        "id": "b6f779a3.cc7ed8",
         "type": "other",
         "name": "outcome 100",
         "xml": "<outcome value='100'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 838.9999389648438,
-        "y": 571.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 918.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f44a47b3.3aa128"
+                "1a65bc45.b2fcb4"
             ]
         ]
     },
     {
-        "id": "f44a47b3.3aa128",
+        "id": "1a65bc45.b2fcb4",
         "type": "execute",
         "name": "execute reqExecResult",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.upgrade-post-check.playbookname`'/>\n\t\n\n\n\n\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9999389648438,
-        "y": 570.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1064.9999389648438,
+        "y": 917.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "dd2fe7e6.957248",
-                "6913b982.6c9bb8"
+                "5b0d24c6.9eb0ac",
+                "2b5e4322.1d495c"
             ]
         ]
     },
     {
-        "id": "895a0a53.e12ea8",
+        "id": "bb8a76ca.fb7058",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 581.9999389648438,
-        "y": 439.0000534057617,
-        "z": "af8f5cdd.6e4de",
+        "x": 593.9999389648438,
+        "y": 776.0000915527344,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "f279f5b8.9d49b8",
+        "id": "734b2c42.973ee4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 583.9999389648438,
-        "y": 491.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 595.9999389648438,
+        "y": 828.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f7db5396.7b5f1"
+                "f17ff2aa.67075"
             ]
         ]
     },
     {
-        "id": "dd2fe7e6.957248",
+        "id": "5b0d24c6.9eb0ac",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1189.9999389648438,
-        "y": 542.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1233.9999389648438,
+        "y": 875.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "ffd4aab1.e3c4b8",
+        "id": "f695f05e.abf31",
         "type": "other",
         "name": "outcome 101",
         "xml": "<outcome value='101'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 832.9999389648438,
-        "y": 486.00006103515625,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 819.0000686645508,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "6913b982.6c9bb8",
+        "id": "2b5e4322.1d495c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1191.9999389648438,
-        "y": 597.0000915527344,
-        "z": "af8f5cdd.6e4de",
+        "x": 1241.9998779296875,
+        "y": 923.0001220703125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "14c8dea1.b5b7a1"
+                "db1e6d62.a1404"
             ]
         ]
     },
     {
-        "id": "a32993f8.f8215",
+        "id": "c1a2b259.11e46",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
         "comments": "",
-        "x": 1467.9998779296875,
-        "y": 648.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 1535.9998779296875,
+        "y": 980.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "d8c3f83d.d0b9d8",
+        "id": "566f9779.c05d38",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 153,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 83,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c220826b.91906"
+                "5c791eb8.0072b"
             ]
         ]
     },
     {
-        "id": "e635fd5d.f4087",
+        "id": "5ccc8e8d.06e5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 139.91668701171875,
-        "y": 241.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 80.91668701171875,
+        "y": 239.08334350585938,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "810e1e54.dec1c",
-                "ee1802be.c5c18",
-                "e8d3b31a.f46c6",
-                "4d7f56db.9375c8"
+                "3503ece1.d7ad14",
+                "dc18f7c9.2e4ac8",
+                "814875d2.cac108",
+                "e9d89bdf.30f7a8",
+                "69e97f86.e07ef",
+                "fa9a8e1f.bba53",
+                "baba22fc.1ceb5",
+                "81510405.ca8868"
             ]
         ]
     },
     {
-        "id": "ee1802be.c5c18",
+        "id": "dc18f7c9.2e4ac8",
         "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": 328.00001525878906,
-        "y": 225.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 379.0000305175781,
+        "y": 272.0833435058594,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "3830f5d4.87f1aa",
+        "id": "70d1c79a.089af8",
         "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": 1222.9999389648438,
-        "y": 371.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1545.9998779296875,
+        "y": 725.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1566d659.a0655a"
+                "d776c76b.1dd188"
             ]
         ]
     },
     {
-        "id": "1566d659.a0655a",
+        "id": "d776c76b.1dd188",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1392.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1715.9998168945312,
+        "y": 724.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "22f8bfd0.6139e"
+                "eac6c260.d11fc"
             ]
         ]
     },
     {
-        "id": "80cc4946.3f0f78",
+        "id": "2b54a991.b17b16",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9998779296875,
-        "y": 395.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1348.9998168945312,
+        "y": 749.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "3830f5d4.87f1aa",
-                "fedbb5e6.fb3c28",
-                "898f667e.daf2e8"
+                "70d1c79a.089af8",
+                "7970fcd5.6f11b4",
+                "3d8934f9.d0339c"
             ]
         ]
     },
     {
-        "id": "7ce48bed.5b7c74",
+        "id": "e790e11b.4f947",
         "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": 1488.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1546.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "37e7fa80.2728b6"
+                "2e13891.034f576"
             ]
         ]
     },
     {
-        "id": "37e7fa80.2728b6",
+        "id": "2e13891.034f576",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1714.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "47c7511a.dd8fe"
+                "30475e40.9b8be2"
             ]
         ]
     },
     {
-        "id": "22f8bfd0.6139e",
+        "id": "eac6c260.d11fc",
         "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": 1524.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1835.9998779296875,
+        "y": 723.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "fedbb5e6.fb3c28",
+        "id": "7970fcd5.6f11b4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
         "comments": "",
-        "x": 1197.9165649414062,
-        "y": 408.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1527.91650390625,
+        "y": 776.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "47c7511a.dd8fe",
+        "id": "30475e40.9b8be2",
         "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": 1769.9166259765625,
-        "y": 598.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1842.9166259765625,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "898f667e.daf2e8",
+        "id": "3d8934f9.d0339c",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1174.9999389648438,
-        "y": 318.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1532.9998779296875,
+        "y": 672.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "14c8dea1.b5b7a1",
+        "id": "db1e6d62.a1404",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1317.9998779296875,
-        "y": 596.0833435058594,
-        "z": "af8f5cdd.6e4de",
+        "x": 1369.9998779296875,
+        "y": 924.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "7ce48bed.5b7c74",
-                "70a28c6a.563d24",
-                "a32993f8.f8215"
+                "e790e11b.4f947",
+                "3a3f1d44.898da2",
+                "c1a2b259.11e46"
             ]
         ]
     },
     {
-        "id": "70a28c6a.563d24",
+        "id": "3a3f1d44.898da2",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1448.1666259765625,
-        "y": 549.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1536.1666259765625,
+        "y": 875.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "fa759954.4e2068",
+        "id": "a457fe79.46497",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 577.9999389648438,
-        "y": 392.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 602.9999389648438,
+        "y": 728.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "ed41675d.59c088"
+                "3d4c2c9a.7b1324"
             ]
         ]
     },
     {
-        "id": "756c2e53.ca6d7",
+        "id": "d512629f.bc625",
         "type": "set",
         "name": "set Defaults",
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
         "comments": "",
-        "x": 1009.9999389648438,
-        "y": 297.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 893.9999389648438,
+        "y": 687,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "ed41675d.59c088",
+        "id": "3d4c2c9a.7b1324",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 761.9999389648438,
-        "y": 384.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 739.9999389648438,
+        "y": 722.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "756c2e53.ca6d7",
-                "80cc4946.3f0f78"
+                "d512629f.bc625",
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "e8d3b31a.f46c6",
+        "id": "814875d2.cac108",
         "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<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "name": "set default values",
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
         "comments": "",
-        "x": 336,
-        "y": 269,
-        "z": "af8f5cdd.6e4de",
+        "x": 372,
+        "y": 319,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "4d7f56db.9375c8",
+        "id": "442dbdff.6dfcb4",
         "type": "get-resource",
-        "name": "get aai.generic-vnf by vnf-id",
+        "name": "get aai.generic-vnf ",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $upgrade-post-check-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
         "comments": "",
         "outputs": 1,
-        "x": 349.0000305175781,
-        "y": 325,
-        "z": "af8f5cdd.6e4de",
+        "x": 912,
+        "y": 495,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "fa69a126.2a554",
-                "f9cb9963.f9e368"
+                "1e57cb28.122ad5"
             ]
         ]
     },
     {
-        "id": "fa69a126.2a554",
-        "type": "failure",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 589.86083984375,
-        "y": 312.53564453125,
-        "z": "af8f5cdd.6e4de",
-        "wires": [
-            [
-                "2d1a88c6.11f9d8"
-            ]
-        ]
-    },
-    {
-        "id": "f9cb9963.f9e368",
+        "id": "1e57cb28.122ad5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 591.3908081054688,
-        "y": 260.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "x": 1070.3907470703125,
+        "y": 493.28399658203125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c4d4de4d.3e19f"
+                "5a65efc0.bf413"
             ]
         ]
     },
     {
-        "id": "c4d4de4d.3e19f",
-        "type": "set",
-        "name": "set nodelist",
-        "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "id": "baba22fc.1ceb5",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
         "comments": "",
-        "x": 740.3908081054688,
-        "y": 259.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "outputs": 1,
+        "x": 300.9998779296875,
+        "y": 683,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "69e97f86.e07ef",
+        "type": "switchNode",
+        "name": "switch pnf-flag",
+        "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 354,
+        "y": 420,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "e43265e9.4c7f38",
+                "d78c93da.7125f"
+            ]
+        ]
+    },
+    {
+        "id": "e9d89bdf.30f7a8",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-post-check-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 386,
+        "y": 366,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e43265e9.4c7f38",
+        "type": "outcome",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 551,
+        "y": 399,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "abbc4ae4.be5328"
+            ]
+        ]
+    },
+    {
+        "id": "d78c93da.7125f",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 550.9999389648438,
+        "y": 460,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "f68ee407.ca6d88"
+            ]
+        ]
+    },
+    {
+        "id": "f68ee407.ca6d88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 698.9999389648438,
+        "y": 459,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "442dbdff.6dfcb4",
+                "80c560bb.eea5f"
+            ]
+        ]
+    },
+    {
+        "id": "abbc4ae4.be5328",
+        "type": "set",
+        "name": "set AnsibleReq",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-post-check.playbookname`'/>\n",
+        "comments": "",
+        "x": 712,
+        "y": 397,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "2d1a88c6.11f9d8",
-        "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='VNF not found in AAI. Nodelist retrieved from config'/>",
+        "id": "80c560bb.eea5f",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-post-check.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 736,
-        "y": 312,
-        "z": "af8f5cdd.6e4de",
+        "x": 921,
+        "y": 439,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fa9a8e1f.bba53",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 351,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "1a5624d2.74e98b"
+            ]
+        ]
+    },
+    {
+        "id": "1a5624d2.74e98b",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 522,
+        "y": 552,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "524c17a1.30fbf8"
+            ]
+        ]
+    },
+    {
+        "id": "524c17a1.30fbf8",
+        "type": "set",
+        "name": "set playbookname",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-post-check.playbookname`'/>",
+        "comments": "",
+        "x": 712,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "81510405.ca8868",
+        "type": "switchNode",
+        "name": "switch nodelist",
+        "xml": "<switch test='`$nodelist`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 341,
+        "y": 610,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "7a126f.d2de2d9",
+                "8743a074.e8506"
+            ]
+        ]
+    },
+    {
+        "id": "7a126f.d2de2d9",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 521,
+        "y": 603,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "c954af6f.c34df",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "comments": "",
+        "x": 678,
+        "y": 617,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "8743a074.e8506",
+        "type": "outcome",
+        "name": "empty",
+        "xml": "<outcome value=\"['']\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 520,
+        "y": 647,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "90b2891b.001708",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1396,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c9dd0d76.432f7"
+            ]
+        ]
+    },
+    {
+        "id": "c9dd0d76.432f7",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1574,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "6ea15b2b.d9cd74"
+            ]
+        ]
+    },
+    {
+        "id": "9706bdee.6acf9",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "comments": "",
+        "x": 1369,
+        "y": 535,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "5a65efc0.bf413",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1199,
+        "y": 492,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "90b2891b.001708",
+                "9706bdee.6acf9"
+            ]
+        ]
+    },
+    {
+        "id": "6ea15b2b.d9cd74",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-post-check.playbookname'`\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1746,
+        "y": 480,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
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
--- 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 @@
 [
     {
-        "id": "1a420388.7ce24c",
+        "id": "fab0f7ed.c486b8",
         "type": "method",
         "name": "upgrade-pre-check",
         "xml": "<method rpc='upgrade-pre-check' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 550,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 480,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "e635fd5d.f4087"
+                "5ccc8e8d.06e5"
             ]
         ]
     },
     {
-        "id": "c220826b.91906",
+        "id": "5c791eb8.0072b",
         "type": "service-logic",
         "name": "LCM ${project.version}",
         "module": "LCM",
@@ -24,528 +24,788 @@
         "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": 337.99993896484375,
-        "y": 103,
-        "z": "af8f5cdd.6e4de",
+        "x": 267.99993896484375,
+        "y": 148,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1a420388.7ce24c"
+                "fab0f7ed.c486b8"
             ]
         ]
     },
     {
-        "id": "810e1e54.dec1c",
+        "id": "3503ece1.d7ad14",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-pre-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-pre-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 345.00001525878906,
-        "y": 379,
-        "z": "af8f5cdd.6e4de",
+        "x": 335.00001525878906,
+        "y": 755,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f279f5b8.9d49b8",
-                "895a0a53.e12ea8",
-                "fa759954.4e2068"
+                "734b2c42.973ee4",
+                "bb8a76ca.fb7058",
+                "a457fe79.46497"
             ]
         ]
     },
     {
-        "id": "f7db5396.7b5f1",
+        "id": "f17ff2aa.67075",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 690.9999389648438,
-        "y": 530.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 734.9999389648438,
+        "y": 863.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "bc5a2382.4973",
-                "84f0dd88.8438",
-                "ffd4aab1.e3c4b8"
+                "7ad5787f.1c20f8",
+                "b6f779a3.cc7ed8",
+                "f695f05e.abf31"
             ]
         ]
     },
     {
-        "id": "bc5a2382.4973",
+        "id": "7ad5787f.1c20f8",
         "type": "other",
         "name": "outcome 500",
         "xml": "<outcome value='500'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 835.9999389648438,
-        "y": 528.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 879.9999389648438,
+        "y": 861.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "84f0dd88.8438",
+        "id": "b6f779a3.cc7ed8",
         "type": "other",
         "name": "outcome 100",
         "xml": "<outcome value='100'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 838.9999389648438,
-        "y": 571.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 918.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f44a47b3.3aa128"
+                "1a65bc45.b2fcb4"
             ]
         ]
     },
     {
-        "id": "f44a47b3.3aa128",
+        "id": "1a65bc45.b2fcb4",
         "type": "execute",
         "name": "execute reqExecResult",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>\n\t\n\n\n\n\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9999389648438,
-        "y": 570.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1064.9999389648438,
+        "y": 917.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "dd2fe7e6.957248",
-                "6913b982.6c9bb8"
+                "5b0d24c6.9eb0ac",
+                "2b5e4322.1d495c"
             ]
         ]
     },
     {
-        "id": "895a0a53.e12ea8",
+        "id": "bb8a76ca.fb7058",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 581.9999389648438,
-        "y": 439.0000534057617,
-        "z": "af8f5cdd.6e4de",
+        "x": 593.9999389648438,
+        "y": 776.0000915527344,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "f279f5b8.9d49b8",
+        "id": "734b2c42.973ee4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 583.9999389648438,
-        "y": 491.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 595.9999389648438,
+        "y": 828.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f7db5396.7b5f1"
+                "f17ff2aa.67075"
             ]
         ]
     },
     {
-        "id": "dd2fe7e6.957248",
+        "id": "5b0d24c6.9eb0ac",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1189.9999389648438,
-        "y": 542.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1233.9999389648438,
+        "y": 875.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "ffd4aab1.e3c4b8",
+        "id": "f695f05e.abf31",
         "type": "other",
         "name": "outcome 101",
         "xml": "<outcome value='101'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 832.9999389648438,
-        "y": 486.00006103515625,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 819.0000686645508,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "6913b982.6c9bb8",
+        "id": "2b5e4322.1d495c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1191.9999389648438,
-        "y": 597.0000915527344,
-        "z": "af8f5cdd.6e4de",
+        "x": 1241.9998779296875,
+        "y": 923.0001220703125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "14c8dea1.b5b7a1"
+                "db1e6d62.a1404"
             ]
         ]
     },
     {
-        "id": "a32993f8.f8215",
+        "id": "c1a2b259.11e46",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
         "comments": "",
-        "x": 1467.9998779296875,
-        "y": 648.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 1535.9998779296875,
+        "y": 980.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "d8c3f83d.d0b9d8",
+        "id": "566f9779.c05d38",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 153,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 83,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c220826b.91906"
+                "5c791eb8.0072b"
             ]
         ]
     },
     {
-        "id": "e635fd5d.f4087",
+        "id": "5ccc8e8d.06e5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 139.91668701171875,
-        "y": 241.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 80.91668701171875,
+        "y": 239.08334350585938,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "810e1e54.dec1c",
-                "ee1802be.c5c18",
-                "e8d3b31a.f46c6",
-                "4d7f56db.9375c8"
+                "3503ece1.d7ad14",
+                "dc18f7c9.2e4ac8",
+                "814875d2.cac108",
+                "e9d89bdf.30f7a8",
+                "69e97f86.e07ef",
+                "fa9a8e1f.bba53",
+                "baba22fc.1ceb5",
+                "81510405.ca8868"
             ]
         ]
     },
     {
-        "id": "ee1802be.c5c18",
+        "id": "dc18f7c9.2e4ac8",
         "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": 328.00001525878906,
-        "y": 225.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 379.0000305175781,
+        "y": 272.0833435058594,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "3830f5d4.87f1aa",
+        "id": "70d1c79a.089af8",
         "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": 1222.9999389648438,
-        "y": 371.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1545.9998779296875,
+        "y": 725.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1566d659.a0655a"
+                "d776c76b.1dd188"
             ]
         ]
     },
     {
-        "id": "1566d659.a0655a",
+        "id": "d776c76b.1dd188",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1392.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1715.9998168945312,
+        "y": 724.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "22f8bfd0.6139e"
+                "eac6c260.d11fc"
             ]
         ]
     },
     {
-        "id": "80cc4946.3f0f78",
+        "id": "2b54a991.b17b16",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9998779296875,
-        "y": 395.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1348.9998168945312,
+        "y": 749.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "3830f5d4.87f1aa",
-                "fedbb5e6.fb3c28",
-                "898f667e.daf2e8"
+                "70d1c79a.089af8",
+                "7970fcd5.6f11b4",
+                "3d8934f9.d0339c"
             ]
         ]
     },
     {
-        "id": "7ce48bed.5b7c74",
+        "id": "e790e11b.4f947",
         "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": 1488.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1546.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "37e7fa80.2728b6"
+                "2e13891.034f576"
             ]
         ]
     },
     {
-        "id": "37e7fa80.2728b6",
+        "id": "2e13891.034f576",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1714.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "47c7511a.dd8fe"
+                "30475e40.9b8be2"
             ]
         ]
     },
     {
-        "id": "22f8bfd0.6139e",
+        "id": "eac6c260.d11fc",
         "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": 1524.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1835.9998779296875,
+        "y": 723.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "fedbb5e6.fb3c28",
+        "id": "7970fcd5.6f11b4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
         "comments": "",
-        "x": 1197.9165649414062,
-        "y": 408.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1527.91650390625,
+        "y": 776.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "47c7511a.dd8fe",
+        "id": "30475e40.9b8be2",
         "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": 1769.9166259765625,
-        "y": 598.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1842.9166259765625,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "898f667e.daf2e8",
+        "id": "3d8934f9.d0339c",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1174.9999389648438,
-        "y": 318.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1532.9998779296875,
+        "y": 672.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "14c8dea1.b5b7a1",
+        "id": "db1e6d62.a1404",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1317.9998779296875,
-        "y": 596.0833435058594,
-        "z": "af8f5cdd.6e4de",
+        "x": 1369.9998779296875,
+        "y": 924.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "7ce48bed.5b7c74",
-                "70a28c6a.563d24",
-                "a32993f8.f8215"
+                "e790e11b.4f947",
+                "3a3f1d44.898da2",
+                "c1a2b259.11e46"
             ]
         ]
     },
     {
-        "id": "70a28c6a.563d24",
+        "id": "3a3f1d44.898da2",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1448.1666259765625,
-        "y": 549.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1536.1666259765625,
+        "y": 875.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "fa759954.4e2068",
+        "id": "a457fe79.46497",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 577.9999389648438,
-        "y": 392.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 602.9999389648438,
+        "y": 728.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "ed41675d.59c088"
+                "3d4c2c9a.7b1324"
             ]
         ]
     },
     {
-        "id": "756c2e53.ca6d7",
+        "id": "d512629f.bc625",
         "type": "set",
         "name": "set Defaults",
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
         "comments": "",
-        "x": 1009.9999389648438,
-        "y": 297.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 893.9999389648438,
+        "y": 687,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "ed41675d.59c088",
+        "id": "3d4c2c9a.7b1324",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 761.9999389648438,
-        "y": 384.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 739.9999389648438,
+        "y": 722.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "756c2e53.ca6d7",
-                "80cc4946.3f0f78"
+                "d512629f.bc625",
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "e8d3b31a.f46c6",
+        "id": "814875d2.cac108",
         "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<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "name": "set default values",
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
         "comments": "",
-        "x": 336,
-        "y": 269,
-        "z": "af8f5cdd.6e4de",
+        "x": 372,
+        "y": 319,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "4d7f56db.9375c8",
+        "id": "442dbdff.6dfcb4",
         "type": "get-resource",
-        "name": "get aai.generic-vnf by vnf-id",
+        "name": "get aai.generic-vnf ",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $upgrade-pre-check-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
         "comments": "",
         "outputs": 1,
-        "x": 349.0000305175781,
-        "y": 325,
-        "z": "af8f5cdd.6e4de",
+        "x": 912,
+        "y": 495,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "fa69a126.2a554",
-                "f9cb9963.f9e368"
+                "1e57cb28.122ad5"
             ]
         ]
     },
     {
-        "id": "fa69a126.2a554",
-        "type": "failure",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 589.86083984375,
-        "y": 312.53564453125,
-        "z": "af8f5cdd.6e4de",
-        "wires": [
-            [
-                "2d1a88c6.11f9d8"
-            ]
-        ]
-    },
-    {
-        "id": "f9cb9963.f9e368",
+        "id": "1e57cb28.122ad5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 591.3908081054688,
-        "y": 260.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "x": 1070.3907470703125,
+        "y": 493.28399658203125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c4d4de4d.3e19f"
+                "5a65efc0.bf413"
             ]
         ]
     },
     {
-        "id": "c4d4de4d.3e19f",
-        "type": "set",
-        "name": "set nodelist",
-        "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "id": "baba22fc.1ceb5",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
         "comments": "",
-        "x": 740.3908081054688,
-        "y": 259.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "outputs": 1,
+        "x": 300.9998779296875,
+        "y": 683,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "69e97f86.e07ef",
+        "type": "switchNode",
+        "name": "switch pnf-flag",
+        "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 354,
+        "y": 420,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "e43265e9.4c7f38",
+                "d78c93da.7125f"
+            ]
+        ]
+    },
+    {
+        "id": "e9d89bdf.30f7a8",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-pre-check-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 386,
+        "y": 366,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e43265e9.4c7f38",
+        "type": "outcome",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 551,
+        "y": 399,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "abbc4ae4.be5328"
+            ]
+        ]
+    },
+    {
+        "id": "d78c93da.7125f",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 550.9999389648438,
+        "y": 460,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "f68ee407.ca6d88"
+            ]
+        ]
+    },
+    {
+        "id": "f68ee407.ca6d88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 698.9999389648438,
+        "y": 459,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "442dbdff.6dfcb4",
+                "80c560bb.eea5f"
+            ]
+        ]
+    },
+    {
+        "id": "abbc4ae4.be5328",
+        "type": "set",
+        "name": "set AnsibleReq",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-pre-check.playbookname`'/>\n",
+        "comments": "",
+        "x": 712,
+        "y": 397,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "2d1a88c6.11f9d8",
-        "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='VNF not found in AAI. Nodelist retrieved from config'/>",
+        "id": "80c560bb.eea5f",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-pre-check.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 736,
-        "y": 312,
-        "z": "af8f5cdd.6e4de",
+        "x": 921,
+        "y": 439,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fa9a8e1f.bba53",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 351,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "1a5624d2.74e98b"
+            ]
+        ]
+    },
+    {
+        "id": "1a5624d2.74e98b",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 522,
+        "y": 552,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "524c17a1.30fbf8"
+            ]
+        ]
+    },
+    {
+        "id": "524c17a1.30fbf8",
+        "type": "set",
+        "name": "set playbookname",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>",
+        "comments": "",
+        "x": 712,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "81510405.ca8868",
+        "type": "switchNode",
+        "name": "switch nodelist",
+        "xml": "<switch test='`$nodelist`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 341,
+        "y": 610,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "7a126f.d2de2d9",
+                "8743a074.e8506"
+            ]
+        ]
+    },
+    {
+        "id": "7a126f.d2de2d9",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 521,
+        "y": 603,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "c954af6f.c34df",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "comments": "",
+        "x": 678,
+        "y": 617,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "8743a074.e8506",
+        "type": "outcome",
+        "name": "empty",
+        "xml": "<outcome value=\"['']\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 520,
+        "y": 647,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "90b2891b.001708",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1396,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c9dd0d76.432f7"
+            ]
+        ]
+    },
+    {
+        "id": "c9dd0d76.432f7",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1574,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "6ea15b2b.d9cd74"
+            ]
+        ]
+    },
+    {
+        "id": "9706bdee.6acf9",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "comments": "",
+        "x": 1369,
+        "y": 535,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "5a65efc0.bf413",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1199,
+        "y": 492,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "90b2891b.001708",
+                "9706bdee.6acf9"
+            ]
+        ]
+    },
+    {
+        "id": "6ea15b2b.d9cd74",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-pre-check.playbookname'`\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1746,
+        "y": 480,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
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
--- 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 @@
 [
     {
-        "id": "1a420388.7ce24c",
+        "id": "fab0f7ed.c486b8",
         "type": "method",
         "name": "upgrade-software",
         "xml": "<method rpc='upgrade-software' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 550,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 480,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "e635fd5d.f4087"
+                "5ccc8e8d.06e5"
             ]
         ]
     },
     {
-        "id": "c220826b.91906",
+        "id": "5c791eb8.0072b",
         "type": "service-logic",
         "name": "LCM ${project.version}",
         "module": "LCM",
@@ -24,528 +24,788 @@
         "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": 337.99993896484375,
-        "y": 103,
-        "z": "af8f5cdd.6e4de",
+        "x": 267.99993896484375,
+        "y": 148,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1a420388.7ce24c"
+                "fab0f7ed.c486b8"
             ]
         ]
     },
     {
-        "id": "810e1e54.dec1c",
+        "id": "3503ece1.d7ad14",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-software-input.payload`'/>\n<parameter name='NodeList' value=\"`$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`'/>",
+        "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`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 345.00001525878906,
-        "y": 379,
-        "z": "af8f5cdd.6e4de",
+        "x": 335.00001525878906,
+        "y": 755,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f279f5b8.9d49b8",
-                "895a0a53.e12ea8",
-                "fa759954.4e2068"
+                "734b2c42.973ee4",
+                "bb8a76ca.fb7058",
+                "a457fe79.46497"
             ]
         ]
     },
     {
-        "id": "f7db5396.7b5f1",
+        "id": "f17ff2aa.67075",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 690.9999389648438,
-        "y": 530.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 734.9999389648438,
+        "y": 863.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "bc5a2382.4973",
-                "84f0dd88.8438",
-                "ffd4aab1.e3c4b8"
+                "7ad5787f.1c20f8",
+                "b6f779a3.cc7ed8",
+                "f695f05e.abf31"
             ]
         ]
     },
     {
-        "id": "bc5a2382.4973",
+        "id": "7ad5787f.1c20f8",
         "type": "other",
         "name": "outcome 500",
         "xml": "<outcome value='500'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 835.9999389648438,
-        "y": 528.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 879.9999389648438,
+        "y": 861.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "84f0dd88.8438",
+        "id": "b6f779a3.cc7ed8",
         "type": "other",
         "name": "outcome 100",
         "xml": "<outcome value='100'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 838.9999389648438,
-        "y": 571.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 918.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f44a47b3.3aa128"
+                "1a65bc45.b2fcb4"
             ]
         ]
     },
     {
-        "id": "f44a47b3.3aa128",
+        "id": "1a65bc45.b2fcb4",
         "type": "execute",
         "name": "execute reqExecResult",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>\n\t\n\n\n\n\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9999389648438,
-        "y": 570.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1064.9999389648438,
+        "y": 917.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "dd2fe7e6.957248",
-                "6913b982.6c9bb8"
+                "5b0d24c6.9eb0ac",
+                "2b5e4322.1d495c"
             ]
         ]
     },
     {
-        "id": "895a0a53.e12ea8",
+        "id": "bb8a76ca.fb7058",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 581.9999389648438,
-        "y": 439.0000534057617,
-        "z": "af8f5cdd.6e4de",
+        "x": 593.9999389648438,
+        "y": 776.0000915527344,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "f279f5b8.9d49b8",
+        "id": "734b2c42.973ee4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 583.9999389648438,
-        "y": 491.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 595.9999389648438,
+        "y": 828.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f7db5396.7b5f1"
+                "f17ff2aa.67075"
             ]
         ]
     },
     {
-        "id": "dd2fe7e6.957248",
+        "id": "5b0d24c6.9eb0ac",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1189.9999389648438,
-        "y": 542.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1233.9999389648438,
+        "y": 875.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "ffd4aab1.e3c4b8",
+        "id": "f695f05e.abf31",
         "type": "other",
         "name": "outcome 101",
         "xml": "<outcome value='101'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 832.9999389648438,
-        "y": 486.00006103515625,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 819.0000686645508,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "6913b982.6c9bb8",
+        "id": "2b5e4322.1d495c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1191.9999389648438,
-        "y": 597.0000915527344,
-        "z": "af8f5cdd.6e4de",
+        "x": 1241.9998779296875,
+        "y": 923.0001220703125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "14c8dea1.b5b7a1"
+                "db1e6d62.a1404"
             ]
         ]
     },
     {
-        "id": "a32993f8.f8215",
+        "id": "c1a2b259.11e46",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
         "comments": "",
-        "x": 1467.9998779296875,
-        "y": 648.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 1535.9998779296875,
+        "y": 980.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "d8c3f83d.d0b9d8",
+        "id": "566f9779.c05d38",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 153,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 83,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c220826b.91906"
+                "5c791eb8.0072b"
             ]
         ]
     },
     {
-        "id": "e635fd5d.f4087",
+        "id": "5ccc8e8d.06e5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 139.91668701171875,
-        "y": 241.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 80.91668701171875,
+        "y": 239.08334350585938,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "810e1e54.dec1c",
-                "ee1802be.c5c18",
-                "e8d3b31a.f46c6",
-                "4d7f56db.9375c8"
+                "3503ece1.d7ad14",
+                "dc18f7c9.2e4ac8",
+                "814875d2.cac108",
+                "e9d89bdf.30f7a8",
+                "69e97f86.e07ef",
+                "fa9a8e1f.bba53",
+                "baba22fc.1ceb5",
+                "81510405.ca8868"
             ]
         ]
     },
     {
-        "id": "ee1802be.c5c18",
+        "id": "dc18f7c9.2e4ac8",
         "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": 328.00001525878906,
-        "y": 225.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 379.0000305175781,
+        "y": 272.0833435058594,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "3830f5d4.87f1aa",
+        "id": "70d1c79a.089af8",
         "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": 1222.9999389648438,
-        "y": 371.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1545.9998779296875,
+        "y": 725.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1566d659.a0655a"
+                "d776c76b.1dd188"
             ]
         ]
     },
     {
-        "id": "1566d659.a0655a",
+        "id": "d776c76b.1dd188",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1392.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1715.9998168945312,
+        "y": 724.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "22f8bfd0.6139e"
+                "eac6c260.d11fc"
             ]
         ]
     },
     {
-        "id": "80cc4946.3f0f78",
+        "id": "2b54a991.b17b16",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9998779296875,
-        "y": 395.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1348.9998168945312,
+        "y": 749.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "3830f5d4.87f1aa",
-                "fedbb5e6.fb3c28",
-                "898f667e.daf2e8"
+                "70d1c79a.089af8",
+                "7970fcd5.6f11b4",
+                "3d8934f9.d0339c"
             ]
         ]
     },
     {
-        "id": "7ce48bed.5b7c74",
+        "id": "e790e11b.4f947",
         "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": 1488.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1546.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "37e7fa80.2728b6"
+                "2e13891.034f576"
             ]
         ]
     },
     {
-        "id": "37e7fa80.2728b6",
+        "id": "2e13891.034f576",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1714.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "47c7511a.dd8fe"
+                "30475e40.9b8be2"
             ]
         ]
     },
     {
-        "id": "22f8bfd0.6139e",
+        "id": "eac6c260.d11fc",
         "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": 1524.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1835.9998779296875,
+        "y": 723.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "fedbb5e6.fb3c28",
+        "id": "7970fcd5.6f11b4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
         "comments": "",
-        "x": 1197.9165649414062,
-        "y": 408.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1527.91650390625,
+        "y": 776.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "47c7511a.dd8fe",
+        "id": "30475e40.9b8be2",
         "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": 1769.9166259765625,
-        "y": 598.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1842.9166259765625,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "898f667e.daf2e8",
+        "id": "3d8934f9.d0339c",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-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",
         "comments": "",
-        "x": 1174.9999389648438,
-        "y": 318.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1532.9998779296875,
+        "y": 672.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "14c8dea1.b5b7a1",
+        "id": "db1e6d62.a1404",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1317.9998779296875,
-        "y": 596.0833435058594,
-        "z": "af8f5cdd.6e4de",
+        "x": 1369.9998779296875,
+        "y": 924.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "7ce48bed.5b7c74",
-                "70a28c6a.563d24",
-                "a32993f8.f8215"
+                "e790e11b.4f947",
+                "3a3f1d44.898da2",
+                "c1a2b259.11e46"
             ]
         ]
     },
     {
-        "id": "70a28c6a.563d24",
+        "id": "3a3f1d44.898da2",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-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",
         "comments": "",
-        "x": 1448.1666259765625,
-        "y": 549.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1536.1666259765625,
+        "y": 875.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "fa759954.4e2068",
+        "id": "a457fe79.46497",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 577.9999389648438,
-        "y": 392.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 602.9999389648438,
+        "y": 728.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "ed41675d.59c088"
+                "3d4c2c9a.7b1324"
             ]
         ]
     },
     {
-        "id": "756c2e53.ca6d7",
+        "id": "d512629f.bc625",
         "type": "set",
         "name": "set Defaults",
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
         "comments": "",
-        "x": 1009.9999389648438,
-        "y": 297.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 893.9999389648438,
+        "y": 687,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "ed41675d.59c088",
+        "id": "3d4c2c9a.7b1324",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 761.9999389648438,
-        "y": 384.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 739.9999389648438,
+        "y": 722.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "756c2e53.ca6d7",
-                "80cc4946.3f0f78"
+                "d512629f.bc625",
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "e8d3b31a.f46c6",
+        "id": "814875d2.cac108",
         "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<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "name": "set default values",
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
         "comments": "",
-        "x": 336,
-        "y": 269,
-        "z": "af8f5cdd.6e4de",
+        "x": 372,
+        "y": 319,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "4d7f56db.9375c8",
+        "id": "442dbdff.6dfcb4",
         "type": "get-resource",
-        "name": "get aai.generic-vnf by vnf-id",
+        "name": "get aai.generic-vnf ",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $upgrade-software-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
         "comments": "",
         "outputs": 1,
-        "x": 349.0000305175781,
-        "y": 325,
-        "z": "af8f5cdd.6e4de",
+        "x": 912,
+        "y": 495,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "fa69a126.2a554",
-                "f9cb9963.f9e368"
+                "1e57cb28.122ad5"
             ]
         ]
     },
     {
-        "id": "fa69a126.2a554",
-        "type": "failure",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 589.86083984375,
-        "y": 312.53564453125,
-        "z": "af8f5cdd.6e4de",
-        "wires": [
-            [
-                "2d1a88c6.11f9d8"
-            ]
-        ]
-    },
-    {
-        "id": "f9cb9963.f9e368",
+        "id": "1e57cb28.122ad5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 591.3908081054688,
-        "y": 260.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "x": 1070.3907470703125,
+        "y": 493.28399658203125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c4d4de4d.3e19f"
+                "5a65efc0.bf413"
             ]
         ]
     },
     {
-        "id": "c4d4de4d.3e19f",
-        "type": "set",
-        "name": "set nodelist",
-        "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "id": "baba22fc.1ceb5",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
         "comments": "",
-        "x": 740.3908081054688,
-        "y": 259.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "outputs": 1,
+        "x": 300.9998779296875,
+        "y": 683,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "69e97f86.e07ef",
+        "type": "switchNode",
+        "name": "switch pnf-flag",
+        "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 354,
+        "y": 420,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "e43265e9.4c7f38",
+                "d78c93da.7125f"
+            ]
+        ]
+    },
+    {
+        "id": "e9d89bdf.30f7a8",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "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' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 386,
+        "y": 366,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e43265e9.4c7f38",
+        "type": "outcome",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 551,
+        "y": 399,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "abbc4ae4.be5328"
+            ]
+        ]
+    },
+    {
+        "id": "d78c93da.7125f",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 550.9999389648438,
+        "y": 460,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "f68ee407.ca6d88"
+            ]
+        ]
+    },
+    {
+        "id": "f68ee407.ca6d88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 698.9999389648438,
+        "y": 459,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "442dbdff.6dfcb4",
+                "80c560bb.eea5f"
+            ]
+        ]
+    },
+    {
+        "id": "abbc4ae4.be5328",
+        "type": "set",
+        "name": "set AnsibleReq",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-software.playbookname`'/>\n",
+        "comments": "",
+        "x": 712,
+        "y": 397,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "2d1a88c6.11f9d8",
-        "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='VNF not found in AAI. Nodelist retrieved from config'/>",
+        "id": "80c560bb.eea5f",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-software.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 736,
-        "y": 312,
-        "z": "af8f5cdd.6e4de",
+        "x": 921,
+        "y": 439,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fa9a8e1f.bba53",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 351,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "1a5624d2.74e98b"
+            ]
+        ]
+    },
+    {
+        "id": "1a5624d2.74e98b",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 522,
+        "y": 552,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "524c17a1.30fbf8"
+            ]
+        ]
+    },
+    {
+        "id": "524c17a1.30fbf8",
+        "type": "set",
+        "name": "set playbookname",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-software.playbookname`'/>",
+        "comments": "",
+        "x": 712,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "81510405.ca8868",
+        "type": "switchNode",
+        "name": "switch nodelist",
+        "xml": "<switch test='`$nodelist`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 341,
+        "y": 610,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "7a126f.d2de2d9",
+                "8743a074.e8506"
+            ]
+        ]
+    },
+    {
+        "id": "7a126f.d2de2d9",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 521,
+        "y": 603,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "c954af6f.c34df",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "comments": "",
+        "x": 678,
+        "y": 617,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "8743a074.e8506",
+        "type": "outcome",
+        "name": "empty",
+        "xml": "<outcome value=\"['']\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 520,
+        "y": 647,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "90b2891b.001708",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1396,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c9dd0d76.432f7"
+            ]
+        ]
+    },
+    {
+        "id": "c9dd0d76.432f7",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1574,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "6ea15b2b.d9cd74"
+            ]
+        ]
+    },
+    {
+        "id": "9706bdee.6acf9",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "comments": "",
+        "x": 1369,
+        "y": 535,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "5a65efc0.bf413",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1199,
+        "y": 492,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "90b2891b.001708",
+                "9706bdee.6acf9"
+            ]
+        ]
+    },
+    {
+        "id": "6ea15b2b.d9cd74",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-software.playbookname'`\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1746,
+        "y": 480,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
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..9b550d32 100755
--- 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>
                 <parameter name='status.code' value='200' />
                 <parameter name='status.message' value='unexpected return from DG' />
-                <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                <parameter name='quote' value="'" />
             </set>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                <parameter name='source' value='distribute-traffic-input.payload' />
+                <parameter name='outputPath' value='payloadJson' />
+                <parameter name='isEscaped' value='true' />
+            </execute>
+            <switch test='`$payloadJson.pnf-flag`'>
+                <outcome value='true'>
+                    <set>
+                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.pnf.distribute-traffic.playbookname`'/>
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <block>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                            <parameter name='outputPath' value='playbookname' />
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.distribute-traffic.playbookname'`" />
+                        </execute>
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="generic-vnf" 
 		key="generic-vnf.vnf-id = $distribute-traffic-input.action-identifiers.vnf-id" 
 		local-only="false" 
 		pfx='aai.generic-vnf'>
-                <outcome value='success'>
+                            <outcome value='success'>
+                                <block>
+                                    <switch test='`$playbookname`'>
+                                        <outcome value=''>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                <parameter name='outputPath' value='playbookname' />
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.distribute-traffic.playbookname'`" />
+                                            </execute>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`"/>
+                                    </set>
+                                </block>
+                            </outcome>
+                        </get-resource>
+                    </block>
+                </outcome>
+            </switch>
+            <switch test='`$playbookname`'>
+                <outcome value=''>
                     <set>
-                        <parameter name='quote' value="'" />
-                        <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`"/>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.distribute-traffic.playbookname`'/>
                     </set>
                 </outcome>
-                <outcome value='Other'>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>
-                    </record>
+            </switch>
+            <switch test='`$nodelist`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
                 </outcome>
-            </get-resource>
+                <outcome value="['']">
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
+                </outcome>
+            </switch>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                <parameter name="logger" value="message-log"/>
+                <parameter name="field1" value='`$playbookname`'/>
+                <parameter name="field2" value='`$nodelist`'/>
+            </record>
             <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
                 <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
                 <parameter name='User' value='`$prop.ansible.user`'/>
@@ -40,7 +89,7 @@
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>
                 <parameter name='Version' value='`$prop.ansible.version`'/>
                 <parameter name='Id' value='`$distribute-traffic-input.common-header.request-id`'/>
-                <parameter name='PlaybookName' value='`$prop.lcm.distribute-traffic.playbookname`'/>
+                <parameter name='PlaybookName' value='`$playbookname`'/>
                 <outcome value='not-found'>
                     <block>
                         <set>
@@ -219,7 +268,7 @@
                                 <parameter name='User' value='`$prop.ansible.user`'/>
                                 <parameter name='Password' value='`$prop.ansible.password`'/>
                                 <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
-                                <parameter name='PlaybookName' value='`$prop.lcm.distribute-traffic.playbookname`'/>
+                                <parameter name='PlaybookName' value='`$playbookname`'/>
                                 <outcome value='failure'>
                                     <block>
                                         <set>
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
--- 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>
                 <parameter name='status.code' value='200' />
                 <parameter name='status.message' value='unexpected return from DG' />
-                <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                <parameter name='quote' value="'" />
             </set>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                <parameter name='source' value='quiesce-traffic-input.payload' />
+                <parameter name='outputPath' value='payloadJson' />
+                <parameter name='isEscaped' value='true' />
+            </execute>
+            <switch test='`$payloadJson.pnf-flag`'>
+                <outcome value='true'>
+                    <set>
+                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.pnf.quiesce-traffic.playbookname`'/>
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <block>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                            <parameter name='outputPath' value='playbookname' />
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.quiesce-traffic.playbookname'`" />
+                        </execute>
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="generic-vnf" 
 		key="generic-vnf.vnf-id = $quiesce-traffic-input.action-identifiers.vnf-id" 
 		local-only="false" 
 		pfx='aai.generic-vnf'>
-                <outcome value='success'>
+                            <outcome value='success'>
+                                <block>
+                                    <switch test='`$playbookname`'>
+                                        <outcome value=''>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                <parameter name='outputPath' value='playbookname' />
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.quiesce-traffic.playbookname'`" />
+                                            </execute>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`"/>
+                                    </set>
+                                </block>
+                            </outcome>
+                        </get-resource>
+                    </block>
+                </outcome>
+            </switch>
+            <switch test='`$playbookname`'>
+                <outcome value=''>
                     <set>
-                        <parameter name='quote' value="'" />
-                        <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`"/>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.quiesce-traffic.playbookname`'/>
                     </set>
                 </outcome>
-                <outcome value='Other'>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>
-                    </record>
+            </switch>
+            <switch test='`$nodelist`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
                 </outcome>
-            </get-resource>
+                <outcome value="['']">
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
+                </outcome>
+            </switch>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                <parameter name="logger" value="message-log"/>
+                <parameter name="field1" value='`$playbookname`'/>
+                <parameter name="field2" value='`$nodelist`'/>
+            </record>
             <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
                 <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
                 <parameter name='User' value='`$prop.ansible.user`'/>
@@ -40,7 +89,7 @@
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>
                 <parameter name='Version' value='`$prop.ansible.version`'/>
                 <parameter name='Id' value='`$quiesce-traffic-input.common-header.request-id`'/>
-                <parameter name='PlaybookName' value='`$prop.lcm.quiesce-traffic.playbookname`'/>
+                <parameter name='PlaybookName' value='`$playbookname`'/>
                 <outcome value='not-found'>
                     <block>
                         <set>
@@ -219,7 +268,7 @@
                                 <parameter name='User' value='`$prop.ansible.user`'/>
                                 <parameter name='Password' value='`$prop.ansible.password`'/>
                                 <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
-                                <parameter name='PlaybookName' value='`$prop.lcm.quiesce-traffic.playbookname`'/>
+                                <parameter name='PlaybookName' value='`$playbookname`'/>
                                 <outcome value='failure'>
                                     <block>
                                         <set>
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
--- 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>
                 <parameter name='status.code' value='200' />
                 <parameter name='status.message' value='unexpected return from DG' />
-                <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                <parameter name='quote' value="'" />
             </set>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                <parameter name='source' value='resume-traffic-input.payload' />
+                <parameter name='outputPath' value='payloadJson' />
+                <parameter name='isEscaped' value='true' />
+            </execute>
+            <switch test='`$payloadJson.pnf-flag`'>
+                <outcome value='true'>
+                    <set>
+                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.pnf.resume-traffic.playbookname`'/>
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <block>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                            <parameter name='outputPath' value='playbookname' />
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.resume-traffic.playbookname'`" />
+                        </execute>
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="generic-vnf" 
 		key="generic-vnf.vnf-id = $resume-traffic-input.action-identifiers.vnf-id" 
 		local-only="false" 
 		pfx='aai.generic-vnf'>
-                <outcome value='success'>
+                            <outcome value='success'>
+                                <block>
+                                    <switch test='`$playbookname`'>
+                                        <outcome value=''>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                <parameter name='outputPath' value='playbookname' />
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.resume-traffic.playbookname'`" />
+                                            </execute>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`"/>
+                                    </set>
+                                </block>
+                            </outcome>
+                        </get-resource>
+                    </block>
+                </outcome>
+            </switch>
+            <switch test='`$playbookname`'>
+                <outcome value=''>
                     <set>
-                        <parameter name='quote' value="'" />
-                        <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`"/>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.resume-traffic.playbookname`'/>
                     </set>
                 </outcome>
-                <outcome value='Other'>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>
-                    </record>
+            </switch>
+            <switch test='`$nodelist`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
                 </outcome>
-            </get-resource>
+                <outcome value="['']">
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
+                </outcome>
+            </switch>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                <parameter name="logger" value="message-log"/>
+                <parameter name="field1" value='`$playbookname`'/>
+                <parameter name="field2" value='`$nodelist`'/>
+            </record>
             <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
                 <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
                 <parameter name='User' value='`$prop.ansible.user`'/>
@@ -40,7 +89,7 @@
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>
                 <parameter name='Version' value='`$prop.ansible.version`'/>
                 <parameter name='Id' value='`$resume-traffic-input.common-header.request-id`'/>
-                <parameter name='PlaybookName' value='`$prop.lcm.resume-traffic.playbookname`'/>
+                <parameter name='PlaybookName' value='`$playbookname`'/>
                 <outcome value='not-found'>
                     <block>
                         <set>
@@ -219,7 +268,7 @@
                                 <parameter name='User' value='`$prop.ansible.user`'/>
                                 <parameter name='Password' value='`$prop.ansible.password`'/>
                                 <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
-                                <parameter name='PlaybookName' value='`$prop.lcm.resume-traffic.playbookname`'/>
+                                <parameter name='PlaybookName' value='`$playbookname`'/>
                                 <outcome value='failure'>
                                     <block>
                                         <set>
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
--- 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>
         </block>
     </method>
-</service-logic>
+</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
--- 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`'/>
                 <parameter name='lcm-dmaap.flags.ttl' value='`$unlock-input.common-header.flags.ttl`'/>
                 <parameter name='lcm-dmaap.status.code' value='400' />
-                <parameter name='lcm-dmaap.status.message' value='SDNC UnLock Mock returns success'/>
+                <parameter name='lcm-dmaap.status.message' value='SDNC Unlock Mock returns success'/>
             </set>
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                 <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
@@ -46,8 +46,8 @@
             </execute>
             <return status='success'>
                 <parameter name='status.code' value='400' />
-                <parameter name='status.message' value='SDNC UnLock Mock returns success'/>
+                <parameter name='status.message' value='SDNC Unlock Mock returns success'/>
             </return>
         </block>
     </method>
-</service-logic>
+</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
--- 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`'/>
                 <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-backup-input.common-header.flags.ttl`'/>
                 <parameter name='lcm-dmaap.status.code' value='400' />
-                <parameter name='lcm-dmaap.status.message' value='SDNC Lock Mock returns success'/>
+                <parameter name='lcm-dmaap.status.message' value='SDNC Upgrade-backup Mock returns success'/>
             </set>
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                 <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
@@ -46,8 +46,8 @@
             </execute>
             <return status='success'>
                 <parameter name='status.code' value='400' />
-                <parameter name='status.message' value='SDNC Lock Mock returns success'/>
+                <parameter name='status.message' value='SDNC Upgrade-backup Mock returns success'/>
             </return>
         </block>
     </method>
-</service-logic>
+</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
--- 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>
                 <parameter name='status.code' value='200' />
                 <parameter name='status.message' value='unexpected return from DG' />
-                <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                <parameter name='quote' value="'" />
             </set>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                <parameter name='source' value='upgrade-post-check-input.payload' />
+                <parameter name='outputPath' value='payloadJson' />
+                <parameter name='isEscaped' value='true' />
+            </execute>
+            <switch test='`$payloadJson.pnf-flag`'>
+                <outcome value='true'>
+                    <set>
+                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-post-check.playbookname`'/>
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <block>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                            <parameter name='outputPath' value='playbookname' />
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-post-check.playbookname'`" />
+                        </execute>
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="generic-vnf" 
 		key="generic-vnf.vnf-id = $upgrade-post-check-input.action-identifiers.vnf-id" 
 		local-only="false" 
 		pfx='aai.generic-vnf'>
-                <outcome value='success'>
+                            <outcome value='success'>
+                                <block>
+                                    <switch test='`$playbookname`'>
+                                        <outcome value=''>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                <parameter name='outputPath' value='playbookname' />
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-post-check.playbookname'`" />
+                                            </execute>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`"/>
+                                    </set>
+                                </block>
+                            </outcome>
+                        </get-resource>
+                    </block>
+                </outcome>
+            </switch>
+            <switch test='`$playbookname`'>
+                <outcome value=''>
                     <set>
-                        <parameter name='quote' value="'" />
-                        <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`"/>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.upgrade-post-check.playbookname`'/>
                     </set>
                 </outcome>
-                <outcome value='Other'>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>
-                    </record>
+            </switch>
+            <switch test='`$nodelist`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
                 </outcome>
-            </get-resource>
+                <outcome value="['']">
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
+                </outcome>
+            </switch>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                <parameter name="logger" value="message-log"/>
+                <parameter name="field1" value='`$playbookname`'/>
+                <parameter name="field2" value='`$nodelist`'/>
+            </record>
             <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
                 <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
                 <parameter name='User' value='`$prop.ansible.user`'/>
@@ -40,7 +89,7 @@
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>
                 <parameter name='Version' value='`$prop.ansible.version`'/>
                 <parameter name='Id' value='`$upgrade-post-check-input.common-header.request-id`'/>
-                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-post-check.playbookname`'/>
+                <parameter name='PlaybookName' value='`$playbookname`'/>
                 <outcome value='not-found'>
                     <block>
                         <set>
@@ -219,7 +268,7 @@
                                 <parameter name='User' value='`$prop.ansible.user`'/>
                                 <parameter name='Password' value='`$prop.ansible.password`'/>
                                 <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
-                                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-post-check.playbookname`'/>
+                                <parameter name='PlaybookName' value='`$playbookname`'/>
                                 <outcome value='failure'>
                                     <block>
                                         <set>
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
--- 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>
                 <parameter name='status.code' value='200' />
                 <parameter name='status.message' value='unexpected return from DG' />
-                <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                <parameter name='quote' value="'" />
             </set>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                <parameter name='source' value='upgrade-pre-check-input.payload' />
+                <parameter name='outputPath' value='payloadJson' />
+                <parameter name='isEscaped' value='true' />
+            </execute>
+            <switch test='`$payloadJson.pnf-flag`'>
+                <outcome value='true'>
+                    <set>
+                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-pre-check.playbookname`'/>
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <block>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                            <parameter name='outputPath' value='playbookname' />
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-pre-check.playbookname'`" />
+                        </execute>
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="generic-vnf" 
 		key="generic-vnf.vnf-id = $upgrade-pre-check-input.action-identifiers.vnf-id" 
 		local-only="false" 
 		pfx='aai.generic-vnf'>
-                <outcome value='success'>
+                            <outcome value='success'>
+                                <block>
+                                    <switch test='`$playbookname`'>
+                                        <outcome value=''>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                <parameter name='outputPath' value='playbookname' />
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-pre-check.playbookname'`" />
+                                            </execute>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`"/>
+                                    </set>
+                                </block>
+                            </outcome>
+                        </get-resource>
+                    </block>
+                </outcome>
+            </switch>
+            <switch test='`$playbookname`'>
+                <outcome value=''>
                     <set>
-                        <parameter name='quote' value="'" />
-                        <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`"/>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>
                     </set>
                 </outcome>
-                <outcome value='Other'>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>
-                    </record>
+            </switch>
+            <switch test='`$nodelist`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
                 </outcome>
-            </get-resource>
+                <outcome value="['']">
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
+                </outcome>
+            </switch>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                <parameter name="logger" value="message-log"/>
+                <parameter name="field1" value='`$playbookname`'/>
+                <parameter name="field2" value='`$nodelist`'/>
+            </record>
             <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
                 <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
                 <parameter name='User' value='`$prop.ansible.user`'/>
@@ -40,7 +89,7 @@
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>
                 <parameter name='Version' value='`$prop.ansible.version`'/>
                 <parameter name='Id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
-                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>
+                <parameter name='PlaybookName' value='`$playbookname`'/>
                 <outcome value='not-found'>
                     <block>
                         <set>
@@ -219,7 +268,7 @@
                                 <parameter name='User' value='`$prop.ansible.user`'/>
                                 <parameter name='Password' value='`$prop.ansible.password`'/>
                                 <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
-                                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>
+                                <parameter name='PlaybookName' value='`$playbookname`'/>
                                 <outcome value='failure'>
                                     <block>
                                         <set>
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
--- 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>
                 <parameter name='status.code' value='200' />
                 <parameter name='status.message' value='unexpected return from DG' />
-                <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                <parameter name='quote' value="'" />
             </set>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                <parameter name='source' value='upgrade-software-input.payload' />
+                <parameter name='outputPath' value='payloadJson' />
+                <parameter name='isEscaped' value='true' />
+            </execute>
+            <switch test='`$payloadJson.pnf-flag`'>
+                <outcome value='true'>
+                    <set>
+                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-software.playbookname`'/>
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <block>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                            <parameter name='outputPath' value='playbookname' />
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-software.playbookname'`" />
+                        </execute>
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="generic-vnf" 
 		key="generic-vnf.vnf-id = $upgrade-software-input.action-identifiers.vnf-id" 
 		local-only="false" 
 		pfx='aai.generic-vnf'>
-                <outcome value='success'>
+                            <outcome value='success'>
+                                <block>
+                                    <switch test='`$playbookname`'>
+                                        <outcome value=''>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                <parameter name='outputPath' value='playbookname' />
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-software.playbookname'`" />
+                                            </execute>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`"/>
+                                    </set>
+                                </block>
+                            </outcome>
+                        </get-resource>
+                    </block>
+                </outcome>
+            </switch>
+            <switch test='`$playbookname`'>
+                <outcome value=''>
                     <set>
-                        <parameter name='quote' value="'" />
-                        <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`"/>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.upgrade-software.playbookname`'/>
                     </set>
                 </outcome>
-                <outcome value='Other'>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>
-                    </record>
+            </switch>
+            <switch test='`$nodelist`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
                 </outcome>
-            </get-resource>
+                <outcome value="['']">
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
+                </outcome>
+            </switch>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                <parameter name="logger" value="message-log"/>
+                <parameter name="field1" value='`$playbookname`'/>
+                <parameter name="field2" value='`$nodelist`'/>
+            </record>
             <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
                 <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
                 <parameter name='User' value='`$prop.ansible.user`'/>
@@ -40,7 +89,7 @@
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>
                 <parameter name='Version' value='`$prop.ansible.version`'/>
                 <parameter name='Id' value='`$upgrade-software-input.common-header.request-id`'/>
-                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>
+                <parameter name='PlaybookName' value='`$playbookname`'/>
                 <outcome value='not-found'>
                     <block>
                         <set>
@@ -219,7 +268,7 @@
                                 <parameter name='User' value='`$prop.ansible.user`'/>
                                 <parameter name='Password' value='`$prop.ansible.password`'/>
                                 <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
-                                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>
+                                <parameter name='PlaybookName' value='`$playbookname`'/>
                                 <outcome value='failure'>
                                     <block>
                                         <set>