From d082f249f543b5643245213ce6c1b7c7ebd464c3 Mon Sep 17 00:00:00 2001
From: Sandeep Shah <sandeeplinux1068@gmail.com>
Date: Mon, 21 Oct 2019 13:15:48 -0500
Subject: [PATCH] Bug fixes to OOFPCIPOC templates, DG's, properties

Bug fixes to OOFPCIPOC ConfigDB and DMAAP template files, SDNR
property file, and corresponding DG's

Issue-ID: CCSDK-1840
Signed-off-by: SandeepLinux <Sandeep.Shah@ibm.com>
Change-Id: I23ebfdc819213ed5e070887bdf7cc14ba0121ec8
---
 .../properties/sdnr-oofpcipoc-api-dg.properties    |    8 +-
 .../oofpcipoc-api_configuration-phy-cell-id.json   | 1352 +++++++++----------
 ...fpcipoc-api_generic-neighbor-configuration.json | 1427 +++++++++-----------
 .../oofpcipoc-api_configuration-phy-cell-id.xml    |   34 +-
 ...ofpcipoc-api_generic-neighbor-configuration.xml |   26 +-
 ...poc-dmaap-publish-config-response-template.json |   42 +-
 .../json/oofpcipoc-patch-configdb-ho-for-nbr.json  |    2 +-
 .../oofpcipoc-patch-configdb-pci-for-cell.json     |    2 +-
 8 files changed, 1324 insertions(+), 1569 deletions(-)

diff --git a/odlsli/src/main/properties/sdnr-oofpcipoc-api-dg.properties b/odlsli/src/main/properties/sdnr-oofpcipoc-api-dg.properties
index bfa53979..b958707d 100644
--- a/odlsli/src/main/properties/sdnr-oofpcipoc-api-dg.properties
+++ b/odlsli/src/main/properties/sdnr-oofpcipoc-api-dg.properties
@@ -54,9 +54,9 @@ 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
+dmaap-message-router.url=http://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-configuration-response.topic=SDNR-CL-RSP
 
 oofpcipoc-dmaap.requestID=9d2d790e-a5f0-11e8-98d0-529269fb1459
 oofpcipoc-dmaap.aai=
