From 135361cff32dd84b2fa72cd713c9204f24363e6d Mon Sep 17 00:00:00 2001
From: yashwanth <gandhapu.yashwanth@wipro.com>
Date: Wed, 27 Apr 2022 07:27:20 +0000
Subject: [PATCH] Generic Neighbor Configuration dg - Bug Fix

Issue-ID: CCSDK-3643
Signed-off-by: yashwanth <gandhapu.yashwanth@wipro.com>
Change-Id: Id1e5ea3cef9a2eff6b6e473f2ea54f8defa0d77c
---
 ...fpcipoc-api_generic-neighbor-configuration.json | 2394 ++++++++++----------
 ...ofpcipoc-api_generic-neighbor-configuration.xml |    6 -
 .../src/main/json/cps-templates/cps-put-ho.json    |    2 +-
 .../json/oofpcipoc-generic-neighbor-patch.json     |    7 -
 4 files changed, 1198 insertions(+), 1211 deletions(-)

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 9d2eafd7..f8a161c1 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,192 +1,192 @@
 [
     {
-        "id": "a23e1986.d0e508",
+        "id": "7497e618.fbc9e8",
         "type": "comment",
         "name": "Generic Neighbor Configuration",
         "info": "",
         "comments": "",
-        "x": 342.5104064941406,
-        "y": 71.66666412353516,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 419.9999694824219,
+        "y": 51.666666984558105,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "c91e3e99.6d94",
+        "id": "b87f24bf.7b3ca8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2254.510841369629,
-        "y": 946.6772780418396,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2332.00040435791,
+        "y": 926.6772809028625,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "6925e908.d68148",
-                "44d3f36e.4e5edc",
-                "468b7854.8855a8",
-                "58f14033.666ac",
-                "752eee76.25b35",
-                "57d3d9c.2e0d328",
-                "4acfeeff.78756",
-                "7b39b4de.4e9c6c",
-                "f5ee8b6.12ca678",
-                "82978ac0.ed8dc8",
-                "6b608403.2d3acc",
-                "9f32aefb.8b268",
-                "f51e527f.45e31"
+                "4733a250.77958c",
+                "dc0a8329.30e8",
+                "ec9be427.25e9a8",
+                "387cb9f3.f70276",
+                "a97fcdf6.a499d",
+                "1de1e583.8fb7fa",
+                "5e95d235.988f0c",
+                "4f68e3db.956bac",
+                "d62d2854.e6ac28",
+                "15d3f16c.8176ef",
+                "57f80d61.d3fa74",
+                "f8b63e76.98572",
+                "1fdbb9e6.5c2526"
             ]
         ]
     },
     {
-        "id": "2424729e.e49bce",
+        "id": "d893d229.1e59d",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$generic-neighbor-configuration-input.lte-cell-number-of-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 1500.5108261108398,
-        "y": 814.666862487793,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1578.000389099121,
+        "y": 794.6668653488159,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "c91e3e99.6d94"
+                "b87f24bf.7b3ca8"
             ]
         ]
     },
     {
-        "id": "6925e908.d68148",
+        "id": "4733a250.77958c",
         "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": 2659.5118865966797,
-        "y": 796.2224502563477,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2737.001449584961,
+        "y": 776.2224531173706,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "13ca70be.83d0ef",
+        "id": "9d97f004.d2075",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 76,
-        "y": 398.65629959106445,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 153.48956298828125,
+        "y": 378.6563024520874,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "3eca09f7.b873e6",
-                "a9f8f882.e807f8",
-                "d6fb8a83.bb64f8",
-                "b1d6a19d.fa01b",
-                "82ac39cb.7f9698",
-                "1f32c22f.4bd18e",
-                "92654a64.0d57a8",
-                "530ff06c.c455e",
-                "5b9b0a8.18bd8f4",
-                "67a95ff9.4b3fd",
-                "465d1be9.f815a4",
-                "ad4ecd3c.4121d",
-                "ddbfcb04.fe0288",
-                "3b17d3a0.cdc9fc",
-                "524f7198.62576",
-                "f9ba5873.70cca8",
-                "d7997fdc.fef12",
-                "8b8d2961.aeae98"
+                "8a0a1234.c615",
+                "f8773aff.9925f8",
+                "d8c9c555.90df68",
+                "e0d1bd80.fdd2c",
+                "c8406de0.e7d19",
+                "655b71f9.458d1",
+                "b025f934.fbf218",
+                "3103a38e.d771ec",
+                "2816cf49.04226",
+                "16823f81.eb375",
+                "ecefd81d.f9cab8",
+                "560d1a47.8473d4",
+                "2e676669.44090a",
+                "3f5bd73.2a4f028",
+                "a8b2bc66.e3a98",
+                "4eb9dd77.949f74",
+                "902d542b.495ea8",
+                "f1691caa.0d71"
             ]
         ]
     },
     {
-        "id": "d67b8559.51c7a8",
+        "id": "db5a5af.157f7a8",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='generic-neighbor-configuration' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 93.51040649414062,
-        "y": 230.65624237060547,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 170.99996948242188,
+        "y": 210.65624523162842,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "13ca70be.83d0ef"
+                "9d97f004.d2075"
             ]
         ]
     },
     {
-        "id": "3eca09f7.b873e6",
+        "id": "8a0a1234.c615",
         "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": 96.51074600219727,
-        "y": 2889.656629562378,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 174.00030899047852,
+        "y": 2869.656632423401,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "a9f8f882.e807f8",
+        "id": "f8773aff.9925f8",
         "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": 392.5107116699219,
-        "y": 128.67709350585938,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 470.0002746582031,
+        "y": 108.67709636688232,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "d6fb8a83.bb64f8",
+        "id": "d8c9c555.90df68",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$generic-neighbor-configuration-input.lte-cell-number-of-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 403.5960998535156,
-        "y": 175.61983489990234,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 481.0856628417969,
+        "y": 155.6198377609253,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "3f83b27a.26631e"
+                "89da7c92.4df0d"
             ]
         ]
     },
     {
-        "id": "b1d6a19d.fa01b",
+        "id": "e0d1bd80.fdd2c",
         "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": 413.5105895996094,
-        "y": 224.67707061767578,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 491.0001525878906,
+        "y": 204.67707347869873,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "82ac39cb.7f9698",
+        "id": "c8406de0.e7d19",
         "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.5107116699219,
-        "y": 265.67716217041016,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 457.0002746582031,
+        "y": 245.6771650314331,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "819d7966.4e53d8",
+        "id": "9719444.b72f1b8",
         "type": "service-logic",
         "name": "oofpcipoc-api ${project.version}",
         "module": "oofpcipoc-api",
@@ -194,3479 +194,3479 @@
         "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": 147.51039123535156,
-        "y": 140.6563491821289,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 224.9999542236328,
+        "y": 120.65635204315186,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "d67b8559.51c7a8"
+                "db5a5af.157f7a8"
             ]
         ]
     },
     {
-        "id": "3f83b27a.26631e",
+        "id": "89da7c92.4df0d",
         "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": 568.5109558105469,
-        "y": 159.6562957763672,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 646.0005187988281,
+        "y": 139.65629863739014,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "f7672e92.fc0de",
+        "id": "556d3bac.37b8d4",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 82.51040649414062,
-        "y": 78.65625,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 159.99996948242188,
+        "y": 58.65625286102295,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "819d7966.4e53d8"
+                "9719444.b72f1b8"
             ]
         ]
     },
     {
-        "id": "57d3d9c.2e0d328",
+        "id": "1de1e583.8fb7fa",
         "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.patchNRCellRelation`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.config-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{idNearRTRIC}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.nearRTRICId`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 2578.3551712036133,
-        "y": 1002.2327814102173,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2655.8447341918945,
+        "y": 982.2327842712402,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "44d3f36e.4e5edc",
+        "id": "dc0a8329.30e8",
         "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": 2512.0211067199707,
-        "y": 1200.454993724823,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2589.510669708252,
+        "y": 1180.454996585846,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "58f14033.666ac",
+        "id": "387cb9f3.f70276",
         "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": 2547.021194458008,
-        "y": 1301.455020904541,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2624.510757446289,
+        "y": 1281.455023765564,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "fceb428.c8443c",
-                "407e4c2f.42a8f4"
+                "824122cc.ec932",
+                "6c82f7ae.11e058"
             ]
         ]
     },
     {
-        "id": "fceb428.c8443c",
+        "id": "824122cc.ec932",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2918.0210666656494,
-        "y": 1175.444447517395,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2995.5106296539307,
+        "y": 1155.444450378418,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "c454f3e3.bd2bf"
+                "7f135f2b.5e4e"
             ]
         ]
     },
     {
-        "id": "407e4c2f.42a8f4",
+        "id": "6c82f7ae.11e058",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2920.021011352539,
-        "y": 1239.444278717041,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2997.5105743408203,
+        "y": 1219.444281578064,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "330ddc53.338d34"
+                "c824fb0e.366fb8"
             ]
         ]
     },
     {
-        "id": "2492fcd7.1fb324",
+        "id": "2259619a.132d9e",
         "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": 3251.0208053588867,
-        "y": 1235.4443664550781,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3328.510368347168,
+        "y": 1215.444369316101,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "330ddc53.338d34",
+        "id": "c824fb0e.366fb8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3087.020854949951,
-        "y": 1238.4443607330322,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3164.5104179382324,
+        "y": 1218.4443635940552,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "2492fcd7.1fb324"
+                "2259619a.132d9e"
             ]
         ]
     },
     {
-        "id": "c454f3e3.bd2bf",
+        "id": "7f135f2b.5e4e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3077.020929336548,
-        "y": 1184.4444332122803,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3154.510492324829,
+        "y": 1164.4444360733032,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "ab38ccb9.17f85"
+                "8001866e.ecf208"
             ]
         ]
     },
     {
-        "id": "ab38ccb9.17f85",
+        "id": "8001866e.ecf208",
         "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": 3253.0206928253174,
-        "y": 1169.4444065093994,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3330.5102558135986,
+        "y": 1149.4444093704224,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "468b7854.8855a8",
+        "id": "ec9be427.25e9a8",
         "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": 2571.6878662109375,
-        "y": 1248.454933166504,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2649.1774291992188,
+        "y": 1228.4549360275269,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "10854dfb.5c9a62",
-                "2be3a2fc.af94fe"
+                "5cc21c61.53ce94",
+                "8abf7676.42ec98"
             ]
         ]
     },
     {
-        "id": "10854dfb.5c9a62",
+        "id": "5cc21c61.53ce94",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2923.0211791992188,
-        "y": 1060.1109132766724,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3000.5107421875,
+        "y": 1040.1109161376953,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "748ad58c.536bec"
+                "9fc3eccd.d50ad"
             ]
         ]
     },
     {
-        "id": "2be3a2fc.af94fe",
+        "id": "8abf7676.42ec98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2910.0210723876953,
-        "y": 1124.1110610961914,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2987.5106353759766,
+        "y": 1104.1110639572144,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "8a001b63.43d398"
+                "34e2f3c6.0b029c"
             ]
         ]
     },
     {
-        "id": "8a001b63.43d398",
+        "id": "34e2f3c6.0b029c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3053.0208683013916,
-        "y": 1121.1109766960144,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3130.510431289673,
+        "y": 1101.1109795570374,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "3b696d35.d99f82"
+                "cd9b04e7.c021d8"
             ]
         ]
     },
     {
-        "id": "3b696d35.d99f82",
+        "id": "cd9b04e7.c021d8",
         "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.attributes.nRTCI`\"/>\n<parameter name=\"field3\" value=\"`$oofpci-neighbor-response.attributes.isHOAllowed`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 3214.0207843780518,
-        "y": 1115.111247062683,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3291.510347366333,
+        "y": 1095.111249923706,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "748ad58c.536bec",
+        "id": "9fc3eccd.d50ad",
         "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": 3122.0210723876953,
-        "y": 1050.1109409332275,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3199.5106353759766,
+        "y": 1030.1109437942505,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "752eee76.25b35",
+        "id": "a97fcdf6.a499d",
         "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": 2553.021194458008,
-        "y": 1355.6770725250244,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2630.510757446289,
+        "y": 1335.6770753860474,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "7fe560fd.02d23",
-                "ed1931cf.b85b4"
+                "fac5fb98.f8bda8",
+                "c868ebf.6c9bd18"
             ]
         ]
     },
     {
-        "id": "7fe560fd.02d23",
+        "id": "fac5fb98.f8bda8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2948.0211181640625,
-        "y": 1286.9997692108154,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3025.5106811523438,
+        "y": 1266.9997720718384,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "204d349b.8c167c"
+                "29b41d9b.c7aa62"
             ]
         ]
     },
     {
-        "id": "ed1931cf.b85b4",
+        "id": "c868ebf.6c9bd18",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2941.021011352539,
-        "y": 1338.9999656677246,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3018.5105743408203,
+        "y": 1318.9999685287476,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "80020226.7c32a"
+                "e84a4e3c.2a362"
             ]
         ]
     },
     {
-        "id": "80020226.7c32a",
+        "id": "e84a4e3c.2a362",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3110.0207710266113,
-        "y": 1345.9999046325684,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3187.5103340148926,
+        "y": 1325.9999074935913,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "78e48fb1.deedb"
+                "7d034b7a.7ded04"
             ]
         ]
     },
     {
-        "id": "204d349b.8c167c",
+        "id": "29b41d9b.c7aa62",
         "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": 3121.0210723876953,
-        "y": 1283.9997968673706,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3198.5106353759766,
+        "y": 1263.9997997283936,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "78e48fb1.deedb",
+        "id": "7d034b7a.7ded04",
         "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.attributes.nRTCI`\"/>\n<parameter name=\"field3\" value=\"`$oofpci-neighbor-response.attributes.isHOAllowed`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 3257.0208053588867,
-        "y": 1344.0001211166382,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3334.510368347168,
+        "y": 1324.0001239776611,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "4c74462a.6f2e48",
+        "id": "f929eb5b.440608",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 971.5107345581055,
-        "y": 1316.6667013168335,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1049.0002975463867,
+        "y": 1296.6667041778564,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "dfe1cac7.b0a0c8",
-                "ff99ef1.36e851",
-                "567107e4.113ae8",
-                "1abc8087.4dadff",
-                "792e7b5a.a61a04",
-                "3504d0f4.5ddf1",
-                "b1cab950.390f88",
-                "a83b1f0f.66683",
-                "95fb7dbc.302e3",
-                "2e0329eb.7cfeb6",
-                "8750c827.149de8",
-                "2f355bcb.3566f4",
-                "1f8cb6f9.f168b9",
-                "edde733c.b2ac9"
+                "d03e1f91.9c56d",
+                "a5ced40f.c5ed98",
+                "200057ef.f758b8",
+                "c6cfba86.3c2758",
+                "1535bf80.d7eaa1",
+                "3d1c31b8.6a42de",
+                "5731ee67.20bdf",
+                "72454488.439cfc",
+                "fa7a1ecf.9d12a",
+                "67a527dc.0e62f8",
+                "112b836f.c3a6fd",
+                "c1718eaa.0441e",
+                "b411ee0f.38431",
+                "1bc42ca7.cbfc53"
             ]
         ]
     },
     {
-        "id": "f05d9389.aa23",
+        "id": "e1a1b2cb.34ffd",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$generic-neighbor-configuration-input.lte-cell-number-of-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 881.5107002258301,
-        "y": 908.656328201294,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 959.0002632141113,
+        "y": 888.6563310623169,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "4c74462a.6f2e48"
+                "f929eb5b.440608"
             ]
         ]
     },
     {
-        "id": "dfe1cac7.b0a0c8",
+        "id": "d03e1f91.9c56d",
         "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": 1298.1787033081055,
-        "y": 952.2120819091797,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1375.6682662963867,
+        "y": 932.2120847702026,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "a83b1f0f.66683",
+        "id": "72454488.439cfc",
         "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.patchNRCellRelation.ransim-mounted`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.config-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{idNearRTRIC}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.nearRTRICId`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1284.0216979980469,
-        "y": 1174.2226285934448,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1361.5112609863281,
+        "y": 1154.2226314544678,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "ff99ef1.36e851",
+        "id": "a5ced40f.c5ed98",
         "type": "execute",
         "name": "populate idNRCellCU",
         "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=\"{idNRCellCU}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.idNRCellCU`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1259.0214157104492,
-        "y": 1289.4447593688965,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1336.5109786987305,
+        "y": 1269.4447622299194,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "567107e4.113ae8",
+        "id": "200057ef.f758b8",
         "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": 1210.021327972412,
-        "y": 1392.5876898765564,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1287.5108909606934,
+        "y": 1372.5876927375793,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "1abc8087.4dadff",
+        "id": "c6cfba86.3c2758",
         "type": "execute",
         "name": "populate idNRCellRelation",
         "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=\"{idNRCellRelation}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.idNRCellRelation`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1247.0212326049805,
-        "y": 1340.444679260254,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1324.5107955932617,
+        "y": 1320.4446821212769,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "3504d0f4.5ddf1",
+        "id": "3d1c31b8.6a42de",
         "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": 1271.021245956421,
-        "y": 1498.4445362091064,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1348.5108089447021,
+        "y": 1478.4445390701294,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "38f6302f.63f8e",
-                "6c5aecc3.e3bae4"
+                "68f4d126.e55b1",
+                "b2bb07ce.f4e058"
             ]
         ]
     },
     {
-        "id": "38f6302f.63f8e",
+        "id": "68f4d126.e55b1",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1566.0211334228516,
-        "y": 1505.4339895248413,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1643.5106964111328,
+        "y": 1485.4339923858643,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "21f9c0d0.b3e61"
+                "b9ec00d4.b538e"
             ]
         ]
     },
     {
-        "id": "6c5aecc3.e3bae4",
+        "id": "b2bb07ce.f4e058",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1584.0211753845215,
-        "y": 1573.4338159561157,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1661.5107383728027,
+        "y": 1553.4338188171387,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "2b727255.684e4e"
+                "d7cf72c2.e9805"
             ]
         ]
     },
     {
-        "id": "6d617e74.2db02",
+        "id": "41489bd.b250264",
         "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": 1922.0209274291992,
-        "y": 1560.4339241981506,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1999.5104904174805,
+        "y": 1540.4339270591736,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "2b727255.684e4e",
+        "id": "d7cf72c2.e9805",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1764.020839691162,
-        "y": 1571.4338970184326,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1841.5104026794434,
+        "y": 1551.4338998794556,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "6d617e74.2db02"
+                "41489bd.b250264"
             ]
         ]
     },
     {
-        "id": "21f9c0d0.b3e61",
+        "id": "b9ec00d4.b538e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1725.02099609375,
-        "y": 1514.4339752197266,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1802.5105590820312,
+        "y": 1494.4339780807495,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "f5d875fe.b1abd8"
+                "132f7afb.055025"
             ]
         ]
     },
     {
-        "id": "f5d875fe.b1abd8",
+        "id": "132f7afb.055025",
         "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": 1901.0207595825195,
-        "y": 1499.4339485168457,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1978.5103225708008,
+        "y": 1479.4339513778687,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "792e7b5a.a61a04",
+        "id": "1535bf80.d7eaa1",
         "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": 1299.0212097167969,
-        "y": 1445.44455909729,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1376.5107727050781,
+        "y": 1425.444561958313,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "540211b2.94b0d",
-                "801a995a.edafc8"
+                "ffb3bdf3.53433",
+                "65b8d71f.1788f8"
             ]
         ]
     },
     {
-        "id": "540211b2.94b0d",
+        "id": "ffb3bdf3.53433",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1554.0212860107422,
-        "y": 1386.1004600524902,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1631.5108489990234,
+        "y": 1366.1004629135132,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "3c1c75d7.8974ba"
+                "b8b2890a.64acb8"
             ]
         ]
     },
     {
-        "id": "801a995a.edafc8",
+        "id": "65b8d71f.1788f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1549.0211181640625,
-        "y": 1442.1006135940552,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1626.5106811523438,
+        "y": 1422.1006164550781,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "fd5d7c52.8ddfa"
+                "e1049af6.3e7568"
             ]
         ]
     },
     {
-        "id": "fd5d7c52.8ddfa",
+        "id": "e1049af6.3e7568",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1701.0209350585938,
-        "y": 1451.1005187034607,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1778.510498046875,
+        "y": 1431.1005215644836,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "2a23aaaf.9ebec6"
+                "dcb8a2b0.2ca1d"
             ]
         ]
     },
     {
-        "id": "2a23aaaf.9ebec6",
+        "id": "dcb8a2b0.2ca1d",
         "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.attributes.nRTCI`\"/>\n<parameter name=\"field3\" value=\"`$oofpci-neighbor-response.attributes.isHOAllowed`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1862.020887851715,
-        "y": 1445.1008157730103,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1939.5104508399963,
+        "y": 1425.1008186340332,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "3c1c75d7.8974ba",
+        "id": "b8b2890a.64acb8",
         "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": 1755.0210762023926,
-        "y": 1392.100468635559,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1832.5106391906738,
+        "y": 1372.100471496582,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "b1cab950.390f88",
+        "id": "5731ee67.20bdf",
         "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": 1237.0211849212646,
-        "y": 1612.333330154419,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1314.510747909546,
+        "y": 1592.333333015442,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "29106f4a.64b9b",
-                "697dc7e3.e53d38"
+                "791b1b2d.b6fc04",
+                "83ecad5c.08b18"
             ]
         ]
     },
     {
-        "id": "29106f4a.64b9b",
+        "id": "791b1b2d.b6fc04",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1594.0212860107422,
-        "y": 1623.989315032959,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1671.5108489990234,
+        "y": 1603.989317893982,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "e1372b.75c588d8"
+                "5765dd3c.e9a584"
             ]
         ]
     },
     {
-        "id": "697dc7e3.e53d38",
+        "id": "83ecad5c.08b18",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1589.0211181640625,
-        "y": 1679.989468574524,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1666.5106811523438,
+        "y": 1659.9894714355469,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "fca7e979.981c08"
+                "4aa99161.720b"
             ]
         ]
     },
     {
-        "id": "fca7e979.981c08",
+        "id": "4aa99161.720b",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1741.0209350585938,
-        "y": 1688.9893736839294,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1818.510498046875,
+        "y": 1668.9893765449524,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "e95b282a.51b588"
+                "840d8d33.ff91a"
             ]
         ]
     },
     {
-        "id": "e1372b.75c588d8",
+        "id": "5765dd3c.e9a584",
         "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": 1795.0210762023926,
-        "y": 1629.9893236160278,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1872.5106391906738,
+        "y": 1609.9893264770508,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "e95b282a.51b588",
+        "id": "840d8d33.ff91a",
         "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.attributes.nRTCI`\"/>\n<parameter name=\"field3\" value=\"`$oofpci-neighbor-response.attributes.isHOAllowed`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1902.0208435058594,
-        "y": 1681.9896183013916,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1979.5104064941406,
+        "y": 1661.9896211624146,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "e15c6c11.eab37",
+        "id": "836164a0.8f5908",
         "type": "outcome",
         "name": "Not Mounted",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1172.5105209350586,
-        "y": 819.6667823791504,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1250.0000839233398,
+        "y": 799.6667852401733,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "2424729e.e49bce"
+                "d893d229.1e59d"
             ]
         ]
     },
     {
-        "id": "1f32c22f.4bd18e",
+        "id": "655b71f9.458d1",
         "type": "switchNode",
         "name": "switch mounted",
         "xml": "<switch test='`$prop.ransim-mounted`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 455.51043701171875,
-        "y": 843.6667327880859,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 533,
+        "y": 823.6667356491089,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "e15c6c11.eab37",
-                "572a8f53.31922"
+                "836164a0.8f5908",
+                "f8eae7b7.829e38"
             ]
         ]
     },
     {
-        "id": "572a8f53.31922",
+        "id": "f8eae7b7.829e38",
         "type": "outcome",
         "name": "Mounted",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 678.510440826416,
-        "y": 883.6667442321777,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 756.0000038146973,
+        "y": 863.6667470932007,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "f05d9389.aa23"
+                "e1a1b2cb.34ffd"
             ]
         ]
     },
     {
-        "id": "95fb7dbc.302e3",
+        "id": "fa7a1ecf.9d12a",
         "type": "execute",
         "name": "populate idGNBCUCPFunction",
         "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=\"{idGNBCUCPFunction}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.idGNBCUCPFunction`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1281.5108795166016,
-        "y": 1254.6669673919678,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1359.0004425048828,
+        "y": 1234.6669702529907,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "158a1faf.a18df",
+        "id": "52143aa1.b77114",
         "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": 921.520866394043,
-        "y": 2665.121678367257,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 999.0104293823242,
+        "y": 2645.12168122828,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "14c5f32a.54dc0d",
-                "822b4365.b6357"
+                "e440e098.78e0c",
+                "7053a05.65d0d6"
             ]
         ]
     },
     {
-        "id": "14c5f32a.54dc0d",
+        "id": "e440e098.78e0c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1195.520866394043,
-        "y": 2634.121678367257,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1273.0104293823242,
+        "y": 2614.12168122828,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "7bdc60e.dc968a"
+                "576ec5c3.1d1b0c"
             ]
         ]
     },
     {
-        "id": "7bdc60e.dc968a",
+        "id": "576ec5c3.1d1b0c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1386.520866394043,
-        "y": 2637.121678367257,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1464.0104293823242,
+        "y": 2617.12168122828,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "840a192f.604148"
+                "8466c66f.0d0e98"
             ]
         ]
     },
     {
-        "id": "840a192f.604148",
+        "id": "8466c66f.0d0e98",
         "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": 1554.520866394043,
-        "y": 2638.121678367257,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1632.0104293823242,
+        "y": 2618.12168122828,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "8bb32410.7dc268",
+        "id": "a73a0ee8.bd8fb",
         "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": 894.020866394043,
-        "y": 2781.121678367257,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 971.5104293823242,
+        "y": 2761.12168122828,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "404aa1a2.5b57",
-                "a2cdb02b.0dff3"
+                "afa088b0.5ed568",
+                "505337c.4e27cc8"
             ]
         ]
     },
     {
-        "id": "824b311c.61cc8",
+        "id": "4c7ec6de.f7c0e8",
         "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": 883.520866394043,
-        "y": 2863.121678367257,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 961.0104293823242,
+        "y": 2843.12168122828,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "944b733b.d27a6",
-                "99c0e62b.b388a8"
+                "367fbfbb.3f84b",
+                "85f2cc20.ba3c"
             ]
         ]
     },
     {
-        "id": "944b733b.d27a6",
+        "id": "367fbfbb.3f84b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1066.020866394043,
-        "y": 2871.121678367257,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1143.5104293823242,
+        "y": 2851.12168122828,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "8a494f39.07c32"
+                "65dff440.5780ac"
             ]
         ]
     },
     {
-        "id": "8a494f39.07c32",
+        "id": "65dff440.5780ac",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1251.020866394043,
-        "y": 2869.121678367257,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1328.5104293823242,
+        "y": 2849.12168122828,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "1ace760a.7dbbda"
+                "92783d84.1e475"
             ]
         ]
     },
     {
-        "id": "1ace760a.7dbbda",
+        "id": "92783d84.1e475",
         "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": 1453.020866394043,
-        "y": 2864.121678367257,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1530.5104293823242,
+        "y": 2844.12168122828,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "404aa1a2.5b57",
+        "id": "afa088b0.5ed568",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1087.520866394043,
-        "y": 2749.121678367257,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1165.0104293823242,
+        "y": 2729.12168122828,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "8e0a05a9.8ff498"
+                "568762d7.690adc"
             ]
         ]
     },
     {
-        "id": "8e0a05a9.8ff498",
+        "id": "568762d7.690adc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1262.520866394043,
-        "y": 2763.121678367257,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1340.0104293823242,
+        "y": 2743.12168122828,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "bebd6ee2.3c9e6"
+                "53b43155.d39b3"
             ]
         ]
     },
     {
-        "id": "bebd6ee2.3c9e6",
+        "id": "53b43155.d39b3",
         "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": 1456.5209045410156,
-        "y": 2768.1217303425074,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1534.0104675292969,
+        "y": 2748.1217332035303,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "822b4365.b6357",
+        "id": "7053a05.65d0d6",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1194.520866394043,
-        "y": 2691.121678367257,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1272.0104293823242,
+        "y": 2671.12168122828,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "cec53de4.d756d"
+                "2c1648f2.22bda8"
             ]
         ]
     },
     {
-        "id": "cec53de4.d756d",
+        "id": "2c1648f2.22bda8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1363.5207443237305,
-        "y": 2697.121678367257,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1441.0103073120117,
+        "y": 2677.12168122828,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "7950b06c.0480a"
+                "94bab17f.bef16"
             ]
         ]
     },
     {
-        "id": "7950b06c.0480a",
+        "id": "94bab17f.bef16",
         "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 Generic neighbor  configuration\" />",
         "comments": "",
-        "x": 1519.5205001831055,
-        "y": 2696.121678367257,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1597.0100631713867,
+        "y": 2676.12168122828,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "a2cdb02b.0dff3",
+        "id": "505337c.4e27cc8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1108.520866394043,
-        "y": 2820.121678367257,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1186.0104293823242,
+        "y": 2800.12168122828,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "9c133c8f.808f1"
+                "d8b65a92.3a6a38"
             ]
         ]
     },
     {
-        "id": "9c133c8f.808f1",
+        "id": "d8b65a92.3a6a38",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1276.5207443237305,
-        "y": 2815.121678367257,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1354.0103073120117,
+        "y": 2795.12168122828,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "1075385e.46e228"
+                "4d64cb22.623374"
             ]
         ]
     },
     {
-        "id": "1075385e.46e228",
+        "id": "4d64cb22.623374",
         "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 Generic neighbor  configuration\" />",
         "comments": "",
-        "x": 1434.5204391479492,
-        "y": 2818.121678367257,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1512.0100021362305,
+        "y": 2798.12168122828,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "99c0e62b.b388a8",
+        "id": "85f2cc20.ba3c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1063.5209121704102,
-        "y": 2954.1218099594116,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1141.0104751586914,
+        "y": 2934.1218128204346,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "54cbffb2.b0ea"
+                "6c51fb4a.22de44"
             ]
         ]
     },
     {
-        "id": "54cbffb2.b0ea",
+        "id": "6c51fb4a.22de44",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1239.5207901000977,
-        "y": 2955.1218099594116,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1317.010353088379,
+        "y": 2935.1218128204346,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "f7613a42.82e6d8"
+                "46221b5f.bc8fd4"
             ]
         ]
     },
     {
-        "id": "f7613a42.82e6d8",
+        "id": "46221b5f.bc8fd4",
         "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 Generic neighbor configuration\" />",
         "comments": "",
-        "x": 1386.5204849243164,
-        "y": 2958.1218099594116,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1464.0100479125977,
+        "y": 2938.1218128204346,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "92654a64.0d57a8",
+        "id": "b025f934.fbf218",
         "type": "block",
         "name": "DMAAP Payload Generation",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 625.520881652832,
-        "y": 2783.1217765957117,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 703.0104446411133,
+        "y": 2763.1217794567347,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "158a1faf.a18df",
-                "8bb32410.7dc268",
-                "824b311c.61cc8"
+                "52143aa1.b77114",
+                "a73a0ee8.bd8fb",
+                "4c7ec6de.f7c0e8"
             ]
         ]
     },
     {
-        "id": "530ff06c.c455e",
+        "id": "3103a38e.d771ec",
         "type": "block",
         "name": "DMAAP Reponse Publish",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 482.5208969116211,
-        "y": 3166.010600090027,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 560.0104598999023,
+        "y": 3146.01060295105,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "cc493306.8c459",
-                "1c6aa3ba.e4877c",
-                "e342a902.c1abe8",
-                "44e3cf80.cc129"
+                "2a4f46db.7ddf0a",
+                "7618d1ef.077ec",
+                "c3ee7dcf.f6392",
+                "ebff5a7d.3ae608"
             ]
         ]
     },
     {
-        "id": "1c6aa3ba.e4877c",
+        "id": "7618d1ef.077ec",
         "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": 755.5209732055664,
-        "y": 3562.12189245224,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 833.0105361938477,
+        "y": 3542.121895313263,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "41360722.eac968",
-                "a6d1a857.b6e408"
+                "78df8849.978328",
+                "b04a81c6.04818"
             ]
         ]
     },
     {
-        "id": "cc493306.8c459",
+        "id": "2a4f46db.7ddf0a",
         "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": 723.1876983642578,
-        "y": 2977.121861934662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 800.6772613525391,
+        "y": 2957.121864795685,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "41360722.eac968",
+        "id": "78df8849.978328",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 930.0209503173828,
-        "y": 3496.038609981537,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1007.5105133056641,
+        "y": 3476.03861284256,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "60a9270f.3d4e18"
+                "cfb0100e.7b4bb"
             ]
         ]
     },
     {
-        "id": "a6d1a857.b6e408",
+        "id": "b04a81c6.04818",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 953.0208053588867,
-        "y": 3625.0387167930603,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1030.510368347168,
+        "y": 3605.0387196540833,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "ead59e1e.36a5"
+                "2aea7185.58dc4e"
             ]
         ]
     },
     {
-        "id": "60a9270f.3d4e18",
+        "id": "cfb0100e.7b4bb",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1111.0207214355469,
-        "y": 3499.038739681244,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1188.5102844238281,
+        "y": 3479.038742542267,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "856c7686.a3c978"
+                "271bf6b2.9b956a"
             ]
         ]
     },
     {
-        "id": "856c7686.a3c978",
+        "id": "271bf6b2.9b956a",
         "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": 1285.0204391479492,
-        "y": 3506.03866481781,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1362.5100021362305,
+        "y": 3486.038667678833,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "ead59e1e.36a5",
+        "id": "2aea7185.58dc4e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1113.020450592041,
-        "y": 3617.038689136505,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1190.5100135803223,
+        "y": 3597.038691997528,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "2c555488.acc29c"
+                "f884c5ea.f20388"
             ]
         ]
     },
     {
-        "id": "2c555488.acc29c",
+        "id": "f884c5ea.f20388",
         "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": 1290.0205688476562,
-        "y": 3622.038797855377,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1367.5101318359375,
+        "y": 3602.0388007164,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "66f18141.7b5fa",
+        "id": "7ee07b59.9e6bf4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2625.5211181640625,
-        "y": 1623.0104141235352,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2703.0106811523438,
+        "y": 1603.010416984558,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "32d140f1.b88fb",
-                "637b306f.543c5",
-                "d465c10b.caccf",
-                "6e14e0da.0bdb5"
+                "333a376b.8a5ba8",
+                "7c603463.f85d2c",
+                "e325883.c2c6178",
+                "e93b8bb1.624708"
             ]
         ]
     },
     {
-        "id": "32d140f1.b88fb",
+        "id": "333a376b.8a5ba8",
         "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": 2907.521041870117,
-        "y": 1476.0104608535767,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2985.0106048583984,
+        "y": 1456.0104637145996,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "637b306f.543c5",
+        "id": "7c603463.f85d2c",
         "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": 2916.5211334228516,
-        "y": 1589.0104570388794,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2994.010696411133,
+        "y": 1569.0104598999023,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "d465c10b.caccf",
+        "id": "e325883.c2c6178",
         "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": 2883.5211181640625,
-        "y": 1694.0104141235352,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2961.0106811523438,
+        "y": 1674.010416984558,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "69a167be.15f958",
-                "22e6933f.21f04c"
+                "3ba68e94.ae1022",
+                "b05dcf0b.e1a9e"
             ]
         ]
     },
     {
-        "id": "69a167be.15f958",
+        "id": "3ba68e94.ae1022",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3098.5211181640625,
-        "y": 1637.0104141235352,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3176.0106811523438,
+        "y": 1617.010416984558,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "e88caf47.ae702"
+                "210e3756.c957f8"
             ]
         ]
     },
     {
-        "id": "22e6933f.21f04c",
+        "id": "b05dcf0b.e1a9e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3118.5212478637695,
-        "y": 1733.0102767944336,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3196.010810852051,
+        "y": 1713.0102796554565,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "d16cc436.3bcdb8"
+                "69eb930.9374e6c"
             ]
         ]
     },
     {
-        "id": "e88caf47.ae702",
+        "id": "210e3756.c957f8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3267.52099609375,
-        "y": 1648.0104141235352,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3345.0105590820312,
+        "y": 1628.010416984558,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "888ea163.551f"
+                "79bb5cbc.ddc6b4"
             ]
         ]
     },
     {
-        "id": "d16cc436.3bcdb8",
+        "id": "69eb930.9374e6c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3280.5210037231445,
-        "y": 1734.010398864746,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3358.010566711426,
+        "y": 1714.010401725769,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "bd20f7c9.c85b98"
+                "3d553e85.a473f2"
             ]
         ]
     },
     {
-        "id": "888ea163.551f",
+        "id": "79bb5cbc.ddc6b4",
         "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": 3421.5206909179688,
-        "y": 1641.0104141235352,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3499.01025390625,
+        "y": 1621.010416984558,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "bd20f7c9.c85b98",
+        "id": "3d553e85.a473f2",
         "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": 3435.5212020874023,
-        "y": 1731.010407447815,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3513.0107650756836,
+        "y": 1711.010410308838,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "4acfeeff.78756",
+        "id": "5e95d235.988f0c",
         "type": "switchNode",
         "name": "switch configdb deployed",
         "xml": "<switch test='`$prop.configdb-deployed`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2508.5211334228516,
-        "y": 1417.0104351043701,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2586.010696411133,
+        "y": 1397.010437965393,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "4867f77f.c8c358",
-                "8b55e7b1.9c1f78"
+                "6f0b801a.27af3",
+                "25cfc748.d94fc8"
             ]
         ]
     },
     {
-        "id": "4867f77f.c8c358",
+        "id": "6f0b801a.27af3",
         "type": "outcome",
         "name": "Deployed",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2550.5211181640625,
-        "y": 1547.0104141235352,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2628.0106811523438,
+        "y": 1527.010416984558,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "66f18141.7b5fa"
+                "7ee07b59.9e6bf4"
             ]
         ]
     },
     {
-        "id": "6e14e0da.0bdb5",
+        "id": "e93b8bb1.624708",
         "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": 2975.5210723876953,
-        "y": 1528.12162733078,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3053.0106353759766,
+        "y": 1508.121630191803,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "8b55e7b1.9c1f78",
+        "id": "25cfc748.d94fc8",
         "type": "outcome",
         "name": "Not Deployed",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2915.52108001709,
-        "y": 1407.3435878753662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2993.010643005371,
+        "y": 1387.3435907363892,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "fa469169.21411"
+                "8a4f7193.b86bf"
             ]
         ]
     },
     {
-        "id": "5a9987d8.e2c4e8",
+        "id": "2e5bd9d.2048726",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1199.5212936401367,
-        "y": 2281.2328329086304,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1277.010856628418,
+        "y": 2261.2328357696533,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "11bccb81.cfc964",
-                "c7e9af19.d1a3f",
-                "81297356.87779",
-                "9e49d63a.a0f698"
+                "f9a355bd.18d688",
+                "9acfbe6.cb2fb4",
+                "21d304e2.82fa0c",
+                "d2241176.acb26"
             ]
         ]
     },
     {
-        "id": "11bccb81.cfc964",
+        "id": "f9a355bd.18d688",
         "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": 1566.521240234375,
-        "y": 2222.2328810691833,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1644.0108032226562,
+        "y": 2202.2328839302063,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "c7e9af19.d1a3f",
+        "id": "9acfbe6.cb2fb4",
         "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": 1497.5213012695312,
-        "y": 2432.232874393463,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1575.0108642578125,
+        "y": 2412.232877254486,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "4119df2f.58877",
-                "dc98917.65ab07"
+                "9d654cdb.37cfb",
+                "1cdd3f11.0ca791"
             ]
         ]
     },
     {
-        "id": "4119df2f.58877",
+        "id": "9d654cdb.37cfb",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1712.5213012695312,
-        "y": 2375.232874393463,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1790.0108642578125,
+        "y": 2355.232877254486,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "f2acbf7d.06f19"
+                "b793486c.9f63a8"
             ]
         ]
     },
     {
-        "id": "dc98917.65ab07",
+        "id": "1cdd3f11.0ca791",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1712.5211791992188,
-        "y": 2471.2327523231506,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1790.0107421875,
+        "y": 2451.2327551841736,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "d974524c.48c3"
+                "f10cf49.aecaa08"
             ]
         ]
     },
     {
-        "id": "f2acbf7d.06f19",
+        "id": "b793486c.9f63a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1881.5211791992188,
-        "y": 2386.232874393463,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1959.0107421875,
+        "y": 2366.232877254486,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "66c19c9a.cc0744"
+                "46e50dfd.86c824"
             ]
         ]
     },
     {
-        "id": "d974524c.48c3",
+        "id": "f10cf49.aecaa08",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1874.5209350585938,
-        "y": 2472.232874393463,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1952.010498046875,
+        "y": 2452.232877254486,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "bd975804.87fac8"
+                "ccfb6b0a.501f38"
             ]
         ]
     },
     {
-        "id": "66c19c9a.cc0744",
+        "id": "46e50dfd.86c824",
         "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": 2035.5208740234375,
-        "y": 2379.232874393463,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2113.0104370117188,
+        "y": 2359.232877254486,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "bd975804.87fac8",
+        "id": "ccfb6b0a.501f38",
         "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": 2029.5211334228516,
-        "y": 2469.232882976532,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2107.010696411133,
+        "y": 2449.232885837555,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "2e0329eb.7cfeb6",
+        "id": "67a527dc.0e62f8",
         "type": "switchNode",
         "name": "switch configdb deployed",
         "xml": "<switch test='`$prop.configdb-deployed`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1090.521499633789,
-        "y": 1734.2327632904053,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1168.0110626220703,
+        "y": 1714.2327661514282,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "42e1f30.701fe0c",
-                "c87f7605.35c438"
+                "36a46d3c.be4442",
+                "5e248492.325e0c"
             ]
         ]
     },
     {
-        "id": "42e1f30.701fe0c",
+        "id": "36a46d3c.be4442",
         "type": "outcome",
         "name": "Deployed",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 929.521297454834,
-        "y": 2124.232828140259,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1007.0108604431152,
+        "y": 2104.2328310012817,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "5a9987d8.e2c4e8"
+                "2e5bd9d.2048726"
             ]
         ]
     },
     {
-        "id": "81297356.87779",
+        "id": "21d304e2.82fa0c",
         "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": 1617.521240234375,
-        "y": 2275.344157218933,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1695.0108032226562,
+        "y": 2255.344160079956,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "4b29419d.11b54",
+        "id": "373fca41.5a1086",
         "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=\"CPS is Deployed, ConfigDB Skipped\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1529.5212059020996,
-        "y": 1774.4547634124756,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1607.0107688903809,
+        "y": 1754.4547662734985,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "c87f7605.35c438",
+        "id": "5e248492.325e0c",
         "type": "outcome",
         "name": "Not Deployed",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1406.5211715698242,
-        "y": 1719.5660467147827,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1484.0107345581055,
+        "y": 1699.5660495758057,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "fb5aba08.620b18"
+                "ae070250.5fb89"
             ]
         ]
     },
     {
-        "id": "9e49d63a.a0f698",
+        "id": "d2241176.acb26",
         "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": 1563.0767974853516,
-        "y": 2332.0105538368225,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1640.5663604736328,
+        "y": 2312.0105566978455,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "5b9b0a8.18bd8f4",
+        "id": "2816cf49.04226",
         "type": "set",
         "name": "set properties for DMAAP header",
         "xml": "<set>\n<parameter name=\"prop.oofpcipoc-dmaap-config-resp.timestamp\" value=\"`$generic-neighbor-configuration-input.timeStamp`\"/>\n<parameter name=\"prop.oofpcipoc-dmaap-config-resp.requestID\" value=\"`$generic-neighbor-configuration-input.requestID`\"/>\n<parameter name=\"prop.oofpcipoc-dmaap-config-resp.subrequestID\" value=\"`$generic-neighbor-configuration-input.subRequestID`\"/>",
         "comments": "",
-        "x": 456.5104217529297,
-        "y": 309.6666774749756,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 533.9999847412109,
+        "y": 289.66668033599854,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "67a95ff9.4b3fd",
+        "id": "16823f81.eb375",
         "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 Message Header stored in properties file \"/>\n<parameter name=\"field2\" value=\"`$prop.oofpcipoc-dmaap-config-resp.timestamp`\"/>\n<parameter name=\"field3\" value=\"`$prop.oofpcipoc-dmaap-config-resp.requestID`\"/>\n<parameter name=\"field4\" value=\"`$prop.oofpcipoc-dmaap-config-resp.subrequestID`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 374.5104217529297,
-        "y": 356.6666793823242,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 451.99998474121094,
+        "y": 336.66668224334717,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "e342a902.c1abe8",
+        "id": "c3ee7dcf.f6392",
         "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=\"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<parameter name=\"field5\" value=\"Before DMAAP Event - Timestamp, RequestID, subRequestID\"/>\n<parameter name=\"field6\" value=\"`$prop.oofpcipoc-dmaap-config-resp.timestamp`\"/>\n<parameter name=\"field7\" value=\"`$prop.oofpcipoc-dmaap-config-resp.requestID`\"/>\n<parameter name=\"field8\" value=\"`$prop.oofpcipoc-dmaap-config-resp.subrequestID`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 750.5104522705078,
-        "y": 3461.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 828.0000152587891,
+        "y": 3441.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "44e3cf80.cc129",
+        "id": "ebff5a7d.3ae608",
         "type": "block",
         "name": "Remove escape chars",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 862.5104522705078,
-        "y": 3168.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 940.0000152587891,
+        "y": 3148.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "a122d00d.66a7c",
-                "53d8b063.65e82",
-                "6550ccad.313694"
+                "e0e39992.047088",
+                "ed36b701.cd7678",
+                "7b42709a.d2c18"
             ]
         ]
     },
     {
-        "id": "a122d00d.66a7c",
+        "id": "e0e39992.047088",
         "type": "execute",
         "name": "Timestamp",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$prop.oofpcipoc-dmaap-config-resp.timestamp`\"/>\n    <parameter name=\"outputPath\" value=\"prop.oofpcipoc-dmaap-config-resp.timestamp\"/>\n    <parameter name=\"target\" value='\"'/>\n    <parameter name=\"replacement\" value=''/>",
         "comments": "",
         "outputs": 1,
-        "x": 1071.5104522705078,
-        "y": 3043.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1149.000015258789,
+        "y": 3023.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "c64e3847.585bc8",
-                "62a2cce9.0684d4"
+                "be777b6b.1902e8",
+                "3b769001.8c875"
             ]
         ]
     },
     {
-        "id": "c64e3847.585bc8",
+        "id": "be777b6b.1902e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1254.0104522705078,
-        "y": 3051.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1331.500015258789,
+        "y": 3031.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "9f7c9ff0.810bd"
+                "6ed29261.1ded5c"
             ]
         ]
     },
     {
-        "id": "9f7c9ff0.810bd",
+        "id": "6ed29261.1ded5c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1439.0104522705078,
-        "y": 3049.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1516.500015258789,
+        "y": 3029.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "89eacba2.269688"
+                "55c7e10b.6ef8b"
             ]
         ]
     },
     {
-        "id": "89eacba2.269688",
+        "id": "55c7e10b.6ef8b",
         "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=\"Quotation removed from timestamp for DMAAP response header \\r\"/>\n<parameter name=\"field2\" value=\"`$prop.oofpcipoc-dmaap-config-resp.timestamp`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1642.0104522705078,
-        "y": 3045.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1719.500015258789,
+        "y": 3025.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "62a2cce9.0684d4",
+        "id": "3b769001.8c875",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1256.5104522705078,
-        "y": 3099.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1334.000015258789,
+        "y": 3079.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "4a3b0543.9cb45c"
+                "91641e00.19532"
             ]
         ]
     },
     {
-        "id": "4a3b0543.9cb45c",
+        "id": "91641e00.19532",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1432.5103302001953,
-        "y": 3100.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1509.9998931884766,
+        "y": 3080.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "28bf6401.24b47c"
+                "fc8fcaad.3d9528"
             ]
         ]
     },
     {
-        "id": "28bf6401.24b47c",
+        "id": "fc8fcaad.3d9528",
         "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 quotation from timestamp for DMAAP response header. Aborting Generic neighbor  configuration\" />",
         "comments": "",
-        "x": 1581.5100860595703,
-        "y": 3107.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1658.9996490478516,
+        "y": 3087.666786670685,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "53d8b063.65e82",
+        "id": "ed36b701.cd7678",
         "type": "execute",
         "name": "RequestID",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$prop.oofpcipoc-dmaap-config-resp.requestID`\"/>\n    <parameter name=\"outputPath\" value=\"prop.oofpcipoc-dmaap-config-resp.requestID\"/>\n    <parameter name=\"target\" value='\"'/>\n    <parameter name=\"replacement\" value=''/>",
         "comments": "",
         "outputs": 1,
-        "x": 1078.5104522705078,
-        "y": 3184.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1156.000015258789,
+        "y": 3164.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "ef235728.9a5a78",
-                "26cf2ccb.7c88e4"
+                "d9a4b590.61dcf8",
+                "3c1bbeac.ead2d2"
             ]
         ]
     },
     {
-        "id": "ef235728.9a5a78",
+        "id": "d9a4b590.61dcf8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1261.0104522705078,
-        "y": 3192.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1338.500015258789,
+        "y": 3172.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "8e49ce65.d6a5"
+                "e737e3a7.64beb"
             ]
         ]
     },
     {
-        "id": "8e49ce65.d6a5",
+        "id": "e737e3a7.64beb",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1446.0104522705078,
-        "y": 3190.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1523.500015258789,
+        "y": 3170.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "cdd76f59.adb59"
+                "8d3f1f67.cb6d2"
             ]
         ]
     },
     {
-        "id": "cdd76f59.adb59",
+        "id": "8d3f1f67.cb6d2",
         "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=\"Quotation removed from requestID for DMAAP response header \\r\"/>\n<parameter name=\"field2\" value=\"`$prop.oofpcipoc-dmaap-config-resp.requestID`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1648.0104522705078,
-        "y": 3185.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1725.500015258789,
+        "y": 3165.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "26cf2ccb.7c88e4",
+        "id": "3c1bbeac.ead2d2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1263.5104522705078,
-        "y": 3240.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1341.000015258789,
+        "y": 3220.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "a6e43c9c.5130d"
+                "85cbfa6a.583a78"
             ]
         ]
     },
     {
-        "id": "a6e43c9c.5130d",
+        "id": "85cbfa6a.583a78",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1439.5103302001953,
-        "y": 3241.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1516.9998931884766,
+        "y": 3221.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "95ffaa2c.13f4d8"
+                "b3ae9015.4961a"
             ]
         ]
     },
     {
-        "id": "95ffaa2c.13f4d8",
+        "id": "b3ae9015.4961a",
         "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 quotation from requestID for DMAAP response header. Aborting Generic neighbor  configuration\" />",
         "comments": "",
-        "x": 1588.5100860595703,
-        "y": 3244.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1665.9996490478516,
+        "y": 3224.666786670685,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "6550ccad.313694",
+        "id": "7b42709a.d2c18",
         "type": "execute",
         "name": "subRequestID",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$prop.oofpcipoc-dmaap-config-resp.subrequestID`\"/>\n    <parameter name=\"outputPath\" value=\"prop.oofpcipoc-dmaap-config-resp.subrequestID\"/>\n    <parameter name=\"target\" value='\"'/>\n    <parameter name=\"replacement\" value=''/>",
         "comments": "",
         "outputs": 1,
-        "x": 1013.5104522705078,
-        "y": 3324.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1091.000015258789,
+        "y": 3304.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "9b5e8cd8.47c5a",
-                "931d4e47.4b2f5"
+                "86c5ba9c.cbb738",
+                "8336750.437c288"
             ]
         ]
     },
     {
-        "id": "9b5e8cd8.47c5a",
+        "id": "86c5ba9c.cbb738",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1196.0104522705078,
-        "y": 3332.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1273.500015258789,
+        "y": 3312.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "1ca769c6.3605c6"
+                "69338529.ff300c"
             ]
         ]
     },
     {
-        "id": "1ca769c6.3605c6",
+        "id": "69338529.ff300c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1381.0104522705078,
-        "y": 3330.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1458.500015258789,
+        "y": 3310.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "699f503.ba0ddb"
+                "c6a56252.dfaea"
             ]
         ]
     },
     {
-        "id": "699f503.ba0ddb",
+        "id": "c6a56252.dfaea",
         "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=\"Quotation removed from subRequestID for DMAAP response header \\r\"/>\n<parameter name=\"field2\" value=\"`$prop.oofpcipoc-dmaap-config-resp.subrequestID`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1583.0104522705078,
-        "y": 3325.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1660.500015258789,
+        "y": 3305.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "931d4e47.4b2f5",
+        "id": "8336750.437c288",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1198.5104522705078,
-        "y": 3380.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1276.000015258789,
+        "y": 3360.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "f026cb61.8a0188"
+                "ee4be641.ccbc38"
             ]
         ]
     },
     {
-        "id": "f026cb61.8a0188",
+        "id": "ee4be641.ccbc38",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1374.5103302001953,
-        "y": 3381.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1451.9998931884766,
+        "y": 3361.666786670685,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "643bbe0e.9bd95"
+                "480a5f5d.9d504"
             ]
         ]
     },
     {
-        "id": "643bbe0e.9bd95",
+        "id": "480a5f5d.9d504",
         "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 quotation from timestamp for DMAAP response header. Aborting Generic neighbor  configuration\" />",
         "comments": "",
-        "x": 1521.510025024414,
-        "y": 3384.666783809662,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1598.9995880126953,
+        "y": 3364.666786670685,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "8750c827.149de8",
+        "id": "112b836f.c3a6fd",
         "type": "switchNode",
         "name": "is blacklisted",
         "xml": "<switch test='`$tmp.blacklisted`'>",
         "comments": "",
         "outputs": 1,
-        "x": 1178.6774597167969,
-        "y": 1021.1667175292969,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1256.1670227050781,
+        "y": 1001.1667203903198,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "cde5cc5d.4fb1f",
-                "1473e0be.790f6f"
+                "e6abed7f.2d8fc",
+                "9428e6c7.bdbd68"
             ]
         ]
     },
     {
-        "id": "cde5cc5d.4fb1f",
+        "id": "e6abed7f.2d8fc",
         "type": "outcome",
         "name": "True",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1368.6774673461914,
-        "y": 1003.1667165756226,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1446.1670303344727,
+        "y": 983.1667194366455,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "8636d6f8.5a6178"
+                "e7850e65.747a3"
             ]
         ]
     },
     {
-        "id": "1473e0be.790f6f",
+        "id": "9428e6c7.bdbd68",
         "type": "outcome",
         "name": "False",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1375.6496353149414,
-        "y": 1043.8056344985962,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1453.1391983032227,
+        "y": 1023.8056373596191,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "4c31a601.736cb8"
+                "721613a3.d7ab2c"
             ]
         ]
     },
     {
-        "id": "379e7ddc.d8dd62",
+        "id": "911f37c7.a6eaf8",
         "type": "set",
         "name": "set isHOAllowed as false",
         "xml": "<set>\n<parameter name='tmp.isHOAllowed' value='false' />",
         "comments": "",
-        "x": 1799.621810913086,
-        "y": 999.9167165756226,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1877.1113739013672,
+        "y": 979.9167194366455,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "ca5899d3.9fd1f8",
+        "id": "4437ac82.bcc6c4",
         "type": "set",
         "name": "set isHOAllowed as true",
         "xml": "<set>\n<parameter name='tmp.isHOAllowed' value='true' />",
         "comments": "",
-        "x": 1793.066146850586,
-        "y": 1038.2499704360962,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1870.5557098388672,
+        "y": 1018.2499732971191,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "8636d6f8.5a6178",
+        "id": "e7850e65.747a3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1552.6774673461914,
-        "y": 1001.9443864822388,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1630.1670303344727,
+        "y": 981.9443893432617,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "379e7ddc.d8dd62"
+                "911f37c7.a6eaf8"
             ]
         ]
     },
     {
-        "id": "4c31a601.736cb8",
+        "id": "721613a3.d7ab2c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1540.8439712524414,
-        "y": 1049.3610534667969,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1618.3335342407227,
+        "y": 1029.3610563278198,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "ca5899d3.9fd1f8"
+                "4437ac82.bcc6c4"
             ]
         ]
     },
     {
-        "id": "2f355bcb.3566f4",
+        "id": "c1718eaa.0441e",
         "type": "set",
         "name": "set tmp variables",
-        "xml": "<set>\n<parameter name=\"tmp.idNRCellCU\" value=\"`$generic-neighbor-configuration-input.alias`\"/>\n<parameter name=\"tmp.idNRCellRelation\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].cid`\"/>\n<parameter name=\"tmp.idGNBCUCPFunction\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].pnf-name`\"/>\n<parameter name=\"tmp.nRTCI\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].phy-cell-id`\"/>\n",
+        "xml": "<set>\n<parameter name=\"tmp.idNRCellCU\" value=\"`$generic-neighbor-configuration-input.alias`\"/>\n<parameter name=\"tmp.idNRCellRelation\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].cid`\"/>\n<parameter name=\"tmp.idGNBCUCPFunction\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].pnf-name`\"/>",
         "comments": "",
-        "x": 1216.0107688903809,
-        "y": 1077.500072479248,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1293.500331878662,
+        "y": 1057.500075340271,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "1f8cb6f9.f168b9",
+        "id": "b411ee0f.38431",
         "type": "execute",
         "name": "populate mount name",
         "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=\"{mountName}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.idGNBCUCPFunction`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1260.6775665283203,
-        "y": 1214.4999980926514,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1338.1671295166016,
+        "y": 1194.5000009536743,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "ad4ecd3c.4121d",
+        "id": "560d1a47.8473d4",
         "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=\"URL to fetch the anchors\"/>\n<parameter name=\"field2\" value=\"`$tmp.getAnchors.URL`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 411.37451171875,
-        "y": 486.8864850997925,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 488.86407470703125,
+        "y": 466.88648796081543,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "465d1be9.f815a4",
+        "id": "ecefd81d.f9cab8",
         "type": "execute",
         "name": "getAnchors URL",
         "xml": "<set>\n\t<parameter name='tmp.getAnchors.URL' value=\"`$prop.restapi.cps.anchors.endpoint`\"/>\n\t",
         "comments": "",
         "outputs": 1,
-        "x": 423.12442779541016,
-        "y": 437.70785331726074,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 500.6139907836914,
+        "y": 417.7078561782837,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "3b17d3a0.cdc9fc",
+        "id": "3f5bd73.2a4f028",
         "type": "execute",
         "name": "set anchors size",
         "xml": "<set>\n\t<parameter name='tmp.anchors.length' value=\"`$get-anchors-cps-response._length`\"/>\n\t",
         "comments": "",
         "outputs": 1,
-        "x": 447.671875,
-        "y": 579.8145065307617,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 525.1614379882812,
+        "y": 559.8145093917847,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "a282bdbf.ee13f",
+        "id": "980162ee.9edeb",
         "type": "execute",
         "name": "read schemaSet",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='tmp.schemaset.name' />\n\t<parameter name='source' value=\"`'get-anchors-cps-response.['+$anc+'].schemaSetName'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 852.1716232299805,
-        "y": 564.6676553487778,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 929.6611862182617,
+        "y": 544.6676582098007,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "524f7198.62576",
+        "id": "a8b2bc66.e3a98",
         "type": "execute",
         "name": "initialize nearRTRIC size",
         "xml": "<set>\n\t<parameter name='tmp.RIC.length' value=\"0\"/>\n\t",
         "comments": "",
         "outputs": 1,
-        "x": 480.2621307373047,
-        "y": 623.0527486801147,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 557.7516937255859,
+        "y": 603.0527515411377,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "92bad4c5.5c0658",
+        "id": "f0a7b180.38474",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 648.6799392700195,
-        "y": 699.564998626709,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 726.1695022583008,
+        "y": 679.5650014877319,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "ac7808ef.02f5b8",
-                "5f08445c.08100c"
+                "1938693.e03a497",
+                "73399f70.9ab02"
             ]
         ]
     },
     {
-        "id": "52b5af25.2e1ea",
+        "id": "56fbabb.efc7154",
         "type": "execute",
         "name": "read anchorName",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='tmp.anchor.name' />\n\t<parameter name='source' value=\"`'get-anchors-cps-response.['+$anc+'].name'`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1435.3784713745117,
-        "y": 618.4857667684555,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1512.868034362793,
+        "y": 598.4857696294785,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "f9ba5873.70cca8",
+        "id": "4eb9dd77.949f74",
         "type": "for",
         "name": "For anchorsList",
         "xml": "<for index='anc' start='0' end='`$tmp.anchors.length`'>",
         "comments": "",
         "outputs": 1,
-        "x": 453.547607421875,
-        "y": 659.9499664306641,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 531.0371704101562,
+        "y": 639.949969291687,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "457cfbdd.a13564"
+                "f40e037f.bc749"
             ]
         ]
     },
     {
-        "id": "457cfbdd.a13564",
+        "id": "f40e037f.bc749",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 658.0795135498047,
-        "y": 654.9062652587891,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 735.5690765380859,
+        "y": 634.906268119812,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "3294f80.dc3bf08",
-                "a282bdbf.ee13f"
+                "3983f507.2f68da",
+                "980162ee.9edeb"
             ]
         ]
     },
     {
-        "id": "3294f80.dc3bf08",
+        "id": "3983f507.2f68da",
         "type": "switchNode",
         "name": "check schemaSetName",
         "xml": "<switch test='`$tmp.schemaset.name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 876.6561813354492,
-        "y": 611.7634429931641,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 954.1457443237305,
+        "y": 591.763445854187,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "9a5cb7b8.77e3a8"
+                "7a22756f.e5a93c"
             ]
         ]
     },
     {
-        "id": "9a5cb7b8.77e3a8",
+        "id": "7a22756f.e5a93c",
         "type": "outcome",
         "name": "if ran-network",
         "xml": "<outcome value='ran-network'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1059.9617729187012,
-        "y": 576.2356910705566,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1137.4513359069824,
+        "y": 556.2356939315796,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "f69c66df.dd0898"
+                "f0e5d566.9803a8"
             ]
         ]
     },
     {
-        "id": "f69c66df.dd0898",
+        "id": "f0e5d566.9803a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1231.2642059326172,
-        "y": 562.5689862966537,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1308.7537689208984,
+        "y": 542.5689891576767,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "842797d2.4aba38",
-                "d1deb2dc.55894"
+                "3bdadb62.fea184",
+                "7961d9b7.7fe598"
             ]
         ]
     },
     {
-        "id": "842797d2.4aba38",
+        "id": "3bdadb62.fea184",
         "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=\"Applicable RIC length\"/>\n<parameter name=\"field2\" value=\"`$tmp.RIC.length`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1410.1776275634766,
-        "y": 562.3745282888412,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1487.6671905517578,
+        "y": 542.3745311498642,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "5f08445c.08100c",
+        "id": "73399f70.9ab02",
         "type": "switchNode",
         "name": "check schemaSetName",
         "xml": "<switch test='`$tmp.schemaset.name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 874.4554290771484,
-        "y": 690.1368917226791,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 951.9449920654297,
+        "y": 670.1368945837021,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "51a60746.5abeb8"
+                "b771af8b.ffacc"
             ]
         ]
     },
     {
-        "id": "ac7808ef.02f5b8",
+        "id": "1938693.e03a497",
         "type": "execute",
         "name": "read schemaSet",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='tmp.schemaset.name' />\n\t<parameter name='source' value=\"`'get-anchors-cps-response.['+$anc+'].schemaSetName'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 858.4832611083984,
-        "y": 648.8868898153305,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 935.9728240966797,
+        "y": 628.8868926763535,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "51a60746.5abeb8",
+        "id": "b771af8b.ffacc",
         "type": "outcome",
         "name": "if ran-network",
         "xml": "<outcome value='ran-network'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1058.2610168457031,
-        "y": 646.6091808080673,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1135.7505798339844,
+        "y": 626.6091836690903,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "6854212b.ac4cd"
+                "32307f0a.71ea1"
             ]
         ]
     },
     {
-        "id": "6854212b.ac4cd",
+        "id": "32307f0a.71ea1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1254.3968505859375,
-        "y": 648.831347823143,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1331.8864135742188,
+        "y": 628.831350684166,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "52b5af25.2e1ea",
-                "98eeab3d.b9dba8"
+                "56fbabb.efc7154",
+                "bd7a2ea8.b034e"
             ]
         ]
     },
     {
-        "id": "d7997fdc.fef12",
+        "id": "902d542b.495ea8",
         "type": "for",
         "name": "For anchorsList",
         "xml": "<for index='anc' start='0' end='`$tmp.anchors.length`'>",
         "comments": "",
         "outputs": 1,
-        "x": 447.4208183288574,
-        "y": 705.4107418060303,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 524.9103813171387,
+        "y": 685.4107446670532,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "92bad4c5.5c0658"
+                "f0a7b180.38474"
             ]
         ]
     },
     {
-        "id": "d1deb2dc.55894",
+        "id": "7961d9b7.7fe598",
         "type": "execute",
         "name": "set nearRTRIC size",
         "xml": "<set>\n\t<parameter name='tmp.RIC.length' value=\"`$tmp.RIC.length+1`\"/>\n\t",
         "comments": "",
         "outputs": 1,
-        "x": 1409.235740661621,
-        "y": 514.053570151329,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1486.7253036499023,
+        "y": 494.053573012352,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "98eeab3d.b9dba8",
+        "id": "bd7a2ea8.b034e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1451.3229675292969,
-        "y": 667.2079375982285,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1528.8125305175781,
+        "y": 647.2079404592514,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "e1b02916.7b90e8",
-                "82289c4e.13dd3",
-                "2f6e989a.bcc9b8",
-                "ebd6c08d.354f2"
+                "c181925b.0b237",
+                "a229596b.c5e3c8",
+                "336876a2.4db05a",
+                "e6d5faef.426518"
             ]
         ]
     },
     {
-        "id": "d600693e.8aa858",
+        "id": "292f2bdb.404e94",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 660.62841796875,
-        "y": 463.2633594274521,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 738.1179809570312,
+        "y": 443.26336228847504,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "677352a2.9b602c"
+                "babc71f6.4b1db"
             ]
         ]
     },
     {
-        "id": "e072495d.58e5e8",
+        "id": "689197fa.211fb8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 674.628589630127,
-        "y": 537.4577751159668,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 752.1181526184082,
+        "y": 517.4577779769897,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "b938ae7c.bab38"
+                "77d5394c.7997b8"
             ]
         ]
     },
     {
-        "id": "677352a2.9b602c",
+        "id": "babc71f6.4b1db",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 803.3229141235352,
-        "y": 460.8745588064194,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 880.8124771118164,
+        "y": 440.8745616674423,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "80996cbe.25656",
-                "6fd45460.83d24c"
+                "770e5775.57e468",
+                "d035965a.8e7598"
             ]
         ]
     },
     {
-        "id": "b938ae7c.bab38",
+        "id": "77d5394c.7997b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 823.0727500915527,
-        "y": 514.1244815587997,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 900.562313079834,
+        "y": 494.1244844198227,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "702bf693.a42548",
-                "30065182.39617e"
+                "37717870.1cbac8",
+                "ca6bc514.5f28a8"
             ]
         ]
     },
     {
-        "id": "80996cbe.25656",
+        "id": "770e5775.57e468",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='error-code' value='500'/>\n<parameter name='error-message' value='Error Getting Info from CPS. Aborting RPC executiopn'/>",
         "comments": "",
-        "x": 987.100341796875,
-        "y": 424.70776879787445,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1064.5899047851562,
+        "y": 404.7077716588974,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "702bf693.a42548",
+        "id": "37717870.1cbac8",
         "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=\"Successfully Obtained anchors from CPS\"/>\n<parameter name=\"field2\" value=\"`$get-anchors-cps-response._length`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1004.8225135803223,
-        "y": 498.37452256679535,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1082.3120765686035,
+        "y": 478.3745254278183,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "30065182.39617e",
+        "id": "ca6bc514.5f28a8",
         "type": "execute",
         "name": "printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/opt/opendaylight/current/data/log/generic-neighbor-config-context.log' />",
         "comments": "",
         "outputs": 1,
-        "x": 1018.3507537841797,
-        "y": 531.124524474144,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1095.840316772461,
+        "y": 511.12452733516693,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "6fd45460.83d24c",
+        "id": "d035965a.8e7598",
         "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=\"Failed to fetch anchors from CPS\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 980.9062538146973,
-        "y": 461.2356046438217,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1058.3958168029785,
+        "y": 441.23560750484467,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "ddbfcb04.fe0288",
+        "id": "2e676669.44090a",
         "type": "execute",
         "name": "Get list of anchors from CPS",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.getAnchors.URL`\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"restapiUser\" value=\"cpsuser\" />\n<parameter name=\"restapiPassword\" value=\"cpsr0cks!\"/>\n<parameter name=\"responsePrefix\" value=\"get-anchors-cps-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"true\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 468.32283782958984,
-        "y": 535.4817008972168,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 545.8124008178711,
+        "y": 515.4817037582397,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "e072495d.58e5e8",
-                "d600693e.8aa858"
+                "689197fa.211fb8",
+                "292f2bdb.404e94"
             ]
         ]
     },
     {
-        "id": "25959b30.d72544",
+        "id": "df020a42.c20898",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1957.1771392822266,
-        "y": 695.9999812841415,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2034.6667022705078,
+        "y": 675.9999841451645,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "9483eed9.bf01e"
+                "460c436f.8ca33c"
             ]
         ]
     },
     {
-        "id": "9483eed9.bf01e",
+        "id": "460c436f.8ca33c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2166.177104949951,
-        "y": 667.0001233816147,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2243.6666679382324,
+        "y": 647.0001262426376,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "580e40dc.0b46d",
-                "de693035.c3ab5",
-                "f8032621.282298"
+                "f3ad33eb.84a38",
+                "e0c4e26b.1144a",
+                "b9def43d.5f7818"
             ]
         ]
     },
     {
-        "id": "2fcd593e.871b66",
+        "id": "3afb70c7.5e4ee",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1980.1771030426025,
-        "y": 642.0001233816147,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2057.666666030884,
+        "y": 622.0001262426376,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "4553e5fc.f4cb7c"
+                "d61cc65e.3894e8"
             ]
         ]
     },
     {
-        "id": "4553e5fc.f4cb7c",
+        "id": "d61cc65e.3894e8",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2203.034465789795,
-        "y": 594.2858165502548,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2280.524028778076,
+        "y": 574.2858194112778,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "631e69cb.8f9598"
+                "563b108b.4f55f"
             ]
         ]
     },
     {
-        "id": "e1b02916.7b90e8",
+        "id": "c181925b.0b237",
         "type": "execute",
         "name": "generate getNearRTRICsFromidGNBCUCPFunction URL",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.cps.tbdmt.execute.endpoint`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.cps.getNearRTRICByidGNBCUCPFunction.url\"/>\n    <parameter name=\"target\" value=\"{schemaSet}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.anchor.name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1762.1092948913574,
-        "y": 554.931988120079,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1839.5988578796387,
+        "y": 534.931990981102,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "82289c4e.13dd3",
+        "id": "a229596b.c5e3c8",
         "type": "execute",
         "name": "prepare tbdmt template",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.cps.getNearRTRICByidGNBCUCPFunction.url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.cps.getNearRTRICByidGNBCUCPFunction.url\"/>\n    <parameter name=\"target\" value=\"{templateId}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.tbdmt.template.get-nearrtric-by-idgnbcucpfunction`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1682.1093482971191,
-        "y": 596.9319890737534,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1759.5989112854004,
+        "y": 576.9319919347763,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "2f6e989a.bcc9b8",
+        "id": "336876a2.4db05a",
         "type": "record",
         "name": "record TBDMT RestAPI params",
         "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 CPS TDBMT to Get NearRTRIC for idGNBCUCPFunction\"/>\n<parameter name='field2' value=\"`$tmp.cps.getNearRTRICByidGNBCUCPFunction.url`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1709.1093101501465,
-        "y": 637.9319900274277,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1786.5988731384277,
+        "y": 617.9319928884506,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "ebd6c08d.354f2",
+        "id": "e6d5faef.426518",
         "type": "execute",
         "name": "Get nearRTRIC for idGNBCUCPFunction",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.cps.getNearRTRICByidGNBCUCPFunction.url`\"/>\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/cps-templates/cps-get-nearrtric-by-idgnbcucpfunction.json'`\" />\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"getNFNSSIRIC-cps-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"true\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1709.1092491149902,
-        "y": 682.9319919347763,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1786.5988121032715,
+        "y": 662.9319947957993,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "2fcd593e.871b66",
-                "25959b30.d72544"
+                "3afb70c7.5e4ee",
+                "df020a42.c20898"
             ]
         ]
     },
     {
-        "id": "de693035.c3ab5",
+        "id": "e0c4e26b.1144a",
         "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=\"Successfully Obtained NearRTRIC ID info from CPS\"/>\n<parameter name=\"field2\" value=\"`$tmp.nearRTRICId`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 2373.1091117858887,
-        "y": 691.931941986084,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2450.59867477417,
+        "y": 671.9319448471069,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "580e40dc.0b46d",
+        "id": "f3ad33eb.84a38",
         "type": "execute",
         "name": "printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/opt/opendaylight/current/data/log/generic-neighbor-config-context.log' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2351.8871841430664,
-        "y": 743.9321460723877,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2429.3767471313477,
+        "y": 723.9321489334106,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "631e69cb.8f9598",
+        "id": "563b108b.4f55f",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='error-code' value='500'/>\n<parameter name='error-message' value='Error Getting Info from CPS. Aborting RPC executiopn'/>",
         "comments": "",
-        "x": 2375.1092567443848,
-        "y": 596.042999625206,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2452.598819732666,
+        "y": 576.0430024862289,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "8b8d2961.aeae98",
+        "id": "f1691caa.0d71",
         "type": "set",
         "name": "set tmp variables",
         "xml": "<set>\n<parameter name=\"tmp.idGNBCUCP\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[0].pnf-name`\"/>\n",
         "comments": "",
-        "x": 431.17708587646484,
-        "y": 400.3333406448364,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 508.6666488647461,
+        "y": 380.3333435058594,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "f8032621.282298",
+        "id": "b9def43d.5f7818",
         "type": "execute",
         "name": "read nearRTRICId",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='tmp.nearRTRICId' />\n\t<parameter name='source' value=\"`'getNFNSSIRIC-cps-response.[0]'`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2391.177146911621,
-        "y": 643.6666841506958,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2468.6667098999023,
+        "y": 623.6666870117188,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "edde733c.b2ac9",
+        "id": "1bc42ca7.cbfc53",
         "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=\"idGNBCUCPFunction\"/>\n<parameter name=\"field2\" value=\"`$tmp.idGNBCUCPFunction`\"/>\n<parameter name=\"field3\" value=\"idNRCellCU\"/>\n<parameter name=\"field4\" value=\"`$tmp.idNRCellCU`\"/>\n<parameter name=\"field5\" value=\"idNRCellRelation\"/>\n<parameter name=\"field6\" value=\"`$tmp.idNRCellRelation`\"/>\n<parameter name=\"field7\" value=\"isHOAllowed\"/>\n<parameter name=\"field8\" value=\"`$tmp.isHOAllowed`\"/>\n<parameter name=\"field9\" value=\"nRTCI\"/>\n<parameter name=\"field10\" value=\"`$tmp.nRTCI`\"/>\n",
+        "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=\"idGNBCUCPFunction\"/>\n<parameter name=\"field2\" value=\"`$tmp.idGNBCUCPFunction`\"/>\n<parameter name=\"field3\" value=\"idNRCellCU\"/>\n<parameter name=\"field4\" value=\"`$tmp.idNRCellCU`\"/>\n<parameter name=\"field5\" value=\"idNRCellRelation\"/>\n<parameter name=\"field6\" value=\"`$tmp.idNRCellRelation`\"/>\n<parameter name=\"field7\" value=\"isHOAllowed\"/>\n<parameter name=\"field8\" value=\"`$tmp.isHOAllowed`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1207.22216796875,
-        "y": 1124.4444580078125,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1284.7117309570312,
+        "y": 1104.4444608688354,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "7b39b4de.4e9c6c",
+        "id": "4f68e3db.956bac",
         "type": "switchNode",
         "name": "is blacklisted",
         "xml": "<switch test='`$tmp.blacklisted`'>",
         "comments": "",
         "outputs": 1,
-        "x": 2516.3990783691406,
-        "y": 854.8888320922852,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2593.888641357422,
+        "y": 834.8888349533081,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "593d77a0.5cb8a8",
-                "b8bab935.c41c08"
+                "c63e7d25.5ef1b",
+                "e6ecbedf.8ddcb"
             ]
         ]
     },
     {
-        "id": "593d77a0.5cb8a8",
+        "id": "c63e7d25.5ef1b",
         "type": "outcome",
         "name": "True",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2706.399085998535,
-        "y": 836.8888311386108,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2783.8886489868164,
+        "y": 816.8888339996338,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "b83ed74b.3225d8"
+                "8a4616a8.b07548"
             ]
         ]
     },
     {
-        "id": "b8bab935.c41c08",
+        "id": "e6ecbedf.8ddcb",
         "type": "outcome",
         "name": "False",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2713.371253967285,
-        "y": 877.5277490615845,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2790.8608169555664,
+        "y": 857.5277519226074,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "edf1018d.5b0f1"
+                "76352c73.0ba134"
             ]
         ]
     },
     {
-        "id": "8e20a8df.c00c88",
+        "id": "1b68d278.589ade",
         "type": "set",
         "name": "set isHOAllowed as false",
         "xml": "<set>\n<parameter name='tmp.isHOAllowed' value='false' />",
         "comments": "",
-        "x": 3137.3434295654297,
-        "y": 833.6388311386108,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3214.832992553711,
+        "y": 813.6388339996338,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "936b434c.4f285",
+        "id": "c533f671.aa9438",
         "type": "set",
         "name": "set isHOAllowed as true",
         "xml": "<set>\n<parameter name='tmp.isHOAllowed' value='true' />",
         "comments": "",
-        "x": 3130.7877655029297,
-        "y": 871.9720849990845,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3208.277328491211,
+        "y": 851.9720878601074,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "b83ed74b.3225d8",
+        "id": "8a4616a8.b07548",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2890.399085998535,
-        "y": 835.666501045227,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2967.8886489868164,
+        "y": 815.66650390625,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "8e20a8df.c00c88"
+                "1b68d278.589ade"
             ]
         ]
     },
     {
-        "id": "edf1018d.5b0f1",
+        "id": "76352c73.0ba134",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2878.565589904785,
-        "y": 883.0831680297852,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2956.0551528930664,
+        "y": 863.0831708908081,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "936b434c.4f285"
+                "c533f671.aa9438"
             ]
         ]
     },
     {
-        "id": "f5ee8b6.12ca678",
+        "id": "d62d2854.e6ac28",
         "type": "set",
         "name": "set tmp variables",
-        "xml": "<set>\n<parameter name=\"tmp.idNRCellCU\" value=\"`$generic-neighbor-configuration-input.alias`\"/>\n<parameter name=\"tmp.idNRCellRelation\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].cid`\"/>\n<parameter name=\"tmp.idGNBCUCPFunction\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].pnf-name`\"/>\n<parameter name=\"tmp.nRTCI\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].phy-cell-id`\"/>\n",
+        "xml": "<set>\n<parameter name=\"tmp.idNRCellCU\" value=\"`$generic-neighbor-configuration-input.alias`\"/>\n<parameter name=\"tmp.idNRCellRelation\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].cid`\"/>\n<parameter name=\"tmp.idGNBCUCPFunction\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].pnf-name`\"/>\n",
         "comments": "",
-        "x": 2535.3991203308105,
-        "y": 907.888858795166,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2612.888683319092,
+        "y": 887.888861656189,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "82978ac0.ed8dc8",
+        "id": "15d3f16c.8176ef",
         "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=\"idGNBCUCPFunction\"/>\n<parameter name=\"field2\" value=\"`$tmp.idGNBCUCPFunction`\"/>\n<parameter name=\"field3\" value=\"idNRCellCU\"/>\n<parameter name=\"field4\" value=\"`$tmp.idNRCellCU`\"/>\n<parameter name=\"field5\" value=\"idNRCellRelation\"/>\n<parameter name=\"field6\" value=\"`$tmp.idNRCellRelation`\"/>\n<parameter name=\"field7\" value=\"isHOAllowed\"/>\n<parameter name=\"field8\" value=\"`$tmp.isHOAllowed`\"/>\n<parameter name=\"field9\" value=\"nRTCI\"/>\n<parameter name=\"field10\" value=\"`$tmp.nRTCI`\"/>\n",
+        "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=\"idGNBCUCPFunction\"/>\n<parameter name=\"field2\" value=\"`$tmp.idGNBCUCPFunction`\"/>\n<parameter name=\"field3\" value=\"idNRCellCU\"/>\n<parameter name=\"field4\" value=\"`$tmp.idNRCellCU`\"/>\n<parameter name=\"field5\" value=\"idNRCellRelation\"/>\n<parameter name=\"field6\" value=\"`$tmp.idNRCellRelation`\"/>\n<parameter name=\"field7\" value=\"isHOAllowed\"/>\n<parameter name=\"field8\" value=\"`$tmp.isHOAllowed`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2516.6103019714355,
-        "y": 954.8331985473633,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2594.099864959717,
+        "y": 934.8332014083862,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "9f32aefb.8b268",
+        "id": "f8b63e76.98572",
         "type": "execute",
         "name": "populate idNRCellCU",
         "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=\"{idNRCellCU}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.idNRCellCU`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 2548.065788269043,
-        "y": 1090.999906539917,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2625.555351257324,
+        "y": 1070.99990940094,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "f51e527f.45e31",
+        "id": "1fdbb9e6.5c2526",
         "type": "execute",
         "name": "populate idNRCellRelation",
         "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=\"{idNRCellRelation}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.idNRCellRelation`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 2557.732208251953,
-        "y": 1145.3331623077393,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2635.2217712402344,
+        "y": 1125.3331651687622,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "6b608403.2d3acc",
+        "id": "57f80d61.d3fa74",
         "type": "execute",
         "name": "populate idGNBCUCPFunction",
         "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=\"{idGNBCUCPFunction}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.idGNBCUCPFunction`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 2573.888542175293,
-        "y": 1051.2221240997314,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2651.378105163574,
+        "y": 1031.2221269607544,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "2607273f.d4a8a8",
+        "id": "49974804.2019b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1810,
-        "y": 1895,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1887.4895629882812,
+        "y": 1875.000002861023,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "21213307.d7adac"
+                "adafd367.d3827"
             ]
         ]
     },
     {
-        "id": "21213307.d7adac",
+        "id": "adafd367.d3827",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2054.6666946411133,
-        "y": 1850.6667003631592,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2132.1562576293945,
+        "y": 1830.6667032241821,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "979fa2e8.fdf3d",
-                "c2f4298b.e18828"
+                "1280ded8.c1edc1",
+                "d4c50662.271958"
             ]
         ]
     },
     {
-        "id": "c2f4298b.e18828",
+        "id": "d4c50662.271958",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='error-code' value='500'/>\n<parameter name='error-message' value='Error updating nearRTRIC info in CPS. Aborting RPC executiopn'/>",
         "comments": "",
-        "x": 2235.333694458008,
-        "y": 1822.1109924316406,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2312.823257446289,
+        "y": 1802.1109952926636,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "979fa2e8.fdf3d",
+        "id": "1280ded8.c1edc1",
         "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 nearRTRIC info in ConfigDB. Aborting RPC executiopn'/>",
         "comments": "",
-        "x": 2254.3335342407227,
-        "y": 1876.9999952316284,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2331.823097229004,
+        "y": 1856.9999980926514,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "292c5ef9.66d1b2",
+        "id": "d8ab9c3e.03a3b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1827.8181381225586,
-        "y": 2017.5757112503052,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1905.3077011108398,
+        "y": 1997.5757141113281,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "dac40ec9.1497"
+                "a538b6de.81e968"
             ]
         ]
     },
     {
-        "id": "dac40ec9.1497",
+        "id": "a538b6de.81e968",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2077.8180618286133,
-        "y": 1962.5758905410767,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2155.3076248168945,
+        "y": 1942.5758934020996,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "fedcc61a.6b0308"
+                "2b0af4ae.08b65c"
             ]
         ]
     },
     {
-        "id": "fedcc61a.6b0308",
+        "id": "2b0af4ae.08b65c",
         "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=\"Successfully Updated NRCellRelation info in cps\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 2263.151565551758,
-        "y": 1940.576093673706,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 2340.641128540039,
+        "y": 1920.576096534729,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "2f693817.b45ca8",
+        "id": "b2dbf27a.21124",
         "type": "execute",
         "name": "generate put ho nrcellrelation url",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.cps.tbdmt.execute.endpoint`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.cps.putho.nrcellrelation.url\"/>\n    <parameter name=\"target\" value=\"{schemaSet}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.schemaset.name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1597.5321083068848,
-        "y": 1828.2939586639404,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1675.021671295166,
+        "y": 1808.2939615249634,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "2f88ba7.9742646",
+        "id": "73cb27d4.c11058",
         "type": "execute",
         "name": "prepare tbdmt template",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.cps.putho.nrcellrelation.url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.cps.putho.nrcellrelation.url\"/>\n    <parameter name=\"target\" value=\"{templateId}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.tbdmt.template.put-ho-nrcellrelation`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1564.5321998596191,
-        "y": 1882.6273803710938,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1642.0217628479004,
+        "y": 1862.6273832321167,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "ef019585.316058",
+        "id": "67f8454e.69e89c",
         "type": "execute",
         "name": "put ho nrcellrelation",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.cps.putho.nrcellrelation.url`\"/>\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/cps-templates/cps-put-ho.json'`\" />\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"cps-put-ho-nrcellrelation-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"true\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1539.9984130859375,
-        "y": 1989.4272632598877,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1617.4879760742188,
+        "y": 1969.4272661209106,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "2607273f.d4a8a8",
-                "292c5ef9.66d1b2"
+                "49974804.2019b8",
+                "d8ab9c3e.03a3b"
             ]
         ]
     },
     {
-        "id": "9d1fcee2.302c3",
+        "id": "e1f9dbeb.b36d08",
         "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=\"URL for CPS TDBMT to put ho NRCellRelation\"/>\n<parameter name='field2' value=\"`$tmp.cps.putho.nrcellrelation.url`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1520.1722450256348,
-        "y": 1936.6771001815796,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1597.661808013916,
+        "y": 1916.6771030426025,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "fb5aba08.620b18",
+        "id": "ae070250.5fb89",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1314.0000381469727,
-        "y": 1828.6666831970215,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 1391.489601135254,
+        "y": 1808.6666860580444,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "4b29419d.11b54",
-                "2f693817.b45ca8",
-                "2f88ba7.9742646",
-                "9d1fcee2.302c3",
-                "ef019585.316058"
+                "373fca41.5a1086",
+                "b2dbf27a.21124",
+                "73cb27d4.c11058",
+                "e1f9dbeb.b36d08",
+                "67f8454e.69e89c"
             ]
         ]
     },
     {
-        "id": "e814ff2f.d11c8",
+        "id": "eff92940.1fb528",
         "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=\"CPS is Deployed, ConfigDB Skipped\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 3590,
-        "y": 1352.6666259765625,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3667.4895629882812,
+        "y": 1332.6666288375854,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "f24257c2.25f498",
+        "id": "d06c1323.53c5d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3870.4787940979004,
-        "y": 1473.211862564087,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3947.9683570861816,
+        "y": 1453.2118654251099,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "bf0d224.40fede"
+                "9b66cf4a.4c6ed"
             ]
         ]
     },
     {
-        "id": "bf0d224.40fede",
+        "id": "9b66cf4a.4c6ed",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4115.145488739014,
-        "y": 1428.878562927246,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 4192.635051727295,
+        "y": 1408.878565788269,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "ec44c94.4f34a38",
-                "4c9a416b.04d66"
+                "7947ff08.c0955",
+                "663da05b.08758"
             ]
         ]
     },
     {
-        "id": "4c9a416b.04d66",
+        "id": "663da05b.08758",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='error-code' value='500'/>\n<parameter name='error-message' value='Error updating nearRTRIC info in CPS. Aborting RPC executiopn'/>",
         "comments": "",
-        "x": 4295.812488555908,
-        "y": 1400.3228549957275,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 4373.302051544189,
+        "y": 1380.3228578567505,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "ec44c94.4f34a38",
+        "id": "7947ff08.c0955",
         "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 nearRTRIC info in ConfigDB. Aborting RPC executiopn'/>",
         "comments": "",
-        "x": 4314.812328338623,
-        "y": 1455.2118577957153,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 4392.301891326904,
+        "y": 1435.2118606567383,
+        "z": "93716ca1.df16b",
         "wires": []
     },
     {
-        "id": "429dd402.4553cc",
+        "id": "2cec2467.fffcfc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3888.296932220459,
-        "y": 1595.787573814392,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3965.7864952087402,
+        "y": 1575.787576675415,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "db5ceb2e.2f4e18"
+                "ed344371.52314"
             ]
         ]
     },
     {
-        "id": "db5ceb2e.2f4e18",
+        "id": "ed344371.52314",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4138.296855926514,
-        "y": 1540.7877531051636,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 4215.786418914795,
+        "y": 1520.7877559661865,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "41e1fdb0.ff3a94"
+                "16bf39af.b7bd96"
             ]
         ]
     },
     {
-        "id": "41e1fdb0.ff3a94",
+        "id": "16bf39af.b7bd96",
         "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=\"Successfully Updated NRCellRelation info in cps\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 4323.630359649658,
-        "y": 1518.787956237793,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 4401.119922637939,
+        "y": 1498.787959098816,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "5eb74b88.b56964",
+        "id": "429f2b72.e5b9a4",
         "type": "execute",
         "name": "generate put ho nrcellrelation url",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.cps.tbdmt.execute.endpoint`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.cps.putho.nrcellrelation.url\"/>\n    <parameter name=\"target\" value=\"{schemaSet}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.schemaset.name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 3658.010902404785,
-        "y": 1406.5058212280273,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3735.5004653930664,
+        "y": 1386.5058240890503,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "f9942fcd.8b986",
+        "id": "7af78a8.16d1774",
         "type": "execute",
         "name": "prepare tbdmt template",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.cps.putho.nrcellrelation.url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.cps.putho.nrcellrelation.url\"/>\n    <parameter name=\"target\" value=\"{templateId}\"/>\n    <parameter name=\"replacement\" value=\"`$prop.tbdmt.template.put-ho-nrcellrelation`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 3625.0109939575195,
-        "y": 1460.8392429351807,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3702.500556945801,
+        "y": 1440.8392457962036,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "ebe74e99.9d0b9",
+        "id": "fedc6177.d9441",
         "type": "execute",
         "name": "put ho nrcellrelation",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.cps.putho.nrcellrelation.url`\"/>\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/cps-templates/cps-put-ho.json'`\" />\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"cps-put-ho-nrcellrelation-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"true\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 3600.477207183838,
-        "y": 1567.6391258239746,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3677.966770172119,
+        "y": 1547.6391286849976,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "f24257c2.25f498",
-                "429dd402.4553cc"
+                "d06c1323.53c5d",
+                "2cec2467.fffcfc"
             ]
         ]
     },
     {
-        "id": "a52c3b6f.197a38",
+        "id": "bd326c88.c4e14",
         "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=\"URL for CPS TDBMT to put ho NRCellRelation\"/>\n<parameter name='field2' value=\"`$tmp.cps.putho.nrcellrelation.url`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3580.651039123535,
-        "y": 1514.8889627456665,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3658.1406021118164,
+        "y": 1494.8889656066895,
+        "z": "93716ca1.df16b",
         "wires": [
             []
         ]
     },
     {
-        "id": "fa469169.21411",
+        "id": "8a4f7193.b86bf",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3374.478832244873,
-        "y": 1406.8785457611084,
-        "z": "27bb3cd4.ff8ff4",
+        "x": 3451.9683952331543,
+        "y": 1386.8785486221313,
+        "z": "93716ca1.df16b",
         "wires": [
             [
-                "e814ff2f.d11c8",
-                "5eb74b88.b56964",
-                "f9942fcd.8b986",
-                "a52c3b6f.197a38",
-                "ebe74e99.9d0b9"
+                "eff92940.1fb528",
+                "429f2b72.e5b9a4",
+                "7af78a8.16d1774",
+                "bd326c88.c4e14",
+                "fedc6177.d9441"
             ]
         ]
     }
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 9f02493f..6911f1e4 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
@@ -231,7 +231,6 @@
                                 <parameter name="tmp.idNRCellCU" value="`$generic-neighbor-configuration-input.alias`"/>
                                 <parameter name="tmp.idNRCellRelation" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].cid`"/>
                                 <parameter name="tmp.idGNBCUCPFunction" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].pnf-name`"/>
