From d6deaccf8c37b204191f214b38a771f14cc370a2 Mon Sep 17 00:00:00 2001
From: Sandeep Shah <sandeeplinux1068@gmail.com>
Date: Tue, 20 Aug 2019 12:14:54 -0500
Subject: [PATCH] SDNR OOFPCIPOC - DG Updates for ConfigDB DMAAP

To support closed loop automation, DG's are modified to update ConfiDB
for configuration of PCI and ho flags, and publish DMAAP message
confirming configuration. Corresponding templates are also created

Issue-ID: CCSDK-1581
Signed-off-by: SandeepLinux <Sandeep.Shah@ibm.com>
Change-Id: I030401f394ebdc693eeaf514478200a4d9691c18
---
 .../properties/sdnr-oofpcipoc-api-dg.properties    |   23 +-
 .../oofpcipoc-api_configuration-phy-cell-id.json   | 1657 ++++++++++++++----
 ...fpcipoc-api_generic-neighbor-configuration.json | 1765 ++++++++++++++++----
 .../oofpcipoc-api_configuration-phy-cell-id.xml    |  238 ++-
 ...ofpcipoc-api_generic-neighbor-configuration.xml |  254 +++
 ...poc-dmaap-publish-config-response-template.json |   23 +
 .../json/oofpcipoc-patch-configdb-ho-for-nbr.json  |    5 +
 .../oofpcipoc-patch-configdb-pci-for-cell.json     |    5 +
 8 files changed, 3258 insertions(+), 712 deletions(-)
 create mode 100644 platform-logic/restapi-templates/src/main/json/oofpcipoc-dmaap-publish-config-response-template.json
 create mode 100644 platform-logic/restapi-templates/src/main/json/oofpcipoc-patch-configdb-ho-for-nbr.json
 create mode 100644 platform-logic/restapi-templates/src/main/json/oofpcipoc-patch-configdb-pci-for-cell.json

diff --git a/odlsli/src/main/properties/sdnr-oofpcipoc-api-dg.properties b/odlsli/src/main/properties/sdnr-oofpcipoc-api-dg.properties
index 9464d198..bfa53979 100644
--- a/odlsli/src/main/properties/sdnr-oofpcipoc-api-dg.properties
+++ b/odlsli/src/main/properties/sdnr-oofpcipoc-api-dg.properties
@@ -3,6 +3,7 @@ controller.url=http://sdnc.onap:8282
 controller.user=admin
 controller.pwd=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 ransim-mounted=false
+configdb-deployed=false
 
 restapi.trustStoreFileName=/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks
 restapi.trustStorePassword=adminadmin
@@ -25,7 +26,10 @@ restapi.neighbor-add.templatefile=oofpcipoc-addNeighbor.json
 restapi.neighbor-delete.templatefile=oofpcipoc-deleteNeighbor.json
 restapi.generic-neighbor-patch.template=oofpcipoc-generic-neighbor-patch.json
 restapi.add-nbr-to-configdb-per-notif.template=oofpcipoc-add-nbr-to-configdb-per-nbrlist-change-notif.json
-restapi.dmaap-publish.template=oofpcipoc-dmaap-publish-template.json
+restapi.dmaap-publish.templatefile=oofpcipoc-dmaap-publish-template.json
+restapi.dmaap-publish-config-response.template=oofpcipoc-dmaap-publish-config-response-template.json
+restapi.dmaap-publish-modifyconfig-payload.template=oofpcipoc-dmaap-publish-modifyconfig-resp-payload-template.json
+restapi.dmaap-publish-modifyconfiganr-payload.template=oofpcipoc-dmaap-publish-modifyconfiganr-resp-payload-template.json
 
 # URLs without Netconf Mount of Ran Simulator
 restapi.config=/restconf/config
@@ -46,12 +50,29 @@ restapi.lte-ran-neighbor-in-use.ransim-mounted=/restconf/config/network-topology
 #URLs for ConfigDB
 restapi.configdb.add-nbrlist-change-per-notif=/createNbr/{cellId}
 configdb.url=http://10.31.3.18:8080/api/sdnc-config-db/v3
+restapi.configdb.patch-pci-for-cell=/modifyPci/{cellId}
+restapi.configdb.patch-ho-for-nbr=/modifyNbrHO/{cellId}/{targetCellId}
 
 #DMAAP Publish
 dmaap-message-router.url=message-router.onap:3904/events
 oofpcipoc-dmaap.nbrlist-change.topic=/PCI-NOTIF-TOPIC-NGHBR-LIST-CHANGE-INFO
+oofpcipoc-dmaap-configuration-response.topic=/SDNR-CL-RSP
 
 oofpcipoc-dmaap.requestID=9d2d790e-a5f0-11e8-98d0-529269fb1459
 oofpcipoc-dmaap.aai=
 oofpcipoc-dmaap.version=1.0.2
 oofpcipoc-dmaap.nbrlistchange.action=NeighborListModified