@@ -67,8 +67,8 @@ 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.requesttrack=no
+oofpcipoc-dmaap-config-resp.flags=none
 oofpcipoc-dmaap-config-resp.version=1.0
 oofpcipoc-dmaap-config-resp.rpc-name.modifyconfiganr=modifyconfiganr
 oofpcipoc-dmaap-config-resp.rpc-name.modifyconfig=modifyconfig
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 bcf66ef7..43a52b4d 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": "a56935f3.4d3038",
+        "id": "77f26b4a.f02734",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='configuration-phy-cell-id' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 108,
-        "y": 264,
-        "z": "3ab6fc36.bf1844",
+        "x": 126.51040840148926,
+        "y": 250,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "ef6e3c43.ed0b3"
+                "989bee2d.3d504"
             ]
         ]
     },
     {
-        "id": "3df3d1aa.57745e",
+        "id": "26bdf696.b8a7ea",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 110,
-        "y": 34,
-        "z": "3ab6fc36.bf1844",
+        "x": 128.51040840148926,
+        "y": 20,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "a593b0f.85d915"
+                "a84ca9f2.5dec58"
             ]
         ]
     },
     {
-        "id": "a593b0f.85d915",
+        "id": "a84ca9f2.5dec58",
         "type": "service-logic",
         "name": "oofpcipoc-api ${project.version}",
         "module": "oofpcipoc-api",
@@ -38,1969 +38,1875 @@
         "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": 161.99998474121094,
-        "y": 102.0000991821289,
-        "z": "3ab6fc36.bf1844",
+        "x": 180.5103931427002,
+        "y": 88.0000991821289,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "a56935f3.4d3038"
+                "77f26b4a.f02734"
             ]
         ]
     },
     {
-        "id": "ef6e3c43.ed0b3",
+        "id": "989bee2d.3d504",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 102.48959350585938,
-        "y": 404.0000305175781,
-        "z": "3ab6fc36.bf1844",
+        "x": 121.00000190734863,
+        "y": 390.0000305175781,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "999a0696.5c3b68",
-                "462fd16f.2ce25",
-                "2db1fa7f.454a86",
-                "d2854a92.929028",
-                "de9247e2.4bddb8",
-                "cbd508bf.1f9948",
-                "4b4d0ad6.dd5bc4",
-                "f6929731.8a42a8"
+                "3dc02c1a.f126e4",
+                "8727b008.cb2",
+                "1671a589.62a66a",
+                "f4d5731c.4b161",
+                "10acd060.dece1",
+                "220645f8.cfb8ea",
+                "1e2c6b21.cd17b5",
+                "7bb49999.9148e8"
             ]
         ]
     },
     {
-        "id": "999a0696.5c3b68",
+        "id": "3dc02c1a.f126e4",
         "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": 123.0002670288086,
-        "y": 2549.000244140625,
-        "z": "3ab6fc36.bf1844",
+        "x": 141.51067543029785,
+        "y": 2535.000244140625,
+        "z": "1ba0191f.c9b697",
         "wires": []
     },
     {
-        "id": "7a545fed.e7a77",
+        "id": "6ec27597.c5078c",
         "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": 589.0005493164062,
-        "y": 142.0000457763672,
-        "z": "3ab6fc36.bf1844",
+        "x": 607.5109577178955,
+        "y": 128.0000457763672,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "9515dc9e.39723",
+        "id": "b60eadca.63ad",
         "type": "comment",
         "name": "configuration-phy-cell-id",
         "info": "",
         "comments": "",
-        "x": 338.99999237060547,
-        "y": 53.01041603088379,
-        "z": "3ab6fc36.bf1844",
+        "x": 357.5104007720947,
+        "y": 39.01041603088379,
+        "z": "1ba0191f.c9b697",
         "wires": []
     },
     {
-        "id": "b854c746.0de9d8",
+        "id": "be109ccd.fa411",
         "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": 1401.0001220703125,
-        "y": 255.01040649414062,
-        "z": "3ab6fc36.bf1844",
+        "x": 1419.5105304718018,
+        "y": 241.01040649414062,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "69f6509a.091e1",
+        "id": "33d21a78.648c86",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1096.0001831054688,
-        "y": 197.0104217529297,
-        "z": "3ab6fc36.bf1844",
+        "x": 1114.510591506958,
+        "y": 183.0104217529297,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "e2f4a4a1.d370f8"
+                "32031180.519f3e"
             ]
         ]
     },
     {
-        "id": "e2f4a4a1.d370f8",
+        "id": "32031180.519f3e",
         "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": 1315.000244140625,
-        "y": 197.01044464111328,
-        "z": "3ab6fc36.bf1844",
+        "x": 1333.5106525421143,
+        "y": 183.01044464111328,
+        "z": "1ba0191f.c9b697",
         "wires": []
     },
     {
-        "id": "b6239e81.1f817",
+        "id": "5fb7acbd.6d96f4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1101.0003662109375,
-        "y": 281.0104064941406,
-        "z": "3ab6fc36.bf1844",
+        "x": 1119.5107746124268,
+        "y": 267.0104064941406,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "e0cabe0f.505c5"
+                "c1a94b58.79d758"
             ]
         ]
     },
     {
-        "id": "e0cabe0f.505c5",
+        "id": "c1a94b58.79d758",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1247,
-        "y": 264.0104217529297,
-        "z": "3ab6fc36.bf1844",
+        "x": 1265.5104084014893,
+        "y": 250.0104217529297,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "b854c746.0de9d8"
+                "be109ccd.fa411"
             ]
         ]
     },
     {
-        "id": "3f77f64c.3dd7aa",
+        "id": "bc601045.41112",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1095.0001220703125,
-        "y": 537.6770629882812,
-        "z": "3ab6fc36.bf1844",
+        "x": 1113.5105304718018,
+        "y": 523.6770629882812,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "26b6096e.4923e6"
+                "1b472ace.015705"
             ]
         ]
     },
     {
-        "id": "26b6096e.4923e6",
+        "id": "1b472ace.015705",
         "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": 1322,
-        "y": 535.6770935058594,
-        "z": "3ab6fc36.bf1844",
+        "x": 1340.5104084014893,
+        "y": 521.6770935058594,
+        "z": "1ba0191f.c9b697",
         "wires": []
     },
     {
-        "id": "bee15fb0.acc1",
+        "id": "d7833ce1.7128b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1114,
-        "y": 612.6771850585938,
-        "z": "3ab6fc36.bf1844",
+        "x": 1132.5104084014893,
+        "y": 598.6771850585938,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "fa59582d.79d328"
+                "3d5013e3.eb771c"
             ]
         ]
     },
     {
-        "id": "fa59582d.79d328",
+        "id": "3d5013e3.eb771c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1271.9998779296875,
-        "y": 610.6770629882812,
-        "z": "3ab6fc36.bf1844",
+        "x": 1290.5102863311768,
+        "y": 596.6770629882812,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "bdff86f4.1a7438"
+                "4732375c.7ba838"
             ]
         ]
     },
     {
-        "id": "bdff86f4.1a7438",
+        "id": "4732375c.7ba838",
         "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": 1444.9998779296875,
-        "y": 605.6773071289062,
-        "z": "3ab6fc36.bf1844",
+        "x": 1463.5102863311768,
+        "y": 591.6773071289062,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "aec0a219.4aafa",
+        "id": "957f77de.a55d08",
         "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": 837.0006523132324,
-        "y": 222.0105118751526,
-        "z": "3ab6fc36.bf1844",
+        "x": 855.5110607147217,
+        "y": 208.0105118751526,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "2db1fa7f.454a86",
+        "id": "1671a589.62a66a",
         "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": 434.085693359375,
-        "y": 152.96359252929688,
-        "z": "3ab6fc36.bf1844",
+        "x": 452.59610176086426,
+        "y": 138.96359252929688,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "7a545fed.e7a77"
+                "6ec27597.c5078c"
             ]
         ]
     },
     {
-        "id": "462fd16f.2ce25",
+        "id": "8727b008.cb2",
         "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": 437.00030517578125,
-        "y": 96.02084350585938,
-        "z": "3ab6fc36.bf1844",
+        "x": 455.5107135772705,
+        "y": 82.02084350585938,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "c4cb43a3.b214",
+        "id": "a474866a.a14238",
         "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": 599.0001831054688,
-        "y": 445.0104064941406,
-        "z": "3ab6fc36.bf1844",
+        "x": 617.510591506958,
+        "y": 431.0104064941406,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "223df5ed.4f95aa"
+                "b144ba28.a89b28"
             ]
         ]
     },
     {
-        "id": "d9addb74.3baa98",
+        "id": "b9b93736.1a6868",
         "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": 961.0010986328125,
-        "y": 90.89949798583984,
-        "z": "3ab6fc36.bf1844",
+        "x": 979.5115070343018,
+        "y": 76.89949798583984,
+        "z": "1ba0191f.c9b697",
         "wires": []
     },
     {
-        "id": "793cadd5.b98534",
+        "id": "9ae0b70e.bf3078",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1104.0003662109375,
-        "y": 405.010498046875,
-        "z": "3ab6fc36.bf1844",
+        "x": 1122.5107746124268,
+        "y": 391.010498046875,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "3edcc1aa.bd4cee"
+                "b621a04.fa53d6"
             ]
         ]
     },
     {
-        "id": "8235045c.b53238",
+        "id": "93807362.20453",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1091.000244140625,
-        "y": 483.0104064941406,
-        "z": "3ab6fc36.bf1844",
+        "x": 1109.5106525421143,
+        "y": 469.0104064941406,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "796d00b5.a0e61"
+                "ec0dcdd.3499c3"
             ]
         ]
     },
     {
-        "id": "3edcc1aa.bd4cee",
+        "id": "b621a04.fa53d6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1251.000244140625,
-        "y": 405.0105285644531,
-        "z": "3ab6fc36.bf1844",
+        "x": 1269.5106525421143,
+        "y": 391.0105285644531,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "5f31b8ac.b394a8"
+                "6b835be7.577a84"
             ]
         ]
     },
     {
-        "id": "5f31b8ac.b394a8",
+        "id": "6b835be7.577a84",
         "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": 1415,
-        "y": 389.010498046875,
-        "z": "3ab6fc36.bf1844",
+        "x": 1433.5104084014893,
+        "y": 375.010498046875,
+        "z": "1ba0191f.c9b697",
         "wires": []
     },
     {
-        "id": "796d00b5.a0e61",
+        "id": "ec0dcdd.3499c3",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1247,
-        "y": 467.0104675292969,
-        "z": "3ab6fc36.bf1844",
+        "x": 1265.5104084014893,
+        "y": 453.0104675292969,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "6cee8561.12b37c"
+                "aba8db9e.2b3328"
             ]
         ]
     },
     {
-        "id": "6cee8561.12b37c",
+        "id": "aba8db9e.2b3328",
         "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": 1408.0001220703125,
-        "y": 469.0104675292969,
-        "z": "3ab6fc36.bf1844",
+        "x": 1426.5105304718018,
+        "y": 455.0104675292969,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "223df5ed.4f95aa",
+        "id": "b144ba28.a89b28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 621.9999923706055,
-        "y": 252.0209083557129,
-        "z": "3ab6fc36.bf1844",
+        "x": 640.5104007720947,
+        "y": 238.0209083557129,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "d9addb74.3baa98",
-                "aec0a219.4aafa",
-                "9a4c9d5d.cdbb7",
-                "1f853db2.97c882",
-                "26067730.7d0a88",
-                "288ec912.b142d6",
-                "7380a80e.9f2798",
-                "34a55830.edc018",
-                "11c1dc80.b90664"
+                "b9b93736.1a6868",
+                "957f77de.a55d08",
+                "c24a2d69.c0eca",
+                "66275d05.56f194",
+                "a84f2a18.9bc1b8",
+                "cb8e01a2.f94c9",
+                "40629255.8edd7c",
+                "999c64e3.c9b4e8",
+                "10b07eb4.63e251"
             ]
         ]
     },
     {
-        "id": "288ec912.b142d6",
+        "id": "cb8e01a2.f94c9",
         "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": 849.0006713867188,
-        "y": 395.0208435058594,
-        "z": "3ab6fc36.bf1844",
+        "x": 867.511079788208,
+        "y": 381.0208435058594,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "d2854a92.929028",
+        "id": "f4d5731c.4b161",
         "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": 470.00018310546875,
-        "y": 207.02084350585938,
-        "z": "3ab6fc36.bf1844",
+        "x": 488.510591506958,
+        "y": 193.02084350585938,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "de9247e2.4bddb8",
+        "id": "10acd060.dece1",
         "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": 425.00030517578125,
-        "y": 300.02088928222656,
-        "z": "3ab6fc36.bf1844",
+        "x": 443.5107135772705,
+        "y": 286.02088928222656,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "1f853db2.97c882",
+        "id": "66275d05.56f194",
         "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": 886.0005493164062,
-        "y": 273.02081298828125,
-        "z": "3ab6fc36.bf1844",
+        "x": 904.5109577178955,
+        "y": 259.02081298828125,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "69f6509a.091e1",
-                "b6239e81.1f817"
+                "33d21a78.648c86",
+                "5fb7acbd.6d96f4"
             ]
         ]
     },
     {
-        "id": "9a4c9d5d.cdbb7",
+        "id": "c24a2d69.c0eca",
         "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": 879.0002365112305,
-        "y": 166.0209083557129,
-        "z": "3ab6fc36.bf1844",
+        "x": 897.5106449127197,
+        "y": 152.0209083557129,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "26067730.7d0a88",
+        "id": "a84f2a18.9bc1b8",
         "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": 944.0001831054688,
-        "y": 339.02081298828125,
-        "z": "3ab6fc36.bf1844",
+        "x": 962.510591506958,
+        "y": 325.02081298828125,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "7380a80e.9f2798",
+        "id": "40629255.8edd7c",
         "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": 894.0000610351562,
-        "y": 466.0209655761719,
-        "z": "3ab6fc36.bf1844",
+        "x": 912.5104694366455,
+        "y": 452.0209655761719,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "793cadd5.b98534",
-                "8235045c.b53238"
+                "9ae0b70e.bf3078",
+                "93807362.20453"
             ]
         ]
     },
     {
-        "id": "34a55830.edc018",
+        "id": "999c64e3.c9b4e8",
         "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": 872,
-        "y": 549.0208740234375,
-        "z": "3ab6fc36.bf1844",
+        "x": 890.5104084014893,
+        "y": 535.0208740234375,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "3f77f64c.3dd7aa",
-                "bee15fb0.acc1"
+                "bc601045.41112",
+                "d7833ce1.7128b"
             ]
         ]
     },
     {
-        "id": "cbd508bf.1f9948",
+        "id": "220645f8.cfb8ea",
         "type": "switchNode",
         "name": "switch mounted",
         "xml": "<switch test='`$prop.ransim-mounted`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 420,
-        "y": 477.0103759765625,
-        "z": "3ab6fc36.bf1844",
+        "x": 438.51040840148926,
+        "y": 463.0103759765625,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "56749baa.a78df4",
-                "9c793e23.28d07"
+                "31e1b715.c5b5c8",
+                "52c69e82.f0049"
             ]
         ]
     },
     {
-        "id": "56749baa.a78df4",
+        "id": "31e1b715.c5b5c8",
         "type": "outcome",
         "name": "Not Mounted",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 501,
-        "y": 372.0104064941406,
-        "z": "3ab6fc36.bf1844",
+        "x": 519.5104084014893,
+        "y": 358.0104064941406,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "c4cb43a3.b214"
+                "a474866a.a14238"
             ]
         ]
     },
     {
-        "id": "9c793e23.28d07",
+        "id": "52c69e82.f0049",
         "type": "outcome",
         "name": "Mounted",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 550,
-        "y": 564.0104370117188,
-        "z": "3ab6fc36.bf1844",
+        "x": 568.5104084014893,
+        "y": 550.0104370117188,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "333ff9a3.f9e676"
+                "c983a75a.8d1c98"
             ]
         ]
     },
     {
-        "id": "63d201bc.e0a8c",
+        "id": "9f54e1f9.489ef",
         "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": 1481.999870300293,
-        "y": 1022.0104103088379,
-        "z": "3ab6fc36.bf1844",
+        "x": 1500.5102787017822,
+        "y": 1008.0104103088379,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "760b1313.ffe8fc",
+        "id": "ac6c7cc4.505e2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1134.9999923706055,
-        "y": 1011.0104103088379,
-        "z": "3ab6fc36.bf1844",
+        "x": 1153.5104007720947,
+        "y": 997.0104103088379,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "4bddd3b2.b1953c"
+                "6e1df4ba.dcc26c"
             ]
         ]
     },
     {
-        "id": "4bddd3b2.b1953c",
+        "id": "6e1df4ba.dcc26c",
         "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": 1316.9999923706055,
-        "y": 983.0104713439941,
-        "z": "3ab6fc36.bf1844",
+        "x": 1335.5104007720947,
+        "y": 969.0104713439941,
+        "z": "1ba0191f.c9b697",
         "wires": []
     },
     {
-        "id": "8f7d3b9a.8bfbb8",
+        "id": "cccc941d.ae2de8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1133.0001754760742,
-        "y": 1086.010410308838,
-        "z": "3ab6fc36.bf1844",
+        "x": 1151.5105838775635,
+        "y": 1072.010410308838,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "cfc19b27.de46f8"
+                "36e89129.3c590e"
             ]
         ]
     },
     {
-        "id": "cfc19b27.de46f8",
+        "id": "36e89129.3c590e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1319.999870300293,
-        "y": 1035.010410308838,
-        "z": "3ab6fc36.bf1844",
+        "x": 1338.5102787017822,
+        "y": 1021.0104103088379,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "63d201bc.e0a8c"
+                "9f54e1f9.489ef"
             ]
         ]
     },
     {
-        "id": "127b098e.b6a836",
+        "id": "65be3d3f.cecbe4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1015.9999923706055,
-        "y": 1356.6770362854004,
-        "z": "3ab6fc36.bf1844",
+        "x": 1034.5104007720947,
+        "y": 1342.6770362854004,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "c8490f00.fab44"
+                "1feb8e9a.5a2ae1"
             ]
         ]
     },
     {
-        "id": "c8490f00.fab44",
+        "id": "1feb8e9a.5a2ae1",
         "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": 1203.999870300293,
-        "y": 1363.677158355713,
-        "z": "3ab6fc36.bf1844",
+        "x": 1222.5102787017822,
+        "y": 1349.677158355713,
+        "z": "1ba0191f.c9b697",
         "wires": []
     },
     {
-        "id": "c160441d.a6c7b8",
+        "id": "acc913ad.8c713",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1001.9998092651367,
-        "y": 1433.677158355713,
-        "z": "3ab6fc36.bf1844",
+        "x": 1020.510217666626,
+        "y": 1419.677158355713,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "573df648.f762d8"
+                "1b05366.237f7ca"
             ]
         ]
     },
     {
-        "id": "573df648.f762d8",
+        "id": "1b05366.237f7ca",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1175.9997482299805,
-        "y": 1436.6770362854004,
-        "z": "3ab6fc36.bf1844",
+        "x": 1194.5101566314697,
+        "y": 1422.6770362854004,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "7e194196.5bce9"
+                "588f8bec.94aba4"
             ]
         ]
     },
     {
-        "id": "7e194196.5bce9",
+        "id": "588f8bec.94aba4",
         "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": 1353.999626159668,
-        "y": 1440.6772804260254,
-        "z": "3ab6fc36.bf1844",
+        "x": 1372.5100345611572,
+        "y": 1426.6772804260254,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "7b87e933.35bbc8",
+        "id": "3c274eca.f54e42",
         "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": 825.00048828125,
-        "y": 1018.0105590820312,
-        "z": "3ab6fc36.bf1844",
+        "x": 843.5108966827393,
+        "y": 1004.0105590820312,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "333ff9a3.f9e676",
+        "id": "c983a75a.8d1c98",
         "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": 595,
-        "y": 672.0103759765625,
-        "z": "3ab6fc36.bf1844",
+        "x": 613.5104084014893,
+        "y": 658.0103759765625,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "caaab21e.173d6"
+                "bfb26e80.2f7a1"
             ]
         ]
     },
     {
-        "id": "d6618a8.8d47778",
+        "id": "471a1166.35ea1",
         "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": 897.0009155273438,
-        "y": 885.8995361328125,
-        "z": "3ab6fc36.bf1844",
+        "x": 915.511323928833,
+        "y": 871.8995361328125,
+        "z": "1ba0191f.c9b697",
         "wires": []
     },
     {
-        "id": "970590.65d90a7",
+        "id": "719379fe.a37db8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1107.0001754760742,
-        "y": 1206.0104713439941,
-        "z": "3ab6fc36.bf1844",
+        "x": 1125.5105838775635,
+        "y": 1192.0104713439941,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "8a9b063c.206ef8"
+                "3ce1f670.bcf73a"
             ]
         ]
     },
     {
-        "id": "27f77794.2482e8",
+        "id": "7a8e6698.939c48",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1076.000114440918,
-        "y": 1293.010410308838,
-        "z": "3ab6fc36.bf1844",
+        "x": 1094.5105228424072,
+        "y": 1279.010410308838,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "9ed3714e.73d88"
+                "b75cb29e.ea22d"
             ]
         ]
     },
     {
-        "id": "8a9b063c.206ef8",
+        "id": "3ce1f670.bcf73a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1280.000114440918,
-        "y": 1178.0105323791504,
-        "z": "3ab6fc36.bf1844",
+        "x": 1298.5105228424072,
+        "y": 1164.0105323791504,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "9246b164.ae354"
+                "c4ed8705.3f7c08"
             ]
         ]
     },
     {
-        "id": "9246b164.ae354",
+        "id": "c4ed8705.3f7c08",
         "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": 1467.9997482299805,
-        "y": 1168.0104713439941,
-        "z": "3ab6fc36.bf1844",
+        "x": 1486.5101566314697,
+        "y": 1154.0104713439941,
+        "z": "1ba0191f.c9b697",
         "wires": []
     },
     {
-        "id": "9ed3714e.73d88",
+        "id": "b75cb29e.ea22d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1257.999870300293,
-        "y": 1280.0104713439941,
-        "z": "3ab6fc36.bf1844",
+        "x": 1276.5102787017822,
+        "y": 1266.0104713439941,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "81e12f1a.2cda3"
+                "37190a8a.18f4b6"
             ]
         ]
     },
     {
-        "id": "81e12f1a.2cda3",
+        "id": "37190a8a.18f4b6",
         "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": 1430.999870300293,
-        "y": 1279.0104713439941,
-        "z": "3ab6fc36.bf1844",
+        "x": 1449.5102787017822,
+        "y": 1265.0104713439941,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "caaab21e.173d6",
+        "id": "bfb26e80.2f7a1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 506.99981689453125,
-        "y": 1088.0209350585938,
-        "z": "3ab6fc36.bf1844",
+        "x": 525.5102252960205,
+        "y": 1074.0209350585938,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "d6618a8.8d47778",
-                "7b87e933.35bbc8",
-                "f15fe286.6c578",
-                "9e18cefd.efb4e",
-                "13aa007d.5e7e9",
-                "ee15ba88.203348",
-                "b582d50f.78e0e8",
-                "f23a41a7.283e5",
-                "12c46bb6.023c04",
-                "7283cfac.cf851",
-                "1c833d87.2ea8f2"
+                "471a1166.35ea1",
+                "3c274eca.f54e42",
+                "c280ca97.657fa8",
+                "5bb5760a.bd9e08",
+                "43aa5ec6.b6815",
+                "e10b9ed3.60711",
+                "1fb13f3e.182691",
+                "1d872a84.1b43b5",
+                "fa4ad7f0.ff3bc8",
+                "ae0c1893.d52058",
+                "42dc4c9b.7dd324"
             ]
         ]
     },
     {
-        "id": "ee15ba88.203348",
+        "id": "e10b9ed3.60711",
         "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": 809.0004806518555,
-        "y": 1215.0208473205566,
-        "z": "3ab6fc36.bf1844",
+        "x": 827.5108890533447,
+        "y": 1201.0208473205566,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "9e18cefd.efb4e",
+        "id": "5bb5760a.bd9e08",
         "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": 893.000358581543,
-        "y": 1061.0207862854004,
-        "z": "3ab6fc36.bf1844",
+        "x": 911.5107669830322,
+        "y": 1047.0207862854004,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "760b1313.ffe8fc",
-                "8f7d3b9a.8bfbb8"
+                "ac6c7cc4.505e2",
+                "cccc941d.ae2de8"
             ]
         ]
     },
     {
-        "id": "f15fe286.6c578",
+        "id": "c280ca97.657fa8",
         "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": 824.0000610351562,
-        "y": 937.0209350585938,
-        "z": "3ab6fc36.bf1844",
+        "x": 842.5104694366455,
+        "y": 923.0209350585938,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "13aa007d.5e7e9",
+        "id": "43aa5ec6.b6815",
         "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": 911.9999923706055,
-        "y": 1106.0208473205566,
-        "z": "3ab6fc36.bf1844",
+        "x": 930.5104007720947,
+        "y": 1092.0208473205566,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "b582d50f.78e0e8",
+        "id": "1fb13f3e.182691",
         "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": 832.999870300293,
-        "y": 1275.020908355713,
-        "z": "3ab6fc36.bf1844",
+        "x": 851.5102787017822,
+        "y": 1261.020908355713,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "970590.65d90a7",
-                "27f77794.2482e8"
+                "719379fe.a37db8",
+                "7a8e6698.939c48"
             ]
         ]
     },
     {
-        "id": "f23a41a7.283e5",
+        "id": "1d872a84.1b43b5",
         "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": 799.999870300293,
-        "y": 1349.020908355713,
-        "z": "3ab6fc36.bf1844",
+        "x": 818.5102787017822,
+        "y": 1335.020908355713,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "127b098e.b6a836",
-                "c160441d.a6c7b8"
+                "65be3d3f.cecbe4",
+                "acc913ad.8c713"
             ]
         ]
     },
     {
-        "id": "12c46bb6.023c04",
+        "id": "fa4ad7f0.ff3bc8",
         "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": 908,
-        "y": 981.0104370117188,
-        "z": "3ab6fc36.bf1844",
+        "x": 926.5104084014893,
+        "y": 967.0104370117188,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "7283cfac.cf851",
+        "id": "ae0c1893.d52058",
         "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": 867.9999923706055,
-        "y": 1157.010410308838,
-        "z": "3ab6fc36.bf1844",
+        "x": 886.5104007720947,
+        "y": 1143.010410308838,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "2a281c5e.d2a1f4",
+        "id": "ac9d29f2.0afc08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 859,
-        "y": 1634,
-        "z": "3ab6fc36.bf1844",
+        "x": 877.5104084014893,
+        "y": 1620,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "6198b4f0.d538fc",
-                "1e423b05.ed3eb5",
-                "a346114.07fe0f"
+                "fd25cfff.6cda2",
+                "d4d57f0b.068e4",
+                "d3688bf5.5cf708"
             ]
         ]
     },
     {
-        "id": "6198b4f0.d538fc",
+        "id": "fd25cfff.6cda2",
         "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",
+        "x": 1191.5104084014893,
+        "y": 1532,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "1e423b05.ed3eb5",
+        "id": "d4d57f0b.068e4",
         "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",
+        "x": 1161.5104084014893,
+        "y": 1596,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "a346114.07fe0f",
+        "id": "d3688bf5.5cf708",
         "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",
+        "x": 1135.5104084014893,
+        "y": 1691,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "97d802c8.37d15",
-                "fee402d7.6ade4"
+                "9e3e7d33.68d5c",
+                "1484e8b4.8fed07"
             ]
         ]
     },
     {
-        "id": "97d802c8.37d15",
+        "id": "9e3e7d33.68d5c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1332,
-        "y": 1648,
-        "z": "3ab6fc36.bf1844",
+        "x": 1350.5104084014893,
+        "y": 1634,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "4ef2042b.130fec"
+                "1f6f492c.8bc497"
             ]
         ]
     },
     {
-        "id": "fee402d7.6ade4",
+        "id": "1484e8b4.8fed07",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1331.9998779296875,
-        "y": 1743.9998779296875,
-        "z": "3ab6fc36.bf1844",
+        "x": 1350.5102863311768,
+        "y": 1729.9998779296875,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "b926758.e620b88"
+                "699c36c5.858918"
             ]
         ]
     },
     {
-        "id": "4ef2042b.130fec",
+        "id": "1f6f492c.8bc497",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1500.9998779296875,
-        "y": 1659,
-        "z": "3ab6fc36.bf1844",
+        "x": 1519.5102863311768,
+        "y": 1645,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "83519a55.c98588"
+                "6202ea2a.815a54"
             ]
         ]
     },
     {
-        "id": "b926758.e620b88",
+        "id": "699c36c5.858918",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1493.9996337890625,
-        "y": 1745,
-        "z": "3ab6fc36.bf1844",
+        "x": 1512.5100421905518,
+        "y": 1731,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "e3711f2b.ae7cb"
+                "6dbef6cc.d2a0e8"
             ]
         ]
     },
     {
-        "id": "83519a55.c98588",
+        "id": "6202ea2a.815a54",
         "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",
+        "x": 1673.5099811553955,
+        "y": 1638,
+        "z": "1ba0191f.c9b697",
         "wires": []
     },
     {
-        "id": "e3711f2b.ae7cb",
+        "id": "6dbef6cc.d2a0e8",
         "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",
+        "x": 1663.5101642608643,
+        "y": 1728,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "1c833d87.2ea8f2",
+        "id": "42dc4c9b.7dd324",
         "type": "switchNode",
         "name": "switch configdb deployed",
         "xml": "<switch test='`$prop.configdb-deployed`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 746,
-        "y": 1456,
-        "z": "3ab6fc36.bf1844",
+        "x": 764.5104084014893,
+        "y": 1442,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "6631853d.97d65c"
+                "d70de1f1.078a2"
             ]
         ]
     },
     {
-        "id": "6631853d.97d65c",
+        "id": "d70de1f1.078a2",
         "type": "outcome",
         "name": "Deployed",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 784,
-        "y": 1558,
-        "z": "3ab6fc36.bf1844",
+        "x": 802.5104084014893,
+        "y": 1544,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "2a281c5e.d2a1f4"
+                "ac9d29f2.0afc08"
             ]
         ]
     },
     {
-        "id": "57dfe0e1.47019",
+        "id": "6a46edff.c3cda4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 869,
-        "y": 777.3228416442871,
-        "z": "3ab6fc36.bf1844",
+        "x": 887.5104084014893,
+        "y": 763.3228416442871,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "4ca47f36.fa5c8",
-                "d15b89c2.581e08",
-                "1fc5ba73.7d3816"
+                "40fe573.855f9a8",
+                "2f361483.cf203c",
+                "cde1a3cd.e2adb"
             ]
         ]
     },
     {
-        "id": "4ca47f36.fa5c8",
+        "id": "40fe573.855f9a8",
         "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",
+        "x": 1157.5104084014893,
+        "y": 669.3228149414062,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "d15b89c2.581e08",
+        "id": "2f361483.cf203c",
         "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",
+        "x": 1158.5104084014893,
+        "y": 733.3228149414062,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "1fc5ba73.7d3816",
+        "id": "cde1a3cd.e2adb",
         "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",
+        "x": 1141.5104846954346,
+        "y": 806.3228282928467,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "ba2f9d26.4c071",
-                "25a03d2b.5923c2"
+                "6f4fdb1b.c0ea34",
+                "c5c1eecf.19ccb"
             ]
         ]
     },
     {
-        "id": "ba2f9d26.4c071",
+        "id": "6f4fdb1b.c0ea34",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1342,
-        "y": 791.3228416442871,
-        "z": "3ab6fc36.bf1844",
+        "x": 1360.5104084014893,
+        "y": 777.3228416442871,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "9ab485af.2ca428"
+                "4e796fca.9fa56"
             ]
         ]
     },
     {
-        "id": "25a03d2b.5923c2",
+        "id": "c5c1eecf.19ccb",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1341.9998779296875,
-        "y": 887.3227195739746,
-        "z": "3ab6fc36.bf1844",
+        "x": 1360.5102863311768,
+        "y": 873.3227195739746,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "af46e990.c5e538"
+                "1599d33d.2c960d"
             ]
         ]
     },
     {
-        "id": "9ab485af.2ca428",
+        "id": "4e796fca.9fa56",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1510.9998779296875,
-        "y": 802.3228416442871,
-        "z": "3ab6fc36.bf1844",
+        "x": 1529.5102863311768,
+        "y": 788.3228416442871,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "3bc9e9b1.fac316"
+                "b75a73d9.be6b4"
             ]
         ]
     },
     {
-        "id": "af46e990.c5e538",
+        "id": "1599d33d.2c960d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1503.9996337890625,
-        "y": 888.3228416442871,
-        "z": "3ab6fc36.bf1844",
+        "x": 1522.5100421905518,
+        "y": 874.3228416442871,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "89352005.6c218"
+                "fe5060b9.28d1c"
             ]
         ]
     },
     {
-        "id": "3bc9e9b1.fac316",
+        "id": "b75a73d9.be6b4",
         "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",
+        "x": 1683.5099811553955,
+        "y": 781.3228416442871,
+        "z": "1ba0191f.c9b697",
         "wires": []
     },
     {
-        "id": "89352005.6c218",
+        "id": "fe5060b9.28d1c",
         "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",
+        "x": 1673.5101642608643,
+        "y": 870.3228149414062,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "11c1dc80.b90664",
+        "id": "10b07eb4.63e251",
         "type": "switchNode",
         "name": "switch configdb deployed",
         "xml": "<switch test='`$prop.configdb-deployed`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 798,
-        "y": 603.3228149414062,
-        "z": "3ab6fc36.bf1844",
+        "x": 816.5104084014893,
+        "y": 589.3228149414062,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "2570ba97.638906"
+                "4f5b2144.27355"
             ]
         ]
     },
     {
-        "id": "2570ba97.638906",
+        "id": "4f5b2144.27355",
         "type": "outcome",
         "name": "Deployed",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 794,
-        "y": 701.3228416442871,
-        "z": "3ab6fc36.bf1844",
+        "x": 812.5104084014893,
+        "y": 687.3228416442871,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "57dfe0e1.47019"
+                "6a46edff.c3cda4"
             ]
         ]
     },
     {
-        "id": "521ad3e9.6a770c",
+        "id": "273850f2.7f097",
         "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",
+        "x": 897.5104084014893,
+        "y": 1830,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "ef8ff6e9.86b828",
-                "7697d6f2.332f28"
+                "98dc85e1.e6a448",
+                "143da08e.32845f"
             ]
         ]
     },
     {
-        "id": "ef8ff6e9.86b828",
+        "id": "98dc85e1.e6a448",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1153,
-        "y": 1813,
-        "z": "3ab6fc36.bf1844",
+        "x": 1171.5104084014893,
+        "y": 1799,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "4d3fbe7.120834"
+                "50d24bdf.1cafe4"
             ]
         ]
     },
     {
-        "id": "4d3fbe7.120834",
+        "id": "50d24bdf.1cafe4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1344,
-        "y": 1816,
-        "z": "3ab6fc36.bf1844",
+        "x": 1362.5104084014893,
+        "y": 1802,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "42869be0.f741b4"
+                "5523a93b.04e278"
             ]
         ]
     },
     {
-        "id": "42869be0.f741b4",
+        "id": "5523a93b.04e278",
         "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",
+        "x": 1530.5104084014893,
+        "y": 1803,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "fbb0b389.b7aff",
+        "id": "a5095542.4c6138",
         "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",
+        "x": 870.0104084014893,
+        "y": 1946,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "7bf7bace.f89764",
-                "f8b788a9.137b38"
+                "86d04e15.ba253",
+                "389955cb.dd28ca"
             ]
         ]
     },
     {
-        "id": "7f3d1672.4560b8",
+        "id": "5da8895b.a671a8",
         "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",
+        "x": 859.5104084014893,
+        "y": 2028,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "727bc37e.4cc61c",
-                "a2331760.45b9a8"
+                "5af9f0a0.9927a",
+                "f2be4fdd.b96a6"
             ]
         ]
     },
     {
-        "id": "727bc37e.4cc61c",
+        "id": "5af9f0a0.9927a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1030.5,
-        "y": 2148,
-        "z": "3ab6fc36.bf1844",
+        "x": 1042.0104084014893,
+        "y": 2036,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "e7f1bcf3.909e1"
+                "fa2bcff3.d9037"
             ]
         ]
     },
     {
-        "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",
+        "id": "fa2bcff3.d9037",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1194.5,
-        "y": 2150,
-        "z": "3ab6fc36.bf1844",
+        "x": 1227.0104084014893,
+        "y": 2034,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "f065d3e0.c2419"
+                "765bbd05.ed8054"
             ]
         ]
     },
     {
-        "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",
+        "id": "765bbd05.ed8054",
         "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",
+        "x": 1429.0104084014893,
+        "y": 2029,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "7bf7bace.f89764",
+        "id": "86d04e15.ba253",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1045,
-        "y": 1928,
-        "z": "3ab6fc36.bf1844",
+        "x": 1063.5104084014893,
+        "y": 1914,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "f96218d5.aefe58"
+                "452acb6b.fd5564"
             ]
         ]
     },
     {
-        "id": "f96218d5.aefe58",
+        "id": "452acb6b.fd5564",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1220,
-        "y": 1942,
-        "z": "3ab6fc36.bf1844",
+        "x": 1238.5104084014893,
+        "y": 1928,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "f95a30fb.559c9"
+                "17b423a9.85da4c"
             ]
         ]
     },
     {
-        "id": "f95a30fb.559c9",
+        "id": "17b423a9.85da4c",
         "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",
+        "x": 1426.5104084014893,
+        "y": 1930,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     },
     {
-        "id": "7697d6f2.332f28",
+        "id": "143da08e.32845f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1152,
-        "y": 1870,
-        "z": "3ab6fc36.bf1844",
+        "x": 1170.5104084014893,
+        "y": 1856,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "f82e9af2.fd97c8"
+                "e4a429ce.76b228"
             ]
         ]
     },
     {
-        "id": "f82e9af2.fd97c8",
+        "id": "e4a429ce.76b228",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1320.9998779296875,
-        "y": 1876,
-        "z": "3ab6fc36.bf1844",
+        "x": 1339.5102863311768,
+        "y": 1862,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "9dc76bb2.d10498"
+                "39b7f393.224d4c"
             ]
         ]
     },
     {
-        "id": "9dc76bb2.d10498",
+        "id": "39b7f393.224d4c",
         "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",
+        "x": 1495.5100421905518,
+        "y": 1861,
+        "z": "1ba0191f.c9b697",
         "wires": []
     },
     {
-        "id": "f8b788a9.137b38",
+        "id": "389955cb.dd28ca",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1066,
-        "y": 1999,
-        "z": "3ab6fc36.bf1844",
+        "x": 1084.5104084014893,
+        "y": 1985,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "ce2a00dd.a7d93"
+                "e0055fc2.77eca"
             ]
         ]
     },
     {
-        "id": "ce2a00dd.a7d93",
+        "id": "e0055fc2.77eca",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1233.9998779296875,
-        "y": 1994,
-        "z": "3ab6fc36.bf1844",
+        "x": 1252.5102863311768,
+        "y": 1980,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "c8502ddf.753f"
+                "fc6d0a49.e66b58"
             ]
         ]
     },
     {
-        "id": "c8502ddf.753f",
+        "id": "fc6d0a49.e66b58",
         "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",
+        "x": 1410.5099811553955,
+        "y": 1983,
+        "z": "1ba0191f.c9b697",
         "wires": []
     },
     {
-        "id": "cae77fa4.6625",
+        "id": "f2be4fdd.b96a6",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1026,
-        "y": 2098,
-        "z": "3ab6fc36.bf1844",
+        "x": 1044.5104084014893,
+        "y": 2084,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "45be5487.15b1fc"
+                "8e774301.b98c4"
             ]
         ]
     },
     {
-        "id": "45be5487.15b1fc",
+        "id": "8e774301.b98c4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1201.9998779296875,
-        "y": 2099,
-        "z": "3ab6fc36.bf1844",
+        "x": 1220.5102863311768,
+        "y": 2085,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "323fff8f.f802"
+                "b3a8e99f.100d18"
             ]
         ]
     },
     {
-        "id": "323fff8f.f802",
+        "id": "b3a8e99f.100d18",
         "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",
+        "x": 1367.5099811553955,
+        "y": 2088,
+        "z": "1ba0191f.c9b697",
         "wires": []
     },
     {
-        "id": "4b4d0ad6.dd5bc4",
+        "id": "1e2c6b21.cd17b5",
         "type": "block",
         "name": "DMAAP Payload Generation",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 596,
-        "y": 1965,
-        "z": "3ab6fc36.bf1844",
+        "x": 614.5104084014893,
+        "y": 1951,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "521ad3e9.6a770c",
-                "fbb0b389.b7aff",
-                "7f3d1672.4560b8",
-                "33f0c48d.fd610c"
+                "273850f2.7f097",
+                "a5095542.4c6138",
+                "5da8895b.a671a8"
             ]
         ]
     },
     {
-        "id": "f6929731.8a42a8",
+        "id": "7bb49999.9148e8",
         "type": "block",
         "name": "DMAAP Reponse Publish",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 590,
-        "y": 2337,
-        "z": "3ab6fc36.bf1844",
+        "x": 578.5104064941406,
+        "y": 2212.9999556541443,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "3b3de811.c71c68",
-                "2bf26107.a6146e"
+                "c5a622e2.9d428",
+                "cf239555.a786d8",
+                "10b53a9e.0095c5"
             ]
         ]
     },
     {
-        "id": "2bf26107.a6146e",
+        "id": "cf239555.a786d8",
         "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",
+        "x": 850.5105056762695,
+        "y": 2324.999472618103,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "ab460f24.61aa7",
-                "47494462.f8125c"
+                "665766da.3f50c8",
+                "5db4effd.2e3f5"
             ]
         ]
     },
     {
-        "id": "3b3de811.c71c68",
+        "id": "c5a622e2.9d428",
         "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",
+        "x": 915.1771697998047,
+        "y": 2161.000005722046,
+        "z": "1ba0191f.c9b697",
         "wires": []
     },
     {
-        "id": "ab460f24.61aa7",
+        "id": "665766da.3f50c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1032.5,
-        "y": 2393.9166870117188,
-        "z": "3ab6fc36.bf1844",
+        "x": 1071.0104446411133,
+        "y": 2251.9167337417603,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "55287e9c.c3279"
+                "96a11689.71dfd8"
             ]
         ]
     },
     {
-        "id": "47494462.f8125c",
+        "id": "5db4effd.2e3f5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1018.4998779296875,
-        "y": 2527.9166259765625,
-        "z": "3ab6fc36.bf1844",
+        "x": 1075.0103645324707,
+        "y": 2390.916576385498,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "ae8bbad3.6dc778"
+                "e099506a.7e6b7"
             ]
         ]
     },
     {
-        "id": "55287e9c.c3279",
+        "id": "96a11689.71dfd8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1223.4998779296875,
-        "y": 2423.916717529297,
-        "z": "3ab6fc36.bf1844",
+        "x": 1231.0102787017822,
+        "y": 2253.9167346954346,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "a463bca9.96c86"
+                "4317ae49.ec52b"
             ]
         ]
     },
     {
-        "id": "a463bca9.96c86",
+        "id": "4317ae49.ec52b",
         "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",
+        "x": 1408.0100402832031,
+        "y": 2243.9167881011963,
+        "z": "1ba0191f.c9b697",
         "wires": []
     },
     {
-        "id": "ae8bbad3.6dc778",
+        "id": "e099506a.7e6b7",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1213.4996337890625,
-        "y": 2511.9166564941406,
-        "z": "3ab6fc36.bf1844",
+        "x": 1258.0100078582764,
+        "y": 2383.91668510437,
+        "z": "1ba0191f.c9b697",
         "wires": [
             [
-                "2e1981bc.3e21ee"
+                "63b50581.139fac"
             ]
         ]
     },
     {
-        "id": "2e1981bc.3e21ee",
+        "id": "63b50581.139fac",
         "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",
+        "x": 1440.010124206543,
+        "y": 2368.916955947876,
+        "z": "1ba0191f.c9b697",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "10b53a9e.0095c5",
+        "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=\"Before DMAAP Event - template file name, restapiURL\"/>\n<parameter name='field3' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.dmaap-publish-config-response.template`\" />\n<parameter name='field4' value=\"`$prop.dmaap-message-router.url + '/' + $prop.oofpcipoc-dmaap-configuration-response.topic`\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 922.0104789733887,
+        "y": 2232.454870223999,
+        "z": "1ba0191f.c9b697",
         "wires": [
             []
         ]
     }