-                                <parameter name="tmp.nRTCI" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].phy-cell-id`"/>
                             </set>
                             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                                 <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
@@ -244,8 +243,6 @@
                                 <parameter name="field6" value="`$tmp.idNRCellRelation`"/>
                                 <parameter name="field7" value="isHOAllowed"/>
                                 <parameter name="field8" value="`$tmp.isHOAllowed`"/>
-                                <parameter name="field9" value="nRTCI"/>
-                                <parameter name="field10" value="`$tmp.nRTCI`"/>
                             </record>
                             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
                                 <parameter name="source" value="`$prop.restapi.patchNRCellRelation`"/>
@@ -506,7 +503,6 @@
                                 <parameter name="tmp.idNRCellCU" value="`$generic-neighbor-configuration-input.alias`"/>
                                 <parameter name="tmp.idNRCellRelation" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].cid`"/>
                                 <parameter name="tmp.idGNBCUCPFunction" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].pnf-name`"/>
-                                <parameter name="tmp.nRTCI" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].phy-cell-id`"/>
                             </set>
                             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                                 <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
@@ -519,8 +515,6 @@
                                 <parameter name="field6" value="`$tmp.idNRCellRelation`"/>
                                 <parameter name="field7" value="isHOAllowed"/>
                                 <parameter name="field8" value="`$tmp.isHOAllowed`"/>