+
+oofpcipoc-dmaap-config-resp.timestamp=2018-09-10T07:10:05.614Z
+oofpcipoc-dmaap-config-resp.apiver=1.0
+oofpcipoc-dmaap-config-resp.requestID=722ee65a-8afd-48df-bf57-c152ae45bacc
+oofpcipoc-dmaap-config-resp.subrequestID=1
+oofpcipoc-dmaap-config-resp.requesttrack=
+oofpcipoc-dmaap-config-resp.flags=
+oofpcipoc-dmaap-config-resp.version=1.0
+oofpcipoc-dmaap-config-resp.rpc-name.modifyconfiganr=modifyconfiganr
+oofpcipoc-dmaap-config-resp.rpc-name.modifyconfig=modifyconfig
+oofpcipoc-dmaap-config-resp.correlationID=722ee65a-8afd-48df-bf57-c152ae45bacc-1
+oofpcipoc-dmaap-config-resp.type=response
+oofpcipoc-dmaap-config-resp.status-code=200
+oofpcipoc-dmaap-config-resp.status-value=SUCCESS
diff --git a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_configuration-phy-cell-id.json b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_configuration-phy-cell-id.json
index 589c1ebd..bcf66ef7 100644
--- a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_configuration-phy-cell-id.json
+++ b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_configuration-phy-cell-id.json
@@ -1,36 +1,36 @@
 [
     {
-        "id": "5cfe1e32.70c03",
+        "id": "a56935f3.4d3038",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='configuration-phy-cell-id' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 70.00000762939453,
-        "y": 157.98959350585938,
-        "z": "231735cb.81484a",
+        "x": 108,
+        "y": 264,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "3e0b09ab.48e706"
+                "ef6e3c43.ed0b3"
             ]
         ]
     },
     {
-        "id": "5972e355.1f90dc",
+        "id": "3df3d1aa.57745e",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 72.00000762939453,
-        "y": 8.98958969116211,
-        "z": "231735cb.81484a",
+        "x": 110,
+        "y": 34,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "54079cf7.5dc664"
+                "a593b0f.85d915"
             ]
         ]
     },
     {
-        "id": "54079cf7.5dc664",
+        "id": "a593b0f.85d915",
         "type": "service-logic",
         "name": "oofpcipoc-api ${project.version}",
         "module": "oofpcipoc-api",
@@ -38,1014 +38,1967 @@
         "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='oofpcipoc-api' version='${project.version}'>",
         "outputs": 1,
-        "x": 123.99999237060547,
-        "y": 75.98968505859375,
-        "z": "231735cb.81484a",
+        "x": 161.99998474121094,
+        "y": 102.0000991821289,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "5cfe1e32.70c03"
+                "a56935f3.4d3038"
             ]
         ]
     },
     {
-        "id": "3e0b09ab.48e706",
+        "id": "ef6e3c43.ed0b3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 91.48960494995117,
-        "y": 327.9896240234375,
-        "z": "231735cb.81484a",
+        "x": 102.48959350585938,
+        "y": 404.0000305175781,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "769a67ee.dde568",
-                "9f7ed3ae.40866",
-                "4e6eb75.eedf548",
-                "9fe3285b.bcd158",
-                "5791230f.7e399c",
-                "8025c437.0aac68"
+                "999a0696.5c3b68",
+                "462fd16f.2ce25",
+                "2db1fa7f.454a86",
+                "d2854a92.929028",
+                "de9247e2.4bddb8",
+                "cbd508bf.1f9948",
+                "4b4d0ad6.dd5bc4",
+                "f6929731.8a42a8"
             ]
         ]
     },
     {
-        "id": "769a67ee.dde568",
+        "id": "999a0696.5c3b68",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"SUCCESSFUL Execution\" />\n",
         "comments": "",
-        "x": 89.00027465820312,
-        "y": 605.98974609375,
-        "z": "231735cb.81484a",
+        "x": 123.0002670288086,
+        "y": 2549.000244140625,
+        "z": "3ab6fc36.bf1844",
         "wires": []
     },
     {
-        "id": "e61e6aa7.761fa8",
+        "id": "7a545fed.e7a77",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Input RPC Payload request. FAP #:  \"/>\n<parameter name=\"field2\" value=\"`$idx`\"/>\n<parameter name=\"field3\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].alias`\"/>\n<parameter name=\"field4\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].cid`\"/>\n<parameter name=\"field5\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].phy-cell-id-in-use`\"/>\n<parameter name=\"field6\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].pnf-name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 586.0005493164062,
-        "y": 16.989639282226562,
-        "z": "231735cb.81484a",
+        "x": 589.0005493164062,
+        "y": 142.0000457763672,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
     },
     {
-        "id": "a8c7df6e.f7389",
+        "id": "9515dc9e.39723",
         "type": "comment",
         "name": "configuration-phy-cell-id",
         "info": "",
         "comments": "",
-        "x": 301,
-        "y": 28.0000057220459,
-        "z": "231735cb.81484a",
+        "x": 338.99999237060547,
+        "y": 53.01041603088379,
+        "z": "3ab6fc36.bf1844",
         "wires": []
     },
     {
-        "id": "98c7f031.3beb4",
+        "id": "b854c746.0de9d8",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Initial FAP Service PCI PARMS\"/>\n<parameter name=\"field2\" value=\"`$oofpcigetfapservice.fap-service[0].alias`\"/>\n<parameter name=\"field3\" value=\"`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.phy-cell-id-in-use`\"/>\n<parameter name=\"field4\" value=\"`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.pnf-name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1333.0000762939453,
-        "y": 147.0000033378601,
-        "z": "231735cb.81484a",
+        "x": 1401.0001220703125,
+        "y": 255.01040649414062,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
     },
     {
-        "id": "37b670d3.2d75d",
+        "id": "69f6509a.091e1",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1033.0002059936523,
-        "y": 112.0000147819519,
-        "z": "231735cb.81484a",
+        "x": 1096.0001831054688,
+        "y": 197.0104217529297,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "e5c0ae7e.fb12e"
+                "e2f4a4a1.d370f8"
             ]
         ]
     },
     {
-        "id": "e5c0ae7e.fb12e",
+        "id": "e2f4a4a1.d370f8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing Get odutopo node details rest api\" />",
         "comments": "",
-        "x": 1349.0001907348633,
-        "y": 104.00003385543823,
-        "z": "231735cb.81484a",
+        "x": 1315.000244140625,
+        "y": 197.01044464111328,
+        "z": "3ab6fc36.bf1844",
         "wires": []
     },
     {
-        "id": "6807fd7c.9ffd14",
+        "id": "b6239e81.1f817",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1070.0003471374512,
-        "y": 209.9999976158142,
-        "z": "231735cb.81484a",
+        "x": 1101.0003662109375,
+        "y": 281.0104064941406,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "61cbf7c3.3277c8"
+                "e0cabe0f.505c5"
             ]
         ]
     },
     {
-        "id": "61cbf7c3.3277c8",
+        "id": "e0cabe0f.505c5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1166.000057220459,
-        "y": 152.00000619888306,
-        "z": "231735cb.81484a",
+        "x": 1247,
+        "y": 264.0104217529297,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "98c7f031.3beb4"
+                "b854c746.0de9d8"
             ]
         ]
     },
     {
-        "id": "eb64f79e.fd6af8",
+        "id": "3f77f64c.3dd7aa",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1065.0001621246338,
-        "y": 464.6666452884674,
-        "z": "231735cb.81484a",
+        "x": 1095.0001220703125,
+        "y": 537.6770629882812,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "2883bb3f.bc91d4"
+                "26b6096e.4923e6"
             ]
         ]
     },
     {
-        "id": "2883bb3f.bc91d4",
+        "id": "26b6096e.4923e6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing patch rest api\" />",
         "comments": "",
-        "x": 1275.0000553131104,
-        "y": 483.66669511795044,
-        "z": "231735cb.81484a",
+        "x": 1322,
+        "y": 535.6770935058594,
+        "z": "3ab6fc36.bf1844",
         "wires": []
     },
     {
-        "id": "6d15fc65.dab3d4",
+        "id": "bee15fb0.acc1",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1056.000020980835,
-        "y": 603.6667590141296,
-        "z": "231735cb.81484a",
+        "x": 1114,
+        "y": 612.6771850585938,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "a0dc8cc1.dd008"
+                "fa59582d.79d328"
             ]
         ]
     },
     {
-        "id": "a0dc8cc1.dd008",
+        "id": "fa59582d.79d328",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1243.999891281128,
-        "y": 601.6666655540466,
-        "z": "231735cb.81484a",
+        "x": 1271.9998779296875,
+        "y": 610.6770629882812,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "c1020cf0.6879f"
+                "bdff86f4.1a7438"
             ]
         ]
     },
     {
-        "id": "c1020cf0.6879f",
+        "id": "bdff86f4.1a7438",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Post Reconfig FAP Service PCI PARMS\"/>\n<parameter name=\"field2\" value=\"`$oofpcigetfapservice.fap-service[0].alias`\"/>\n<parameter name=\"field3\" value=\"`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.phy-cell-id-in-use`\"/>\n<parameter name=\"field4\" value=\"`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.pnf-name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1427.9998245239258,
-        "y": 575.6668887138367,
-        "z": "231735cb.81484a",
+        "x": 1444.9998779296875,
+        "y": 605.6773071289062,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
     },
     {
-        "id": "7ecd6e45.7e277",
+        "id": "aec0a219.4aafa",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for GET operation\"/>\n<parameter name=\"field2\" value=\"`$tmp.fap-service-url`\"/>\n<parameter name=\"field3\" value=\"`$tmp.alias`\"/>\n<parameter name=\"field4\" value=\"`$tmp.cid`\"/>\n<parameter name=\"field5\" value=\"`$tmp.phy-cell-id-in-use`\"/>\n<parameter name=\"field6\" value=\"`$tmp.pnf-name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 799.000659942627,
-        "y": 197.0001015663147,
-        "z": "231735cb.81484a",
+        "x": 837.0006523132324,
+        "y": 222.0105118751526,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
     },
     {
-        "id": "4e6eb75.eedf548",
+        "id": "2db1fa7f.454a86",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$configuration-phy-cell-id-input.fap-service-number-of-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 456.085693359375,
-        "y": 16.95317840576172,
-        "z": "231735cb.81484a",
+        "x": 434.085693359375,
+        "y": 152.96359252929688,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "e61e6aa7.761fa8"
+                "7a545fed.e7a77"
             ]
         ]
     },
     {
-        "id": "9f7ed3ae.40866",
+        "id": "462fd16f.2ce25",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"RPC to Configure PCI INVOKED. Number of Cells to configure: \"/>\n<parameter name=\"field2\" value=\"`$configuration-phy-cell-id-input.fap-service-number-of-entries`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 241.00030517578125,
-        "y": 137.01043701171875,
-        "z": "231735cb.81484a",
+        "x": 437.00030517578125,
+        "y": 96.02084350585938,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
     },
     {
-        "id": "7d38cbac.d25ac4",
+        "id": "c4cb43a3.b214",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$configuration-phy-cell-id-input.fap-service-number-of-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 480.00018310546875,
-        "y": 381,
-        "z": "231735cb.81484a",
+        "x": 599.0001831054688,
+        "y": 445.0104064941406,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "ad5896c2.1372a8"
+                "223df5ed.4f95aa"
             ]
         ]
     },
     {
-        "id": "88625aaa.05ac08",
+        "id": "d9addb74.3baa98",
         "type": "set",
         "name": "set tmp variables for the requested fap service input parms",
         "xml": "<set>\n<parameter name=\"tmp.alias\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].alias`\"/>\n<parameter name=\"tmp.cid\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].cid`\"/>\n<parameter name=\"tmp.phy-cell-id-in-use\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].phy-cell-id-in-use`\"/>\n<parameter name=\"tmp.pnf-name\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].pnf-name`\"/>\n",
         "comments": "",
-        "x": 927.0010986328125,
-        "y": 74.88908624649048,
-        "z": "231735cb.81484a",
+        "x": 961.0010986328125,
+        "y": 90.89949798583984,
+        "z": "3ab6fc36.bf1844",
         "wires": []
     },
     {
-        "id": "f4e5fe0e.4b9c6",
+        "id": "793cadd5.b98534",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1068.000343322754,
-        "y": 281.000084400177,
-        "z": "231735cb.81484a",
+        "x": 1104.0003662109375,
+        "y": 405.010498046875,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "78c5715f.569f1"
+                "3edcc1aa.bd4cee"
             ]
         ]
     },
     {
-        "id": "d86bb55b.e8fa48",
+        "id": "8235045c.b53238",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1065.0002746582031,
-        "y": 410.00000619888306,
-        "z": "231735cb.81484a",
+        "x": 1091.000244140625,
+        "y": 483.0104064941406,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "c51a3fee.9dc2a"
+                "796d00b5.a0e61"
             ]
         ]
     },
     {
-        "id": "78c5715f.569f1",
+        "id": "3edcc1aa.bd4cee",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1201.0002727508545,
-        "y": 240.00011587142944,
-        "z": "231735cb.81484a",
+        "x": 1251.000244140625,
+        "y": 405.0105285644531,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "4bd1d88c.a2c018"
+                "5f31b8ac.b394a8"
             ]
         ]
     },
     {
-        "id": "4bd1d88c.a2c018",
+        "id": "5f31b8ac.b394a8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing patch rest api\" />",
         "comments": "",
-        "x": 1379.999963760376,
-        "y": 237.00008344650269,
-        "z": "231735cb.81484a",
+        "x": 1415,
+        "y": 389.010498046875,
+        "z": "3ab6fc36.bf1844",
         "wires": []
     },
     {
-        "id": "c51a3fee.9dc2a",
+        "id": "796d00b5.a0e61",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1223.0000171661377,
-        "y": 376.000066280365,
-        "z": "231735cb.81484a",
+        "x": 1247,
+        "y": 467.0104675292969,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "1390b236.ee339e"
+                "6cee8561.12b37c"
             ]
         ]
     },
     {
-        "id": "1390b236.ee339e",
+        "id": "6cee8561.12b37c",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"PUT PCI POC FAP SERVICE. Reconfigured \"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1402.0000858306885,
-        "y": 375.00005292892456,
-        "z": "231735cb.81484a",
+        "x": 1408.0001220703125,
+        "y": 469.0104675292969,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
     },
     {
-        "id": "ad5896c2.1372a8",
+        "id": "223df5ed.4f95aa",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 584,
-        "y": 227.010498046875,
-        "z": "231735cb.81484a",
+        "x": 621.9999923706055,
+        "y": 252.0209083557129,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "88625aaa.05ac08",
-                "7ecd6e45.7e277",
-                "4a8297f3.fab368",
-                "9f1665ce.4fd9f8",
-                "f010d789.53a0a8",
-                "7e3a85f3.f482ac",
-                "a4027203.6535b",
-                "47db6df.2075794"
+                "d9addb74.3baa98",
+                "aec0a219.4aafa",
+                "9a4c9d5d.cdbb7",
+                "1f853db2.97c882",
+                "26067730.7d0a88",
+                "288ec912.b142d6",
+                "7380a80e.9f2798",
+                "34a55830.edc018",
+                "11c1dc80.b90664"
             ]
         ]
     },
     {
-        "id": "7e3a85f3.f482ac",
+        "id": "288ec912.b142d6",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"URL and Target for PCI patch URL\"/>\n<parameter name='field2' value=\"`$prop.controller.url + $tmp.oofpcipoc.patch.pci.url`\" />\n<parameter name='field3' value=\"`$prop.oofpcipoc.patch.pci.target`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 800.0006637573242,
-        "y": 366.0104355812073,
-        "z": "231735cb.81484a",
+        "x": 849.0006713867188,
+        "y": 395.0208435058594,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
     },
     {
-        "id": "9fe3285b.bcd158",
+        "id": "d2854a92.929028",
         "type": "execute",
         "name": "execute Properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/sdnr-oofpcipoc-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 482.00018310546875,
-        "y": 68.01042175292969,
-        "z": "231735cb.81484a",
+        "x": 470.00018310546875,
+        "y": 207.02084350585938,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
     },
     {
-        "id": "5791230f.7e399c",
+        "id": "de9247e2.4bddb8",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Properties read .. pci patch target\"/>\n<parameter name=\"field2\" value=\"`$prop.oofpcipoc.patch.pci.target`\"/>\n<parameter name=\"field3\" value=\"`$prop.controller.user`\"/>\n<parameter name=\"field4\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"field5\" value=\"`$prop.controller.url`\"/>\n<parameter name=\"field6\" value=\"ransim-mounted (true/false): \"/>\n<parameter name=\"field7\" value=\"`$prop.ransim-mounted`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 447.00030517578125,
-        "y": 112.01048278808594,
-        "z": "231735cb.81484a",
+        "x": 425.00030517578125,
+        "y": 300.02088928222656,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
     },
     {
-        "id": "9f1665ce.4fd9f8",
+        "id": "1f853db2.97c882",
         "type": "execute",
         "name": "Get FAP details for a Cell",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.fap-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"oofpcigetfapservice\"/>\n<parameter name='contentType' value='application/json' />",
         "comments": "",
         "outputs": 1,
-        "x": 828.0005416870117,
-        "y": 268.0103964805603,
-        "z": "231735cb.81484a",
+        "x": 886.0005493164062,
+        "y": 273.02081298828125,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "37b670d3.2d75d",
-                "6807fd7c.9ffd14"
+                "69f6509a.091e1",
+                "b6239e81.1f817"
             ]
         ]
     },
     {
-        "id": "4a8297f3.fab368",
+        "id": "9a4c9d5d.cdbb7",
         "type": "execute",
         "name": "generate fap-service url",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.fap-service`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.fap-service-url\"/>\n    <parameter name=\"target\" value=\"{alias}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.alias`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 841.000244140625,
-        "y": 141.010498046875,
-        "z": "231735cb.81484a",
+        "x": 879.0002365112305,
+        "y": 166.0209083557129,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
     },
     {
-        "id": "f010d789.53a0a8",
+        "id": "26067730.7d0a88",
         "type": "execute",
         "name": "generate pci patch url for a cell",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.x-005b9-lte`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.oofpcipoc.patch.pci.url\"/>\n    <parameter name=\"target\" value=\"{alias}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.alias`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 838.0001754760742,
-        "y": 311.0104126930237,
-        "z": "231735cb.81484a",
+        "x": 944.0001831054688,
+        "y": 339.02081298828125,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
     },
     {
-        "id": "a4027203.6535b",
+        "id": "7380a80e.9f2798",
         "type": "execute",
         "name": "Recofigure PCI for a Cell",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/oofpcipoc-pci-patch.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.oofpcipoc.patch.pci.url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"PATCH\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-patch-response\"/>\n<parameter name='contentType' value='application/yang.patch+json' /> \n<parameter name='format' value='json' />\n<parameter name='accept' value='application/yang.patch-status+json' />",
         "comments": "",
         "outputs": 1,
-        "x": 821.0000762939453,
-        "y": 442.01055097579956,
-        "z": "231735cb.81484a",
+        "x": 894.0000610351562,
+        "y": 466.0209655761719,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "f4e5fe0e.4b9c6",
-                "d86bb55b.e8fa48"
+                "793cadd5.b98534",
+                "8235045c.b53238"
             ]
         ]
     },
     {
-        "id": "47db6df.2075794",
+        "id": "34a55830.edc018",
         "type": "execute",
         "name": "Get FAP details for a Cell",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.fap-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"oofpcigetfapservice\"/>\n<parameter name='contentType' value='application/json' />",
         "comments": "",
         "outputs": 1,
-        "x": 800.0000305175781,
-        "y": 529.0104422569275,
-        "z": "231735cb.81484a",
+        "x": 872,
+        "y": 549.0208740234375,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "eb64f79e.fd6af8",
-                "6d15fc65.dab3d4"
+                "3f77f64c.3dd7aa",
+                "bee15fb0.acc1"
             ]
         ]
     },
     {
-        "id": "8e234f95.57b72",
-        "type": "execute",
-        "name": "Recofigure PCI for a Cell",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/oofpcipoc-pci-patch.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.oofpcipoc.patch.pci.url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"PATCH\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-patch-response\"/>\n<parameter name='contentType' value='application/yang.patch+json' /> \n<parameter name='accept' value='application/yang.patch-status+json' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 111,
-        "y": 867.0104370117188,
-        "z": "231735cb.81484a",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8025c437.0aac68",
+        "id": "cbd508bf.1f9948",
         "type": "switchNode",
         "name": "switch mounted",
         "xml": "<switch test='`$prop.ransim-mounted`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 279,
-        "y": 425,
-        "z": "231735cb.81484a",
+        "x": 420,
+        "y": 477.0103759765625,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "2ba4e078.c9991",
-                "450d192e.16e4c8"
+                "56749baa.a78df4",
+                "9c793e23.28d07"
             ]
         ]
     },
     {
-        "id": "2ba4e078.c9991",
+        "id": "56749baa.a78df4",
         "type": "outcome",
         "name": "Not Mounted",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 355,
-        "y": 313,
-        "z": "231735cb.81484a",
+        "x": 501,
+        "y": 372.0104064941406,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "7d38cbac.d25ac4"
+                "c4cb43a3.b214"
             ]
         ]
     },
     {
-        "id": "450d192e.16e4c8",
+        "id": "9c793e23.28d07",
         "type": "outcome",
         "name": "Mounted",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 253,
-        "y": 526,
-        "z": "231735cb.81484a",
+        "x": 550,
+        "y": 564.0104370117188,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "df962bc0.9c4728"
+                "333ff9a3.f9e676"
             ]
         ]
     },
     {
-        "id": "3804aecc.1eda72",
+        "id": "63d201bc.e0a8c",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Initial FAP Service PCI PARMS\"/>\n<parameter name=\"field2\" value=\"`$oofpcigetfapservice.fap-service[0].alias`\"/>\n<parameter name=\"field3\" value=\"`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.phy-cell-id-in-use`\"/>\n<parameter name=\"field4\" value=\"`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.pnf-name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1178.9998779296875,
-        "y": 730,
-        "z": "231735cb.81484a",
+        "x": 1481.999870300293,
+        "y": 1022.0104103088379,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
     },
     {
-        "id": "294e9c79.ae0324",
+        "id": "760b1313.ffe8fc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 832,
-        "y": 719,
-        "z": "231735cb.81484a",
+        "x": 1134.9999923706055,
+        "y": 1011.0104103088379,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "a2629122.94b21"
+                "4bddd3b2.b1953c"
             ]
         ]
     },
     {
-        "id": "a2629122.94b21",
+        "id": "4bddd3b2.b1953c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing Get odutopo node details rest api\" />",
         "comments": "",
-        "x": 1014,
-        "y": 691.0000610351562,
-        "z": "231735cb.81484a",
+        "x": 1316.9999923706055,
+        "y": 983.0104713439941,
+        "z": "3ab6fc36.bf1844",
         "wires": []
     },
     {
-        "id": "855dbbeb.68dac8",
+        "id": "8f7d3b9a.8bfbb8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 830.0001831054688,
-        "y": 794,
-        "z": "231735cb.81484a",
+        "x": 1133.0001754760742,
+        "y": 1086.010410308838,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "4f5a1521.82fc2c"
+                "cfc19b27.de46f8"
             ]
         ]
     },
     {
-        "id": "4f5a1521.82fc2c",
+        "id": "cfc19b27.de46f8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1016.9998779296875,
-        "y": 743,
-        "z": "231735cb.81484a",
+        "x": 1319.999870300293,
+        "y": 1035.010410308838,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "3804aecc.1eda72"
+                "63d201bc.e0a8c"
             ]
         ]
     },
     {
-        "id": "24eb1ccd.364114",
+        "id": "127b098e.b6a836",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 713,
-        "y": 1064.6666259765625,
-        "z": "231735cb.81484a",
+        "x": 1015.9999923706055,
+        "y": 1356.6770362854004,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "9f4cf18c.81994"
+                "c8490f00.fab44"
             ]
         ]
     },
     {
-        "id": "9f4cf18c.81994",
+        "id": "c8490f00.fab44",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing patch rest api\" />",
         "comments": "",
-        "x": 900.9998779296875,
-        "y": 1071.666748046875,
-        "z": "231735cb.81484a",
+        "x": 1203.999870300293,
+        "y": 1363.677158355713,
+        "z": "3ab6fc36.bf1844",
         "wires": []
     },
     {
-        "id": "a0317cac.b10f8",
+        "id": "c160441d.a6c7b8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 698.9998168945312,
-        "y": 1141.666748046875,
-        "z": "231735cb.81484a",
+        "x": 1001.9998092651367,
+        "y": 1433.677158355713,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "f2262012.299c4"
+                "573df648.f762d8"
             ]
         ]
     },
     {
-        "id": "f2262012.299c4",
+        "id": "573df648.f762d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 872.999755859375,
-        "y": 1144.6666259765625,
-        "z": "231735cb.81484a",
+        "x": 1175.9997482299805,
+        "y": 1436.6770362854004,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "85031fd4.e0c19"
+                "7e194196.5bce9"
             ]
         ]
     },
     {
-        "id": "85031fd4.e0c19",
+        "id": "7e194196.5bce9",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Post Reconfig FAP Service PCI PARMS\"/>\n<parameter name=\"field2\" value=\"`$oofpcigetfapservice.fap-service[0].alias`\"/>\n<parameter name=\"field3\" value=\"`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.phy-cell-id-in-use`\"/>\n<parameter name=\"field4\" value=\"`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.pnf-name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1050.9996337890625,
-        "y": 1148.6668701171875,
-        "z": "231735cb.81484a",
+        "x": 1353.999626159668,
+        "y": 1440.6772804260254,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
     },
     {
-        "id": "41d9ee9a.12b9f",
+        "id": "7b87e933.35bbc8",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for GET operation\"/>\n<parameter name=\"field2\" value=\"`$tmp.fap-service-url`\"/>\n<parameter name=\"field3\" value=\"`$tmp.alias`\"/>\n<parameter name=\"field4\" value=\"`$tmp.cid`\"/>\n<parameter name=\"field5\" value=\"`$tmp.phy-cell-id-in-use`\"/>\n<parameter name=\"field6\" value=\"`$tmp.pnf-name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 523.00048828125,
-        "y": 719.0001220703125,
-        "z": "231735cb.81484a",
+        "x": 825.00048828125,
+        "y": 1018.0105590820312,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
     },
     {
-        "id": "df962bc0.9c4728",
+        "id": "333ff9a3.f9e676",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$configuration-phy-cell-id-input.fap-service-number-of-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 475,
-        "y": 477,
-        "z": "231735cb.81484a",
+        "x": 595,
+        "y": 672.0103759765625,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "d2092690.d1f398"
+                "caaab21e.173d6"
             ]
         ]
     },
     {
-        "id": "3e233d3d.e189b2",
+        "id": "d6618a8.8d47778",
         "type": "set",
         "name": "set tmp variables for the requested fap service input parms",
         "xml": "<set>\n<parameter name=\"tmp.alias\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].alias`\"/>\n<parameter name=\"tmp.cid\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].cid`\"/>\n<parameter name=\"tmp.phy-cell-id-in-use\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].phy-cell-id-in-use`\"/>\n<parameter name=\"tmp.pnf-name\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].pnf-name`\"/>\n",
         "comments": "",
-        "x": 607.0009155273438,
-        "y": 609.8890991210938,
-        "z": "231735cb.81484a",
+        "x": 897.0009155273438,
+        "y": 885.8995361328125,
+        "z": "3ab6fc36.bf1844",
         "wires": []
     },
     {
-        "id": "8345c5a4.2aa138",
+        "id": "970590.65d90a7",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 804.0001831054688,
-        "y": 914.0000610351562,
-        "z": "231735cb.81484a",
+        "x": 1107.0001754760742,
+        "y": 1206.0104713439941,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "d0914b29.da1bf8"
+                "8a9b063c.206ef8"
             ]
         ]
     },
     {
-        "id": "e412cebf.f2b34",
+        "id": "27f77794.2482e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 773.0001220703125,
-        "y": 1001,
-        "z": "231735cb.81484a",
+        "x": 1076.000114440918,
+        "y": 1293.010410308838,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "9f57f600.00e818"
+                "9ed3714e.73d88"
             ]
         ]
     },
     {
-        "id": "d0914b29.da1bf8",
+        "id": "8a9b063c.206ef8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 977.0001220703125,
-        "y": 886.0001220703125,
-        "z": "231735cb.81484a",
+        "x": 1280.000114440918,
+        "y": 1178.0105323791504,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "764300f9.17734"
+                "9246b164.ae354"
             ]
         ]
     },
     {
-        "id": "764300f9.17734",
+        "id": "9246b164.ae354",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing patch rest api\" />",
         "comments": "",
-        "x": 1164.999755859375,
-        "y": 876.0000610351562,
-        "z": "231735cb.81484a",
+        "x": 1467.9997482299805,
+        "y": 1168.0104713439941,
+        "z": "3ab6fc36.bf1844",
         "wires": []
     },
     {
-        "id": "9f57f600.00e818",
+        "id": "9ed3714e.73d88",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 954.9998779296875,
-        "y": 988.0000610351562,
-        "z": "231735cb.81484a",
+        "x": 1257.999870300293,
+        "y": 1280.0104713439941,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "3925925e.0d365e"
+                "81e12f1a.2cda3"
             ]
         ]
     },
     {
-        "id": "3925925e.0d365e",
+        "id": "81e12f1a.2cda3",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"PUT PCI POC FAP SERVICE. Reconfigured \"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1127.9998779296875,
-        "y": 987.0000610351562,
-        "z": "231735cb.81484a",
+        "x": 1430.999870300293,
+        "y": 1279.0104713439941,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
     },
     {
-        "id": "d2092690.d1f398",
+        "id": "caaab21e.173d6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 254.99981689453125,
-        "y": 704.010498046875,
-        "z": "231735cb.81484a",
+        "x": 506.99981689453125,
+        "y": 1088.0209350585938,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "3e233d3d.e189b2",
-                "41d9ee9a.12b9f",
-                "7e6165e7.675aac",
-                "6cada962.37cf28",
-                "5c13f574.f957ac",
-                "3d1c8150.a42e7e",
-                "50d1caf4.0f4e94",
-                "f59ed201.bd8d3",
-                "2f51ed00.9a5384",
-                "326141f0.a2e29e"
+                "d6618a8.8d47778",
+                "7b87e933.35bbc8",
+                "f15fe286.6c578",
+                "9e18cefd.efb4e",
+                "13aa007d.5e7e9",
+                "ee15ba88.203348",
+                "b582d50f.78e0e8",
+                "f23a41a7.283e5",
+                "12c46bb6.023c04",
+                "7283cfac.cf851",
+                "1c833d87.2ea8f2"
             ]
         ]
     },
     {
-        "id": "3d1c8150.a42e7e",
+        "id": "ee15ba88.203348",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"URL and Target for PCI patch URL\"/>\n<parameter name='field2' value=\"`$prop.controller.url + $tmp.oofpcipoc.patch.pci.url`\" />\n<parameter name='field3' value=\"`$prop.oofpcipoc.patch.pci.target`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 506.00048828125,
-        "y": 923.0104370117188,
-        "z": "231735cb.81484a",
+        "x": 809.0004806518555,
+        "y": 1215.0208473205566,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
     },
     {
-        "id": "6cada962.37cf28",
+        "id": "9e18cefd.efb4e",
         "type": "execute",
         "name": "Get FAP details for a Cell",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.fap-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"oofpcigetfapservice\"/>\n<parameter name='contentType' value='application/json' />",
         "comments": "",
         "outputs": 1,
-        "x": 590.0003662109375,
-        "y": 769.0103759765625,
-        "z": "231735cb.81484a",
+        "x": 893.000358581543,
+        "y": 1061.0207862854004,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "294e9c79.ae0324",
-                "855dbbeb.68dac8"
+                "760b1313.ffe8fc",
+                "8f7d3b9a.8bfbb8"
             ]
         ]
     },
     {
-        "id": "7e6165e7.675aac",
+        "id": "f15fe286.6c578",
         "type": "execute",
         "name": "generate fap-service url",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.fap-service.ransim-mounted`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.fap-service-url\"/>\n    <parameter name=\"target\" value=\"{alias}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.alias`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 505.00006103515625,
-        "y": 658.010498046875,
-        "z": "231735cb.81484a",
+        "x": 824.0000610351562,
+        "y": 937.0209350585938,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
     },
     {
-        "id": "5c13f574.f957ac",
+        "id": "13aa007d.5e7e9",
         "type": "execute",
         "name": "generate pci patch url for a cell",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.x-005b9-lte.ransim-mounted`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.oofpcipoc.patch.pci.url\"/>\n    <parameter name=\"target\" value=\"{alias}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.alias`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 609,
-        "y": 814.0104370117188,
-        "z": "231735cb.81484a",
+        "x": 911.9999923706055,
+        "y": 1106.0208473205566,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
     },
     {
-        "id": "50d1caf4.0f4e94",
+        "id": "b582d50f.78e0e8",
         "type": "execute",
         "name": "Recofigure PCI for a Cell",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/oofpcipoc-pci-patch.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.oofpcipoc.patch.pci.url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"PATCH\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-patch-response\"/>\n<parameter name='contentType' value='application/yang.patch+json' /> \n<parameter name='format' value='json' />\n<parameter name='accept' value='application/yang.patch-status+json' />",
         "comments": "",
         "outputs": 1,
-        "x": 529.9998779296875,
-        "y": 983.010498046875,
-        "z": "231735cb.81484a",
+        "x": 832.999870300293,
+        "y": 1275.020908355713,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "8345c5a4.2aa138",
-                "e412cebf.f2b34"
+                "970590.65d90a7",
+                "27f77794.2482e8"
             ]
         ]
     },
     {
-        "id": "f59ed201.bd8d3",
+        "id": "f23a41a7.283e5",
         "type": "execute",
         "name": "Get FAP details for a Cell",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.fap-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"oofpcigetfapservice\"/>\n<parameter name='contentType' value='application/json' />",
         "comments": "",
         "outputs": 1,
-        "x": 496.9998779296875,
-        "y": 1057.010498046875,
-        "z": "231735cb.81484a",
+        "x": 799.999870300293,
+        "y": 1349.020908355713,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             [
-                "24eb1ccd.364114",
-                "a0317cac.b10f8"
+                "127b098e.b6a836",
+                "c160441d.a6c7b8"
             ]
         ]
     },
     {
-        "id": "2f51ed00.9a5384",
+        "id": "12c46bb6.023c04",
         "type": "execute",
         "name": "populate netconf mount",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.fap-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.fap-service-url\"/>\n    <parameter name=\"target\" value=\"{pnf-name}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.pnf-name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 757,
-        "y": 674,
-        "z": "231735cb.81484a",
+        "x": 908,
+        "y": 981.0104370117188,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
     },
     {
-        "id": "326141f0.a2e29e",
+        "id": "7283cfac.cf851",
         "type": "execute",
         "name": "populate netconf mount",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.oofpcipoc.patch.pci.url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.oofpcipoc.patch.pci.url\"/>\n    <parameter name=\"target\" value=\"{pnf-name}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.pnf-name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 565,
-        "y": 865,
-        "z": "231735cb.81484a",
+        "x": 867.9999923706055,
+        "y": 1157.010410308838,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2a281c5e.d2a1f4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 859,
+        "y": 1634,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "6198b4f0.d538fc",
+                "1e423b05.ed3eb5",
+                "a346114.07fe0f"
+            ]
+        ]
+    },
+    {
+        "id": "6198b4f0.d538fc",
+        "type": "execute",
+        "name": "generate configdb phy cell id patch url",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.configdb.patch-pci-for-cell`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.configdb.patch-pci-for-cell.url\"/>\n    <parameter name=\"target\" value=\"{cellId}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.cid`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1173,
+        "y": 1546,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1e423b05.ed3eb5",
+        "type": "record",
+        "name": "record configdb RestAPI parms",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"URL for configDB PCI Update\"/>\n<parameter name='field2' value=\"`$prop.configdb.url + $tmp.configdb.patch-pci-for-cell.url`\" />\n<parameter name='field3' value=\"`$tmp.cid`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1143,
+        "y": 1610,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a346114.07fe0f",
+        "type": "execute",
+        "name": "Configure PCI value in configdb",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/oofpcipoc-patch-configdb-pci-for-cell.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.configdb.url + $tmp.configdb.patch-pci-for-cell.url`\"/>\n<parameter name=\"httpMethod\" value=\"PATCH\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-configdb-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />\n<parameter name='accept' value='application/json' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1117,
+        "y": 1705,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "97d802c8.37d15",
+                "fee402d7.6ade4"
+            ]
+        ]
+    },
+    {
+        "id": "97d802c8.37d15",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1332,
+        "y": 1648,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "4ef2042b.130fec"
+            ]
+        ]
+    },
+    {
+        "id": "fee402d7.6ade4",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1331.9998779296875,
+        "y": 1743.9998779296875,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "b926758.e620b88"
+            ]
+        ]
+    },
+    {
+        "id": "4ef2042b.130fec",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1500.9998779296875,
+        "y": 1659,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "83519a55.c98588"
+            ]
+        ]
+    },
+    {
+        "id": "b926758.e620b88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1493.9996337890625,
+        "y": 1745,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "e3711f2b.ae7cb"
+            ]
+        ]
+    },
+    {
+        "id": "83519a55.c98588",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error updating configDB. Aborting PCI configuration\" />",
+        "comments": "",
+        "x": 1654.9995727539062,
+        "y": 1652,
+        "z": "3ab6fc36.bf1844",
+        "wires": []
+    },
+    {
+        "id": "e3711f2b.ae7cb",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"PCI Value updated in ConfigDB\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1644.999755859375,
+        "y": 1742,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1c833d87.2ea8f2",
+        "type": "switchNode",
+        "name": "switch configdb deployed",
+        "xml": "<switch test='`$prop.configdb-deployed`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 746,
+        "y": 1456,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "6631853d.97d65c"
+            ]
+        ]
+    },
+    {
+        "id": "6631853d.97d65c",
+        "type": "outcome",
+        "name": "Deployed",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 784,
+        "y": 1558,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "2a281c5e.d2a1f4"
+            ]
+        ]
+    },
+    {
+        "id": "57dfe0e1.47019",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 869,
+        "y": 777.3228416442871,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "4ca47f36.fa5c8",
+                "d15b89c2.581e08",
+                "1fc5ba73.7d3816"
+            ]
+        ]
+    },
+    {
+        "id": "4ca47f36.fa5c8",
+        "type": "execute",
+        "name": "generate configdb phy cell id patch url",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.configdb.patch-pci-for-cell`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.configdb.patch-pci-for-cell.url\"/>\n    <parameter name=\"target\" value=\"{cellId}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.cid`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1139,
+        "y": 683.3228149414062,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d15b89c2.581e08",
+        "type": "record",
+        "name": "record configdb RestAPI parms",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"URL for configDB PCI Update\"/>\n<parameter name='field2' value=\"`$prop.configdb.url + $tmp.configdb.patch-pci-for-cell.url`\" />\n<parameter name='field3' value=\"`$tmp.cid`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1140,
+        "y": 747.3228149414062,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1fc5ba73.7d3816",
+        "type": "execute",
+        "name": "Configure PCI value in configdb",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/oofpcipoc-patch-configdb-pci-for-cell.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.configdb.url + $tmp.configdb.patch-pci-for-cell.url`\"/>\n<parameter name=\"httpMethod\" value=\"PATCH\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-configdb-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />\n<parameter name='accept' value='application/json' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1123.0000762939453,
+        "y": 820.3228282928467,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "ba2f9d26.4c071",
+                "25a03d2b.5923c2"
+            ]
+        ]
+    },
+    {
+        "id": "ba2f9d26.4c071",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1342,
+        "y": 791.3228416442871,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "9ab485af.2ca428"
+            ]
+        ]
+    },
+    {
+        "id": "25a03d2b.5923c2",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1341.9998779296875,
+        "y": 887.3227195739746,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "af46e990.c5e538"
+            ]
+        ]
+    },
+    {
+        "id": "9ab485af.2ca428",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1510.9998779296875,
+        "y": 802.3228416442871,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "3bc9e9b1.fac316"
+            ]
+        ]
+    },
+    {
+        "id": "af46e990.c5e538",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1503.9996337890625,
+        "y": 888.3228416442871,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "89352005.6c218"
+            ]
+        ]
+    },
+    {
+        "id": "3bc9e9b1.fac316",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error adding neighbor to configdb. Aborting notification handler\" />",
+        "comments": "",
+        "x": 1664.9995727539062,
+        "y": 795.3228416442871,
+        "z": "3ab6fc36.bf1844",
+        "wires": []
+    },
+    {
+        "id": "89352005.6c218",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"PCI Value updated in ConfigDB\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1654.999755859375,
+        "y": 884.3228149414062,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "11c1dc80.b90664",
+        "type": "switchNode",
+        "name": "switch configdb deployed",
+        "xml": "<switch test='`$prop.configdb-deployed`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 798,
+        "y": 603.3228149414062,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "2570ba97.638906"
+            ]
+        ]
+    },
+    {
+        "id": "2570ba97.638906",
+        "type": "outcome",
+        "name": "Deployed",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 794,
+        "y": 701.3228416442871,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "57dfe0e1.47019"
+            ]
+        ]
+    },
+    {
+        "id": "521ad3e9.6a770c",
+        "type": "execute",
+        "name": "execute TemplateNode",
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.template.TemplateNode\" method=\"evaluateTemplate\" >\n    <parameter name='templatePath' value='oofpcipoc-dmaap-publish-modifyconfig-resp-payload-template.vtl' />\n    <parameter name='output' value='resp-payload' />\n    <parameter name='prefix' value='sdnr' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 879,
+        "y": 1844,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "ef8ff6e9.86b828",
+                "7697d6f2.332f28"
+            ]
+        ]
+    },
+    {
+        "id": "ef8ff6e9.86b828",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1153,
+        "y": 1813,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "4d3fbe7.120834"
+            ]
+        ]
+    },
+    {
+        "id": "4d3fbe7.120834",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1344,
+        "y": 1816,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "42869be0.f741b4"
+            ]
+        ]
+    },
+    {
+        "id": "42869be0.f741b4",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Redndred sdnr payload template as a string\"/>\n<parameter name='field3' value='`$sdnr.resp-payload`' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1512,
+        "y": 1817,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fbb0b389.b7aff",
+        "type": "execute",
+        "name": "remove new lines",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$sdnr.resp-payload`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.oofpcipoc-dmaap-config-resp.payload\"/>\n    <parameter name=\"target\" value=\"\\n\"/>\n    <parameter name=\"replacement\" value=\"\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 851.5,
+        "y": 1960,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "7bf7bace.f89764",
+                "f8b788a9.137b38"
+            ]
+        ]
+    },
+    {
+        "id": "7f3d1672.4560b8",
+        "type": "execute",
+        "name": "remove tabs",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$tmp.oofpcipoc-dmaap-config-resp.payload`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.oofpcipoc-dmaap-config-resp.payload\"/>\n    <parameter name=\"target\" value=\"\\t\"/>\n    <parameter name=\"replacement\" value=\"\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 841,
+        "y": 2042,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "e28b1895.7be268",
+                "cae77fa4.6625"
+            ]
+        ]
+    },
+    {
+        "id": "33f0c48d.fd610c",
+        "type": "execute",
+        "name": "Escape JSON String",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='escapeJsonString' >\n    <parameter name=\"source\" value='`$tmp.oofpcipoc-dmaap-config-resp.payload`'/>\n    <parameter name=\"target\" value='tmp.oofpcipoc-dmaap-config-resp.payload'/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 828.5,
+        "y": 2158,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "727bc37e.4cc61c",
+                "a2331760.45b9a8"
+            ]
+        ]
+    },
+    {
+        "id": "727bc37e.4cc61c",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1030.5,
+        "y": 2148,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "e7f1bcf3.909e1"
+            ]
+        ]
+    },
+    {
+        "id": "e28b1895.7be268",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1023.5,
+        "y": 2050,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "1654fe1e.928c32"
+            ]
+        ]
+    },
+    {
+        "id": "e7f1bcf3.909e1",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1194.5,
+        "y": 2150,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "f065d3e0.c2419"
+            ]
+        ]
+    },
+    {
+        "id": "f065d3e0.c2419",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Redndred template as an Escaped string\"/>\n<parameter name='field3' value='`$tmp.oofpcipoc-dmaap-config-resp.payload`' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1354.5,
+        "y": 2149,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1654fe1e.928c32",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1208.5,
+        "y": 2048,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "2b43fbf9.c2ba14"
+            ]
+        ]
+    },
+    {
+        "id": "2b43fbf9.c2ba14",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Redndred template with tabs removed \\r\"/>\n<parameter name='field3' value='`$tmp.oofpcipoc-dmaap-config-resp.payload`' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1410.5,
+        "y": 2043,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7bf7bace.f89764",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1045,
+        "y": 1928,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "f96218d5.aefe58"
+            ]
+        ]
+    },
+    {
+        "id": "f96218d5.aefe58",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1220,
+        "y": 1942,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "f95a30fb.559c9"
+            ]
+        ]
+    },
+    {
+        "id": "f95a30fb.559c9",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Redndred template with lines removed \\r\"/>\n<parameter name='field3' value='`$tmp.oofpcipoc-dmaap-config-resp.payload`' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1408,
+        "y": 1944,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7697d6f2.332f28",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1152,
+        "y": 1870,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "f82e9af2.fd97c8"
+            ]
+        ]
+    },
+    {
+        "id": "f82e9af2.fd97c8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1320.9998779296875,
+        "y": 1876,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "9dc76bb2.d10498"
+            ]
+        ]
+    },
+    {
+        "id": "9dc76bb2.d10498",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error creating SDNR response payload string. Aborting PCI configuration\" />",
+        "comments": "",
+        "x": 1476.9996337890625,
+        "y": 1875,
+        "z": "3ab6fc36.bf1844",
+        "wires": []
+    },
+    {
+        "id": "f8b788a9.137b38",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1066,
+        "y": 1999,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "ce2a00dd.a7d93"
+            ]
+        ]
+    },
+    {
+        "id": "ce2a00dd.a7d93",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1233.9998779296875,
+        "y": 1994,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "c8502ddf.753f"
+            ]
+        ]
+    },
+    {
+        "id": "c8502ddf.753f",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error removing lines from SDNR response payload string. Aborting PCI configuration\" />",
+        "comments": "",
+        "x": 1391.9995727539062,
+        "y": 1997,
+        "z": "3ab6fc36.bf1844",
+        "wires": []
+    },
+    {
+        "id": "cae77fa4.6625",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1026,
+        "y": 2098,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "45be5487.15b1fc"
+            ]
+        ]
+    },
+    {
+        "id": "45be5487.15b1fc",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1201.9998779296875,
+        "y": 2099,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "323fff8f.f802"
+            ]
+        ]
+    },
+    {
+        "id": "323fff8f.f802",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error removing tabs from SDNR response payload string. Aborting PCI configuration\" />",
+        "comments": "",
+        "x": 1348.9995727539062,
+        "y": 2102,
+        "z": "3ab6fc36.bf1844",
+        "wires": []
+    },
+    {
+        "id": "a2331760.45b9a8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1024,
+        "y": 2210,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "4f3dcb55.c70b64"
+            ]
+        ]
+    },
+    {
+        "id": "4f3dcb55.c70b64",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1185.9998779296875,
+        "y": 2206,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "86cf38.d3cc70c8"
+            ]
+        ]
+    },
+    {
+        "id": "86cf38.d3cc70c8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error inserting escape chars in SDNR response payload string. Aborting PCI configuration\" />",
+        "comments": "",
+        "x": 1346.9995727539062,
+        "y": 2214,
+        "z": "3ab6fc36.bf1844",
+        "wires": []
+    },
+    {
+        "id": "4b4d0ad6.dd5bc4",
+        "type": "block",
+        "name": "DMAAP Payload Generation",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 596,
+        "y": 1965,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "521ad3e9.6a770c",
+                "fbb0b389.b7aff",
+                "7f3d1672.4560b8",
+                "33f0c48d.fd610c"
+            ]
+        ]
+    },
+    {
+        "id": "f6929731.8a42a8",
+        "type": "block",
+        "name": "DMAAP Reponse Publish",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 590,
+        "y": 2337,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "3b3de811.c71c68",
+                "2bf26107.a6146e"
+            ]
+        ]
+    },
+    {
+        "id": "2bf26107.a6146e",
+        "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.dmaap-publish-config-response.template`\" />\n    <parameter name='restapiUrl' value=\"`$prop.dmaap-message-router.url + '/' + $prop.oofpcipoc-dmaap-configuration-response.topic`\" />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name='responsePrefix' value='dmaap' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 837,
+        "y": 2454,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "ab460f24.61aa7",
+                "47494462.f8125c"
+            ]
+        ]
+    },
+    {
+        "id": "3b3de811.c71c68",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='tmp.oofpcipoc-dmaap-config-resp.rpc-name' value='`$prop.oofpcipoc-dmaap-config-resp.rpc-name.modifyconfig`'/>",
+        "comments": "",
+        "x": 801.666748046875,
+        "y": 2259,
+        "z": "3ab6fc36.bf1844",
+        "wires": []
+    },
+    {
+        "id": "ab460f24.61aa7",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1032.5,
+        "y": 2393.9166870117188,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "55287e9c.c3279"
+            ]
+        ]
+    },
+    {
+        "id": "47494462.f8125c",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1018.4998779296875,
+        "y": 2527.9166259765625,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "ae8bbad3.6dc778"
+            ]
+        ]
+    },
+    {
+        "id": "55287e9c.c3279",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1223.4998779296875,
+        "y": 2423.916717529297,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "a463bca9.96c86"
+            ]
+        ]
+    },
+    {
+        "id": "a463bca9.96c86",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error publishing DMAAP Config Response message. ConfigDB Updated; TO be rolled back...will handle next release\" />",
+        "comments": "",
+        "x": 1402.499568939209,
+        "y": 2420.91668510437,
+        "z": "3ab6fc36.bf1844",
+        "wires": []
+    },
+    {
+        "id": "ae8bbad3.6dc778",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1213.4996337890625,
+        "y": 2511.9166564941406,
+        "z": "3ab6fc36.bf1844",
+        "wires": [
+            [
+                "2e1981bc.3e21ee"
+            ]
+        ]
+    },
+    {
+        "id": "2e1981bc.3e21ee",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"DMAAP Config Response Message Successfully Published \"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1392.4997024536133,
+        "y": 2510.9166431427,
+        "z": "3ab6fc36.bf1844",
         "wires": [
             []
         ]
diff --git a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_generic-neighbor-configuration.json b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_generic-neighbor-configuration.json
index 484dfc49..c7813893 100644
--- a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_generic-neighbor-configuration.json
+++ b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_generic-neighbor-configuration.json
@@ -1,191 +1,194 @@
 [
     {
-        "id": "acb70e34.bf9d7",
+        "id": "62c88a41.7901c4",
         "type": "comment",
         "name": "Generic Neighbor Configuration",
         "info": "",
         "comments": "",
-        "x": 356,
-        "y": 23,
-        "z": "c197f7e7.1da478",
+        "x": 363,
+        "y": 27,
+        "z": "b5912bac.e498b8",
         "wires": []
     },
     {
-        "id": "d3fed603.f6fc28",
+        "id": "baa967e2.faeed8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 581.9999866485596,
-        "y": 252.01049518585205,
-        "z": "c197f7e7.1da478",
+        "x": 604.0000457763672,
+        "y": 247.01050186157227,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "dd03124b.c1ad6",
-                "bb81a2c1.93396",
-                "a007069.f2610f8",
-                "92d276da.4c88e8",
-                "198eb06.8f50d5",
-                "f75fac3.b2d7e5",
-                "1c57b1b4.beaaee",
-                "1e96218.b0f68df",
-                "15ad3471.a615dc",
-                "cc8e22e1.329b1"
+                "e7f7731c.df44c",
+                "e8c58776.722298",
+                "26d77802.a1d148",
+                "a1ea2bf1.677578",
+                "1dc9243f.b48cec",
+                "42fc4612.e644c8",
+                "dd9a5d15.06aae",
+                "772f6c66.8f6644",
+                "9257d114.fbb5f",
+                "bf3b2072.183ee",
+                "5dfa3076.0f2dc"
             ]
         ]
     },
     {
-        "id": "86dca6b7.e82f88",
+        "id": "3b46224d.2d6b5e",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$generic-neighbor-configuration-input.lte-cell-number-of-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 544.0001831054688,
-        "y": 401,
-        "z": "c197f7e7.1da478",
+        "x": 551.0001831054688,
+        "y": 405,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "d3fed603.f6fc28"
+                "baa967e2.faeed8"
             ]
         ]
     },
     {
-        "id": "dd03124b.c1ad6",
+        "id": "e7f7731c.df44c",
         "type": "set",
         "name": "set tmp variables for the requested fap service input parms",
         "xml": "<set>\n<parameter name=\"tmp.alias\" value=\"`$generic-neighbor-configuration-input.alias`\"/>\n<parameter name=\"tmp.plmnid\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].plmnid`\"/>\n<parameter name=\"tmp.cid\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].cid`\"/>\n<parameter name=\"tmp.phy-cell-id\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].phy-cell-id`\"/>\n<parameter name=\"tmp.pnf-name\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].pnf-name`\"/>\n<parameter name=\"tmp.blacklisted\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].blacklisted`\"/>\n",
         "comments": "",
-        "x": 928.0011596679688,
-        "y": 45.88909912109375,
-        "z": "c197f7e7.1da478",
+        "x": 935.0011596679688,
+        "y": 49.88909912109375,
+        "z": "b5912bac.e498b8",
         "wires": []
     },
     {
-        "id": "bb81a2c1.93396",
+        "id": "e8c58776.722298",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Temporary varaibles set. Neighbor #:  \"/>\n<parameter name=\"field2\" value=\"`$idx`\"/>\n<parameter name=\"field3\" value=\"`$tmp.plmnid`\"/>\n<parameter name=\"field4\" value=\"`$tmp.cid`\"/>\n<parameter name=\"field5\" value=\"`$tmp.phy-cell-id`\"/>\n<parameter name=\"field6\" value=\"`$tmp.pnf-name`\"/>\n<parameter name=\"field7\" value=\"`$tmp.blacklisted`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 792.5105075836182,
-        "y": 89.01042747497559,
-        "z": "c197f7e7.1da478",
+        "x": 799.5105075836182,
+        "y": 93.01042747497559,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ac8961a8.d1fb4",
+        "id": "472be384.ef3bac",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 119.48959350585938,
-        "y": 279.9896240234375,
-        "z": "c197f7e7.1da478",
+        "x": 126.48959350585938,
+        "y": 283.9896240234375,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "6501a6c8.9b7ae8",
-                "32f454b1.f5ccfc",
-                "32ca92c1.87b4ae",
-                "dc78859c.2a1938",
-                "fb252ea6.2716a",
-                "c0db2192.9d16c"
+                "58f1d84.b947928",
+                "f7111027.f6312",
+                "be76099f.4dfad8",
+                "ce40b7fa.694068",
+                "d8ef20b.61a53e",
+                "1cfec41e.135f0c",
+                "598648b2.5aa358",
+                "3e67b041.fa193"
             ]
         ]
     },
     {
-        "id": "93ef8347.1a6f",
+        "id": "98417a7.9342688",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='generic-neighbor-configuration' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 105,
-        "y": 180.9895782470703,
-        "z": "c197f7e7.1da478",
+        "x": 112,
+        "y": 184.9895782470703,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "ac8961a8.d1fb4"
+                "472be384.ef3bac"
             ]
         ]
     },
     {
-        "id": "6501a6c8.9b7ae8",
+        "id": "58f1d84.b947928",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"SUCCESSFUL Execution\" />\n",
         "comments": "",
-        "x": 160.00033569335938,
-        "y": 647.98974609375,
-        "z": "c197f7e7.1da478",
+        "x": 117.00033950805664,
+        "y": 2844.989965438843,
+        "z": "b5912bac.e498b8",
         "wires": []
     },
     {
-        "id": "32f454b1.f5ccfc",
+        "id": "f7111027.f6312",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"RPC to Configure Neighbors INVOKED. Number of Neighbors to configure: \"/>\n<parameter name=\"field2\" value=\"`$generic-neighbor-configuration-input.lte-cell-number-of-entries`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 406.00030517578125,
-        "y": 80.01042938232422,
-        "z": "c197f7e7.1da478",
+        "x": 413.00030517578125,
+        "y": 84.01042938232422,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "32ca92c1.87b4ae",
+        "id": "be76099f.4dfad8",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$generic-neighbor-configuration-input.lte-cell-number-of-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 417.085693359375,
-        "y": 126.95317077636719,
-        "z": "c197f7e7.1da478",
+        "x": 424.085693359375,
+        "y": 130.9531707763672,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "e3ecab0.b7f5858"
+                "93be64d3.f030f8"
             ]
         ]
     },
     {
-        "id": "dc78859c.2a1938",
+        "id": "ce40b7fa.694068",
         "type": "execute",
         "name": "execute Properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/sdnr-oofpcipoc-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 420.00018310546875,
-        "y": 185.01040649414062,
-        "z": "c197f7e7.1da478",
+        "x": 427.00018310546875,
+        "y": 189.01040649414062,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "fb252ea6.2716a",
+        "id": "d8ef20b.61a53e",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Properties read .. generic neighbor config template\"/>\n<parameter name=\"field2\" value=\"`$prop.restapi.generic-neighbor-patch.template`\"/>\n<parameter name=\"field3\" value=\"`$prop.controller.user`\"/>\n<parameter name=\"field4\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"field5\" value=\"`$prop.controller.url`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 350.00030517578125,
-        "y": 243.010498046875,
-        "z": "c197f7e7.1da478",
+        "x": 379.000301361084,
+        "y": 257.01050090789795,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "2071d805.4be628",
+        "id": "f6fcf198.4f53a",
         "type": "service-logic",
         "name": "oofpcipoc-api ${project.version}",
         "module": "oofpcipoc-api",
@@ -193,890 +196,1946 @@
         "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='oofpcipoc-api' version='${project.version}'>",
         "outputs": 1,
-        "x": 160.99998474121094,
-        "y": 91.98968505859375,
-        "z": "c197f7e7.1da478",
+        "x": 167.99998474121094,
+        "y": 95.98968505859375,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "93ef8347.1a6f"
+                "98417a7.9342688"
             ]
         ]
     },
     {
-        "id": "e3ecab0.b7f5858",
+        "id": "93be64d3.f030f8",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Input RPC Payload request. Neighbor #:  \"/>\n<parameter name=\"field2\" value=\"`$idx`\"/>\n<parameter name=\"field3\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].plmnid`\"/>\n<parameter name=\"field4\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].cid`\"/>\n<parameter name=\"field5\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].phy-cell-id`\"/>\n<parameter name=\"field6\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].pnf-name`\"/>\n<parameter name=\"field7\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].blacklisted`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 582.0005493164062,
-        "y": 110.98963165283203,
-        "z": "c197f7e7.1da478",
+        "x": 589.0005493164062,
+        "y": 114.98963165283203,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "6ed34cf7.c51b14",
+        "id": "9a50d806.bf9d88",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 96,
-        "y": 29.989585876464844,
-        "z": "c197f7e7.1da478",
+        "x": 103,
+        "y": 33.989585876464844,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "2071d805.4be628"
+                "f6fcf198.4f53a"
             ]
         ]
     },
     {
-        "id": "cc8e22e1.329b1",
+        "id": "bf3b2072.183ee",
         "type": "execute",
         "name": "generate neighbor config URL",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.lte-ran-neighbor-in-use`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.config-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{alias}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.alias`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 863.5108642578125,
-        "y": 133.56614685058594,
-        "z": "c197f7e7.1da478",
+        "x": 870.5108642578125,
+        "y": 137.56614685058594,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a007069.f2610f8",
+        "id": "26d77802.a1d148",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Config Neighbor List URL\"/>\n<parameter name=\"field2\" value=\"`$tmp.config-neighbor-service-url`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 790.510498046875,
-        "y": 186.7882080078125,
-        "z": "c197f7e7.1da478",
+        "x": 797.510498046875,
+        "y": 190.7882080078125,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "92d276da.4c88e8",
+        "id": "a1ea2bf1.677578",
         "type": "execute",
         "name": "populate plmnid",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.config-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.config-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{plmnid}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.plmnid`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 992.5106258392334,
-        "y": 198.78822231292725,
-        "z": "c197f7e7.1da478",
+        "x": 999.5106258392334,
+        "y": 202.78822231292725,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "198eb06.8f50d5",
+        "id": "1dc9243f.b48cec",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Config Neighbor List URL\"/>\n<parameter name=\"field2\" value=\"`$tmp.config-neighbor-service-url`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 860.5104789733887,
-        "y": 242.78819751739502,
-        "z": "c197f7e7.1da478",
+        "x": 867.5104789733887,
+        "y": 246.78819751739502,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "f75fac3.b2d7e5",
+        "id": "42fc4612.e644c8",
         "type": "execute",
         "name": "populate cid",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.config-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.config-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{cid}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.cid`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 883.5105075836182,
-        "y": 287.7882204055786,
-        "z": "c197f7e7.1da478",
+        "x": 890.5105075836182,
+        "y": 291.7882204055786,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "1e96218.b0f68df",
+        "id": "772f6c66.8f6644",
         "type": "execute",
         "name": "Configure neighbor using PATCH",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/oofpcipoc-generic-neighbor-patch.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.config-neighbor-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"PATCH\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-neighbor-patch-response\"/>\n<parameter name='contentType' value='application/yang.patch+json' /> \n<parameter name='format' value='json' />\n<parameter name='accept' value='application/yang.patch-status+json' />",
         "comments": "",
         "outputs": 1,
-        "x": 915.510498046875,
-        "y": 427.788330078125,
-        "z": "c197f7e7.1da478",
+        "x": 922.510498046875,
+        "y": 431.788330078125,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "9ab812b9.2441c",
-                "b2feb5f3.1f8718"
+                "18e5fc47.677d84",
+                "9996e5f3.0463a8"
             ]
         ]
     },
     {
-        "id": "9ab812b9.2441c",
+        "id": "18e5fc47.677d84",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1176.5103855133057,
-        "y": 440.77778339385986,
-        "z": "c197f7e7.1da478",
+        "x": 1183.5103855133057,
+        "y": 395.77778339385986,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "94c0690e.412458"
+                "7e1599c6.f4b258"
             ]
         ]
     },
     {
-        "id": "b2feb5f3.1f8718",
+        "id": "9996e5f3.0463a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1194.5104274749756,
-        "y": 508.7776098251343,
-        "z": "c197f7e7.1da478",
+        "x": 1185.5103302001953,
+        "y": 459.77761459350586,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "42fa2758.89b668"
+                "8be63bfe.ba0d78"
             ]
         ]
     },
     {
-        "id": "a8f77123.4f739",
+        "id": "24c17f16.af7c2",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"PATCH Neighbor Executed Successfully \"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1532.5101795196533,
-        "y": 495.7777180671692,
-        "z": "c197f7e7.1da478",
+        "x": 1516.510124206543,
+        "y": 455.77770233154297,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "42fa2758.89b668",
+        "id": "8be63bfe.ba0d78",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1374.5100917816162,
-        "y": 506.7776908874512,
-        "z": "c197f7e7.1da478",
+        "x": 1352.5101737976074,
+        "y": 458.77769660949707,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "a8f77123.4f739"
+                "24c17f16.af7c2"
             ]
         ]
     },
     {
-        "id": "94c0690e.412458",
+        "id": "7e1599c6.f4b258",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1335.510248184204,
-        "y": 449.7777690887451,
-        "z": "c197f7e7.1da478",
+        "x": 1342.510248184204,
+        "y": 404.7777690887451,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "8f2a4b45.9518e8"
+                "ce7d1839.31b058"
             ]
         ]
     },
     {
-        "id": "8f2a4b45.9518e8",
+        "id": "ce7d1839.31b058",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error adding a new neighbor\" />",
         "comments": "",
-        "x": 1511.5100116729736,
-        "y": 434.77774238586426,
-        "z": "c197f7e7.1da478",
+        "x": 1518.5100116729736,
+        "y": 389.77774238586426,
+        "z": "b5912bac.e498b8",
         "wires": []
     },
     {
-        "id": "1c57b1b4.beaaee",
+        "id": "dd9a5d15.06aae",
         "type": "execute",
         "name": "Get neighbor details pre-configuration",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.config-neighbor-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-neighbor-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 913.5104370117188,
-        "y": 339.7882080078125,
-        "z": "c197f7e7.1da478",
+        "x": 920.5104370117188,
+        "y": 343.7882080078125,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "6f64c3b4.09149c",
-                "b4abf739.6c1f68"
+                "9fe95e60.166c3",
+                "9512e3ea.241a4"
             ]
         ]
     },
     {
-        "id": "6f64c3b4.09149c",
+        "id": "9fe95e60.166c3",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1164.5105381011963,
-        "y": 321.4442539215088,
-        "z": "c197f7e7.1da478",
+        "x": 1188.510498046875,
+        "y": 280.4442491531372,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "a028bb53.ce35a8"
+                "5a501fde.87adb"
             ]
         ]
     },
     {
-        "id": "b4abf739.6c1f68",
+        "id": "9512e3ea.241a4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1159.5103702545166,
-        "y": 377.44440746307373,
-        "z": "c197f7e7.1da478",
+        "x": 1175.5103912353516,
+        "y": 344.44439697265625,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "f4e4f96.daf0108"
+                "f3752e03.cce3d"
             ]
         ]
     },
     {
-        "id": "f4e4f96.daf0108",
+        "id": "f3752e03.cce3d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1311.5101871490479,
-        "y": 386.44431257247925,
-        "z": "c197f7e7.1da478",
+        "x": 1318.5101871490479,
+        "y": 341.44431257247925,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "d3310510.124b48"
+                "56993fd5.34454"
             ]
         ]
     },
     {
-        "id": "d3310510.124b48",
+        "id": "56993fd5.34454",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Details about Neighbor Pre-configuration\"/>\n<parameter name=\"field2\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].plmnid`\"/>\n<parameter name=\"field3\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].cid`\"/>\n<parameter name=\"field4\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].phy-cell-id`\"/>\n<parameter name=\"field5\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].pnf-name`\"/>\n<parameter name=\"field6\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].blacklisted`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1472.510103225708,
-        "y": 380.44458293914795,
-        "z": "c197f7e7.1da478",
+        "x": 1479.510103225708,
+        "y": 335.44458293914795,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a028bb53.ce35a8",
+        "id": "5a501fde.87adb",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error getting details about new neighbor \" />",
         "comments": "",
-        "x": 1365.5103282928467,
-        "y": 327.44426250457764,
-        "z": "c197f7e7.1da478",
+        "x": 1387.5103912353516,
+        "y": 270.4442768096924,
+        "z": "b5912bac.e498b8",
         "wires": []
     },
     {
-        "id": "15ad3471.a615dc",
+        "id": "9257d114.fbb5f",
         "type": "execute",
         "name": "Get neighbor details post-configuration",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.config-neighbor-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-neighbor-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 871.5104370117188,
-        "y": 503.67706298828125,
-        "z": "c197f7e7.1da478",
+        "x": 878.5104370117188,
+        "y": 507.67706298828125,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "144ccd4d.5f33d3",
-                "6b712cb1.c5f834"
+                "f3eccc73.b462e",
+                "3ed6cc6a.c6c044"
             ]
         ]
     },
     {
-        "id": "144ccd4d.5f33d3",
+        "id": "f3eccc73.b462e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1204.5105381011963,
-        "y": 559.3331089019775,
-        "z": "c197f7e7.1da478",
+        "x": 1213.5104370117188,
+        "y": 507.3331050872803,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "5f6e00fc.ed03a"
+                "1ebdbe5d.7f30b2"
             ]
         ]
     },
     {
-        "id": "6b712cb1.c5f834",
+        "id": "3ed6cc6a.c6c044",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1199.5103702545166,
-        "y": 615.3332624435425,
-        "z": "c197f7e7.1da478",
+        "x": 1206.5103302001953,
+        "y": 559.3333015441895,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "4913d618.0c8fe8"
+                "7a33e4a5.c1140c"
             ]
         ]
     },
     {
-        "id": "4913d618.0c8fe8",
+        "id": "7a33e4a5.c1140c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1351.5101871490479,
-        "y": 624.333167552948,
-        "z": "c197f7e7.1da478",
+        "x": 1375.5100898742676,
+        "y": 566.3332405090332,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "1c9c0def.8b9082"
+                "8874cc8.fdd9c3"
             ]
         ]
     },
     {
-        "id": "5f6e00fc.ed03a",
+        "id": "1ebdbe5d.7f30b2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error getting details about new neighbor \" />",
         "comments": "",
-        "x": 1405.5103282928467,
-        "y": 565.3331174850464,
-        "z": "c197f7e7.1da478",
+        "x": 1386.5103912353516,
+        "y": 504.33313274383545,
+        "z": "b5912bac.e498b8",
         "wires": []
     },
     {
-        "id": "1c9c0def.8b9082",
+        "id": "8874cc8.fdd9c3",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Details about Neighbor Post-configuration\"/>\n<parameter name=\"field2\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].plmnid`\"/>\n<parameter name=\"field3\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].cid`\"/>\n<parameter name=\"field4\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].phy-cell-id`\"/>\n<parameter name=\"field5\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].pnf-name`\"/>\n<parameter name=\"field6\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].blacklisted`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1512.5100955963135,
-        "y": 617.3334121704102,
-        "z": "c197f7e7.1da478",
+        "x": 1522.510124206543,
+        "y": 564.333456993103,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "1262f222.f1f98e",
+        "id": "caedd83d.51f7c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 530.9999866485596,
-        "y": 869.999997138977,
-        "z": "c197f7e7.1da478",
+        "x": 576.9999465942383,
+        "y": 1317.0000581741333,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "4156eb3.49eb114",
-                "28301c50.f9a394",
-                "2aab82d0.4d643e",
-                "c0b1bda4.651cf",
-                "6b902758.7673c8",
-                "f337f894.e1cc48",
-                "fe8ae27d.83e96",
-                "359b0369.a48e7c",
-                "8d693ead.befbb",
-                "38c29228.79ba4e",
-                "411a695d.a4f048"
+                "1c84f0b8.618d3f",
+                "661254e5.c354ac",
+                "30fcd4e2.e8af6c",
+                "f65cc795.09a8f8",
+                "6002fae9.c462d4",
+                "26a41e87.9a2a42",
+                "8ad484a4.2e48f8",
+                "9cd115c6.7d3528",
+                "aa95ae6a.9db0c",
+                "917698f.742c268",
+                "5d5cd71e.9e8ad8",
+                "dd44dc35.baa9a"
             ]
         ]
     },
     {
-        "id": "ae52469b.df3fe8",
+        "id": "49402706.7c5b88",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$generic-neighbor-configuration-input.lte-cell-number-of-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 513.0001831054688,
-        "y": 493.989501953125,
-        "z": "c197f7e7.1da478",
+        "x": 520.0001831054688,
+        "y": 497.989501953125,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "1262f222.f1f98e"
+                "caedd83d.51f7c8"
             ]
         ]
     },
     {
-        "id": "4156eb3.49eb114",
+        "id": "1c84f0b8.618d3f",
         "type": "set",
         "name": "set tmp variables for the requested fap service input parms",
         "xml": "<set>\n<parameter name=\"tmp.alias\" value=\"`$generic-neighbor-configuration-input.alias`\"/>\n<parameter name=\"tmp.plmnid\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].plmnid`\"/>\n<parameter name=\"tmp.cid\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].cid`\"/>\n<parameter name=\"tmp.phy-cell-id\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].phy-cell-id`\"/>\n<parameter name=\"tmp.pnf-name\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].pnf-name`\"/>\n<parameter name=\"tmp.blacklisted\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].blacklisted`\"/>\n",
         "comments": "",
-        "x": 839.0011596679688,
-        "y": 598.8786010742188,
-        "z": "c197f7e7.1da478",
+        "x": 910.0011806488037,
+        "y": 1000.8786706924438,
+        "z": "b5912bac.e498b8",
         "wires": []
     },
     {
-        "id": "28301c50.f9a394",
+        "id": "661254e5.c354ac",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Temporary varaibles set. Neighbor #:  \"/>\n<parameter name=\"field2\" value=\"`$idx`\"/>\n<parameter name=\"field3\" value=\"`$tmp.plmnid`\"/>\n<parameter name=\"field4\" value=\"`$tmp.cid`\"/>\n<parameter name=\"field5\" value=\"`$tmp.phy-cell-id`\"/>\n<parameter name=\"field6\" value=\"`$tmp.pnf-name`\"/>\n<parameter name=\"field7\" value=\"`$tmp.blacklisted`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 734.510498046875,
-        "y": 642.9999389648438,
-        "z": "c197f7e7.1da478",
+        "x": 780.5105037689209,
+        "y": 1077.0000381469727,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "38c29228.79ba4e",
+        "id": "917698f.742c268",
         "type": "execute",
         "name": "generate neighbor config URL",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.lte-ran-neighbor-in-use.ransim-mounted`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.config-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{alias}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.alias`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 827.5108642578125,
-        "y": 691.5556640625,
-        "z": "c197f7e7.1da478",
+        "x": 873.5108242034912,
+        "y": 1138.5557250976562,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "2aab82d0.4d643e",
+        "id": "30fcd4e2.e8af6c",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Config Neighbor List URL\"/>\n<parameter name=\"field2\" value=\"`$tmp.config-neighbor-service-url`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 768.510498046875,
-        "y": 740.7777099609375,
-        "z": "c197f7e7.1da478",
+        "x": 814.5104579925537,
+        "y": 1187.7777709960938,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "c0b1bda4.651cf",
+        "id": "f65cc795.09a8f8",
         "type": "execute",
         "name": "populate plmnid",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.config-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.config-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{plmnid}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.plmnid`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 832.5106201171875,
-        "y": 836.7777099609375,
-        "z": "c197f7e7.1da478",
+        "x": 878.5105800628662,
+        "y": 1283.7777709960938,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "6b902758.7673c8",
+        "id": "6002fae9.c462d4",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Config Neighbor List URL\"/>\n<parameter name=\"field2\" value=\"`$tmp.config-neighbor-service-url`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 807.510498046875,
-        "y": 884.7777099609375,
-        "z": "c197f7e7.1da478",
+        "x": 853.5104579925537,
+        "y": 1331.7777709960938,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "f337f894.e1cc48",
+        "id": "26a41e87.9a2a42",
         "type": "execute",
         "name": "populate cid",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.config-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.config-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{cid}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.cid`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 816.510498046875,
-        "y": 921.7777099609375,
-        "z": "c197f7e7.1da478",
+        "x": 862.5104579925537,
+        "y": 1368.7777709960938,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "359b0369.a48e7c",
+        "id": "9cd115c6.7d3528",
         "type": "execute",
         "name": "Configure neighbor using PATCH",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/oofpcipoc-generic-neighbor-patch.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.config-neighbor-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"PATCH\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-neighbor-patch-response\"/>\n<parameter name='contentType' value='application/yang.patch+json' /> \n<parameter name='format' value='json' />\n<parameter name='accept' value='application/yang.patch-status+json' />",
         "comments": "",
         "outputs": 1,
-        "x": 830.510498046875,
-        "y": 1051.77783203125,
-        "z": "c197f7e7.1da478",
+        "x": 876.5104579925537,
+        "y": 1498.7778930664062,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "aaf367ec.71a3d8",
-                "f6e2a503.cab1e8"
+                "550d2fe8.b2398",
+                "c01d1028.d9257"
             ]
         ]
     },
     {
-        "id": "aaf367ec.71a3d8",
+        "id": "550d2fe8.b2398",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1125.5103855133057,
-        "y": 1058.7672853469849,
-        "z": "c197f7e7.1da478",
+        "x": 1171.5103454589844,
+        "y": 1505.767346382141,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "d64f59f9.bbcd88"
+                "6a5a8363.937f4c"
             ]
         ]
     },
     {
-        "id": "f6e2a503.cab1e8",
+        "id": "c01d1028.d9257",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1143.5104274749756,
-        "y": 1126.7671117782593,
-        "z": "c197f7e7.1da478",
+        "x": 1189.5103874206543,
+        "y": 1573.7671728134155,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "ad51aa4c.6dd0f8"
+                "52465faf.7e9e9"
             ]
         ]
     },
     {
-        "id": "da0a9ad3.338348",
+        "id": "7626dcea.9b0314",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"PATCH Neighbor Executed Successfully \"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1481.5101795196533,
-        "y": 1113.7672200202942,
-        "z": "c197f7e7.1da478",
+        "x": 1527.510139465332,
+        "y": 1560.7672810554504,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ad51aa4c.6dd0f8",
+        "id": "52465faf.7e9e9",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1323.5100917816162,
-        "y": 1124.7671928405762,
-        "z": "c197f7e7.1da478",
+        "x": 1369.510051727295,
+        "y": 1571.7672538757324,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "da0a9ad3.338348"
+                "7626dcea.9b0314"
             ]
         ]
     },
     {
-        "id": "d64f59f9.bbcd88",
+        "id": "6a5a8363.937f4c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1284.510248184204,
-        "y": 1067.7672710418701,
-        "z": "c197f7e7.1da478",
+        "x": 1330.5102081298828,
+        "y": 1514.7673320770264,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "1a1c9666.4c773a"
+                "c37acb1b.5bf368"
             ]
         ]
     },
     {
-        "id": "1a1c9666.4c773a",
+        "id": "c37acb1b.5bf368",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error adding a new neighbor\" />",
         "comments": "",
-        "x": 1460.5100116729736,
-        "y": 1052.7672443389893,
-        "z": "c197f7e7.1da478",
+        "x": 1506.5099716186523,
+        "y": 1499.7673053741455,
+        "z": "b5912bac.e498b8",
         "wires": []
     },
     {
-        "id": "fe8ae27d.83e96",
+        "id": "8ad484a4.2e48f8",
         "type": "execute",
         "name": "Get neighbor details pre-configuration",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.config-neighbor-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-neighbor-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 840.5104370117188,
-        "y": 966.7777099609375,
-        "z": "c197f7e7.1da478",
+        "x": 886.5103969573975,
+        "y": 1413.7777709960938,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "dc414a11.7edb78",
-                "9db5bb73.2d55e8"
+                "91fb4292.af9ba",
+                "4fbff7ac.8fb1f8"
             ]
         ]
     },
     {
-        "id": "dc414a11.7edb78",
+        "id": "91fb4292.af9ba",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1113.5105381011963,
-        "y": 939.4337558746338,
-        "z": "c197f7e7.1da478",
+        "x": 1159.510498046875,
+        "y": 1386.43381690979,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "64dcc609.fa2868"
+                "a8a950c8.2502f"
             ]
         ]
     },
     {
-        "id": "9db5bb73.2d55e8",
+        "id": "4fbff7ac.8fb1f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1108.5103702545166,
-        "y": 995.4339094161987,
-        "z": "c197f7e7.1da478",
+        "x": 1154.5103302001953,
+        "y": 1442.433970451355,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "47f38d6d.89f364"
+                "ffc0c87a.ab73b8"
             ]
         ]
     },
     {
-        "id": "47f38d6d.89f364",
+        "id": "ffc0c87a.ab73b8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1260.5101871490479,
-        "y": 1004.4338145256042,
-        "z": "c197f7e7.1da478",
+        "x": 1306.5101470947266,
+        "y": 1451.4338755607605,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "ab46d61a.7a0318"
+                "d27f355.abdb1c8"
             ]
         ]
     },
     {
-        "id": "ab46d61a.7a0318",
+        "id": "d27f355.abdb1c8",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Details about Neighbor Pre-configuration\"/>\n<parameter name=\"field2\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].plmnid`\"/>\n<parameter name=\"field3\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].cid`\"/>\n<parameter name=\"field4\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].phy-cell-id`\"/>\n<parameter name=\"field5\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].pnf-name`\"/>\n<parameter name=\"field6\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].blacklisted`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1421.510103225708,
-        "y": 998.434084892273,
-        "z": "c197f7e7.1da478",
+        "x": 1467.5100631713867,
+        "y": 1445.4341459274292,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "64dcc609.fa2868",
+        "id": "a8a950c8.2502f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error getting details about new neighbor \" />",
         "comments": "",
-        "x": 1314.5103282928467,
-        "y": 945.4337644577026,
-        "z": "c197f7e7.1da478",
+        "x": 1360.5102882385254,
+        "y": 1392.433825492859,
+        "z": "b5912bac.e498b8",
         "wires": []
     },
     {
-        "id": "8d693ead.befbb",
+        "id": "aa95ae6a.9db0c",
         "type": "execute",
         "name": "Get neighbor details post-configuration",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.config-neighbor-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-neighbor-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 796.5104370117188,
-        "y": 1165.6666259765625,
-        "z": "c197f7e7.1da478",
+        "x": 842.5103969573975,
+        "y": 1612.6666870117188,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "8f75a41.6426d58",
-                "23c81cd0.efa084"
+                "9a649311.6c99",
+                "6cc8d6fb.f0ac98"
             ]
         ]
     },
     {
-        "id": "8f75a41.6426d58",
+        "id": "9a649311.6c99",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1153.5105381011963,
-        "y": 1177.3226108551025,
-        "z": "c197f7e7.1da478",
+        "x": 1199.510498046875,
+        "y": 1624.3226718902588,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "bfbdf11e.993f7"
+                "cdae9665.c04dc8"
             ]
         ]
     },
     {
-        "id": "23c81cd0.efa084",
+        "id": "6cc8d6fb.f0ac98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1148.5103702545166,
-        "y": 1233.3227643966675,
-        "z": "c197f7e7.1da478",
+        "x": 1194.5103302001953,
+        "y": 1680.3228254318237,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "4d4d048c.c416cc"
+                "c3f07c0c.f0779"
             ]
         ]
     },
     {
-        "id": "4d4d048c.c416cc",
+        "id": "c3f07c0c.f0779",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1300.5101871490479,
-        "y": 1242.322669506073,
-        "z": "c197f7e7.1da478",
+        "x": 1346.5101470947266,
+        "y": 1689.3227305412292,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "fcddb4e7.12b6d8"
+                "adbc9ce8.ce34e"
             ]
         ]
     },
     {
-        "id": "bfbdf11e.993f7",
+        "id": "cdae9665.c04dc8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error getting details about new neighbor \" />",
         "comments": "",
-        "x": 1354.5103282928467,
-        "y": 1183.3226194381714,
-        "z": "c197f7e7.1da478",
+        "x": 1400.5102882385254,
+        "y": 1630.3226804733276,
+        "z": "b5912bac.e498b8",
         "wires": []
     },
     {
-        "id": "fcddb4e7.12b6d8",
+        "id": "adbc9ce8.ce34e",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Details about Neighbor Post-configuration\"/>\n<parameter name=\"field2\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].plmnid`\"/>\n<parameter name=\"field3\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].cid`\"/>\n<parameter name=\"field4\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].phy-cell-id`\"/>\n<parameter name=\"field5\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].pnf-name`\"/>\n<parameter name=\"field6\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].blacklisted`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1461.5100955963135,
-        "y": 1235.3229141235352,
-        "z": "c197f7e7.1da478",
+        "x": 1507.5100555419922,
+        "y": 1682.3229751586914,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "8472ac8d.f6ede",
+        "id": "9e1d4a81.fff878",
         "type": "outcome",
         "name": "Not Mounted",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 420,
-        "y": 320,
-        "z": "c197f7e7.1da478",
+        "x": 427,
+        "y": 324,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "86dca6b7.e82f88"
+                "3b46224d.2d6b5e"
             ]
         ]
     },
     {
-        "id": "c0db2192.9d16c",
+        "id": "1cfec41e.135f0c",
         "type": "switchNode",
         "name": "switch mounted",
         "xml": "<switch test='`$prop.ransim-mounted`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 318,
-        "y": 409,
-        "z": "c197f7e7.1da478",
+        "x": 325,
+        "y": 413,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "8472ac8d.f6ede",
-                "5a41edd6.afaa34"
+                "9e1d4a81.fff878",
+                "f4668911.4ee4b8"
             ]
         ]
     },
     {
-        "id": "5a41edd6.afaa34",
+        "id": "f4668911.4ee4b8",
         "type": "outcome",
         "name": "Mounted",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 351,
-        "y": 487,
-        "z": "c197f7e7.1da478",
+        "x": 358,
+        "y": 491,
+        "z": "b5912bac.e498b8",
         "wires": [
             [
-                "ae52469b.df3fe8"
+                "49402706.7c5b88"
             ]
         ]
     },
     {
-        "id": "411a695d.a4f048",
+        "id": "5d5cd71e.9e8ad8",
         "type": "execute",
         "name": "populate netconf mount",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.config-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.config-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{pnf-name}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.pnf-name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 837,
-        "y": 792,
-        "z": "c197f7e7.1da478",
+        "x": 882.9999599456787,
+        "y": 1239.0000610351562,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3cf0d2d4.0a5d0e",
+        "type": "execute",
+        "name": "execute TemplateNode",
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.template.TemplateNode\" method=\"evaluateTemplate\" >\n    <parameter name='templatePath' value='oofpcipoc-dmaap-publish-modifyconfiganr-resp-payload-template.vtl' />\n    <parameter name='output' value='resp-payload' />\n    <parameter name='prefix' value='sdnr' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 872.0104598999023,
+        "y": 2125.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "fb7f30bc.4c65b",
+                "bdb5c927.8af808"
+            ]
+        ]
+    },
+    {
+        "id": "fb7f30bc.4c65b",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1146.0104598999023,
+        "y": 2094.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "c11aee10.e6e67"
+            ]
+        ]
+    },
+    {
+        "id": "c11aee10.e6e67",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1337.0104598999023,
+        "y": 2097.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "9a917d5e.1c727"
+            ]
+        ]
+    },
+    {
+        "id": "9a917d5e.1c727",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Redndred sdnr payload template as a string\"/>\n<parameter name='field3' value='`$sdnr.resp-payload`' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1505.0104598999023,
+        "y": 2098.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "df99ee06.4ace2",
+        "type": "execute",
+        "name": "remove new lines",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$sdnr.resp-payload`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.oofpcipoc-dmaap-config-resp.payload\"/>\n    <parameter name=\"target\" value=\"\\n\"/>\n    <parameter name=\"replacement\" value=\"\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 844.5104598999023,
+        "y": 2241.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "c93e93f1.a82ee",
+                "185060e1.24becf"
+            ]
+        ]
+    },
+    {
+        "id": "2dc1f234.42072e",
+        "type": "execute",
+        "name": "remove tabs",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$tmp.oofpcipoc-dmaap-config-resp.payload`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.oofpcipoc-dmaap-config-resp.payload\"/>\n    <parameter name=\"target\" value=\"\\t\"/>\n    <parameter name=\"replacement\" value=\"\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 834.0104598999023,
+        "y": 2323.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "6e15985e.9487b8",
+                "ee17f7c6.a13008"
+            ]
+        ]
+    },
+    {
+        "id": "d94faf20.0bc6f",
+        "type": "execute",
+        "name": "Escape JSON String",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='escapeJsonString' >\n    <parameter name=\"source\" value='`$tmp.oofpcipoc-dmaap-config-resp.payload`'/>\n    <parameter name=\"target\" value='tmp.oofpcipoc-dmaap-config-resp.payload'/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 821.5104598999023,
+        "y": 2439.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "90e3f8bd.7c3bc8",
+                "a4d7a3a6.62a39"
+            ]
+        ]
+    },
+    {
+        "id": "90e3f8bd.7c3bc8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1023.5104598999023,
+        "y": 2429.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "dc13ddfc.0613e"
+            ]
+        ]
+    },
+    {
+        "id": "6e15985e.9487b8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1016.5104598999023,
+        "y": 2331.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "a4df22c7.c42fd"
+            ]
+        ]
+    },
+    {
+        "id": "dc13ddfc.0613e",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1187.5104598999023,
+        "y": 2431.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "a1498459.692f68"
+            ]
+        ]
+    },
+    {
+        "id": "a1498459.692f68",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Redndred template as an Escaped string\"/>\n<parameter name='field3' value='`$tmp.oofpcipoc-dmaap-config-resp.payload`' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1347.5104598999023,
+        "y": 2430.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a4df22c7.c42fd",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1201.5104598999023,
+        "y": 2329.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "64c913b9.99501c"
+            ]
+        ]
+    },
+    {
+        "id": "64c913b9.99501c",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Redndred template with tabs removed \\r\"/>\n<parameter name='field3' value='`$tmp.oofpcipoc-dmaap-config-resp.payload`' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1403.5104598999023,
+        "y": 2324.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c93e93f1.a82ee",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1038.0104598999023,
+        "y": 2209.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "d0d96a57.50b6a8"
+            ]
+        ]
+    },
+    {
+        "id": "d0d96a57.50b6a8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1213.0104598999023,
+        "y": 2223.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "f893a35e.08e4f"
+            ]
+        ]
+    },
+    {
+        "id": "f893a35e.08e4f",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Redndred template with lines removed \\r\"/>\n<parameter name='field3' value='`$tmp.oofpcipoc-dmaap-config-resp.payload`' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1401.0104598999023,
+        "y": 2225.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "bdb5c927.8af808",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1145.0104598999023,
+        "y": 2151.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "3f455a05.46ca56"
+            ]
+        ]
+    },
+    {
+        "id": "3f455a05.46ca56",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1314.0103378295898,
+        "y": 2157.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "4b319563.0e680c"
+            ]
+        ]
+    },
+    {
+        "id": "4b319563.0e680c",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error creating SDNR response payload string. Aborting PCI configuration\" />",
+        "comments": "",
+        "x": 1470.0100936889648,
+        "y": 2156.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": []
+    },
+    {
+        "id": "185060e1.24becf",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1059.0104598999023,
+        "y": 2280.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "f035b64a.afd518"
+            ]
+        ]
+    },
+    {
+        "id": "f035b64a.afd518",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1227.0103378295898,
+        "y": 2275.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "3f311f39.6d976"
+            ]
+        ]
+    },
+    {
+        "id": "3f311f39.6d976",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error removing lines from SDNR response payload string. Aborting PCI configuration\" />",
+        "comments": "",
+        "x": 1385.0100326538086,
+        "y": 2278.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": []
+    },
+    {
+        "id": "ee17f7c6.a13008",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1019.0104598999023,
+        "y": 2379.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "435f1a9.a102ee4"
+            ]
+        ]
+    },
+    {
+        "id": "435f1a9.a102ee4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1195.0103378295898,
+        "y": 2380.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "d581508c.2e804"
+            ]
+        ]
+    },
+    {
+        "id": "d581508c.2e804",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error removing tabs from SDNR response payload string. Aborting PCI configuration\" />",
+        "comments": "",
+        "x": 1342.0100326538086,
+        "y": 2383.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": []
+    },
+    {
+        "id": "a4d7a3a6.62a39",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1017.0104598999023,
+        "y": 2491.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "7a39172d.482ce8"
+            ]
+        ]
+    },
+    {
+        "id": "7a39172d.482ce8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1179.0103378295898,
+        "y": 2487.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "7705a742.9b25b8"
+            ]
+        ]
+    },
+    {
+        "id": "7705a742.9b25b8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error inserting escape chars in SDNR response payload string. Aborting PCI configuration\" />",
+        "comments": "",
+        "x": 1340.0100326538086,
+        "y": 2495.4550261497498,
+        "z": "b5912bac.e498b8",
+        "wires": []
+    },
+    {
+        "id": "598648b2.5aa358",
+        "type": "block",
+        "name": "DMAAP Payload Generation",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 576.0104751586914,
+        "y": 2243.4551243782043,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "3cf0d2d4.0a5d0e",
+                "df99ee06.4ace2",
+                "2dc1f234.42072e",
+                "d94faf20.0bc6f"
+            ]
+        ]
+    },
+    {
+        "id": "3e67b041.fa193",
+        "type": "block",
+        "name": "DMAAP Reponse Publish",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 438.0104446411133,
+        "y": 2591.343816280365,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "31416be7.b41224",
+                "5ccbfc1e.20e2f4"
+            ]
+        ]
+    },
+    {
+        "id": "5ccbfc1e.20e2f4",
+        "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.dmaap-publish-config-response.template`\" />\n    <parameter name='restapiUrl' value=\"`$prop.dmaap-message-router.url + '/' + $prop.oofpcipoc-dmaap-configuration-response.topic`\" />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name='responsePrefix' value='dmaap' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 853.0105209350586,
+        "y": 2653.4550433158875,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "35df2cf3.78dc74",
+                "ecbae94b.e41fd8"
+            ]
+        ]
+    },
+    {
+        "id": "31416be7.b41224",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='tmp.oofpcipoc-dmaap-config-resp.rpc-name' value='`$prop.oofpcipoc-dmaap-config-resp.rpc-name.modifyconfiganr`'/>",
+        "comments": "",
+        "x": 839.6772193908691,
+        "y": 2549.4550337791443,
+        "z": "b5912bac.e498b8",
+        "wires": []
+    },
+    {
+        "id": "35df2cf3.78dc74",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1027.510498046875,
+        "y": 2587.3717608451843,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "6faec48c.adf59c"
+            ]
+        ]
+    },
+    {
+        "id": "ecbae94b.e41fd8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1050.510353088379,
+        "y": 2716.3718676567078,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "7c97eaeb.048ce4"
+            ]
+        ]
+    },
+    {
+        "id": "6faec48c.adf59c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1208.510269165039,
+        "y": 2590.3718905448914,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "96ee7bd4.ade948"
+            ]
+        ]
+    },
+    {
+        "id": "96ee7bd4.ade948",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error publishing DMAAP Config Response message. ConfigDB Updated; TO be rolled back...will handle next release\" />",
+        "comments": "",
+        "x": 1382.5099868774414,
+        "y": 2597.3718156814575,
+        "z": "b5912bac.e498b8",
+        "wires": []
+    },
+    {
+        "id": "7c97eaeb.048ce4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1210.5099983215332,
+        "y": 2708.3718400001526,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "9752c29a.925d5"
+            ]
+        ]
+    },
+    {
+        "id": "9752c29a.925d5",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"DMAAP Config Response Message Successfully Published \"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1387.5101165771484,
+        "y": 2713.3719487190247,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "6658e995.a8afc8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 891.0104370117188,
+        "y": 843.34375,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "be155b7f.4b4658",
+                "e5e6ffd6.3ceea",
+                "33c67261.6b5ade",
+                "aa8fe0bd.58667"
+            ]
+        ]
+    },
+    {
+        "id": "be155b7f.4b4658",
+        "type": "execute",
+        "name": "generate configdb nbr ho patch url",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.configdb.patch-ho-for-nbr`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.configdb.patch-ho-for-nbr.url\"/>\n    <parameter name=\"target\" value=\"{cellId}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.alias`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1173.0103607177734,
+        "y": 696.3437967300415,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e5e6ffd6.3ceea",
+        "type": "record",
+        "name": "record configdb RestAPI parms",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"URL for configDB PCI Update\"/>\n<parameter name='field2' value=\"`$prop.configdb.url + $tmp.configdb.patch-ho-for-nbr.url`\" />\n<parameter name='field3' value=\"`$tmp.alias`\" />\n<parameter name='field4' value=\"`$tmp.cid`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1182.0104522705078,
+        "y": 809.3437929153442,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "33c67261.6b5ade",
+        "type": "execute",
+        "name": "Configure PCI value in configdb",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/oofpcipoc-patch-configdb-ho-for-nbr.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.configdb.url + $tmp.configdb.patch-ho-for-nbr.url`\"/>\n<parameter name=\"httpMethod\" value=\"PATCH\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-configdb-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />\n<parameter name='accept' value='application/json' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1149.0104370117188,
+        "y": 914.34375,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "cbd12702.8e4338",
+                "12af70f8.c2945f"
+            ]
+        ]
+    },
+    {
+        "id": "cbd12702.8e4338",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1364.0104370117188,
+        "y": 857.34375,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "eebd8d4d.fd481"
+            ]
+        ]
+    },
+    {
+        "id": "12af70f8.c2945f",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1364.0103149414062,
+        "y": 953.3436279296875,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "342f48d0.8ab638"
+            ]
+        ]
+    },
+    {
+        "id": "eebd8d4d.fd481",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1533.0103149414062,
+        "y": 868.34375,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "d55d851b.fc1958"
+            ]
+        ]
+    },
+    {
+        "id": "342f48d0.8ab638",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1526.0100708007812,
+        "y": 954.34375,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "6dcdc966.a406c8"
+            ]
+        ]
+    },
+    {
+        "id": "d55d851b.fc1958",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error updating configDB. Aborting Nbr HO configuration\" />",
+        "comments": "",
+        "x": 1687.010009765625,
+        "y": 861.34375,
+        "z": "b5912bac.e498b8",
+        "wires": []
+    },
+    {
+        "id": "6dcdc966.a406c8",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"HO Value for nbr updated in ConfigDB\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1681.010269165039,
+        "y": 951.3437585830688,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5dfa3076.0f2dc",
+        "type": "switchNode",
+        "name": "switch configdb deployed",
+        "xml": "<switch test='`$prop.configdb-deployed`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 774.0104522705078,
+        "y": 637.343770980835,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "f86727f0.323a28",
+                "b1853d4e.2ef79"
+            ]
+        ]
+    },
+    {
+        "id": "f86727f0.323a28",
+        "type": "outcome",
+        "name": "Deployed",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 816.0104370117188,
+        "y": 767.34375,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "6658e995.a8afc8"
+            ]
+        ]
+    },
+    {
+        "id": "aa8fe0bd.58667",
+        "type": "execute",
+        "name": "Update target cellid for configdb nbr ho patch url",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.configdb.patch-ho-for-nbr.url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.configdb.patch-ho-for-nbr.url\"/>\n    <parameter name=\"target\" value=\"{targetCellId}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.cid`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1241.0103912353516,
+        "y": 748.4549632072449,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fcdde69d.5ef6b8",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"ConfigDB Update Skipped\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1213.0103645324707,
+        "y": 623.5659379959106,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b1853d4e.2ef79",
+        "type": "outcome",
+        "name": "Not Deployed",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1039.0103302001953,
+        "y": 619.6770076751709,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "fcdde69d.5ef6b8"
+            ]
+        ]
+    },
+    {
+        "id": "b59fe403.100df8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 880.0104370117188,
+        "y": 1921.5660400390625,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "5fee4a24.714e24",
+                "e80f49c7.bc5e98",
+                "9f3eddb8.4c8b6",
+                "ede238d3.02b908"
+            ]
+        ]
+    },
+    {
+        "id": "5fee4a24.714e24",
+        "type": "execute",
+        "name": "generate configdb nbr ho patch url",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.configdb.patch-ho-for-nbr`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.configdb.patch-ho-for-nbr.url\"/>\n    <parameter name=\"target\" value=\"{cellId}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.alias`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1207.0103759765625,
+        "y": 1782.5660467147827,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e80f49c7.bc5e98",
+        "type": "execute",
+        "name": "Configure Nbr HO value in configdb",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/oofpcipoc-patch-configdb-ho-for-nbr.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.configdb.url + $tmp.configdb.patch-ho-for-nbr.url`\"/>\n<parameter name=\"httpMethod\" value=\"PATCH\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-configdb-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />\n<parameter name='accept' value='application/json' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1138.0104370117188,
+        "y": 1992.5660400390625,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "fde36f04.ecf63",
+                "5da0cd73.d5ac34"
+            ]
+        ]
+    },
+    {
+        "id": "fde36f04.ecf63",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1353.0104370117188,
+        "y": 1935.5660400390625,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "b0184360.4173a"
+            ]
+        ]
+    },
+    {
+        "id": "5da0cd73.d5ac34",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1353.0103149414062,
+        "y": 2031.56591796875,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "6d733c40.16c4e4"
+            ]
+        ]
+    },
+    {
+        "id": "b0184360.4173a",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1522.0103149414062,
+        "y": 1946.5660400390625,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "c56ebe3b.bbda7"
+            ]
+        ]
+    },
+    {
+        "id": "6d733c40.16c4e4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1515.0100708007812,
+        "y": 2032.5660400390625,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "c9d72369.59a1b"
+            ]
+        ]
+    },
+    {
+        "id": "c56ebe3b.bbda7",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error updating configDB. Aborting Nbr HO configuration\" />",
+        "comments": "",
+        "x": 1676.010009765625,
+        "y": 1939.5660400390625,
+        "z": "b5912bac.e498b8",
+        "wires": []
+    },
+    {
+        "id": "c9d72369.59a1b",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"HO Value for nbr updated in ConfigDB\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1670.010269165039,
+        "y": 2029.5660486221313,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "dd44dc35.baa9a",
+        "type": "switchNode",
+        "name": "switch configdb deployed",
+        "xml": "<switch test='`$prop.configdb-deployed`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 696.0107116699219,
+        "y": 1734.566120147705,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "b541eb45.1e5278",
+                "eefdf306.9fa25"
+            ]
+        ]
+    },
+    {
+        "id": "b541eb45.1e5278",
+        "type": "outcome",
+        "name": "Deployed",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 900.0104904174805,
+        "y": 1819.5660769939423,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "b59fe403.100df8"
+            ]
+        ]
+    },
+    {
+        "id": "9f3eddb8.4c8b6",
+        "type": "execute",
+        "name": "Update target cellid for configdb nbr ho patch url",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.configdb.patch-ho-for-nbr.url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.configdb.patch-ho-for-nbr.url\"/>\n    <parameter name=\"target\" value=\"{targetCellId}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.cid`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1258.0103759765625,
+        "y": 1835.6773228645325,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a5a8d47.a6e5b28",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"ConfigDB Update Skipped\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1191.0104579925537,
+        "y": 1732.788185119629,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "eefdf306.9fa25",
+        "type": "outcome",
+        "name": "Not Deployed",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1012.010383605957,
+        "y": 1719.8994035720825,
+        "z": "b5912bac.e498b8",
+        "wires": [
+            [
+                "a5a8d47.a6e5b28"
+            ]
+        ]
+    },
+    {
+        "id": "ede238d3.02b908",
+        "type": "record",
+        "name": "record configdb RestAPI parms",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"URL for configDB PCI Update\"/>\n<parameter name='field2' value=\"`$prop.configdb.url + $tmp.configdb.patch-ho-for-nbr.url`\" />\n<parameter name='field3' value=\"`$tmp.alias`\" />\n<parameter name='field4' value=\"`$tmp.cid`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1203.565933227539,
+        "y": 1892.3437194824219,
+        "z": "b5912bac.e498b8",
         "wires": [
             []
         ]
diff --git a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_configuration-phy-cell-id.xml b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_configuration-phy-cell-id.xml
index 7aedb6a7..ef4737ed 100644
--- a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_configuration-phy-cell-id.xml
+++ b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_configuration-phy-cell-id.xml
@@ -3,6 +3,12 @@
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='${project.version}'>
     <method rpc='configuration-phy-cell-id' mode='sync'>
         <block atomic='true'>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="RPC to Configure PCI INVOKED. Number of Cells to configure: "/>
+                <parameter name="field2" value="`$configuration-phy-cell-id-input.fap-service-number-of-entries`"/>
+            </record>
             <for index='idx' start='0' end="`$configuration-phy-cell-id-input.fap-service-number-of-entries`" >
                 <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                     <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
@@ -30,12 +36,6 @@
                 <parameter name="field6" value="ransim-mounted (true/false): "/>
                 <parameter name="field7" value="`$prop.ransim-mounted`"/>
             </record>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="RPC to Configure PCI INVOKED. Number of Cells to configure: "/>
-                <parameter name="field2" value="`$configuration-phy-cell-id-input.fap-service-number-of-entries`"/>
-            </record>
             <switch test='`$prop.ransim-mounted`'>
                 <outcome value='false'>
                     <for index='idx' start='0' end="`$configuration-phy-cell-id-input.fap-service-number-of-entries`" >
@@ -160,6 +160,52 @@
                                     </block>
                                 </outcome>
                             </execute>
+                            <switch test='`$prop.configdb-deployed`'>
+                                <outcome value='true'>
+                                    <block atomic='true'>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                            <parameter name="source" value="`$prop.restapi.configdb.patch-pci-for-cell`"/>
+                                            <parameter name="outputPath" value="tmp.configdb.patch-pci-for-cell.url"/>
+                                            <parameter name="target" value="{cellId}"/>
+                                            <parameter name="replacement" value="`$tmp.cid`"/>
+                                        </execute>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="URL for configDB PCI Update"/>
+                                            <parameter name='field2' value="`$prop.configdb.url + $tmp.configdb.patch-pci-for-cell.url`" />
+                                            <parameter name='field3' value="`$tmp.cid`" />
+                                        </record>
+                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/oofpcipoc-patch-configdb-pci-for-cell.json'`" />
+                                            <parameter name="restapiUrl" value="`$prop.configdb.url + $tmp.configdb.patch-pci-for-cell.url`"/>
+                                            <parameter name="httpMethod" value="PATCH"/>
+                                            <parameter name="responsePrefix" value="oofpci-configdb-response"/>
+                                            <parameter name='contentType' value='application/json' />
+                                            <parameter name='format' value='json' />
+                                            <parameter name='accept' value='application/json' />
+                                            <outcome value='failure'>
+                                                <block>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error adding neighbor to configdb. Aborting notification handler" />
+                                                    </return>
+                                                </block>
+                                            </outcome>
+                                            <outcome value='success'>
+                                                <block>
+                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                                                        <parameter name="level" value="info" />
+                                                        <parameter name="field1" value="PCI Value updated in ConfigDB"/>
+                                                    </record>
+                                                </block>
+                                            </outcome>
+                                        </execute>
+                                    </block>
+                                </outcome>
+                            </switch>
                         </block>
                     </for>
                 </outcome>
@@ -298,10 +344,190 @@
                                     </block>
                                 </outcome>
                             </execute>
+                            <switch test='`$prop.configdb-deployed`'>
+                                <outcome value='true'>
+                                    <block atomic='true'>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                            <parameter name="source" value="`$prop.restapi.configdb.patch-pci-for-cell`"/>
+                                            <parameter name="outputPath" value="tmp.configdb.patch-pci-for-cell.url"/>
+                                            <parameter name="target" value="{cellId}"/>
+                                            <parameter name="replacement" value="`$tmp.cid`"/>
+                                        </execute>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="URL for configDB PCI Update"/>
+                                            <parameter name='field2' value="`$prop.configdb.url + $tmp.configdb.patch-pci-for-cell.url`" />
+                                            <parameter name='field3' value="`$tmp.cid`" />
+                                        </record>
+                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/oofpcipoc-patch-configdb-pci-for-cell.json'`" />
+                                            <parameter name="restapiUrl" value="`$prop.configdb.url + $tmp.configdb.patch-pci-for-cell.url`"/>
+                                            <parameter name="httpMethod" value="PATCH"/>
+                                            <parameter name="responsePrefix" value="oofpci-configdb-response"/>
+                                            <parameter name='contentType' value='application/json' />
+                                            <parameter name='format' value='json' />
+                                            <parameter name='accept' value='application/json' />
+                                            <outcome value='failure'>
+                                                <block>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error updating configDB. Aborting PCI configuration" />
+                                                    </return>
+                                                </block>
+                                            </outcome>
+                                            <outcome value='success'>
+                                                <block>
+                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                                                        <parameter name="level" value="info" />
+                                                        <parameter name="field1" value="PCI Value updated in ConfigDB"/>
+                                                    </record>
+                                                </block>
+                                            </outcome>
+                                        </execute>
+                                    </block>
+                                </outcome>
+                            </switch>
                         </block>
                     </for>
                 </outcome>
             </switch>
+            <block atomic='true'>
+                <execute plugin="org.onap.ccsdk.sli.plugins.template.TemplateNode" method="evaluateTemplate" >
+                    <parameter name='templatePath' value='oofpcipoc-dmaap-publish-modifyconfig-resp-payload-template.vtl' />
+                    <parameter name='output' value='resp-payload' />
+                    <parameter name='prefix' value='sdnr' />
+                    <outcome value='success'>
+                        <block atomic='true'>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="__TIMESTAMP__"/>
+                                <parameter name="field2" value="Redndred sdnr payload template as a string"/>
+                                <parameter name='field3' value='`$sdnr.resp-payload`' />
+                            </record>
+                        </block>
+                    </outcome>
+                    <outcome value='failure'>
+                        <block>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="Error creating SDNR response payload string. Aborting PCI configuration" />
+                            </return>
+                        </block>
+                    </outcome>
+                </execute>
+                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
+                    <parameter name="source" value="`$sdnr.resp-payload`"/>
+                    <parameter name="outputPath" value="tmp.oofpcipoc-dmaap-config-resp.payload"/>
+                    <parameter name="target" value="\n"/>
+                    <parameter name="replacement" value=""/>
+                    <outcome value='success'>
+                        <block atomic='true'>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="__TIMESTAMP__"/>
+                                <parameter name="field2" value="Redndred template with lines removed \r"/>
+                                <parameter name='field3' value='`$tmp.oofpcipoc-dmaap-config-resp.payload`' />
+                            </record>
+                        </block>
+                    </outcome>
+                    <outcome value='failure'>
+                        <block>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="Error removing lines from SDNR response payload string. Aborting PCI configuration" />
+                            </return>
+                        </block>
+                    </outcome>
+                </execute>
+                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
+                    <parameter name="source" value="`$tmp.oofpcipoc-dmaap-config-resp.payload`"/>
+                    <parameter name="outputPath" value="tmp.oofpcipoc-dmaap-config-resp.payload"/>
+                    <parameter name="target" value="\t"/>
+                    <parameter name="replacement" value=""/>
+                    <outcome value='success'>
+                        <block atomic='true'>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="__TIMESTAMP__"/>
+                                <parameter name="field2" value="Redndred template with tabs removed \r"/>
+                                <parameter name='field3' value='`$tmp.oofpcipoc-dmaap-config-resp.payload`' />
+                            </record>
+                        </block>
+                    </outcome>
+                    <outcome value='failure'>
+                        <block>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="Error removing tabs from SDNR response payload string. Aborting PCI configuration" />
+                            </return>
+                        </block>
+                    </outcome>
+                </execute>
+                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='escapeJsonString' >
+                    <parameter name="source" value='`$tmp.oofpcipoc-dmaap-config-resp.payload`'/>
+                    <parameter name="target" value='tmp.oofpcipoc-dmaap-config-resp.payload'/>
+                    <outcome value='success'>
+                        <block atomic='true'>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="__TIMESTAMP__"/>
+                                <parameter name="field2" value="Redndred template as an Escaped string"/>
+                                <parameter name='field3' value='`$tmp.oofpcipoc-dmaap-config-resp.payload`' />
+                            </record>
+                        </block>
+                    </outcome>
+                    <outcome value='failure'>
+                        <block>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="Error inserting escape chars in SDNR response payload string. Aborting PCI configuration" />
+                            </return>
+                        </block>
+                    </outcome>
+                </execute>
+            </block>
+            <block atomic='true'>
+                <set>
+                    <parameter name='tmp.oofpcipoc-dmaap-config-resp.rpc-name' value='`$prop.oofpcipoc-dmaap-config-resp.rpc-name.modifyconfig`'/>
+                </set>
+                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.dmaap-publish-config-response.template`" />
+                    <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + '/' + $prop.oofpcipoc-dmaap-configuration-response.topic`" />
+                    <parameter name='format' value='json' />
+                    <parameter name='httpMethod' value='POST' />
+                    <parameter name='contentType' value='application/json' />
+                    <parameter name='responsePrefix' value='dmaap' />
+                    <outcome value='failure'>
+                        <block>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="Error publishing DMAAP Config Response message. ConfigDB Updated; TO be rolled back...will handle next release" />
+                            </return>
+                        </block>
+                    </outcome>
+                    <outcome value='success'>
+                        <block>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="DMAAP Config Response Message Successfully Published "/>
+                            </record>
+                        </block>
+                    </outcome>
+                </execute>
+            </block>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
                 <parameter name="error-code" value="200" />
diff --git a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_generic-neighbor-configuration.xml b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_generic-neighbor-configuration.xml
index 8faf96fc..6e386b9e 100644
--- a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_generic-neighbor-configuration.xml
+++ b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_generic-neighbor-configuration.xml
@@ -177,6 +177,66 @@
                                     </block>
                                 </outcome>
                             </execute>
+                            <switch test='`$prop.configdb-deployed`'>
+                                <outcome value='false'>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                        <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                        <parameter name="level" value="info" />
+                                        <parameter name="field1" value="ConfigDB Update Skipped"/>
+                                    </record>
+                                </outcome>
+                                <outcome value='true'>
+                                    <block atomic='true'>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                            <parameter name="source" value="`$prop.restapi.configdb.patch-ho-for-nbr`"/>
+                                            <parameter name="outputPath" value="tmp.configdb.patch-ho-for-nbr.url"/>
+                                            <parameter name="target" value="{cellId}"/>
+                                            <parameter name="replacement" value="`$tmp.alias`"/>
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                            <parameter name="source" value="`$tmp.configdb.patch-ho-for-nbr.url`"/>
+                                            <parameter name="outputPath" value="tmp.configdb.patch-ho-for-nbr.url"/>
+                                            <parameter name="target" value="{targetCellId}"/>
+                                            <parameter name="replacement" value="`$tmp.cid`"/>
+                                        </execute>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="URL for configDB PCI Update"/>
+                                            <parameter name='field2' value="`$prop.configdb.url + $tmp.configdb.patch-ho-for-nbr.url`" />
+                                            <parameter name='field3' value="`$tmp.alias`" />
+                                            <parameter name='field4' value="`$tmp.cid`" />
+                                        </record>
+                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/oofpcipoc-patch-configdb-ho-for-nbr.json'`" />
+                                            <parameter name="restapiUrl" value="`$prop.configdb.url + $tmp.configdb.patch-ho-for-nbr.url`"/>
+                                            <parameter name="httpMethod" value="PATCH"/>
+                                            <parameter name="responsePrefix" value="oofpci-configdb-response"/>
+                                            <parameter name='contentType' value='application/json' />
+                                            <parameter name='format' value='json' />
+                                            <parameter name='accept' value='application/json' />
+                                            <outcome value='failure'>
+                                                <block>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error updating configDB. Aborting Nbr HO configuration" />
+                                                    </return>
+                                                </block>
+                                            </outcome>
+                                            <outcome value='success'>
+                                                <block>
+                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                                        <parameter name="level" value="info" />
+                                                        <parameter name="field1" value="HO Value for nbr updated in ConfigDB"/>
+                                                    </record>
+                                                </block>
+                                            </outcome>
+                                        </execute>
+                                    </block>
+                                </outcome>
+                            </switch>
                         </block>
                     </for>
                 </outcome>
@@ -327,10 +387,204 @@
                                     </block>
                                 </outcome>
                             </execute>
+                            <switch test='`$prop.configdb-deployed`'>
+                                <outcome value='false'>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                        <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                        <parameter name="level" value="info" />
+                                        <parameter name="field1" value="ConfigDB Update Skipped"/>
+                                    </record>
+                                </outcome>
+                                <outcome value='true'>
+                                    <block atomic='true'>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                            <parameter name="source" value="`$prop.restapi.configdb.patch-ho-for-nbr`"/>
+                                            <parameter name="outputPath" value="tmp.configdb.patch-ho-for-nbr.url"/>
+                                            <parameter name="target" value="{cellId}"/>
+                                            <parameter name="replacement" value="`$tmp.alias`"/>
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                            <parameter name="source" value="`$tmp.configdb.patch-ho-for-nbr.url`"/>
+                                            <parameter name="outputPath" value="tmp.configdb.patch-ho-for-nbr.url"/>
+                                            <parameter name="target" value="{targetCellId}"/>
+                                            <parameter name="replacement" value="`$tmp.cid`"/>
+                                        </execute>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="URL for configDB PCI Update"/>
+                                            <parameter name='field2' value="`$prop.configdb.url + $tmp.configdb.patch-ho-for-nbr.url`" />
+                                            <parameter name='field3' value="`$tmp.alias`" />
+                                            <parameter name='field4' value="`$tmp.cid`" />
+                                        </record>
+                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/oofpcipoc-patch-configdb-ho-for-nbr.json'`" />
+                                            <parameter name="restapiUrl" value="`$prop.configdb.url + $tmp.configdb.patch-ho-for-nbr.url`"/>
+                                            <parameter name="httpMethod" value="PATCH"/>
+                                            <parameter name="responsePrefix" value="oofpci-configdb-response"/>
+                                            <parameter name='contentType' value='application/json' />
+                                            <parameter name='format' value='json' />
+                                            <parameter name='accept' value='application/json' />
+                                            <outcome value='failure'>
+                                                <block>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error updating configDB. Aborting Nbr HO configuration" />
+                                                    </return>
+                                                </block>
+                                            </outcome>
+                                            <outcome value='success'>
+                                                <block>
+                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                                        <parameter name="level" value="info" />
+                                                        <parameter name="field1" value="HO Value for nbr updated in ConfigDB"/>
+                                                    </record>
+                                                </block>
+                                            </outcome>
+                                        </execute>
+                                    </block>
+                                </outcome>
+                            </switch>
                         </block>
                     </for>
                 </outcome>
             </switch>
+            <block atomic='true'>
+                <execute plugin="org.onap.ccsdk.sli.plugins.template.TemplateNode" method="evaluateTemplate" >
+                    <parameter name='templatePath' value='oofpcipoc-dmaap-publish-modifyconfiganr-resp-payload-template.vtl' />
+                    <parameter name='output' value='resp-payload' />
+                    <parameter name='prefix' value='sdnr' />
+                    <outcome value='success'>
+                        <block atomic='true'>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="__TIMESTAMP__"/>
+                                <parameter name="field2" value="Redndred sdnr payload template as a string"/>
+                                <parameter name='field3' value='`$sdnr.resp-payload`' />
+                            </record>
+                        </block>
+                    </outcome>
+                    <outcome value='failure'>
+                        <block>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="Error creating SDNR response payload string. Aborting PCI configuration" />
+                            </return>
+                        </block>
+                    </outcome>
+                </execute>
+                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
+                    <parameter name="source" value="`$sdnr.resp-payload`"/>
+                    <parameter name="outputPath" value="tmp.oofpcipoc-dmaap-config-resp.payload"/>
+                    <parameter name="target" value="\n"/>
+                    <parameter name="replacement" value=""/>
+                    <outcome value='success'>
+                        <block atomic='true'>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="__TIMESTAMP__"/>
+                                <parameter name="field2" value="Redndred template with lines removed \r"/>
+                                <parameter name='field3' value='`$tmp.oofpcipoc-dmaap-config-resp.payload`' />
+                            </record>
+                        </block>
+                    </outcome>
+                    <outcome value='failure'>
+                        <block>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="Error removing lines from SDNR response payload string. Aborting PCI configuration" />
+                            </return>
+                        </block>
+                    </outcome>
+                </execute>
+                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
+                    <parameter name="source" value="`$tmp.oofpcipoc-dmaap-config-resp.payload`"/>
+                    <parameter name="outputPath" value="tmp.oofpcipoc-dmaap-config-resp.payload"/>
+                    <parameter name="target" value="\t"/>
+                    <parameter name="replacement" value=""/>
+                    <outcome value='success'>
+                        <block atomic='true'>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="__TIMESTAMP__"/>
+                                <parameter name="field2" value="Redndred template with tabs removed \r"/>
+                                <parameter name='field3' value='`$tmp.oofpcipoc-dmaap-config-resp.payload`' />
+                            </record>
+                        </block>
+                    </outcome>
+                    <outcome value='failure'>
+                        <block>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="Error removing tabs from SDNR response payload string. Aborting PCI configuration" />
+                            </return>
+                        </block>
+                    </outcome>
+                </execute>
+                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='escapeJsonString' >
+                    <parameter name="source" value='`$tmp.oofpcipoc-dmaap-config-resp.payload`'/>
+                    <parameter name="target" value='tmp.oofpcipoc-dmaap-config-resp.payload'/>
+                    <outcome value='success'>
+                        <block atomic='true'>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="__TIMESTAMP__"/>
+                                <parameter name="field2" value="Redndred template as an Escaped string"/>
+                                <parameter name='field3' value='`$tmp.oofpcipoc-dmaap-config-resp.payload`' />
+                            </record>
+                        </block>
+                    </outcome>
+                    <outcome value='failure'>
+                        <block>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="Error inserting escape chars in SDNR response payload string. Aborting PCI configuration" />
+                            </return>
+                        </block>
+                    </outcome>
+                </execute>
+            </block>
+            <block atomic='true'>
+                <set>
+                    <parameter name='tmp.oofpcipoc-dmaap-config-resp.rpc-name' value='`$prop.oofpcipoc-dmaap-config-resp.rpc-name.modifyconfiganr`'/>
+                </set>
+                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.dmaap-publish-config-response.template`" />
+                    <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + '/' + $prop.oofpcipoc-dmaap-configuration-response.topic`" />
+                    <parameter name='format' value='json' />
+                    <parameter name='httpMethod' value='POST' />
+                    <parameter name='contentType' value='application/json' />
+                    <parameter name='responsePrefix' value='dmaap' />
+                    <outcome value='failure'>
+                        <block>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="Error publishing DMAAP Config Response message. ConfigDB Updated; TO be rolled back...will handle next release" />
+                            </return>
+                        </block>
+                    </outcome>
+                    <outcome value='success'>
+                        <block>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="DMAAP Config Response Message Successfully Published "/>
+                            </record>
+                        </block>
+                    </outcome>
+                </execute>
+            </block>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
                 <parameter name="error-code" value="200" />
diff --git a/platform-logic/restapi-templates/src/main/json/oofpcipoc-dmaap-publish-config-response-template.json b/platform-logic/restapi-templates/src/main/json/oofpcipoc-dmaap-publish-config-response-template.json
new file mode 100644
index 00000000..655afed5
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/oofpcipoc-dmaap-publish-config-response-template.json
@@ -0,0 +1,23 @@
+{
+  "body": {
+    "output": {
+      "CommonHeader": {
+        "TimeStamp": ${prop.oofpcipoc-dmaap-config-resp.timestamp},
+        "APIver": ${prop.oofpcipoc-dmaap-config-resp.apiver},
+        "RequestID": ${prop.oofpcipoc-dmaap-config-resp.requestID},
+        "SubRequestID": ${prop.oofpcipoc-dmaap-config-resp.subrequestID},
+        "RequestTrack": ${prop.oofpcipoc-dmaap-config-resp.requesttrack},
+        "Flags": ${prop.oofpcipoc-dmaap-config-resp.flags}
+      },
+      "Status": {
+        "Code": ${prop.oofpcipoc-dmaap-config-resp.status-code},
+        "Value": ${prop.oofpcipoc-dmaap-config-resp.status-value}
+      },
+      "Payload": ${tmp.oofpcipoc-dmaap-config-resp.payload}
+    }
+  },
+  "version": ${prop.oofpcipoc-dmaap-config-resp.version},
+  "rpc-name": ${tmp.oofpcipoc-dmaap-config-resp.rpc-name},
+  "correlation-id": ${prop.oofpcipoc-dmaap-config-resp.correlationID},
+  "type": ${prop.oofpcipoc-dmaap-config-resp.response}
+}
diff --git a/platform-logic/restapi-templates/src/main/json/oofpcipoc-patch-configdb-ho-for-nbr.json b/platform-logic/restapi-templates/src/main/json/oofpcipoc-patch-configdb-ho-for-nbr.json
new file mode 100644
index 00000000..5cd8a6ef
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/oofpcipoc-patch-configdb-ho-for-nbr.json
@@ -0,0 +1,5 @@
+{
+
+"ho": ${tmp.blacklisted}
+
+}
diff --git a/platform-logic/restapi-templates/src/main/json/oofpcipoc-patch-configdb-pci-for-cell.json b/platform-logic/restapi-templates/src/main/json/oofpcipoc-patch-configdb-pci-for-cell.json
new file mode 100644
index 00000000..51309bb0
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/oofpcipoc-patch-configdb-pci-for-cell.json
@@ -0,0 +1,5 @@
+{
+
+"pci-value": ${tmp.phy-cell-id-in-use}
+
+}
-- 
2.16.6