-]
+]
\ No newline at end of file
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 c7813893..2aa5365c 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,194 +1,194 @@
 [
     {
-        "id": "62c88a41.7901c4",
+        "id": "d0e2330e.dd019",
         "type": "comment",
         "name": "Generic Neighbor Configuration",
         "info": "",
         "comments": "",
-        "x": 363,
-        "y": 27,
-        "z": "b5912bac.e498b8",
+        "x": 390.0104064941406,
+        "y": 36.010414123535156,
+        "z": "d6ec916.8139a7",
         "wires": []
     },
     {
-        "id": "baa967e2.faeed8",
+        "id": "5dfdcd01.84b604",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 604.0000457763672,
-        "y": 247.01050186157227,
-        "z": "b5912bac.e498b8",
+        "x": 631.0104522705078,
+        "y": 256.0209159851074,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "e7f7731c.df44c",
-                "e8c58776.722298",
-                "26d77802.a1d148",
-                "a1ea2bf1.677578",
-                "1dc9243f.b48cec",
-                "42fc4612.e644c8",
-                "dd9a5d15.06aae",
-                "772f6c66.8f6644",
-                "9257d114.fbb5f",
-                "bf3b2072.183ee",
-                "5dfa3076.0f2dc"
+                "974d680f.76f648",
+                "ffd54ab.ffbd1b8",
+                "36063fad.1cea",
+                "6d746eb6.f750f",
+                "af6305e8.738f98",
+                "91adaea7.e39c",
+                "293691a3.763afe",
+                "9adcdf48.89f9a",
+                "c43ffb14.6b99d8",
+                "402887.5e785778",
+                "358802c3.47e34e"
             ]
         ]
     },
     {
-        "id": "3b46224d.2d6b5e",
+        "id": "cd37cc80.83b05",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$generic-neighbor-configuration-input.lte-cell-number-of-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 551.0001831054688,
-        "y": 405,
-        "z": "b5912bac.e498b8",
+        "x": 578.0105895996094,
+        "y": 414.01041412353516,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "baa967e2.faeed8"
+                "5dfdcd01.84b604"
             ]
         ]
     },
     {
-        "id": "e7f7731c.df44c",
+        "id": "974d680f.76f648",
         "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": 935.0011596679688,
-        "y": 49.88909912109375,
-        "z": "b5912bac.e498b8",
+        "x": 962.0115661621094,
+        "y": 58.899513244628906,
+        "z": "d6ec916.8139a7",
         "wires": []
     },
     {
-        "id": "e8c58776.722298",
+        "id": "ffd54ab.ffbd1b8",
         "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": 799.5105075836182,
-        "y": 93.01042747497559,
-        "z": "b5912bac.e498b8",
+        "x": 826.5209140777588,
+        "y": 102.02084159851074,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "472be384.ef3bac",
+        "id": "27b0597e.d8a2a6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 126.48959350585938,
-        "y": 283.9896240234375,
-        "z": "b5912bac.e498b8",
+        "x": 153.5,
+        "y": 293.00003814697266,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "58f1d84.b947928",
-                "f7111027.f6312",
-                "be76099f.4dfad8",
-                "ce40b7fa.694068",
-                "d8ef20b.61a53e",
-                "1cfec41e.135f0c",
-                "598648b2.5aa358",
-                "3e67b041.fa193"
+                "6abe663a.7efa98",
+                "68b7eea8.7de3b",
+                "9cda453e.0abf28",
+                "a5fd7aa3.7b58d8",
+                "46dea300.ac250c",
+                "1a0d310b.f6a53f",
+                "a3fe027d.820d4",
+                "2f1179a.0005886"
             ]
         ]
     },
     {
-        "id": "98417a7.9342688",
+        "id": "51fad8f4.1d8738",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='generic-neighbor-configuration' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 112,
-        "y": 184.9895782470703,
-        "z": "b5912bac.e498b8",
+        "x": 139.01040649414062,
+        "y": 193.99999237060547,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "472be384.ef3bac"
+                "27b0597e.d8a2a6"
             ]
         ]
     },
     {
-        "id": "58f1d84.b947928",
+        "id": "6abe663a.7efa98",
         "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": 117.00033950805664,
-        "y": 2844.989965438843,
-        "z": "b5912bac.e498b8",
+        "x": 144.01074600219727,
+        "y": 2854.000379562378,
+        "z": "d6ec916.8139a7",
         "wires": []
     },
     {
-        "id": "f7111027.f6312",
+        "id": "68b7eea8.7de3b",
         "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": 413.00030517578125,
-        "y": 84.01042938232422,
-        "z": "b5912bac.e498b8",
+        "x": 440.0107116699219,
+        "y": 93.02084350585938,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "be76099f.4dfad8",
+        "id": "9cda453e.0abf28",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$generic-neighbor-configuration-input.lte-cell-number-of-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 424.085693359375,
-        "y": 130.9531707763672,
-        "z": "b5912bac.e498b8",
+        "x": 451.0960998535156,
+        "y": 139.96358489990234,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "93be64d3.f030f8"
+                "a3004a52.319a18"
             ]
         ]
     },
     {
-        "id": "ce40b7fa.694068",
+        "id": "a5fd7aa3.7b58d8",
         "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": 427.00018310546875,
-        "y": 189.01040649414062,
-        "z": "b5912bac.e498b8",
+        "x": 454.0105895996094,
+        "y": 198.02082061767578,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "d8ef20b.61a53e",
+        "id": "46dea300.ac250c",
         "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": 379.000301361084,
-        "y": 257.01050090789795,
-        "z": "b5912bac.e498b8",
+        "x": 408.0107192993164,
+        "y": 268.0209140777588,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "f6fcf198.4f53a",
+        "id": "cd34e05c.615e2",
         "type": "service-logic",
         "name": "oofpcipoc-api ${project.version}",
         "module": "oofpcipoc-api",
@@ -196,1948 +196,1839 @@
         "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": 167.99998474121094,
-        "y": 95.98968505859375,
-        "z": "b5912bac.e498b8",
+        "x": 195.01039123535156,
+        "y": 105.0000991821289,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "98417a7.9342688"
+                "51fad8f4.1d8738"
             ]
         ]
     },
     {
-        "id": "93be64d3.f030f8",
+        "id": "a3004a52.319a18",
         "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": 589.0005493164062,
-        "y": 114.98963165283203,
-        "z": "b5912bac.e498b8",
+        "x": 616.0109558105469,
+        "y": 124.00004577636719,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "9a50d806.bf9d88",
+        "id": "e06f1f1c.d6952",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 103,
-        "y": 33.989585876464844,
-        "z": "b5912bac.e498b8",
+        "x": 130.01040649414062,
+        "y": 43,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "f6fcf198.4f53a"
+                "cd34e05c.615e2"
             ]
         ]
     },
     {
-        "id": "bf3b2072.183ee",
+        "id": "402887.5e785778",
         "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": 870.5108642578125,
-        "y": 137.56614685058594,
-        "z": "b5912bac.e498b8",
+        "x": 897.5212707519531,
+        "y": 146.5765609741211,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "26d77802.a1d148",
+        "id": "36063fad.1cea",
         "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": 797.510498046875,
-        "y": 190.7882080078125,
-        "z": "b5912bac.e498b8",
+        "x": 824.5209045410156,
+        "y": 199.79862213134766,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "a1ea2bf1.677578",
+        "id": "6d746eb6.f750f",
         "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": 999.5106258392334,
-        "y": 202.78822231292725,
-        "z": "b5912bac.e498b8",
+        "x": 1026.521032333374,
+        "y": 211.7986364364624,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "1dc9243f.b48cec",
+        "id": "af6305e8.738f98",
         "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": 867.5104789733887,
-        "y": 246.78819751739502,
-        "z": "b5912bac.e498b8",
+        "x": 894.5208854675293,
+        "y": 255.79861164093018,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "42fc4612.e644c8",
+        "id": "91adaea7.e39c",
         "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": 890.5105075836182,
-        "y": 291.7882204055786,
-        "z": "b5912bac.e498b8",
+        "x": 917.5209140777588,
+        "y": 300.79863452911377,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "772f6c66.8f6644",
+        "id": "9adcdf48.89f9a",
         "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": 922.510498046875,
-        "y": 431.788330078125,
-        "z": "b5912bac.e498b8",
+        "x": 949.5209045410156,
+        "y": 440.79874420166016,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "18e5fc47.677d84",
-                "9996e5f3.0463a8"
+                "22593c53.2e3704",
+                "61ad6fb2.eff45"
             ]
         ]
     },
     {
-        "id": "18e5fc47.677d84",
+        "id": "22593c53.2e3704",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1183.5103855133057,
-        "y": 395.77778339385986,
-        "z": "b5912bac.e498b8",
+        "x": 1210.5207920074463,
+        "y": 404.788197517395,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "7e1599c6.f4b258"
+                "c761c957.dedf48"
             ]
         ]
     },
     {
-        "id": "9996e5f3.0463a8",
+        "id": "61ad6fb2.eff45",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1185.5103302001953,
-        "y": 459.77761459350586,
-        "z": "b5912bac.e498b8",
+        "x": 1212.520736694336,
+        "y": 468.788028717041,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "8be63bfe.ba0d78"
+                "ff97581a.3ffb78"
             ]
         ]
     },
     {
-        "id": "24c17f16.af7c2",
+        "id": "932587a2.10c5b8",
         "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": 1516.510124206543,
-        "y": 455.77770233154297,
-        "z": "b5912bac.e498b8",
+        "x": 1543.5205307006836,
+        "y": 464.7881164550781,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "8be63bfe.ba0d78",
+        "id": "ff97581a.3ffb78",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1352.5101737976074,
-        "y": 458.77769660949707,
-        "z": "b5912bac.e498b8",
+        "x": 1379.520580291748,
+        "y": 467.7881107330322,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "24c17f16.af7c2"
+                "932587a2.10c5b8"
             ]
         ]
     },
     {
-        "id": "7e1599c6.f4b258",
+        "id": "c761c957.dedf48",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1342.510248184204,
-        "y": 404.7777690887451,
-        "z": "b5912bac.e498b8",
+        "x": 1369.5206546783447,
+        "y": 413.7881832122803,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "ce7d1839.31b058"
+                "3f189c10.9d0974"
             ]
         ]
     },
     {
-        "id": "ce7d1839.31b058",
+        "id": "3f189c10.9d0974",
         "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": 1518.5100116729736,
-        "y": 389.77774238586426,
-        "z": "b5912bac.e498b8",
+        "x": 1545.5204181671143,
+        "y": 398.7881565093994,
+        "z": "d6ec916.8139a7",
         "wires": []
     },
     {
-        "id": "dd9a5d15.06aae",
+        "id": "293691a3.763afe",
         "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": 920.5104370117188,
-        "y": 343.7882080078125,
-        "z": "b5912bac.e498b8",
+        "x": 947.5208435058594,
+        "y": 352.79862213134766,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "9fe95e60.166c3",
-                "9512e3ea.241a4"
+                "b5029146.a42d5",
+                "a42c72d.e2d129"
             ]
         ]
     },
     {
-        "id": "9fe95e60.166c3",
+        "id": "b5029146.a42d5",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1188.510498046875,
-        "y": 280.4442491531372,
-        "z": "b5912bac.e498b8",
+        "x": 1215.5209045410156,
+        "y": 289.45466327667236,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "5a501fde.87adb"
+                "700df0ce.ff7ea"
             ]
         ]
     },
     {
-        "id": "9512e3ea.241a4",
+        "id": "a42c72d.e2d129",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1175.5103912353516,
-        "y": 344.44439697265625,
-        "z": "b5912bac.e498b8",
+        "x": 1202.5207977294922,
+        "y": 353.4548110961914,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "f3752e03.cce3d"
+                "291ffd2d.96c9c2"
             ]
         ]
     },
     {
-        "id": "f3752e03.cce3d",
+        "id": "291ffd2d.96c9c2",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1318.5101871490479,
-        "y": 341.44431257247925,
-        "z": "b5912bac.e498b8",
+        "x": 1345.5205936431885,
+        "y": 350.4547266960144,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "56993fd5.34454"
+                "3e25c03b.b3b17"
             ]
         ]
     },
     {
-        "id": "56993fd5.34454",
+        "id": "3e25c03b.b3b17",
         "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": 1479.510103225708,
-        "y": 335.44458293914795,
-        "z": "b5912bac.e498b8",
+        "x": 1506.5205097198486,
+        "y": 344.4549970626831,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "5a501fde.87adb",
+        "id": "700df0ce.ff7ea",
         "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": 1387.5103912353516,
-        "y": 270.4442768096924,
-        "z": "b5912bac.e498b8",
+        "x": 1414.5207977294922,
+        "y": 279.45469093322754,
+        "z": "d6ec916.8139a7",
         "wires": []
     },
     {
-        "id": "9257d114.fbb5f",
+        "id": "c43ffb14.6b99d8",
         "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": 878.5104370117188,
-        "y": 507.67706298828125,
-        "z": "b5912bac.e498b8",
+        "x": 905.5208435058594,
+        "y": 516.6874771118164,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "f3eccc73.b462e",
-                "3ed6cc6a.c6c044"
+                "e1ac38ab.5b2678",
+                "28d404f.3a94bfc"
             ]
         ]
     },
     {
-        "id": "f3eccc73.b462e",
+        "id": "e1ac38ab.5b2678",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1213.5104370117188,
-        "y": 507.3331050872803,
-        "z": "b5912bac.e498b8",
+        "x": 1240.5208435058594,
+        "y": 516.3435192108154,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "1ebdbe5d.7f30b2"
+                "db457a19.686678"
             ]
         ]
     },
     {
-        "id": "3ed6cc6a.c6c044",
+        "id": "28d404f.3a94bfc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1206.5103302001953,
-        "y": 559.3333015441895,
-        "z": "b5912bac.e498b8",
+        "x": 1233.520736694336,
+        "y": 568.3437156677246,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "7a33e4a5.c1140c"
+                "d569846c.bbb0a8"
             ]
         ]
     },
     {
-        "id": "7a33e4a5.c1140c",
+        "id": "d569846c.bbb0a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1375.5100898742676,
-        "y": 566.3332405090332,
-        "z": "b5912bac.e498b8",
+        "x": 1402.5204963684082,
+        "y": 575.3436546325684,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "8874cc8.fdd9c3"
+                "d8455bac.fb0098"
             ]
         ]
     },
     {
-        "id": "1ebdbe5d.7f30b2",
+        "id": "db457a19.686678",
         "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": 1386.5103912353516,
-        "y": 504.33313274383545,
-        "z": "b5912bac.e498b8",
+        "x": 1413.5207977294922,
+        "y": 513.3435468673706,
+        "z": "d6ec916.8139a7",
         "wires": []
     },
     {
-        "id": "8874cc8.fdd9c3",
+        "id": "d8455bac.fb0098",
         "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": 1522.510124206543,
-        "y": 564.333456993103,
-        "z": "b5912bac.e498b8",
+        "x": 1549.5205307006836,
+        "y": 573.3438711166382,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "caedd83d.51f7c8",
+        "id": "4895fc97.e32324",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 576.9999465942383,
-        "y": 1317.0000581741333,
-        "z": "b5912bac.e498b8",
+        "x": 604.0103530883789,
+        "y": 1326.0104722976685,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "1c84f0b8.618d3f",
-                "661254e5.c354ac",
-                "30fcd4e2.e8af6c",
-                "f65cc795.09a8f8",
-                "6002fae9.c462d4",
-                "26a41e87.9a2a42",
-                "8ad484a4.2e48f8",
-                "9cd115c6.7d3528",
-                "aa95ae6a.9db0c",
-                "917698f.742c268",
-                "5d5cd71e.9e8ad8",
-                "dd44dc35.baa9a"
+                "19788b57.90a7e5",
+                "385fcdb8.05b3d2",
+                "5628b9b0.c40b68",
+                "c3097a46.f42c48",
+                "367fb347.85f46c",
+                "b9a8089a.03ce48",
+                "fed6b7a1.a8d0a8",
+                "c614fa93.bff818",
+                "81cbcc37.957ee",
+                "b67a292f.048478",
+                "ef79f154.b96da",
+                "d0e25241.e0e23"
             ]
         ]
     },
     {
-        "id": "49402706.7c5b88",
+        "id": "fab83ed4.d6eae",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$generic-neighbor-configuration-input.lte-cell-number-of-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 520.0001831054688,
-        "y": 497.989501953125,
-        "z": "b5912bac.e498b8",
+        "x": 547.0105895996094,
+        "y": 506.99991607666016,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "caedd83d.51f7c8"
+                "4895fc97.e32324"
             ]
         ]
     },
     {
-        "id": "1c84f0b8.618d3f",
+        "id": "19788b57.90a7e5",
         "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": 910.0011806488037,
-        "y": 1000.8786706924438,
-        "z": "b5912bac.e498b8",
+        "x": 937.0115871429443,
+        "y": 1009.889084815979,
+        "z": "d6ec916.8139a7",
         "wires": []
     },
     {
-        "id": "661254e5.c354ac",
+        "id": "385fcdb8.05b3d2",
         "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": 780.5105037689209,
-        "y": 1077.0000381469727,
-        "z": "b5912bac.e498b8",
+        "x": 807.5209102630615,
+        "y": 1086.0104522705078,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "917698f.742c268",
+        "id": "b67a292f.048478",
         "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": 873.5108242034912,
-        "y": 1138.5557250976562,
-        "z": "b5912bac.e498b8",
+        "x": 900.5212306976318,
+        "y": 1147.5661392211914,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "30fcd4e2.e8af6c",
+        "id": "5628b9b0.c40b68",
         "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": 814.5104579925537,
-        "y": 1187.7777709960938,
-        "z": "b5912bac.e498b8",
+        "x": 841.5208644866943,
+        "y": 1196.788185119629,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "f65cc795.09a8f8",
+        "id": "c3097a46.f42c48",
         "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": 878.5105800628662,
-        "y": 1283.7777709960938,
-        "z": "b5912bac.e498b8",
+        "x": 905.5209865570068,
+        "y": 1292.788185119629,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "6002fae9.c462d4",
+        "id": "367fb347.85f46c",
         "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": 853.5104579925537,
-        "y": 1331.7777709960938,
-        "z": "b5912bac.e498b8",
+        "x": 880.5208644866943,
+        "y": 1340.788185119629,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "26a41e87.9a2a42",
+        "id": "b9a8089a.03ce48",
         "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": 862.5104579925537,
-        "y": 1368.7777709960938,
-        "z": "b5912bac.e498b8",
+        "x": 889.5208644866943,
+        "y": 1377.788185119629,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "9cd115c6.7d3528",
+        "id": "c614fa93.bff818",
         "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": 876.5104579925537,
-        "y": 1498.7778930664062,
-        "z": "b5912bac.e498b8",
+        "x": 903.5208644866943,
+        "y": 1507.7883071899414,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "550d2fe8.b2398",
-                "c01d1028.d9257"
+                "4c4f9668.9a6768",
+                "d03774b5.088378"
             ]
         ]
     },
     {
-        "id": "550d2fe8.b2398",
+        "id": "4c4f9668.9a6768",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1171.5103454589844,
-        "y": 1505.767346382141,
-        "z": "b5912bac.e498b8",
+        "x": 1198.520751953125,
+        "y": 1514.7777605056763,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "6a5a8363.937f4c"
+                "a2cf7a8.1cb9388"
             ]
         ]
     },
     {
-        "id": "c01d1028.d9257",
+        "id": "d03774b5.088378",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1189.5103874206543,
-        "y": 1573.7671728134155,
-        "z": "b5912bac.e498b8",
+        "x": 1216.520793914795,
+        "y": 1582.7775869369507,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "52465faf.7e9e9"
+                "718f1a13.9fb2a4"
             ]
         ]
     },
     {
-        "id": "7626dcea.9b0314",
+        "id": "a830f268.e88c7",
         "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": 1527.510139465332,
-        "y": 1560.7672810554504,
-        "z": "b5912bac.e498b8",
+        "x": 1554.5205459594727,
+        "y": 1569.7776951789856,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "52465faf.7e9e9",
+        "id": "718f1a13.9fb2a4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1369.510051727295,
-        "y": 1571.7672538757324,
-        "z": "b5912bac.e498b8",
+        "x": 1396.5204582214355,
+        "y": 1580.7776679992676,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "7626dcea.9b0314"
+                "a830f268.e88c7"
             ]
         ]
     },
     {
-        "id": "6a5a8363.937f4c",
+        "id": "a2cf7a8.1cb9388",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1330.5102081298828,
-        "y": 1514.7673320770264,
-        "z": "b5912bac.e498b8",
+        "x": 1357.5206146240234,
+        "y": 1523.7777462005615,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "c37acb1b.5bf368"
+                "242984bf.f0802c"
             ]
         ]
     },
     {
-        "id": "c37acb1b.5bf368",
+        "id": "242984bf.f0802c",
         "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": 1506.5099716186523,
-        "y": 1499.7673053741455,
-        "z": "b5912bac.e498b8",
+        "x": 1533.520378112793,
+        "y": 1508.7777194976807,
+        "z": "d6ec916.8139a7",
         "wires": []
     },
     {
-        "id": "8ad484a4.2e48f8",
+        "id": "fed6b7a1.a8d0a8",
         "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": 886.5103969573975,
-        "y": 1413.7777709960938,
-        "z": "b5912bac.e498b8",
+        "x": 913.5208034515381,
+        "y": 1422.788185119629,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "91fb4292.af9ba",
-                "4fbff7ac.8fb1f8"
+                "efb6986a.a3d5c8",
+                "ede271f9.16cb"
             ]
         ]
     },
     {
-        "id": "91fb4292.af9ba",
+        "id": "efb6986a.a3d5c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1159.510498046875,
-        "y": 1386.43381690979,
-        "z": "b5912bac.e498b8",
+        "x": 1186.5209045410156,
+        "y": 1395.4442310333252,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "a8a950c8.2502f"
+                "d1dfa9a6.c787b8"
             ]
         ]
     },
     {
-        "id": "4fbff7ac.8fb1f8",
+        "id": "ede271f9.16cb",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1154.5103302001953,
-        "y": 1442.433970451355,
-        "z": "b5912bac.e498b8",
+        "x": 1181.520736694336,
+        "y": 1451.4443845748901,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "ffc0c87a.ab73b8"
+                "490c9697.67ef88"
             ]
         ]
     },
     {
-        "id": "ffc0c87a.ab73b8",
+        "id": "490c9697.67ef88",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1306.5101470947266,
-        "y": 1451.4338755607605,
-        "z": "b5912bac.e498b8",
+        "x": 1333.5205535888672,
+        "y": 1460.4442896842957,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "d27f355.abdb1c8"
+                "4b9f8ddf.96d214"
             ]
         ]
     },
     {
-        "id": "d27f355.abdb1c8",
+        "id": "4b9f8ddf.96d214",
         "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": 1467.5100631713867,
-        "y": 1445.4341459274292,
-        "z": "b5912bac.e498b8",
+        "x": 1494.5204696655273,
+        "y": 1454.4445600509644,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "a8a950c8.2502f",
+        "id": "d1dfa9a6.c787b8",
         "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": 1360.5102882385254,
-        "y": 1392.433825492859,
-        "z": "b5912bac.e498b8",
+        "x": 1387.520694732666,
+        "y": 1401.444239616394,
+        "z": "d6ec916.8139a7",
         "wires": []
     },
     {
-        "id": "aa95ae6a.9db0c",
+        "id": "81cbcc37.957ee",
         "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": 842.5103969573975,
-        "y": 1612.6666870117188,
-        "z": "b5912bac.e498b8",
+        "x": 869.5208034515381,
+        "y": 1621.677101135254,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "9a649311.6c99",
-                "6cc8d6fb.f0ac98"
+                "8381427b.3a415",
+                "4a867416.bc28ac"
             ]
         ]
     },
     {
-        "id": "9a649311.6c99",
+        "id": "8381427b.3a415",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1199.510498046875,
-        "y": 1624.3226718902588,
-        "z": "b5912bac.e498b8",
+        "x": 1226.5209045410156,
+        "y": 1633.333086013794,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "cdae9665.c04dc8"
+                "71c70e29.c9f39"
             ]
         ]
     },
     {
-        "id": "6cc8d6fb.f0ac98",
+        "id": "4a867416.bc28ac",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1194.5103302001953,
-        "y": 1680.3228254318237,
-        "z": "b5912bac.e498b8",
+        "x": 1221.520736694336,
+        "y": 1689.333239555359,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "c3f07c0c.f0779"
+                "2fdc95ce.87b1ca"
             ]
         ]
     },
     {
-        "id": "c3f07c0c.f0779",
+        "id": "2fdc95ce.87b1ca",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1346.5101470947266,
-        "y": 1689.3227305412292,
-        "z": "b5912bac.e498b8",
+        "x": 1373.5205535888672,
+        "y": 1698.3331446647644,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "adbc9ce8.ce34e"
+                "50e2721e.a2ab5c"
             ]
         ]
     },
     {
-        "id": "cdae9665.c04dc8",
+        "id": "71c70e29.c9f39",
         "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": 1400.5102882385254,
-        "y": 1630.3226804733276,
-        "z": "b5912bac.e498b8",
+        "x": 1427.520694732666,
+        "y": 1639.3330945968628,
+        "z": "d6ec916.8139a7",
         "wires": []
     },
     {
-        "id": "adbc9ce8.ce34e",
+        "id": "50e2721e.a2ab5c",
         "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": 1507.5100555419922,
-        "y": 1682.3229751586914,
-        "z": "b5912bac.e498b8",
+        "x": 1534.5204620361328,
+        "y": 1691.3333892822266,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "9e1d4a81.fff878",
+        "id": "cf6755dc.b50b78",
         "type": "outcome",
         "name": "Not Mounted",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 427,
-        "y": 324,
-        "z": "b5912bac.e498b8",
+        "x": 454.0104064941406,
+        "y": 333.01041412353516,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "3b46224d.2d6b5e"
+                "cd37cc80.83b05"
             ]
         ]
     },
     {
-        "id": "1cfec41e.135f0c",
+        "id": "1a0d310b.f6a53f",
         "type": "switchNode",
         "name": "switch mounted",
         "xml": "<switch test='`$prop.ransim-mounted`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 325,
-        "y": 413,
-        "z": "b5912bac.e498b8",
+        "x": 352.0104064941406,
+        "y": 422.01041412353516,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "9e1d4a81.fff878",
-                "f4668911.4ee4b8"
+                "cf6755dc.b50b78",
+                "5f209115.361e5"
             ]
         ]
     },
     {
-        "id": "f4668911.4ee4b8",
+        "id": "5f209115.361e5",
         "type": "outcome",
         "name": "Mounted",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 358,
-        "y": 491,
-        "z": "b5912bac.e498b8",
+        "x": 385.0104064941406,
+        "y": 500.01041412353516,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "49402706.7c5b88"
+                "fab83ed4.d6eae"
             ]
         ]
     },
     {
-        "id": "5d5cd71e.9e8ad8",
+        "id": "ef79f154.b96da",
         "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": 882.9999599456787,
-        "y": 1239.0000610351562,
-        "z": "b5912bac.e498b8",
+        "x": 910.0103664398193,
+        "y": 1248.0104751586914,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "3cf0d2d4.0a5d0e",
+        "id": "3c0d7f19.6c811",
         "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",
+        "x": 899.020866394043,
+        "y": 2134.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "fb7f30bc.4c65b",
-                "bdb5c927.8af808"
+                "b2a6c2c3.f1a3b",
+                "294194dd.c5fd5c"
             ]
         ]
     },
     {
-        "id": "fb7f30bc.4c65b",
+        "id": "b2a6c2c3.f1a3b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1146.0104598999023,
-        "y": 2094.4550261497498,
-        "z": "b5912bac.e498b8",
+        "x": 1173.020866394043,
+        "y": 2103.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "c11aee10.e6e67"
+                "8238e819.a3ec88"
             ]
         ]
     },
     {
-        "id": "c11aee10.e6e67",
+        "id": "8238e819.a3ec88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1337.0104598999023,
-        "y": 2097.4550261497498,
-        "z": "b5912bac.e498b8",
+        "x": 1364.020866394043,
+        "y": 2106.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "9a917d5e.1c727"
+                "89f27573.4e9d08"
             ]
         ]
     },
     {
-        "id": "9a917d5e.1c727",
+        "id": "89f27573.4e9d08",
         "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",
+        "x": 1532.020866394043,
+        "y": 2107.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "df99ee06.4ace2",
+        "id": "2d15e84e.91cbd8",
         "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",
+        "x": 871.520866394043,
+        "y": 2250.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "c93e93f1.a82ee",
-                "185060e1.24becf"
+                "5debb003.5b86d",
+                "f677a278.2fa7"
             ]
         ]
     },
     {
-        "id": "2dc1f234.42072e",
+        "id": "e8161499.fba198",
         "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",
+        "x": 861.020866394043,
+        "y": 2332.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "6e15985e.9487b8",
-                "ee17f7c6.a13008"
+                "17433612.64f8ea",
+                "2d401fc.38631e"
             ]
         ]
     },
     {
-        "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",
+        "id": "17433612.64f8ea",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1023.5104598999023,
-        "y": 2429.4550261497498,
-        "z": "b5912bac.e498b8",
+        "x": 1043.520866394043,
+        "y": 2340.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "dc13ddfc.0613e"
+                "8233dba4.2a6c08"
             ]
         ]
     },
     {
-        "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",
+        "id": "8233dba4.2a6c08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1201.5104598999023,
-        "y": 2329.4550261497498,
-        "z": "b5912bac.e498b8",
+        "x": 1228.520866394043,
+        "y": 2338.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "64c913b9.99501c"
+                "de84fc8b.e06b5"
             ]
         ]
     },
     {
-        "id": "64c913b9.99501c",
+        "id": "de84fc8b.e06b5",
         "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",
+        "x": 1430.520866394043,
+        "y": 2333.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "c93e93f1.a82ee",
+        "id": "5debb003.5b86d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1038.0104598999023,
-        "y": 2209.4550261497498,
-        "z": "b5912bac.e498b8",
+        "x": 1065.020866394043,
+        "y": 2218.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "d0d96a57.50b6a8"
+                "9d89b03e.2ff07"
             ]
         ]
     },
     {
-        "id": "d0d96a57.50b6a8",
+        "id": "9d89b03e.2ff07",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1213.0104598999023,
-        "y": 2223.4550261497498,
-        "z": "b5912bac.e498b8",
+        "x": 1240.020866394043,
+        "y": 2232.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "f893a35e.08e4f"
+                "dabf9835.e13098"
             ]
         ]
     },
     {
-        "id": "f893a35e.08e4f",
+        "id": "dabf9835.e13098",
         "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",
+        "x": 1428.020866394043,
+        "y": 2234.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "bdb5c927.8af808",
+        "id": "294194dd.c5fd5c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1145.0104598999023,
-        "y": 2151.4550261497498,
-        "z": "b5912bac.e498b8",
+        "x": 1172.020866394043,
+        "y": 2160.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "3f455a05.46ca56"
+                "53c27ee.7f69b8"
             ]
         ]
     },
     {
-        "id": "3f455a05.46ca56",
+        "id": "53c27ee.7f69b8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1314.0103378295898,
-        "y": 2157.4550261497498,
-        "z": "b5912bac.e498b8",
+        "x": 1341.0207443237305,
+        "y": 2166.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "4b319563.0e680c"
+                "cf58efc6.7b3ca"
             ]
         ]
     },
     {
-        "id": "4b319563.0e680c",
+        "id": "cf58efc6.7b3ca",
         "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",
+        "x": 1497.0205001831055,
+        "y": 2165.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": []
     },
     {
-        "id": "185060e1.24becf",
+        "id": "f677a278.2fa7",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1059.0104598999023,
-        "y": 2280.4550261497498,
-        "z": "b5912bac.e498b8",
+        "x": 1086.020866394043,
+        "y": 2289.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "f035b64a.afd518"
+                "d2d6e5d8.209298"
             ]
         ]
     },
     {
-        "id": "f035b64a.afd518",
+        "id": "d2d6e5d8.209298",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1227.0103378295898,
-        "y": 2275.4550261497498,
-        "z": "b5912bac.e498b8",
+        "x": 1254.0207443237305,
+        "y": 2284.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "3f311f39.6d976"
+                "2d9f0013.4f0cb"
             ]
         ]
     },
     {
-        "id": "3f311f39.6d976",
+        "id": "2d9f0013.4f0cb",
         "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",
+        "x": 1412.0204391479492,
+        "y": 2287.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": []
     },
     {
-        "id": "ee17f7c6.a13008",
+        "id": "2d401fc.38631e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1019.0104598999023,
-        "y": 2379.4550261497498,
-        "z": "b5912bac.e498b8",
+        "x": 1046.020866394043,
+        "y": 2388.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "435f1a9.a102ee4"
+                "bda74b26.1b1388"
             ]
         ]
     },
     {
-        "id": "435f1a9.a102ee4",
+        "id": "bda74b26.1b1388",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1195.0103378295898,
-        "y": 2380.4550261497498,
-        "z": "b5912bac.e498b8",
+        "x": 1222.0207443237305,
+        "y": 2389.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "d581508c.2e804"
+                "d56e28d4.650d08"
             ]
         ]
     },
     {
-        "id": "d581508c.2e804",
+        "id": "d56e28d4.650d08",
         "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",
+        "x": 1369.0204391479492,
+        "y": 2392.465440273285,
+        "z": "d6ec916.8139a7",
         "wires": []
     },
     {
-        "id": "598648b2.5aa358",
+        "id": "a3fe027d.820d4",
         "type": "block",
         "name": "DMAAP Payload Generation",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 576.0104751586914,
-        "y": 2243.4551243782043,
-        "z": "b5912bac.e498b8",
+        "x": 603.020881652832,
+        "y": 2252.4655385017395,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "3cf0d2d4.0a5d0e",
-                "df99ee06.4ace2",
-                "2dc1f234.42072e",
-                "d94faf20.0bc6f"
+                "3c0d7f19.6c811",
+                "2d15e84e.91cbd8",
+                "e8161499.fba198"
             ]
         ]
     },
     {
-        "id": "3e67b041.fa193",
+        "id": "2f1179a.0005886",
         "type": "block",
         "name": "DMAAP Reponse Publish",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 438.0104446411133,
-        "y": 2591.343816280365,
-        "z": "b5912bac.e498b8",
+        "x": 465.0208511352539,
+        "y": 2600.3542304039,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "31416be7.b41224",
-                "5ccbfc1e.20e2f4"
+                "b22d0788.83a868",
+                "74c6c1ac.1e42d"
             ]
         ]
     },
     {
-        "id": "5ccbfc1e.20e2f4",
+        "id": "74c6c1ac.1e42d",
         "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",
+        "x": 880.0209274291992,
+        "y": 2662.4654574394226,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "35df2cf3.78dc74",
-                "ecbae94b.e41fd8"
+                "66967541.9509fc",
+                "19014f9c.5bacd"
             ]
         ]
     },
     {
-        "id": "31416be7.b41224",
+        "id": "b22d0788.83a868",
         "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",
+        "x": 866.6876258850098,
+        "y": 2558.4654479026794,
+        "z": "d6ec916.8139a7",
         "wires": []
     },
     {
-        "id": "35df2cf3.78dc74",
+        "id": "66967541.9509fc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1027.510498046875,
-        "y": 2587.3717608451843,
-        "z": "b5912bac.e498b8",
+        "x": 1054.5209045410156,
+        "y": 2596.3821749687195,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "6faec48c.adf59c"
+                "5277ae5c.6edee"
             ]
         ]
     },
     {
-        "id": "ecbae94b.e41fd8",
+        "id": "19014f9c.5bacd",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1050.510353088379,
-        "y": 2716.3718676567078,
-        "z": "b5912bac.e498b8",
+        "x": 1077.5207595825195,
+        "y": 2725.382281780243,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "7c97eaeb.048ce4"
+                "3817a66f.511b9a"
             ]
         ]
     },
     {
-        "id": "6faec48c.adf59c",
+        "id": "5277ae5c.6edee",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1208.510269165039,
-        "y": 2590.3718905448914,
-        "z": "b5912bac.e498b8",
+        "x": 1235.5206756591797,
+        "y": 2599.3823046684265,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "96ee7bd4.ade948"
+                "5d24962d.477fe8"
             ]
         ]
     },
     {
-        "id": "96ee7bd4.ade948",
+        "id": "5d24962d.477fe8",
         "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",
+        "x": 1409.520393371582,
+        "y": 2606.3822298049927,
+        "z": "d6ec916.8139a7",
         "wires": []
     },
     {
-        "id": "7c97eaeb.048ce4",
+        "id": "3817a66f.511b9a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1210.5099983215332,
-        "y": 2708.3718400001526,
-        "z": "b5912bac.e498b8",
+        "x": 1237.5204048156738,
+        "y": 2717.3822541236877,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "9752c29a.925d5"
+                "2e47c897.bb4cb8"
             ]
         ]
     },
     {
-        "id": "9752c29a.925d5",
+        "id": "2e47c897.bb4cb8",
         "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",
+        "x": 1414.520523071289,
+        "y": 2722.38236284256,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "6658e995.a8afc8",
+        "id": "f89579dd.91a288",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 891.0104370117188,
-        "y": 843.34375,
-        "z": "b5912bac.e498b8",
+        "x": 918.0208435058594,
+        "y": 852.3541641235352,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "be155b7f.4b4658",
-                "e5e6ffd6.3ceea",
-                "33c67261.6b5ade",
-                "aa8fe0bd.58667"
+                "e2e4a468.8a1838",
+                "89dd4b27.cf59d8",
+                "67336a18.ae2e64",
+                "68bfb6e.dac1e48"
             ]
         ]
     },
     {
-        "id": "be155b7f.4b4658",
+        "id": "e2e4a468.8a1838",
         "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",
+        "x": 1200.020767211914,
+        "y": 705.3542108535767,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "e5e6ffd6.3ceea",
+        "id": "89dd4b27.cf59d8",
         "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",
+        "x": 1209.0208587646484,
+        "y": 818.3542070388794,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "33c67261.6b5ade",
+        "id": "67336a18.ae2e64",
         "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",
+        "x": 1176.0208435058594,
+        "y": 923.3541641235352,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "cbd12702.8e4338",
-                "12af70f8.c2945f"
+                "ef644403.24c058",
+                "fdf802eb.60d9c"
             ]
         ]
     },
     {
-        "id": "cbd12702.8e4338",
+        "id": "ef644403.24c058",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1364.0104370117188,
-        "y": 857.34375,
-        "z": "b5912bac.e498b8",
+        "x": 1391.0208435058594,
+        "y": 866.3541641235352,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "eebd8d4d.fd481"
+                "8b811332.af384"
             ]
         ]
     },
     {
-        "id": "12af70f8.c2945f",
+        "id": "fdf802eb.60d9c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1364.0103149414062,
-        "y": 953.3436279296875,
-        "z": "b5912bac.e498b8",
+        "x": 1391.0207214355469,
+        "y": 962.3540420532227,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "342f48d0.8ab638"
+                "e176cd2e.3e59"
             ]
         ]
     },
     {
-        "id": "eebd8d4d.fd481",
+        "id": "8b811332.af384",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1533.0103149414062,
-        "y": 868.34375,
-        "z": "b5912bac.e498b8",
+        "x": 1560.0207214355469,
+        "y": 877.3541641235352,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "d55d851b.fc1958"
+                "476e5e5b.ebfba"
             ]
         ]
     },
     {
-        "id": "342f48d0.8ab638",
+        "id": "e176cd2e.3e59",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1526.0100708007812,
-        "y": 954.34375,
-        "z": "b5912bac.e498b8",
+        "x": 1553.0204772949219,
+        "y": 963.3541641235352,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "6dcdc966.a406c8"
+                "13d8c36c.6c2d3d"
             ]
         ]
     },
     {
-        "id": "d55d851b.fc1958",
+        "id": "476e5e5b.ebfba",
         "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",
+        "x": 1714.0204162597656,
+        "y": 870.3541641235352,
+        "z": "d6ec916.8139a7",
         "wires": []
     },
     {
-        "id": "6dcdc966.a406c8",
+        "id": "13d8c36c.6c2d3d",
         "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",
+        "x": 1708.0206756591797,
+        "y": 960.354172706604,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "5dfa3076.0f2dc",
+        "id": "358802c3.47e34e",
         "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",
+        "x": 801.0208587646484,
+        "y": 646.3541851043701,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "f86727f0.323a28",
-                "b1853d4e.2ef79"
+                "85f30747.c1b888",
+                "2d20c343.20b36c"
             ]
         ]
     },
     {
-        "id": "f86727f0.323a28",
+        "id": "85f30747.c1b888",
         "type": "outcome",
         "name": "Deployed",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 816.0104370117188,
-        "y": 767.34375,
-        "z": "b5912bac.e498b8",
+        "x": 843.0208435058594,
+        "y": 776.3541641235352,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "6658e995.a8afc8"
+                "f89579dd.91a288"
             ]
         ]
     },
     {
-        "id": "aa8fe0bd.58667",
+        "id": "68bfb6e.dac1e48",
         "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",
+        "x": 1268.0207977294922,
+        "y": 757.46537733078,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "fcdde69d.5ef6b8",
+        "id": "8a8d9414.5fc568",
         "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",
+        "x": 1240.0207710266113,
+        "y": 632.5763521194458,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "b1853d4e.2ef79",
+        "id": "2d20c343.20b36c",
         "type": "outcome",
         "name": "Not Deployed",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1039.0103302001953,
-        "y": 619.6770076751709,
-        "z": "b5912bac.e498b8",
+        "x": 1066.020736694336,
+        "y": 628.687421798706,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "fcdde69d.5ef6b8"
+                "8a8d9414.5fc568"
             ]
         ]
     },
     {
-        "id": "b59fe403.100df8",
+        "id": "94a1fc66.854fd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 880.0104370117188,
-        "y": 1921.5660400390625,
-        "z": "b5912bac.e498b8",
+        "x": 907.0208435058594,
+        "y": 1930.5764541625977,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "5fee4a24.714e24",
-                "e80f49c7.bc5e98",
-                "9f3eddb8.4c8b6",
-                "ede238d3.02b908"
+                "dd73feca.07c61",
+                "37207b6c.909104",
+                "b87cd468.06cb68",
+                "ab8ee4d1.6884d8"
             ]
         ]
     },
     {
-        "id": "5fee4a24.714e24",
+        "id": "dd73feca.07c61",
         "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",
+        "x": 1234.0207824707031,
+        "y": 1791.5764608383179,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "e80f49c7.bc5e98",
+        "id": "37207b6c.909104",
         "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",
+        "x": 1165.0208435058594,
+        "y": 2001.5764541625977,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "fde36f04.ecf63",
-                "5da0cd73.d5ac34"
+                "1813ece8.963fa3",
+                "183b086e.f8d5e8"
             ]
         ]
     },
     {
-        "id": "fde36f04.ecf63",
+        "id": "1813ece8.963fa3",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1353.0104370117188,
-        "y": 1935.5660400390625,
-        "z": "b5912bac.e498b8",
+        "x": 1380.0208435058594,
+        "y": 1944.5764541625977,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "b0184360.4173a"
+                "6a8582d5.f0470c"
             ]
         ]
     },
     {
-        "id": "5da0cd73.d5ac34",
+        "id": "183b086e.f8d5e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1353.0103149414062,
-        "y": 2031.56591796875,
-        "z": "b5912bac.e498b8",
+        "x": 1380.0207214355469,
+        "y": 2040.5763320922852,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "6d733c40.16c4e4"
+                "6f48523c.7e7b2c"
             ]
         ]
     },
     {
-        "id": "b0184360.4173a",
+        "id": "6a8582d5.f0470c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1522.0103149414062,
-        "y": 1946.5660400390625,
-        "z": "b5912bac.e498b8",
+        "x": 1549.0207214355469,
+        "y": 1955.5764541625977,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "c56ebe3b.bbda7"
+                "9bd49b3c.96bdb8"
             ]
         ]
     },
     {
-        "id": "6d733c40.16c4e4",
+        "id": "6f48523c.7e7b2c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1515.0100708007812,
-        "y": 2032.5660400390625,
-        "z": "b5912bac.e498b8",
+        "x": 1542.0204772949219,
+        "y": 2041.5764541625977,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "c9d72369.59a1b"
+                "6bee533f.79d24c"
             ]
         ]
     },
     {
-        "id": "c56ebe3b.bbda7",
+        "id": "9bd49b3c.96bdb8",
         "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",
+        "x": 1703.0204162597656,
+        "y": 1948.5764541625977,
+        "z": "d6ec916.8139a7",
         "wires": []
     },
     {
-        "id": "c9d72369.59a1b",
+        "id": "6bee533f.79d24c",
         "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",
+        "x": 1697.0206756591797,
+        "y": 2038.5764627456665,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "dd44dc35.baa9a",
+        "id": "d0e25241.e0e23",
         "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",
+        "x": 723.0211181640625,
+        "y": 1743.5765342712402,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "b541eb45.1e5278",
-                "eefdf306.9fa25"
+                "5b4167c1.3f34a8",
+                "dd0ef7.efed5108"
             ]
         ]
     },
     {
-        "id": "b541eb45.1e5278",
+        "id": "5b4167c1.3f34a8",
         "type": "outcome",
         "name": "Deployed",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 900.0104904174805,
-        "y": 1819.5660769939423,
-        "z": "b5912bac.e498b8",
+        "x": 927.0208969116211,
+        "y": 1828.5764911174774,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "b59fe403.100df8"
+                "94a1fc66.854fd"
             ]
         ]
     },
     {
-        "id": "9f3eddb8.4c8b6",
+        "id": "b87cd468.06cb68",
         "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",
+        "x": 1285.0207824707031,
+        "y": 1844.6877369880676,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "a5a8d47.a6e5b28",
+        "id": "c3d98242.04a72",
         "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",
+        "x": 1218.0208644866943,
+        "y": 1741.798599243164,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     },
     {
-        "id": "eefdf306.9fa25",
+        "id": "dd0ef7.efed5108",
         "type": "outcome",
         "name": "Not Deployed",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1012.010383605957,
-        "y": 1719.8994035720825,
-        "z": "b5912bac.e498b8",
+        "x": 1039.0207901000977,
+        "y": 1728.9098176956177,
+        "z": "d6ec916.8139a7",
         "wires": [
             [
-                "a5a8d47.a6e5b28"
+                "c3d98242.04a72"
             ]
         ]
     },
     {
-        "id": "ede238d3.02b908",
+        "id": "ab8ee4d1.6884d8",
         "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",
+        "x": 1230.5763397216797,
+        "y": 1901.354133605957,
+        "z": "d6ec916.8139a7",
         "wires": [
             []
         ]
     }