-                                <parameter name="field9" value="nRTCI"/>
-                                <parameter name="field10" value="`$tmp.nRTCI`"/>
                             </record>
                             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
                                 <parameter name="source" value="`$prop.restapi.patchNRCellRelation.ransim-mounted`"/>
diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-ho.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-ho.json
index 5f3ade8c..ee5e07c9 100644
--- a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-ho.json
+++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-ho.json
@@ -6,6 +6,6 @@
 "idNRCellRelation":${tmp.idNRCellRelation}
 },
 "payload":{
-"attributes":{"nRTCI":${tmp.nRTCI},"isHOAllowed":${tmp.isHOAllowed}}
+"attributes":{"isHOAllowed":${tmp.isHOAllowed}}
 }
 }
diff --git a/platform-logic/restapi-templates/src/main/json/oofpcipoc-generic-neighbor-patch.json b/platform-logic/restapi-templates/src/main/json/oofpcipoc-generic-neighbor-patch.json
index 1bed7c93..b0a4700b 100644
--- a/platform-logic/restapi-templates/src/main/json/oofpcipoc-generic-neighbor-patch.json
+++ b/platform-logic/restapi-templates/src/main/json/oofpcipoc-generic-neighbor-patch.json
@@ -5,13 +5,6 @@
                 "edit": [{
                         "edit-id": "edit1",
                         "operation": "merge",
-                        "target": "/ran-network:nRTCI",
-                        "value": {
-                             "nRTCI": ${tmp.nRTCI}
-                        }
-                 },{
-                        "edit-id": "edit2",
-                        "operation": "merge",
                         "target": "/ran-network:isHOAllowed",
                         "value": {
                              "isHOAllowed": ${tmp.isHOAllowed}
-- 
2.16.6