-]
+]
\ No newline at end of file
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 ef4737ed..bf5c4710 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
@@ -472,35 +472,19 @@
                         </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>
+                <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="Before DMAAP Event - template file name, restapiURL"/>
+                    <parameter name='field3' value="`$prop.restapi.templateDir + '/' + $prop.restapi.dmaap-publish-config-response.template`" />
+                    <parameter name='field4' value="`$prop.dmaap-message-router.url + '/' + $prop.oofpcipoc-dmaap-configuration-response.topic`" />
+                </record>
                 <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`" />
@@ -535,4 +519,4 @@
             </return>
         </block>
     </method>
-</service-logic>
+</service-logic>
\ No newline at end of file
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 6e386b9e..305b97ae 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
@@ -529,30 +529,6 @@
                         </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>
@@ -592,4 +568,4 @@
             </return>
         </block>
     </method>
-</service-logic>
+</service-logic>
\ No newline at end of file
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
index 655afed5..b6fa4716 100644
--- 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
@@ -1,23 +1,21 @@
-{
-  "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}
+{ "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.type}
 }
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
index 5cd8a6ef..f379f704 100644
--- 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
@@ -1,5 +1,5 @@
 {
 
-"ho": ${tmp.blacklisted}
+"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
index 51309bb0..29e3a1bd 100644
--- 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
@@ -1,5 +1,5 @@
 {
 
-"pci-value": ${tmp.phy-cell-id-in-use}
+"pci-value": ${"tmp.phy-cell-id-in-use}
 
 }
-- 
2.16.6