SDNR OOCPCI DG Updates for RANSIM Netconf Mount

RAN Simulator leverages Netconf servers to simulate DU's in the  RAN
and DG's that reconfigure YANG tree leaf nodes for closed loop
automation need to also support RESTCONF API calls for YANG tree
leaf nodes behind the mount points. Modified existing DG's and
DG properties file

Issue-ID: CCSDK-1398
Signed-off-by: SandeepLinux <sandeeplinux1068@gmail.com>
Change-Id: I2875860115d6ee07edaa39bfcb2e28c01ac9040f

9 files changed, 3431 insertions, 1236 deletions

diff --git a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_add-neighbor.json b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_add-neighbor.json
index 8b3a703b..459daf4a 100644
--- a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_add-neighbor.json
+++ b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_add-neighbor.json
@@ -1,36 +1,36 @@
 [
     {
-        "id": "f22345c.de9f5b8",
+        "id": "aeeb7f1b.21de4",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='add-neighbor' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 148.0103988647461,
-        "y": 257.98956298828125,
-        "z": "cc83b660.90f568",
+        "x": 129,
+        "y": 216.98956298828125,
+        "z": "5119743a.9ef5ec",
         "wires": [
             [
-                "d7c5d576.1a7868"
+                "ddcea5f4.b62c08"
             ]
         ]
     },
     {
-        "id": "882b1b72.c01588",
+        "id": "c0c05b1f.4be1c8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 168.010404586792,
-        "y": 59.989585876464844,
-        "z": "cc83b660.90f568",
+        "x": 96.00000762939453,
+        "y": 34.989585876464844,
+        "z": "5119743a.9ef5ec",
         "wires": [
             [
-                "96efced.3d6433"
+                "9a9306f0.db8218"
             ]
         ]
     },
     {
-        "id": "96efced.3d6433",
+        "id": "9a9306f0.db8218",
         "type": "service-logic",
         "name": "oofpcipoc-api 0.4.2-SNAPSHOT",
         "module": "oofpcipoc-api",
@@ -38,493 +38,893 @@
         "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='0.4.2-SNAPSHOT'>",
         "outputs": 1,
-        "x": 169.01039123535156,
-        "y": 141.98968315124512,
-        "z": "cc83b660.90f568",
+        "x": 161.99999237060547,
+        "y": 115.98968505859375,
+        "z": "5119743a.9ef5ec",
         "wires": [
             [
-                "f22345c.de9f5b8"
+                "aeeb7f1b.21de4"
             ]
         ]
     },
     {
-        "id": "d7c5d576.1a7868",
+        "id": "ddcea5f4.b62c08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 134.50000381469727,
-        "y": 452.9896240234375,
-        "z": "cc83b660.90f568",
+        "x": 82.48960876464844,
+        "y": 331.9896240234375,
+        "z": "5119743a.9ef5ec",
         "wires": [
             [
-                "ff63b265.d194a",
-                "add1f4bf.f5ec98",
-                "f85efba7.e52cf8",
-                "5b7bde21.76a44",
-                "dd389a0f.51a588",
-                "9b68a77d.4364d8"
+                "92a384d9.f02948",
+                "48d142ef.d9f49c",
+                "bdb38341.e760b",
+                "1110ac05.6f6994",
+                "fc2b7348.4f328",
+                "dd5b7dbc.8d908"
             ]
         ]
     },
     {
-        "id": "ff63b265.d194a",
+        "id": "92a384d9.f02948",
         "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 add-neighbor Execution\" />\n",
         "comments": "",
-        "x": 405.01065826416016,
-        "y": 599.9897012710571,
-        "z": "cc83b660.90f568",
+        "x": 137.000244140625,
+        "y": 578.9896850585938,
+        "z": "5119743a.9ef5ec",
         "wires": []
     },
     {
-        "id": "9832e91f.5dea28",
+        "id": "f4036480.02d348",
         "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/add-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Input RPC Payload request for Alias:  \"/>\n<parameter name=\"field2\" value=\"`$add-neighbor-input.alias`\"/>\n<parameter name=\"field3\" value=\"Input RPC Payload request for add-neighbor. Neighbor Cell #:  \"/>\n<parameter name=\"field4\" value=\"`$idx`\"/>\n<parameter name=\"field5\" value=\"`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].plmnid`\"/>\n<parameter name=\"field6\" value=\"`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].cid`\"/>\n<parameter name=\"field7\" value=\"`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].phy-cell-id`\"/>\n<parameter name=\"field8\" value=\"`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].pnf-name`\"/>\n<parameter name=\"field9\" value=\"`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].blacklisted`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 717.0112991333008,
-        "y": 36.98963642120361,
-        "z": "cc83b660.90f568",
+        "x": 558.0009155273438,
+        "y": 132.98963928222656,
+        "z": "5119743a.9ef5ec",
         "wires": [
             []
         ]
     },
     {
-        "id": "e5a7e054.27e8c",
+        "id": "a94986f.5e05878",
         "type": "comment",
         "name": "Add Neighbor",
         "info": "",
         "comments": "",
-        "x": 371.010404586792,
-        "y": 20,
-        "z": "cc83b660.90f568",
+        "x": 372.0000057220459,
+        "y": 33,
+        "z": "5119743a.9ef5ec",
         "wires": []
     },
     {
-        "id": "4725ca86.5a91c4",
+        "id": "ef8351b1.e89d7",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 911.0106582641602,
-        "y": 520.6666460037231,
-        "z": "cc83b660.90f568",
+        "x": 1106.000259399414,
+        "y": 442.6666326522827,
+        "z": "5119743a.9ef5ec",
         "wires": [
             [
-                "419e89e2.878848"
+                "ac999630.a33af8"
             ]
         ]
     },
     {
-        "id": "419e89e2.878848",
+        "id": "ac999630.a33af8",
         "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": 1114.0104713439941,
-        "y": 526.6666889190674,
-        "z": "cc83b660.90f568",
+        "x": 1309.000072479248,
+        "y": 448.66667556762695,
+        "z": "5119743a.9ef5ec",
         "wires": []
     },
     {
-        "id": "b77d4baf.430698",
+        "id": "8647fd2c.83ed",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 894.0104560852051,
-        "y": 604.6667747497559,
-        "z": "cc83b660.90f568",
+        "x": 1089.000057220459,
+        "y": 526.6667613983154,
+        "z": "5119743a.9ef5ec",
         "wires": [
             [
-                "3d864d85.162082"
+                "3f87ccd6.6e8934"
             ]
         ]
     },
     {
-        "id": "3d864d85.162082",
+        "id": "3f87ccd6.6e8934",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1060.01025390625,
-        "y": 608.6667079925537,
-        "z": "cc83b660.90f568",
+        "x": 1254.999855041504,
+        "y": 530.6666946411133,
+        "z": "5119743a.9ef5ec",
         "wires": [
             [
-                "d764eca7.6c1dd"
+                "1f57f138.7861af"
             ]
         ]
     },
     {
-        "id": "d764eca7.6c1dd",
+        "id": "1f57f138.7861af",
         "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/add-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Details about newly added Neighbor\"/>\n<parameter name=\"field2\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].plmnid`\"/>\n<parameter name=\"field3\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].cid`\"/>\n<parameter name=\"field4\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].phy-cell-id`\"/>\n<parameter name=\"field5\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].pnf-name`\"/>\n<parameter name=\"field6\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].blacklisted`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1236.010196685791,
-        "y": 607.6669750213623,
-        "z": "cc83b660.90f568",
+        "x": 1430.999797821045,
+        "y": 529.6669616699219,
+        "z": "5119743a.9ef5ec",
         "wires": [
             []
         ]
     },
     {
-        "id": "e945229c.9e3f8",
+        "id": "7f995943.734d18",
         "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/add-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for Neighbor Add PUT operation\"/>\n<parameter name=\"field2\" value=\"`$tmp.add-neighbor-service-url`\"/>\n<parameter name=\"field3\" value=\"`$tmp.plmnid`\"/>\n<parameter name=\"field4\" value=\"`$tmp.cid`\"/>\n<parameter name=\"field5\" value=\"`$tmp.phy-cell-id`\"/>\n<parameter name=\"field6\" value=\"`$tmp.pnf-name`\"/>\n<parameter name=\"field7\" value=\"`$tmp.blacklisted`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 614.0113372802734,
-        "y": 442.0000858306885,
-        "z": "cc83b660.90f568",
+        "x": 809.0009384155273,
+        "y": 364.00007247924805,
+        "z": "5119743a.9ef5ec",
         "wires": [
             []
         ]
     },
     {
-        "id": "f85efba7.e52cf8",
+        "id": "bdb38341.e760b",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$add-neighbor-input.lte-cell-number-of-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 566.0961723327637,
-        "y": 44.95317363739014,
-        "z": "cc83b660.90f568",
+        "x": 424.08575439453125,
+        "y": 144.9531707763672,
+        "z": "5119743a.9ef5ec",
         "wires": [
             [
-                "9832e91f.5dea28"
+                "f4036480.02d348"
             ]
         ]
     },
     {
-        "id": "add1f4bf.f5ec98",
+        "id": "48d142ef.d9f49c",
         "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/add-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"RPC to add neighbors. Number of neighbors to add: \"/>\n<parameter name=\"field2\" value=\"`$add-neighbor-input.lte-cell-number-of-entries`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 387.0107116699219,
-        "y": 85.01043033599854,
-        "z": "cc83b660.90f568",
+        "x": 447.00030517578125,
+        "y": 81.01042938232422,
+        "z": "5119743a.9ef5ec",
         "wires": [
             []
         ]
     },
     {
-        "id": "9b68a77d.4364d8",
+        "id": "363b094e.0a3776",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$add-neighbor-input.lte-cell-number-of-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 323.0105800628662,
-        "y": 453.99998664855957,
-        "z": "cc83b660.90f568",
+        "x": 517.0001831054688,
+        "y": 382,
+        "z": "5119743a.9ef5ec",
         "wires": [
             [
-                "d54b1c5c.89e1a"
+                "78f71404.16b18c"
             ]
         ]
     },
     {
-        "id": "2a7d5b86.2f1f74",
+        "id": "6136870d.6c6478",
         "type": "set",
         "name": "set tmp variables for the requested neighbor to be added",
         "xml": "<set>\n<parameter name=\"tmp.plmnid\" value=\"`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].plmnid`\"/>\n<parameter name=\"tmp.cid\" value=\"`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].cid`\"/>\n<parameter name=\"tmp.phy-cell-id\" value=\"`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].phy-cell-id`\"/>\n<parameter name=\"tmp.pnf-name\" value=\"`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].pnf-name`\"/>\n<parameter name=\"tmp.blacklisted\" value=\"`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].blacklisted`\"/>\n<parameter name=\"tmp.alias\" value=\"`$add-neighbor-input.alias`\"/>",
         "comments": "",
-        "x": 876.0115585327148,
-        "y": 125.88908386230469,
-        "z": "cc83b660.90f568",
+        "x": 911.0011596679688,
+        "y": 45.889068603515625,
+        "z": "5119743a.9ef5ec",
         "wires": []
     },
     {
-        "id": "2241af1e.1c926",
+        "id": "6246b287.7aacbc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 914.0107421875,
-        "y": 383.00007915496826,
-        "z": "cc83b660.90f568",
+        "x": 1109.000343322754,
+        "y": 305.00006580352783,
+        "z": "5119743a.9ef5ec",
         "wires": [
             [
-                "1cb43b66.fbd255"
+                "f674a6de.faac88"
             ]
         ]
     },
     {
-        "id": "90d94f4f.9d631",
+        "id": "edbcedd0.5795c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 905.0107002258301,
-        "y": 464.00000190734863,
-        "z": "cc83b660.90f568",
+        "x": 1100.000301361084,
+        "y": 385.9999885559082,
+        "z": "5119743a.9ef5ec",
         "wires": [
             [
-                "70dd741.ff0be8c"
+                "eff48a81.d2c568"
             ]
         ]
     },
     {
-        "id": "1cb43b66.fbd255",
+        "id": "f674a6de.faac88",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1047.0106716156006,
-        "y": 342.0001106262207,
-        "z": "cc83b660.90f568",
+        "x": 1242.0002727508545,
+        "y": 264.0000972747803,
+        "z": "5119743a.9ef5ec",
         "wires": [
             [
-                "469db094.1216"
+                "28976a3f.4f5f06"
             ]
         ]
     },
     {
-        "id": "469db094.1216",
+        "id": "28976a3f.4f5f06",
         "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": 1226.010362625122,
-        "y": 339.00007820129395,
-        "z": "cc83b660.90f568",
+        "x": 1420.999963760376,
+        "y": 261.0000648498535,
+        "z": "5119743a.9ef5ec",
         "wires": []
     },
     {
-        "id": "70dd741.ff0be8c",
+        "id": "eff48a81.d2c568",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1070.0104293823242,
-        "y": 463.00006198883057,
-        "z": "cc83b660.90f568",
+        "x": 1265.0000305175781,
+        "y": 385.00004863739014,
+        "z": "5119743a.9ef5ec",
         "wires": [
             [
-                "2f306524.135d7a"
+                "661aa2c3.9aab5c"
             ]
         ]
     },
     {
-        "id": "2f306524.135d7a",
+        "id": "661aa2c3.9aab5c",
         "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/add-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"PUT New Neighbor Executed Successfully \"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1243.0105438232422,
-        "y": 464.0000944137573,
-        "z": "cc83b660.90f568",
+        "x": 1438.000144958496,
+        "y": 386.0000810623169,
+        "z": "5119743a.9ef5ec",
         "wires": [
             []
         ]
     },
     {
-        "id": "d54b1c5c.89e1a",
+        "id": "78f71404.16b18c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 403.0103988647461,
-        "y": 392.0104808807373,
-        "z": "cc83b660.90f568",
+        "x": 629,
+        "y": 262.0104675292969,
+        "z": "5119743a.9ef5ec",
         "wires": [
             [
-                "2a7d5b86.2f1f74",
-                "e945229c.9e3f8",
-                "6df2494b.4e3978",
-                "89170580.861658",
-                "27948b9f.2a3644",
-                "4d365ed1.6f0aa",
-                "9041c096.4c873",
-                "a5298f6.4caf87",
-                "98094ef7.d5497",
-                "75189f8.6382e6"
+                "6136870d.6c6478",
+                "7f995943.734d18",
+                "f2193064.b94cb",
+                "5ed24074.bab9f",
+                "4c6d75c9.00d93c",
+                "3c21b3a5.bda2cc",
+                "6fce4ab.12f26b4",
+                "d6d8f210.b0639",
+                "adc061b8.23a98",
+                "3587edc4.c1b4e2"
             ]
         ]
     },
     {
-        "id": "5b7bde21.76a44",
+        "id": "1110ac05.6f6994",
         "type": "execute",
         "name": "execute Properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/sdnr-oofpcipoc-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 612.0106506347656,
-        "y": 91.01041412353516,
-        "z": "cc83b660.90f568",
+        "x": 453.000244140625,
+        "y": 202.01040649414062,
+        "z": "5119743a.9ef5ec",
         "wires": [
             []
         ]
     },
     {
-        "id": "dd389a0f.51a588",
+        "id": "fc2b7348.4f328",
         "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/add-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Properties read .. neighbor-add template\"/>\n<parameter name=\"field2\" value=\"`$prop.neighbor-add.templatefile`\"/>\n<parameter name=\"field3\" value=\"`$prop.controller.user`\"/>\n<parameter name=\"field4\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"field5\" value=\"`$prop.controller.url`\"/>\n<parameter name=\"field6\" value=\"`$prop.restapi.lte-ran-neighbor-in-use`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 572.010778427124,
-        "y": 141.01051807403564,
-        "z": "cc83b660.90f568",
+        "x": 410.0003662109375,
+        "y": 253.01051330566406,
+        "z": "5119743a.9ef5ec",
         "wires": [
             []
         ]
     },
     {
-        "id": "6df2494b.4e3978",
+        "id": "f2193064.b94cb",
         "type": "execute",
         "name": "generate neighbor add URL",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.lte-ran-neighbor-in-use`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.add-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{alias}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.alias`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 811.0109329223633,
-        "y": 217.01056575775146,
-        "z": "cc83b660.90f568",
+        "x": 966.0005493164062,
+        "y": 127.01055145263672,
+        "z": "5119743a.9ef5ec",
         "wires": [
             []
         ]
     },
     {
-        "id": "89170580.861658",
+        "id": "5ed24074.bab9f",
         "type": "execute",
         "name": "add a neighbor using PUT",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/oofpcipoc-addNeighbor.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.add-neighbor-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"PUT\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-add-neighbor-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />",
         "comments": "",
         "outputs": 1,
-        "x": 652.0107727050781,
-        "y": 489.01055335998535,
-        "z": "cc83b660.90f568",
+        "x": 847.000373840332,
+        "y": 411.0105400085449,
+        "z": "5119743a.9ef5ec",
         "wires": [
             [
-                "2241af1e.1c926",
-                "90d94f4f.9d631"
+                "6246b287.7aacbc",
+                "edbcedd0.5795c"
             ]
         ]
     },
     {
-        "id": "27948b9f.2a3644",
+        "id": "4c6d75c9.00d93c",
         "type": "execute",
         "name": "Get newly added neighbor details",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.add-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": 638.0105438232422,
-        "y": 547.0106000900269,
-        "z": "cc83b660.90f568",
+        "x": 833.0001449584961,
+        "y": 469.0105867385864,
+        "z": "5119743a.9ef5ec",
         "wires": [
             [
-                "4725ca86.5a91c4",
-                "b77d4baf.430698"
+                "ef8351b1.e89d7",
+                "8647fd2c.83ed"
             ]
         ]
     },
     {
-        "id": "1daa570b.6f6d19",
+        "id": "3c21b3a5.bda2cc",
         "type": "execute",
-        "name": "Recofigure PCI for a Cell",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/oofpcipoc-pci-patch.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.oofpcipoc.patch.pci.url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"PATCH\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-patch-response\"/>\n<parameter name='contentType' value='application/yang.patch+json' /> \n<parameter name='accept' value='application/yang.patch-status+json' />",
+        "name": "populate plmnid",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.add-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.add-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{plmnid}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.plmnid`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 845.0104293823242,
-        "y": 795.0104370117188,
-        "z": "cc83b660.90f568",
+        "x": 1045.0002212524414,
+        "y": 226.01038932800293,
+        "z": "5119743a.9ef5ec",
         "wires": [
             []
         ]
     },
     {
-        "id": "4d365ed1.6f0aa",
+        "id": "6fce4ab.12f26b4",
         "type": "execute",
-        "name": "execute slipluginutils",
+        "name": "populate cid",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.add-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.add-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{cid}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.cid`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 873.0001678466797,
+        "y": 321.0103921890259,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d6d8f210.b0639",
+        "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/add-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Add Neighbor List URL\"/>\n<parameter name=\"field2\" value=\"`$tmp.add-neighbor-service-url`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 959.0000991821289,
+        "y": 179.01039028167725,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "adc061b8.23a98",
+        "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/add-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Add Neighbor List URL\"/>\n<parameter name=\"field2\" value=\"`$tmp.add-neighbor-service-url`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 986.000057220459,
+        "y": 269.0103907585144,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3587edc4.c1b4e2",
+        "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/add-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Temporary variable for Neighbor Cell #:  \"/>\n<parameter name=\"field2\" value=\"`$idx`\"/>\n<parameter name=\"field3\" value=\"`$tmp.plmnid`\"/>\n<parameter name=\"field4\" value=\"`$tmp.cid`\"/>\n<parameter name=\"field5\" value=\"`$tmp.phy-cell-id`\"/>\n<parameter name=\"field6\" value=\"`$tmp.pnf-name`\"/>\n<parameter name=\"field7\" value=\"`$tmp.blacklisted`\"/>\n<parameter name=\"field8\" value=\"`$tmp.alias`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 819.0000610351562,
+        "y": 93.01041412353516,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7d79f8c7.dc0998",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 950,
+        "y": 986,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            [
+                "b55a3fbd.f2373"
+            ]
+        ]
+    },
+    {
+        "id": "b55a3fbd.f2373",
+        "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": 1152.999813079834,
+        "y": 992.0000429153442,
+        "z": "5119743a.9ef5ec",
+        "wires": []
+    },
+    {
+        "id": "4b83adf6.1b4d14",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 932.9997978210449,
+        "y": 1070.0001287460327,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            [
+                "f623dc48.7bc69"
+            ]
+        ]
+    },
+    {
+        "id": "f623dc48.7bc69",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1098.9995956420898,
+        "y": 1074.0000619888306,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            [
+                "362eeae.fdf5716"
+            ]
+        ]
+    },
+    {
+        "id": "362eeae.fdf5716",
+        "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/add-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Details about newly added Neighbor\"/>\n<parameter name=\"field2\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].plmnid`\"/>\n<parameter name=\"field3\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].cid`\"/>\n<parameter name=\"field4\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].phy-cell-id`\"/>\n<parameter name=\"field5\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].pnf-name`\"/>\n<parameter name=\"field6\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].blacklisted`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1274.9995384216309,
+        "y": 1073.0003290176392,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "15df17e8.d9f018",
+        "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/add-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for Neighbor Add PUT operation\"/>\n<parameter name=\"field2\" value=\"`$tmp.add-neighbor-service-url`\"/>\n<parameter name=\"field3\" value=\"`$tmp.plmnid`\"/>\n<parameter name=\"field4\" value=\"`$tmp.cid`\"/>\n<parameter name=\"field5\" value=\"`$tmp.phy-cell-id`\"/>\n<parameter name=\"field6\" value=\"`$tmp.pnf-name`\"/>\n<parameter name=\"field7\" value=\"`$tmp.blacklisted`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 653.0006790161133,
+        "y": 907.3334398269653,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "250e361f.428f2a",
+        "type": "set",
+        "name": "set tmp variables for the requested neighbor to be added",
+        "xml": "<set>\n<parameter name=\"tmp.plmnid\" value=\"`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].plmnid`\"/>\n<parameter name=\"tmp.cid\" value=\"`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].cid`\"/>\n<parameter name=\"tmp.phy-cell-id\" value=\"`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].phy-cell-id`\"/>\n<parameter name=\"tmp.pnf-name\" value=\"`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].pnf-name`\"/>\n<parameter name=\"tmp.blacklisted\" value=\"`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].blacklisted`\"/>\n<parameter name=\"tmp.alias\" value=\"`$add-neighbor-input.alias`\"/>",
+        "comments": "",
+        "x": 838.0009155273438,
+        "y": 567.222412109375,
+        "z": "5119743a.9ef5ec",
+        "wires": []
+    },
+    {
+        "id": "6b6a9cd4.106434",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 953.0000839233398,
+        "y": 848.3334331512451,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            [
+                "58f8ef76.6067d"
+            ]
+        ]
+    },
+    {
+        "id": "8cf43b7e.792208",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 944.0000419616699,
+        "y": 929.3333559036255,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            [
+                "ccc2d5ee.fb0fe8"
+            ]
+        ]
+    },
+    {
+        "id": "58f8ef76.6067d",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1086.0000133514404,
+        "y": 807.3334646224976,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            [
+                "29979cbe.d55e64"
+            ]
+        ]
+    },
+    {
+        "id": "29979cbe.d55e64",
+        "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": 1264.999704360962,
+        "y": 804.3334321975708,
+        "z": "5119743a.9ef5ec",
+        "wires": []
+    },
+    {
+        "id": "ccc2d5ee.fb0fe8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1108.999771118164,
+        "y": 928.3334159851074,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            [
+                "1b563cee.d83563"
+            ]
+        ]
+    },
+    {
+        "id": "1b563cee.d83563",
+        "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/add-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"PUT New Neighbor Executed Successfully \"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1281.999885559082,
+        "y": 929.3334484100342,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4d2987ef.ea1658",
+        "type": "execute",
+        "name": "generate neighbor add URL",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.lte-ran-neighbor-in-use.ransim-mounted`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.add-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{alias}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.alias`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 781.0003051757812,
+        "y": 659.3439331054688,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "cc502fa8.e9011",
+        "type": "execute",
+        "name": "add a neighbor using PUT",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/oofpcipoc-addNeighbor.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.add-neighbor-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"PUT\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-add-neighbor-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 691.000114440918,
+        "y": 954.3439073562622,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            [
+                "6b6a9cd4.106434",
+                "8cf43b7e.792208"
+            ]
+        ]
+    },
+    {
+        "id": "beeeee7c.ffc14",
+        "type": "execute",
+        "name": "Get newly added neighbor details",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.add-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": 676.999885559082,
+        "y": 1012.3439540863037,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            [
+                "7d79f8c7.dc0998",
+                "4b83adf6.1b4d14"
+            ]
+        ]
+    },
+    {
+        "id": "fc7661ec.d45a3",
+        "type": "execute",
+        "name": "populate plmnid",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.add-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.add-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{plmnid}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.plmnid`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 850.0106201171875,
-        "y": 304.01040267944336,
-        "z": "cc83b660.90f568",
+        "x": 844.9999389648438,
+        "y": 771.34375,
+        "z": "5119743a.9ef5ec",
         "wires": [
             []
         ]
     },
     {
-        "id": "9041c096.4c873",
+        "id": "7d7a277.ff55dd8",
         "type": "execute",
-        "name": "execute slipluginutils",
+        "name": "populate cid",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.add-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.add-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{cid}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.cid`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 678.0105667114258,
-        "y": 399.0104055404663,
-        "z": "cc83b660.90f568",
+        "x": 716.9999084472656,
+        "y": 864.3437595367432,
+        "z": "5119743a.9ef5ec",
         "wires": [
             []
         ]
     },
     {
-        "id": "a5298f6.4caf87",
+        "id": "6a3cb946.4407b8",
         "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/add-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Add Neighbor List URL\"/>\n<parameter name=\"field2\" value=\"`$tmp.add-neighbor-service-url`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 764.010498046875,
-        "y": 257.0104036331177,
-        "z": "cc83b660.90f568",
+        "x": 699.9998168945312,
+        "y": 710.34375,
+        "z": "5119743a.9ef5ec",
         "wires": [
             []
         ]
     },
     {
-        "id": "98094ef7.d5497",
+        "id": "d2640cd6.ff60a",
         "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/add-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Add Neighbor List URL\"/>\n<parameter name=\"field2\" value=\"`$tmp.add-neighbor-service-url`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 791.0104560852051,
-        "y": 347.01040410995483,
-        "z": "cc83b660.90f568",
+        "x": 829.9997978210449,
+        "y": 812.3437581062317,
+        "z": "5119743a.9ef5ec",
         "wires": [
             []
         ]
     },
     {
-        "id": "75189f8.6382e6",
+        "id": "c207f64e.adf758",
         "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/add-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Temporary variable for Neighbor Cell #:  \"/>\n<parameter name=\"field2\" value=\"`$idx`\"/>\n<parameter name=\"field3\" value=\"`$tmp.plmnid`\"/>\n<parameter name=\"field4\" value=\"`$tmp.cid`\"/>\n<parameter name=\"field5\" value=\"`$tmp.phy-cell-id`\"/>\n<parameter name=\"field6\" value=\"`$tmp.pnf-name`\"/>\n<parameter name=\"field7\" value=\"`$tmp.blacklisted`\"/>\n<parameter name=\"field8\" value=\"`$tmp.alias`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 760.0104751586914,
-        "y": 173.01042461395264,
-        "z": "cc83b660.90f568",
+        "x": 696.9998168945312,
+        "y": 613.34375,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "503b0a42.4fcef4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 441.99974060058594,
+        "y": 857.3438348770142,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            [
+                "250e361f.428f2a",
+                "15df17e8.d9f018",
+                "4d2987ef.ea1658",
+                "cc502fa8.e9011",
+                "beeeee7c.ffc14",
+                "fc7661ec.d45a3",
+                "7d7a277.ff55dd8",
+                "6a3cb946.4407b8",
+                "d2640cd6.ff60a",
+                "c207f64e.adf758",
+                "111c92b7.4948cd"
+            ]
+        ]
+    },
+    {
+        "id": "8fc7c5ca.cbf158",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end=\"`$add-neighbor-input.lte-cell-number-of-entries`\" >",
+        "comments": "",
+        "outputs": 1,
+        "x": 478.9999084472656,
+        "y": 541.3333740234375,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            [
+                "503b0a42.4fcef4"
+            ]
+        ]
+    },
+    {
+        "id": "dd5b7dbc.8d908",
+        "type": "switchNode",
+        "name": "switch mounted",
+        "xml": "<switch test='`$prop.ransim-mounted`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 284,
+        "y": 448,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            [
+                "d370c315.857ce",
+                "15822244.a3083e"
+            ]
+        ]
+    },
+    {
+        "id": "d370c315.857ce",
+        "type": "outcome",
+        "name": "Not Mounted",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 371,
+        "y": 319,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            [
+                "363b094e.0a3776"
+            ]
+        ]
+    },
+    {
+        "id": "15822244.a3083e",
+        "type": "outcome",
+        "name": "Mounted",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 319,
+        "y": 571,
+        "z": "5119743a.9ef5ec",
+        "wires": [
+            [
+                "8fc7c5ca.cbf158"
+            ]
+        ]
+    },
+    {
+        "id": "111c92b7.4948cd",
+        "type": "execute",
+        "name": "populate netconf mount",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.add-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.add-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{pnf-name}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.pnf-name`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 891,
+        "y": 722,
+        "z": "5119743a.9ef5ec",
         "wires": [
             []
         ]
     }
-]
+]
\ No newline at end of file
diff --git a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_configuration-phy-cell-id.json b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_configuration-phy-cell-id.json
index 3df8daf5..901f1c3c 100644
--- a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_configuration-phy-cell-id.json
+++ b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_configuration-phy-cell-id.json
@@ -1,577 +1,1053 @@
 [
     {
-        "id": "c92045e8.ea6de8",
+        "id": "5cfe1e32.70c03",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='configuration-phy-cell-id' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 146.01040649414062,
-        "y": 255.98958015441895,
-        "z": "630a4d24.993484",
+        "x": 70.00000762939453,
+        "y": 157.98959350585938,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "9f1b4c27.d960a"
+                "3e0b09ab.48e706"
             ]
         ]
     },
     {
-        "id": "9539a9a2.85af98",
+        "id": "5972e355.1f90dc",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 162.010404586792,
-        "y": 59.989585876464844,
-        "z": "630a4d24.993484",
+        "x": 72.00000762939453,
+        "y": 8.98958969116211,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "3e707ad2.360716"
+                "54079cf7.5dc664"
             ]
         ]
     },
     {
-        "id": "3e707ad2.360716",
+        "id": "54079cf7.5dc664",
         "type": "service-logic",
-        "name": "oofpcipoc-api 0.4.2-SNAPSHOT",
+        "name": "oofpcipoc-api ${project.version}",
         "module": "oofpcipoc-api",
         "version": "${project.version}",
         "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='0.4.2-SNAPSHOT'>",
+        "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": 163.01039123535156,
-        "y": 141.98968315124512,
-        "z": "630a4d24.993484",
+        "x": 123.99999237060547,
+        "y": 75.98968505859375,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "c92045e8.ea6de8"
+                "5cfe1e32.70c03"
             ]
         ]
     },
     {
-        "id": "9f1b4c27.d960a",
+        "id": "3e0b09ab.48e706",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 128.50000381469727,
-        "y": 452.9896240234375,
-        "z": "630a4d24.993484",
+        "x": 91.48960494995117,
+        "y": 327.9896240234375,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "3b3e33d7.8ccbec",
-                "aea59ecf.32eac",
-                "64536be7.433404",
-                "1c97574b.348629",
-                "d18d833e.494d1",
-                "9cf5b7f.c337448"
+                "769a67ee.dde568",
+                "9f7ed3ae.40866",
+                "4e6eb75.eedf548",
+                "9fe3285b.bcd158",
+                "5791230f.7e399c",
+                "8025c437.0aac68"
             ]
         ]
     },
     {
-        "id": "3b3e33d7.8ccbec",
+        "id": "769a67ee.dde568",
         "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": 574.010663986206,
-        "y": 766.9897136688232,
-        "z": "630a4d24.993484",
+        "x": 89.00027465820312,
+        "y": 605.98974609375,
+        "z": "231735cb.81484a",
         "wires": []
     },
     {
-        "id": "1659db0a.819375",
+        "id": "e61e6aa7.761fa8",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Input RPC Payload request. FAP #:  \"/>\n<parameter name=\"field2\" value=\"`$idx`\"/>\n<parameter name=\"field3\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].alias`\"/>\n<parameter name=\"field4\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].cid`\"/>\n<parameter name=\"field5\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].phy-cell-id-in-use`\"/>\n<parameter name=\"field6\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].pnf-name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 714.0109386444092,
-        "y": 45.989633560180664,
-        "z": "630a4d24.993484",
+        "x": 586.0005493164062,
+        "y": 16.989639282226562,
+        "z": "231735cb.81484a",
         "wires": [
             []
         ]
     },
     {
-        "id": "719be637.af1098",
+        "id": "a8c7df6e.f7389",
         "type": "comment",
         "name": "configuration-phy-cell-id",
         "info": "",
         "comments": "",
-        "x": 365.010404586792,
-        "y": 20,
-        "z": "630a4d24.993484",
+        "x": 301,
+        "y": 28.0000057220459,
+        "z": "231735cb.81484a",
         "wires": []
     },
     {
-        "id": "fdc1c4b9.c07738",
+        "id": "98c7f031.3beb4",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Initial FAP Service PCI PARMS\"/>\n<parameter name=\"field2\" value=\"`$oofpcigetfapservice.fap-service[0].alias`\"/>\n<parameter name=\"field3\" value=\"`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.phy-cell-id-in-use`\"/>\n<parameter name=\"field4\" value=\"`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.pnf-name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1173.0104751586914,
-        "y": 248.99999809265137,
-        "z": "630a4d24.993484",
+        "x": 1333.0000762939453,
+        "y": 147.0000033378601,
+        "z": "231735cb.81484a",
         "wires": [
             []
         ]
     },
     {
-        "id": "8e0153f0.5dad7",
+        "id": "37b670d3.2d75d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 873.0106048583984,
-        "y": 214.00000953674316,
-        "z": "630a4d24.993484",
+        "x": 1033.0002059936523,
+        "y": 112.0000147819519,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "b5827573.4ab448"
+                "e5c0ae7e.fb12e"
             ]
         ]
     },
     {
-        "id": "b5827573.4ab448",
+        "id": "e5c0ae7e.fb12e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing Get odutopo node details rest api\" />",
         "comments": "",
-        "x": 1189.0105895996094,
-        "y": 206.0000286102295,
-        "z": "630a4d24.993484",
+        "x": 1349.0001907348633,
+        "y": 104.00003385543823,
+        "z": "231735cb.81484a",
         "wires": []
     },
     {
-        "id": "7c752a60.4979e4",
+        "id": "6807fd7c.9ffd14",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 910.0107460021973,
-        "y": 311.99999237060547,
-        "z": "630a4d24.993484",
+        "x": 1070.0003471374512,
+        "y": 209.9999976158142,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "e7ad2f93.1f739"
+                "61cbf7c3.3277c8"
             ]
         ]
     },
     {
-        "id": "e7ad2f93.1f739",
+        "id": "61cbf7c3.3277c8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1006.0104560852051,
-        "y": 254.00000095367432,
-        "z": "630a4d24.993484",
+        "x": 1166.000057220459,
+        "y": 152.00000619888306,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "fdc1c4b9.c07738"
+                "98c7f031.3beb4"
             ]
         ]
     },
     {
-        "id": "cb2275bc.1f41e8",
+        "id": "eb64f79e.fd6af8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 905.0105609893799,
-        "y": 566.6666400432587,
-        "z": "630a4d24.993484",
+        "x": 1065.0001621246338,
+        "y": 464.6666452884674,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "905dd9f3.40a588"
+                "2883bb3f.bc91d4"
             ]
         ]
     },
     {
-        "id": "905dd9f3.40a588",
+        "id": "2883bb3f.bc91d4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing patch rest api\" />",
         "comments": "",
-        "x": 1115.0104541778564,
-        "y": 585.6666898727417,
-        "z": "630a4d24.993484",
+        "x": 1275.0000553131104,
+        "y": 483.66669511795044,
+        "z": "231735cb.81484a",
         "wires": []
     },
     {
-        "id": "5c97d0d3.3281d",
+        "id": "6d15fc65.dab3d4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 896.010419845581,
-        "y": 705.6667537689209,
-        "z": "630a4d24.993484",
+        "x": 1056.000020980835,
+        "y": 603.6667590141296,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "8d8c927b.5b512"
+                "a0dc8cc1.dd008"
             ]
         ]
     },
     {
-        "id": "8d8c927b.5b512",
+        "id": "a0dc8cc1.dd008",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1084.010290145874,
-        "y": 703.6666603088379,
-        "z": "630a4d24.993484",
+        "x": 1243.999891281128,
+        "y": 601.6666655540466,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "989894d0.463e08"
+                "c1020cf0.6879f"
             ]
         ]
     },
     {
-        "id": "989894d0.463e08",
+        "id": "c1020cf0.6879f",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Post Reconfig FAP Service PCI PARMS\"/>\n<parameter name=\"field2\" value=\"`$oofpcigetfapservice.fap-service[0].alias`\"/>\n<parameter name=\"field3\" value=\"`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.phy-cell-id-in-use`\"/>\n<parameter name=\"field4\" value=\"`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.pnf-name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1268.0102233886719,
-        "y": 677.6668834686279,
-        "z": "630a4d24.993484",
+        "x": 1427.9998245239258,
+        "y": 575.6668887138367,
+        "z": "231735cb.81484a",
         "wires": [
             []
         ]
     },
     {
-        "id": "fcc41fc.bfb59e",
+        "id": "7ecd6e45.7e277",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for GET operation\"/>\n<parameter name=\"field2\" value=\"`$tmp.fap-service-url`\"/>\n<parameter name=\"field3\" value=\"`$tmp.alias`\"/>\n<parameter name=\"field4\" value=\"`$tmp.cid`\"/>\n<parameter name=\"field5\" value=\"`$tmp.phy-cell-id-in-use`\"/>\n<parameter name=\"field6\" value=\"`$tmp.pnf-name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 639.011058807373,
-        "y": 299.00009632110596,
-        "z": "630a4d24.993484",
+        "x": 799.000659942627,
+        "y": 197.0001015663147,
+        "z": "231735cb.81484a",
         "wires": [
             []
         ]
     },
     {
-        "id": "64536be7.433404",
+        "id": "4e6eb75.eedf548",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$configuration-phy-cell-id-input.fap-service-number-of-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 560.0960960388184,
-        "y": 43.95316982269287,
-        "z": "630a4d24.993484",
+        "x": 456.085693359375,
+        "y": 16.95317840576172,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "1659db0a.819375"
+                "e61e6aa7.761fa8"
             ]
         ]
     },
     {
-        "id": "aea59ecf.32eac",
+        "id": "9f7ed3ae.40866",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"RPC to Configure PCI INVOKED. Number of Cells to configure: \"/>\n<parameter name=\"field2\" value=\"`$configuration-phy-cell-id-input.fap-service-number-of-entries`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 381.01070404052734,
-        "y": 85.01043033599854,
-        "z": "630a4d24.993484",
+        "x": 241.00030517578125,
+        "y": 137.01043701171875,
+        "z": "231735cb.81484a",
         "wires": [
             []
         ]
     },
     {
-        "id": "9cf5b7f.c337448",
+        "id": "7d38cbac.d25ac4",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$configuration-phy-cell-id-input.fap-service-number-of-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 317.0105800628662,
-        "y": 453.99998664855957,
-        "z": "630a4d24.993484",
+        "x": 480.00018310546875,
+        "y": 381,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "6b550b6e.4ab944"
+                "ad5896c2.1372a8"
             ]
         ]
     },
     {
-        "id": "65d9020f.1c2dbc",
+        "id": "88625aaa.05ac08",
         "type": "set",
         "name": "set tmp variables for the requested fap service input parms",
         "xml": "<set>\n<parameter name=\"tmp.alias\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].alias`\"/>\n<parameter name=\"tmp.cid\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].cid`\"/>\n<parameter name=\"tmp.phy-cell-id-in-use\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].phy-cell-id-in-use`\"/>\n<parameter name=\"tmp.pnf-name\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].pnf-name`\"/>\n",
         "comments": "",
-        "x": 767.0114974975586,
-        "y": 176.88908100128174,
-        "z": "630a4d24.993484",
+        "x": 927.0010986328125,
+        "y": 74.88908624649048,
+        "z": "231735cb.81484a",
         "wires": []
     },
     {
-        "id": "10092a64.445696",
+        "id": "f4e5fe0e.4b9c6",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 908.0107421875,
-        "y": 383.00007915496826,
-        "z": "630a4d24.993484",
+        "x": 1068.000343322754,
+        "y": 281.000084400177,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "83ffe0f1.145c2"
+                "78c5715f.569f1"
             ]
         ]
     },
     {
-        "id": "2f27ee2e.cd2152",
+        "id": "d86bb55b.e8fa48",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 905.0106735229492,
-        "y": 512.0000009536743,
-        "z": "630a4d24.993484",
+        "x": 1065.0002746582031,
+        "y": 410.00000619888306,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "9a40bd5d.b03b7"
+                "c51a3fee.9dc2a"
             ]
         ]
     },
     {
-        "id": "83ffe0f1.145c2",
+        "id": "78c5715f.569f1",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1041.0106716156006,
-        "y": 342.0001106262207,
-        "z": "630a4d24.993484",
+        "x": 1201.0002727508545,
+        "y": 240.00011587142944,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "ebac1d30.63c39"
+                "4bd1d88c.a2c018"
             ]
         ]
     },
     {
-        "id": "ebac1d30.63c39",
+        "id": "4bd1d88c.a2c018",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing patch rest api\" />",
         "comments": "",
-        "x": 1220.010362625122,
-        "y": 339.00007820129395,
-        "z": "630a4d24.993484",
+        "x": 1379.999963760376,
+        "y": 237.00008344650269,
+        "z": "231735cb.81484a",
         "wires": []
     },
     {
-        "id": "9a40bd5d.b03b7",
+        "id": "c51a3fee.9dc2a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1063.0104160308838,
-        "y": 478.00006103515625,
-        "z": "630a4d24.993484",
+        "x": 1223.0000171661377,
+        "y": 376.000066280365,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "6b0cf27b.81140c"
+                "1390b236.ee339e"
             ]
         ]
     },
     {
-        "id": "6b0cf27b.81140c",
+        "id": "1390b236.ee339e",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"PUT PCI POC FAP SERVICE. Reconfigured \"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1242.0104846954346,
-        "y": 477.0000476837158,
-        "z": "630a4d24.993484",
+        "x": 1402.0000858306885,
+        "y": 375.00005292892456,
+        "z": "231735cb.81484a",
         "wires": [
             []
         ]
     },
     {
-        "id": "6b550b6e.4ab944",
+        "id": "ad5896c2.1372a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 397.0103988647461,
-        "y": 392.0104808807373,
-        "z": "630a4d24.993484",
+        "x": 584,
+        "y": 227.010498046875,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "65d9020f.1c2dbc",
-                "fcc41fc.bfb59e",
-                "a04061b8.e630e",
-                "2fa514b0.d7bf8c",
-                "3efc9869.e2bda8",
-                "ec3507db.a35b28",
-                "31202ee3.c34b22",
-                "aab3655.f43a598"
+                "88625aaa.05ac08",
+                "7ecd6e45.7e277",
+                "4a8297f3.fab368",
+                "9f1665ce.4fd9f8",
+                "f010d789.53a0a8",
+                "7e3a85f3.f482ac",
+                "a4027203.6535b",
+                "47db6df.2075794"
             ]
         ]
     },
     {
-        "id": "ec3507db.a35b28",
+        "id": "7e3a85f3.f482ac",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"URL and Target for PCI patch URL\"/>\n<parameter name='field2' value=\"`$prop.controller.url + $tmp.oofpcipoc.patch.pci.url`\" />\n<parameter name='field3' value=\"`$prop.oofpcipoc.patch.pci.target`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 640.0110626220703,
-        "y": 468.01043033599854,
-        "z": "630a4d24.993484",
+        "x": 800.0006637573242,
+        "y": 366.0104355812073,
+        "z": "231735cb.81484a",
         "wires": [
             []
         ]
     },
     {
-        "id": "1c97574b.348629",
+        "id": "9fe3285b.bcd158",
         "type": "execute",
         "name": "execute Properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/sdnr-oofpcipoc-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 606.0105514526367,
-        "y": 92.0104169845581,
-        "z": "630a4d24.993484",
+        "x": 482.00018310546875,
+        "y": 68.01042175292969,
+        "z": "231735cb.81484a",
         "wires": [
             []
         ]
     },
     {
-        "id": "d18d833e.494d1",
+        "id": "5791230f.7e399c",
         "type": "record",
         "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Properties read .. pci patch target\"/>\n<parameter name=\"field2\" value=\"`$prop.oofpcipoc.patch.pci.target`\"/>\n<parameter name=\"field3\" value=\"`$prop.controller.user`\"/>\n<parameter name=\"field4\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"field5\" value=\"`$prop.controller.url`\"/>",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Properties read .. pci patch target\"/>\n<parameter name=\"field2\" value=\"`$prop.oofpcipoc.patch.pci.target`\"/>\n<parameter name=\"field3\" value=\"`$prop.controller.user`\"/>\n<parameter name=\"field4\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"field5\" value=\"`$prop.controller.url`\"/>\n<parameter name=\"field6\" value=\"ransim-mounted (true/false): \"/>\n<parameter name=\"field7\" value=\"`$prop.ransim-mounted`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 603.0106964111328,
-        "y": 139.0104742050171,
-        "z": "630a4d24.993484",
+        "x": 447.00030517578125,
+        "y": 112.01048278808594,
+        "z": "231735cb.81484a",
         "wires": [
             []
         ]
     },
     {
-        "id": "2fa514b0.d7bf8c",
+        "id": "9f1665ce.4fd9f8",
         "type": "execute",
         "name": "Get FAP details for a Cell",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.fap-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"oofpcigetfapservice\"/>\n<parameter name='contentType' value='application/json' />",
         "comments": "",
         "outputs": 1,
-        "x": 668.0109405517578,
-        "y": 370.01039123535156,
-        "z": "630a4d24.993484",
+        "x": 828.0005416870117,
+        "y": 268.0103964805603,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "8e0153f0.5dad7",
-                "7c752a60.4979e4"
+                "37b670d3.2d75d",
+                "6807fd7c.9ffd14"
             ]
         ]
     },
     {
-        "id": "a04061b8.e630e",
+        "id": "4a8297f3.fab368",
         "type": "execute",
         "name": "generate fap-service url",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.fap-service`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.fap-service-url\"/>\n    <parameter name=\"target\" value=\"{alias}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.alias`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 680.0106430053711,
-        "y": 242.01049280166626,
-        "z": "630a4d24.993484",
+        "x": 841.000244140625,
+        "y": 141.010498046875,
+        "z": "231735cb.81484a",
         "wires": [
             []
         ]
     },
     {
-        "id": "3efc9869.e2bda8",
+        "id": "f010d789.53a0a8",
         "type": "execute",
         "name": "generate pci patch url for a cell",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.x-005b9-lte`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.oofpcipoc.patch.pci.url\"/>\n    <parameter name=\"target\" value=\"{alias}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.alias`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 678.0105743408203,
-        "y": 413.01040744781494,
-        "z": "630a4d24.993484",
+        "x": 838.0001754760742,
+        "y": 311.0104126930237,
+        "z": "231735cb.81484a",
         "wires": [
             []
         ]
     },
     {
-        "id": "31202ee3.c34b22",
+        "id": "a4027203.6535b",
         "type": "execute",
         "name": "Recofigure PCI for a Cell",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/oofpcipoc-pci-patch.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.oofpcipoc.patch.pci.url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"PATCH\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-patch-response\"/>\n<parameter name='contentType' value='application/yang.patch+json' /> \n<parameter name='format' value='json' />\n<parameter name='accept' value='application/yang.patch-status+json' />",
         "comments": "",
         "outputs": 1,
-        "x": 661.0104751586914,
-        "y": 544.0105457305908,
-        "z": "630a4d24.993484",
+        "x": 821.0000762939453,
+        "y": 442.01055097579956,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "10092a64.445696",
-                "2f27ee2e.cd2152"
+                "f4e5fe0e.4b9c6",
+                "d86bb55b.e8fa48"
             ]
         ]
     },
     {
-        "id": "aab3655.f43a598",
+        "id": "47db6df.2075794",
         "type": "execute",
         "name": "Get FAP details for a Cell",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.fap-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"oofpcigetfapservice\"/>\n<parameter name='contentType' value='application/json' />",
         "comments": "",
         "outputs": 1,
-        "x": 640.0104293823242,
-        "y": 631.0104370117188,
-        "z": "630a4d24.993484",
+        "x": 800.0000305175781,
+        "y": 529.0104422569275,
+        "z": "231735cb.81484a",
         "wires": [
             [
-                "cb2275bc.1f41e8",
-                "5c97d0d3.3281d"
+                "eb64f79e.fd6af8",
+                "6d15fc65.dab3d4"
             ]
         ]
     },
     {
-        "id": "dc5e9a0c.421988",
+        "id": "8e234f95.57b72",
         "type": "execute",
         "name": "Recofigure PCI for a Cell",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/oofpcipoc-pci-patch.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.oofpcipoc.patch.pci.url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"PATCH\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-patch-response\"/>\n<parameter name='contentType' value='application/yang.patch+json' /> \n<parameter name='accept' value='application/yang.patch-status+json' />",
         "comments": "",
         "outputs": 1,
-        "x": 839.0104293823242,
-        "y": 795.0104370117188,
-        "z": "630a4d24.993484",
+        "x": 111,
+        "y": 867.0104370117188,
+        "z": "231735cb.81484a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8025c437.0aac68",
+        "type": "switchNode",
+        "name": "switch mounted",
+        "xml": "<switch test='`$prop.ransim-mounted`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 279,
+        "y": 425,
+        "z": "231735cb.81484a",
+        "wires": [
+            [
+                "2ba4e078.c9991",
+                "450d192e.16e4c8"
+            ]
+        ]
+    },
+    {
+        "id": "2ba4e078.c9991",
+        "type": "outcome",
+        "name": "Not Mounted",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 355,
+        "y": 313,
+        "z": "231735cb.81484a",
+        "wires": [
+            [
+                "7d38cbac.d25ac4"
+            ]
+        ]
+    },
+    {
+        "id": "450d192e.16e4c8",
+        "type": "outcome",
+        "name": "Mounted",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 253,
+        "y": 526,
+        "z": "231735cb.81484a",
+        "wires": [
+            [
+                "df962bc0.9c4728"
+            ]
+        ]
+    },
+    {
+        "id": "3804aecc.1eda72",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Initial FAP Service PCI PARMS\"/>\n<parameter name=\"field2\" value=\"`$oofpcigetfapservice.fap-service[0].alias`\"/>\n<parameter name=\"field3\" value=\"`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.phy-cell-id-in-use`\"/>\n<parameter name=\"field4\" value=\"`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.pnf-name`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1178.9998779296875,
+        "y": 730,
+        "z": "231735cb.81484a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "294e9c79.ae0324",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 832,
+        "y": 719,
+        "z": "231735cb.81484a",
+        "wires": [
+            [
+                "a2629122.94b21"
+            ]
+        ]
+    },
+    {
+        "id": "a2629122.94b21",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing Get odutopo node details rest api\" />",
+        "comments": "",
+        "x": 1014,
+        "y": 691.0000610351562,
+        "z": "231735cb.81484a",
+        "wires": []
+    },
+    {
+        "id": "855dbbeb.68dac8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 830.0001831054688,
+        "y": 794,
+        "z": "231735cb.81484a",
+        "wires": [
+            [
+                "4f5a1521.82fc2c"
+            ]
+        ]
+    },
+    {
+        "id": "4f5a1521.82fc2c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1016.9998779296875,
+        "y": 743,
+        "z": "231735cb.81484a",
+        "wires": [
+            [
+                "3804aecc.1eda72"
+            ]
+        ]
+    },
+    {
+        "id": "24eb1ccd.364114",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 713,
+        "y": 1064.6666259765625,
+        "z": "231735cb.81484a",
+        "wires": [
+            [
+                "9f4cf18c.81994"
+            ]
+        ]
+    },
+    {
+        "id": "9f4cf18c.81994",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing patch rest api\" />",
+        "comments": "",
+        "x": 900.9998779296875,
+        "y": 1071.666748046875,
+        "z": "231735cb.81484a",
+        "wires": []
+    },
+    {
+        "id": "a0317cac.b10f8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 698.9998168945312,
+        "y": 1141.666748046875,
+        "z": "231735cb.81484a",
+        "wires": [
+            [
+                "f2262012.299c4"
+            ]
+        ]
+    },
+    {
+        "id": "f2262012.299c4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 872.999755859375,
+        "y": 1144.6666259765625,
+        "z": "231735cb.81484a",
+        "wires": [
+            [
+                "85031fd4.e0c19"
+            ]
+        ]
+    },
+    {
+        "id": "85031fd4.e0c19",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Post Reconfig FAP Service PCI PARMS\"/>\n<parameter name=\"field2\" value=\"`$oofpcigetfapservice.fap-service[0].alias`\"/>\n<parameter name=\"field3\" value=\"`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.phy-cell-id-in-use`\"/>\n<parameter name=\"field4\" value=\"`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.pnf-name`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1050.9996337890625,
+        "y": 1148.6668701171875,
+        "z": "231735cb.81484a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "41d9ee9a.12b9f",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for GET operation\"/>\n<parameter name=\"field2\" value=\"`$tmp.fap-service-url`\"/>\n<parameter name=\"field3\" value=\"`$tmp.alias`\"/>\n<parameter name=\"field4\" value=\"`$tmp.cid`\"/>\n<parameter name=\"field5\" value=\"`$tmp.phy-cell-id-in-use`\"/>\n<parameter name=\"field6\" value=\"`$tmp.pnf-name`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 523.00048828125,
+        "y": 719.0001220703125,
+        "z": "231735cb.81484a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "df962bc0.9c4728",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end=\"`$configuration-phy-cell-id-input.fap-service-number-of-entries`\" >",
+        "comments": "",
+        "outputs": 1,
+        "x": 475,
+        "y": 477,
+        "z": "231735cb.81484a",
+        "wires": [
+            [
+                "d2092690.d1f398"
+            ]
+        ]
+    },
+    {
+        "id": "3e233d3d.e189b2",
+        "type": "set",
+        "name": "set tmp variables for the requested fap service input parms",
+        "xml": "<set>\n<parameter name=\"tmp.alias\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].alias`\"/>\n<parameter name=\"tmp.cid\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].cid`\"/>\n<parameter name=\"tmp.phy-cell-id-in-use\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].phy-cell-id-in-use`\"/>\n<parameter name=\"tmp.pnf-name\" value=\"`$configuration-phy-cell-id-input.fap-service[$idx].pnf-name`\"/>\n",
+        "comments": "",
+        "x": 607.0009155273438,
+        "y": 609.8890991210938,
+        "z": "231735cb.81484a",
+        "wires": []
+    },
+    {
+        "id": "8345c5a4.2aa138",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 804.0001831054688,
+        "y": 914.0000610351562,
+        "z": "231735cb.81484a",
+        "wires": [
+            [
+                "d0914b29.da1bf8"
+            ]
+        ]
+    },
+    {
+        "id": "e412cebf.f2b34",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 773.0001220703125,
+        "y": 1001,
+        "z": "231735cb.81484a",
+        "wires": [
+            [
+                "9f57f600.00e818"
+            ]
+        ]
+    },
+    {
+        "id": "d0914b29.da1bf8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 977.0001220703125,
+        "y": 886.0001220703125,
+        "z": "231735cb.81484a",
+        "wires": [
+            [
+                "764300f9.17734"
+            ]
+        ]
+    },
+    {
+        "id": "764300f9.17734",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing patch rest api\" />",
+        "comments": "",
+        "x": 1164.999755859375,
+        "y": 876.0000610351562,
+        "z": "231735cb.81484a",
+        "wires": []
+    },
+    {
+        "id": "9f57f600.00e818",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 954.9998779296875,
+        "y": 988.0000610351562,
+        "z": "231735cb.81484a",
+        "wires": [
+            [
+                "3925925e.0d365e"
+            ]
+        ]
+    },
+    {
+        "id": "3925925e.0d365e",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"PUT PCI POC FAP SERVICE. Reconfigured \"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1127.9998779296875,
+        "y": 987.0000610351562,
+        "z": "231735cb.81484a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d2092690.d1f398",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 254.99981689453125,
+        "y": 704.010498046875,
+        "z": "231735cb.81484a",
+        "wires": [
+            [
+                "3e233d3d.e189b2",
+                "41d9ee9a.12b9f",
+                "7e6165e7.675aac",
+                "6cada962.37cf28",
+                "5c13f574.f957ac",
+                "3d1c8150.a42e7e",
+                "50d1caf4.0f4e94",
+                "f59ed201.bd8d3",
+                "2f51ed00.9a5384",
+                "326141f0.a2e29e"
+            ]
+        ]
+    },
+    {
+        "id": "3d1c8150.a42e7e",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/configuration-phy-cell-id.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"URL and Target for PCI patch URL\"/>\n<parameter name='field2' value=\"`$prop.controller.url + $tmp.oofpcipoc.patch.pci.url`\" />\n<parameter name='field3' value=\"`$prop.oofpcipoc.patch.pci.target`\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 506.00048828125,
+        "y": 923.0104370117188,
+        "z": "231735cb.81484a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "6cada962.37cf28",
+        "type": "execute",
+        "name": "Get FAP details for a Cell",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.fap-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"oofpcigetfapservice\"/>\n<parameter name='contentType' value='application/json' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 590.0003662109375,
+        "y": 769.0103759765625,
+        "z": "231735cb.81484a",
+        "wires": [
+            [
+                "294e9c79.ae0324",
+                "855dbbeb.68dac8"
+            ]
+        ]
+    },
+    {
+        "id": "7e6165e7.675aac",
+        "type": "execute",
+        "name": "generate fap-service url",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.fap-service.ransim-mounted`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.fap-service-url\"/>\n    <parameter name=\"target\" value=\"{alias}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.alias`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 505.00006103515625,
+        "y": 658.010498046875,
+        "z": "231735cb.81484a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5c13f574.f957ac",
+        "type": "execute",
+        "name": "generate pci patch url for a cell",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.x-005b9-lte.ransim-mounted`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.oofpcipoc.patch.pci.url\"/>\n    <parameter name=\"target\" value=\"{alias}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.alias`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 609,
+        "y": 814.0104370117188,
+        "z": "231735cb.81484a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "50d1caf4.0f4e94",
+        "type": "execute",
+        "name": "Recofigure PCI for a Cell",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/oofpcipoc-pci-patch.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.oofpcipoc.patch.pci.url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"PATCH\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-patch-response\"/>\n<parameter name='contentType' value='application/yang.patch+json' /> \n<parameter name='format' value='json' />\n<parameter name='accept' value='application/yang.patch-status+json' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 529.9998779296875,
+        "y": 983.010498046875,
+        "z": "231735cb.81484a",
+        "wires": [
+            [
+                "8345c5a4.2aa138",
+                "e412cebf.f2b34"
+            ]
+        ]
+    },
+    {
+        "id": "f59ed201.bd8d3",
+        "type": "execute",
+        "name": "Get FAP details for a Cell",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.fap-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"oofpcigetfapservice\"/>\n<parameter name='contentType' value='application/json' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 496.9998779296875,
+        "y": 1057.010498046875,
+        "z": "231735cb.81484a",
+        "wires": [
+            [
+                "24eb1ccd.364114",
+                "a0317cac.b10f8"
+            ]
+        ]
+    },
+    {
+        "id": "2f51ed00.9a5384",
+        "type": "execute",
+        "name": "populate netconf mount",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.fap-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.fap-service-url\"/>\n    <parameter name=\"target\" value=\"{pnf-name}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.pnf-name`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 757,
+        "y": 674,
+        "z": "231735cb.81484a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "326141f0.a2e29e",
+        "type": "execute",
+        "name": "populate netconf mount",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.oofpcipoc.patch.pci.url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.oofpcipoc.patch.pci.url\"/>\n    <parameter name=\"target\" value=\"{pnf-name}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.pnf-name`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 565,
+        "y": 865,
+        "z": "231735cb.81484a",
         "wires": [
             []
         ]
     }
-]
+]
\ No newline at end of file
diff --git a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_delete-neighbor.json b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_delete-neighbor.json
index 2154176a..54da3068 100644
--- a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_delete-neighbor.json
+++ b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_delete-neighbor.json
@@ -1,36 +1,36 @@
 [
     {
-        "id": "8f6bbd32.2e1fc",
+        "id": "207a4f7d.8734f",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='delete-neighbor' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 152.01040649414062,
-        "y": 280.0104064941406,
-        "z": "d658c648.5b71e8",
+        "x": 90,
+        "y": 195.98956298828125,
+        "z": "b345f1b.2f85e1",
         "wires": [
             [
-                "9d8eae2c.c98b4"
+                "b25411ae.c24d5"
             ]
         ]
     },
     {
-        "id": "7cc1ba3.0ded644",
+        "id": "aa735cd2.ae183",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 172.01041221618652,
-        "y": 82.01042938232422,
-        "z": "d658c648.5b71e8",
+        "x": 106,
+        "y": 31.989585876464844,
+        "z": "b345f1b.2f85e1",
         "wires": [
             [
-                "3f1f6894.c773d8"
+                "aa08a843.d3fdc8"
             ]
         ]
     },
     {
-        "id": "3f1f6894.c773d8",
+        "id": "aa08a843.d3fdc8",
         "type": "service-logic",
         "name": "oofpcipoc-api 0.4.2-SNAPSHOT",
         "module": "oofpcipoc-api",
@@ -38,415 +38,709 @@
         "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='0.4.2-SNAPSHOT'>",
         "outputs": 1,
-        "x": 173.0103988647461,
-        "y": 164.0105266571045,
-        "z": "d658c648.5b71e8",
+        "x": 160.99999237060547,
+        "y": 89.98968505859375,
+        "z": "b345f1b.2f85e1",
         "wires": [
             [
-                "8f6bbd32.2e1fc"
+                "207a4f7d.8734f"
             ]
         ]
     },
     {
-        "id": "9d8eae2c.c98b4",
+        "id": "b25411ae.c24d5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 138.5000114440918,
-        "y": 475.0104675292969,
-        "z": "d658c648.5b71e8",
+        "x": 120.48960876464844,
+        "y": 290.9896240234375,
+        "z": "b345f1b.2f85e1",
         "wires": [
             [
-                "f3ffc042.30165",
-                "9549fa66.052c98",
-                "1377597c.adf1a7",
-                "d8359a96.3b95b8",
-                "153414fd.ef7b4b",
-                "ce502c9f.ad136"
+                "56e286a0.287f88",
+                "ec6ef330.d3bb6",
+                "94e32e29.2123c",
+                "db5b7b51.736548",
+                "615374e5.a9162c",
+                "70140359.d5b9ec"
             ]
         ]
     },
     {
-        "id": "f3ffc042.30165",
+        "id": "56e286a0.287f88",
         "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 add-neighbor Execution\" />\n",
+        "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 delete-neighbor Execution\" />\n",
         "comments": "",
-        "x": 409.0106658935547,
-        "y": 622.0105447769165,
-        "z": "d658c648.5b71e8",
+        "x": 133.000244140625,
+        "y": 620.9896850585938,
+        "z": "b345f1b.2f85e1",
         "wires": []
     },
     {
-        "id": "444ce01a.b540b",
+        "id": "a73d6bf8.dcb238",
         "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/delete-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Input RPC Payload request for Alias:  \"/>\n<parameter name=\"field2\" value=\"`$delete-neighbor-input.alias`\"/>\n<parameter name=\"field3\" value=\"Input RPC Payload request for delete-neighbor. Neighbor Cell #:  \"/>\n<parameter name=\"field4\" value=\"`$idx`\"/>\n<parameter name=\"field5\" value=\"`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].plmnid`\"/>\n<parameter name=\"field6\" value=\"`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].cid`\"/>",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/delete-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Input RPC Payload request for Alias:  \"/>\n<parameter name=\"field2\" value=\"`$delete-neighbor-input.alias`\"/>\n<parameter name=\"field3\" value=\"Input RPC Payload request for delete-neighbor. Neighbor Cell #:  \"/>\n<parameter name=\"field4\" value=\"`$idx`\"/>\n<parameter name=\"field5\" value=\"`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].plmnid`\"/>\n<parameter name=\"field6\" value=\"`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].cid`\"/>\n<parameter name=\"field7\" value=\"`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].pnf-name`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 721.0113067626953,
-        "y": 59.01047992706299,
-        "z": "d658c648.5b71e8",
+        "x": 545.0009155273438,
+        "y": 139.98963928222656,
+        "z": "b345f1b.2f85e1",
         "wires": [
             []
         ]
     },
     {
-        "id": "a47d97a9.fdacf8",
+        "id": "be689cdc.25859",
         "type": "comment",
         "name": "Delete neighbor",
         "info": "",
         "comments": "",
-        "x": 375.0104122161865,
-        "y": 42.020843505859375,
-        "z": "d658c648.5b71e8",
+        "x": 411.0000057220459,
+        "y": 39,
+        "z": "b345f1b.2f85e1",
         "wires": []
     },
     {
-        "id": "ae098383.f8ea2",
+        "id": "4af01e8d.7dd54",
         "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/delete-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for Neighbor Add PUT operation\"/>\n<parameter name=\"field2\" value=\"`$tmp.add-neighbor-service-url`\"/>\n<parameter name=\"field3\" value=\"`$tmp.plmnid`\"/>\n<parameter name=\"field4\" value=\"`$tmp.cid`\"/>\n<parameter name=\"field5\" value=\"`$tmp.phy-cell-id`\"/>\n<parameter name=\"field6\" value=\"`$tmp.pnf-name`\"/>\n<parameter name=\"field7\" value=\"`$tmp.blacklisted`\"/>",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/delete-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for Neighbor Delete operation\"/>\n<parameter name=\"field2\" value=\"`$tmp.delete-neighbor-service-url`\"/>\n<parameter name=\"field3\" value=\"`$tmp.plmnid`\"/>\n<parameter name=\"field4\" value=\"`$tmp.cid`\"/>\n<parameter name=\"field5\" value=\"`$tmp.pnf-name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 620.0113906860352,
-        "y": 481.02094173431396,
-        "z": "d658c648.5b71e8",
+        "x": 811.0009765625,
+        "y": 393.0000915527344,
+        "z": "b345f1b.2f85e1",
         "wires": [
             []
         ]
     },
     {
-        "id": "1377597c.adf1a7",
+        "id": "94e32e29.2123c",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$delete-neighbor-input.lte-cell-number-of-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 570.0961799621582,
-        "y": 66.97401714324951,
-        "z": "d658c648.5b71e8",
+        "x": 394.08575439453125,
+        "y": 154.95317840576172,
+        "z": "b345f1b.2f85e1",
         "wires": [
             [
-                "444ce01a.b540b"
+                "a73d6bf8.dcb238"
             ]
         ]
     },
     {
-        "id": "9549fa66.052c98",
+        "id": "ec6ef330.d3bb6",
         "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/delete-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"RPC to delete neighbors. Number of neighbors to delete: \"/>\n<parameter name=\"field2\" value=\"`$delete-neighbor-input.lte-cell-number-of-entries`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 391.0107192993164,
-        "y": 107.03127384185791,
-        "z": "d658c648.5b71e8",
+        "x": 419.00030517578125,
+        "y": 88.01042938232422,
+        "z": "b345f1b.2f85e1",
         "wires": [
             []
         ]
     },
     {
-        "id": "ce502c9f.ad136",
+        "id": "515d69fb.0b4178",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$delete-neighbor-input.lte-cell-number-of-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 327.01058769226074,
-        "y": 476.02083015441895,
-        "z": "d658c648.5b71e8",
+        "x": 475.00018310546875,
+        "y": 360,
+        "z": "b345f1b.2f85e1",
         "wires": [
             [
-                "4661d468.e207dc"
+                "cc2e5c47.c44e5"
             ]
         ]
     },
     {
-        "id": "a874a6b4.cbe028",
+        "id": "b7d43aa5.f0cac8",
         "type": "set",
-        "name": "set tmp variables for the requested neighbor to be added",
-        "xml": "<set>\n<parameter name=\"tmp.plmnid\" value=\"`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].plmnid`\"/>\n<parameter name=\"tmp.cid\" value=\"`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].cid`\"/>\n<parameter name=\"tmp.alias\" value=\"`$delete-neighbor-input.alias`\"/>",
+        "name": "set tmp variables for the requested neighbor to be deleted",
+        "xml": "<set>\n<parameter name=\"tmp.plmnid\" value=\"`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].plmnid`\"/>\n<parameter name=\"tmp.cid\" value=\"`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].cid`\"/>\n<parameter name=\"tmp.alias\" value=\"`$delete-neighbor-input.alias`\"/>\n<parameter name=\"tmp.pnf-name\" value=\"`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].pnf-name`\"/>\n",
         "comments": "",
-        "x": 880.0115661621094,
-        "y": 147.90992736816406,
-        "z": "d658c648.5b71e8",
+        "x": 929.0011596679688,
+        "y": 28.889083862304688,
+        "z": "b345f1b.2f85e1",
         "wires": []
     },
     {
-        "id": "17cdca86.1a45e5",
+        "id": "535555d4.11573c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 882.0107955932617,
-        "y": 465.0209321975708,
-        "z": "d658c648.5b71e8",
+        "x": 1103.000389099121,
+        "y": 375.0000886917114,
+        "z": "b345f1b.2f85e1",
         "wires": [
             [
-                "b18e1fe5.42e1a"
+                "238ee5e9.27ec7a"
             ]
         ]
     },
     {
-        "id": "be22f91c.ecdaf8",
+        "id": "61cac774.8ddd18",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 896.0107116699219,
-        "y": 583.0208921432495,
-        "z": "d658c648.5b71e8",
+        "x": 1117.0003051757812,
+        "y": 493.00004863739014,
+        "z": "b345f1b.2f85e1",
         "wires": [
             [
-                "ba4bdf26.a25c6"
+                "df9d1e15.90f2d"
             ]
         ]
     },
     {
-        "id": "b18e1fe5.42e1a",
+        "id": "238ee5e9.27ec7a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1036.0107460021973,
-        "y": 435.0209712982178,
-        "z": "d658c648.5b71e8",
+        "x": 1257.0003395080566,
+        "y": 345.0001277923584,
+        "z": "b345f1b.2f85e1",
         "wires": [
             [
-                "d552d127.0b1b9"
+                "fc657a9b.bf7e68"
             ]
         ]
     },
     {
-        "id": "d552d127.0b1b9",
+        "id": "fc657a9b.bf7e68",
         "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\" />",
+        "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 deleting a new neighbor\" />",
         "comments": "",
-        "x": 1223.0103797912598,
-        "y": 417.02092361450195,
-        "z": "d658c648.5b71e8",
+        "x": 1443.9999732971191,
+        "y": 327.0000801086426,
+        "z": "b345f1b.2f85e1",
         "wires": []
     },
     {
-        "id": "ba4bdf26.a25c6",
+        "id": "df9d1e15.90f2d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1066.010498046875,
-        "y": 568.020932674408,
-        "z": "d658c648.5b71e8",
+        "x": 1287.0000915527344,
+        "y": 478.0000891685486,
+        "z": "b345f1b.2f85e1",
         "wires": [
             [
-                "b46d635a.d09bb"
+                "a52ab576.2492f8"
             ]
         ]
     },
     {
-        "id": "b46d635a.d09bb",
+        "id": "a52ab576.2492f8",
         "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/delete-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"DELETE Neighbor Executed Successfully \"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1250.0105171203613,
-        "y": 553.020959854126,
-        "z": "d658c648.5b71e8",
+        "x": 1471.0001106262207,
+        "y": 463.0001163482666,
+        "z": "b345f1b.2f85e1",
         "wires": [
             []
         ]
     },
     {
-        "id": "4661d468.e207dc",
+        "id": "cc2e5c47.c44e5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 407.0104064941406,
-        "y": 414.0313243865967,
-        "z": "d658c648.5b71e8",
+        "x": 611,
+        "y": 300.0104675292969,
+        "z": "b345f1b.2f85e1",
         "wires": [
             [
-                "a874a6b4.cbe028",
-                "ae098383.f8ea2",
-                "5e9335be.02848c",
-                "c257d0f0.4516e",
-                "895e37be.280c78",
-                "fcb1c157.9d704",
-                "e65af91d.2ad1c8",
-                "2683298a.19da16",
-                "1766bd3c.fe21d3"
+                "b7d43aa5.f0cac8",
+                "4af01e8d.7dd54",
+                "51f44fdf.cf79b",
+                "d4bc7fa6.cc60c",
+                "d9198d9a.74287",
+                "8ea593b0.0d5fd",
+                "a02f97f3.371b08",
+                "8c7628fe.367c08",
+                "448c530d.2a7d3c"
             ]
         ]
     },
     {
-        "id": "d8359a96.3b95b8",
+        "id": "db5b7b51.736548",
         "type": "execute",
         "name": "execute Properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/sdnr-oofpcipoc-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 616.0106582641602,
-        "y": 113.03125762939453,
-        "z": "d658c648.5b71e8",
+        "x": 410.000244140625,
+        "y": 214.01040649414062,
+        "z": "b345f1b.2f85e1",
         "wires": [
             []
         ]
     },
     {
-        "id": "153414fd.ef7b4b",
+        "id": "615374e5.a9162c",
         "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/add-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Properties read .. neighbor-add template\"/>\n<parameter name=\"field2\" value=\"`$prop.neighbor-add.templatefile`\"/>\n<parameter name=\"field3\" value=\"`$prop.controller.user`\"/>\n<parameter name=\"field4\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"field5\" value=\"`$prop.controller.url`\"/>\n<parameter name=\"field6\" value=\"`$prop.restapi.lte-ran-neighbor-in-use`\"/>",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/delete-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Properties read .. neighbor-delete template\"/>\n<parameter name=\"field2\" value=\"`$prop.restapi.neighbor-delete.templatefile`\"/>\n<parameter name=\"field3\" value=\"`$prop.controller.user`\"/>\n<parameter name=\"field4\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"field5\" value=\"`$prop.controller.url`\"/>\n<parameter name=\"field6\" value=\"`$prop.restapi.lte-ran-neighbor-in-use`\"/>\n<parameter name=\"field7\" value=\"`$prop.restapi.lte-ran-neighbor-in-use.ransim-mounted`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 576.0107860565186,
-        "y": 163.03136157989502,
-        "z": "d658c648.5b71e8",
+        "x": 379.0003662109375,
+        "y": 282.010498046875,
+        "z": "b345f1b.2f85e1",
         "wires": [
             []
         ]
     },
     {
-        "id": "5e9335be.02848c",
+        "id": "51f44fdf.cf79b",
         "type": "execute",
-        "name": "generate neighbor add URL",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.lte-ran-neighbor-in-use`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.add-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{alias}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.alias`\"/>",
+        "name": "generate neighbor delete URL",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.lte-ran-neighbor-in-use`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.delete-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{alias}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.alias`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 815.0109405517578,
-        "y": 239.03140926361084,
-        "z": "d658c648.5b71e8",
+        "x": 914.0005493164062,
+        "y": 130.01055908203125,
+        "z": "b345f1b.2f85e1",
         "wires": [
             []
         ]
     },
     {
-        "id": "c257d0f0.4516e",
+        "id": "d4bc7fa6.cc60c",
         "type": "execute",
         "name": "delete a neighbor using DELETE",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.add-neighbor-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"DELETE\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-delete-neighbor-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.delete-neighbor-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"DELETE\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-delete-neighbor-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />",
         "comments": "",
         "outputs": 1,
-        "x": 642.0108261108398,
-        "y": 545.0314388275146,
-        "z": "d658c648.5b71e8",
+        "x": 840.0004272460938,
+        "y": 450.0105895996094,
+        "z": "b345f1b.2f85e1",
         "wires": [
             [
-                "17cdca86.1a45e5",
-                "be22f91c.ecdaf8"
+                "535555d4.11573c",
+                "61cac774.8ddd18"
             ]
         ]
     },
     {
-        "id": "da297c37.82f9f",
+        "id": "d9198d9a.74287",
         "type": "execute",
-        "name": "Recofigure PCI for a Cell",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/oofpcipoc-pci-patch.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.oofpcipoc.patch.pci.url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"PATCH\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-patch-response\"/>\n<parameter name='contentType' value='application/yang.patch+json' /> \n<parameter name='accept' value='application/yang.patch-status+json' />",
+        "name": "populate plmnid",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.delete-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.delete-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{plmnid}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.plmnid`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 849.0104370117188,
-        "y": 817.0312805175781,
-        "z": "d658c648.5b71e8",
+        "x": 931.000244140625,
+        "y": 235.01040649414062,
+        "z": "b345f1b.2f85e1",
         "wires": [
             []
         ]
     },
     {
-        "id": "895e37be.280c78",
+        "id": "8ea593b0.0d5fd",
         "type": "execute",
-        "name": "execute slipluginutils",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.add-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.add-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{plmnid}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.plmnid`\"/>",
+        "name": "Populate cid",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.delete-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.delete-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{cid}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.cid`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 854.010627746582,
-        "y": 326.03124618530273,
-        "z": "d658c648.5b71e8",
+        "x": 874.0001831054688,
+        "y": 337.0104064941406,
+        "z": "b345f1b.2f85e1",
         "wires": [
             []
         ]
     },
     {
-        "id": "fcb1c157.9d704",
-        "type": "execute",
-        "name": "execute slipluginutils",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.add-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.add-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{cid}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.cid`\"/>",
+        "id": "a02f97f3.371b08",
+        "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/delete-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Delete Neighbor List URL\"/>\n<parameter name=\"field2\" value=\"`$tmp.delete-neighbor-service-url`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 682.0105743408203,
-        "y": 421.0312490463257,
-        "z": "d658c648.5b71e8",
+        "x": 886.0001220703125,
+        "y": 187.01040649414062,
+        "z": "b345f1b.2f85e1",
         "wires": [
             []
         ]
     },
     {
-        "id": "e65af91d.2ad1c8",
+        "id": "8c7628fe.367c08",
         "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/delete-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Add Neighbor List URL\"/>\n<parameter name=\"field2\" value=\"`$tmp.add-neighbor-service-url`\"/>",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/delete-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Deletedd Neighbor List URL\"/>\n<parameter name=\"field2\" value=\"`$tmp.delete-neighbor-service-url`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 768.0105056762695,
-        "y": 279.03124713897705,
-        "z": "d658c648.5b71e8",
+        "x": 905.0000610351562,
+        "y": 280.0104064941406,
+        "z": "b345f1b.2f85e1",
         "wires": [
             []
         ]
     },
     {
-        "id": "2683298a.19da16",
+        "id": "448c530d.2a7d3c",
         "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/delete-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Add Neighbor List URL\"/>\n<parameter name=\"field2\" value=\"`$tmp.add-neighbor-service-url`\"/>\n",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/delete-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Temporary variable for Neighbor Cell #:  \"/>\n<parameter name=\"field2\" value=\"`$idx`\"/>\n<parameter name=\"field3\" value=\"`$tmp.plmnid`\"/>\n<parameter name=\"field4\" value=\"`$tmp.cid`\"/>\n<parameter name=\"field5\" value=\"`$tmp.alias`\"/>\n<parameter name=\"field6\" value=\"`$tmp.pnf-name`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 795.0104637145996,
-        "y": 369.0312476158142,
-        "z": "d658c648.5b71e8",
+        "x": 812.0000610351562,
+        "y": 83.01042175292969,
+        "z": "b345f1b.2f85e1",
         "wires": [
             []
         ]
     },
     {
-        "id": "1766bd3c.fe21d3",
+        "id": "70140359.d5b9ec",
+        "type": "switchNode",
+        "name": "switch mounted",
+        "xml": "<switch test='`$prop.ransim-mounted`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 254,
+        "y": 536,
+        "z": "b345f1b.2f85e1",
+        "wires": [
+            [
+                "8fc02b5a.e6fa78",
+                "981162d5.45c12"
+            ]
+        ]
+    },
+    {
+        "id": "8fc02b5a.e6fa78",
+        "type": "outcome",
+        "name": "Not Mounted",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 410,
+        "y": 449,
+        "z": "b345f1b.2f85e1",
+        "wires": [
+            [
+                "515d69fb.0b4178"
+            ]
+        ]
+    },
+    {
+        "id": "981162d5.45c12",
+        "type": "outcome",
+        "name": "Mounted",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 416,
+        "y": 606,
+        "z": "b345f1b.2f85e1",
+        "wires": [
+            [
+                "e4d06a14.c62268"
+            ]
+        ]
+    },
+    {
+        "id": "9fcb1729.58ff08",
+        "type": "set",
+        "name": "set tmp variables for the requested neighbor to be deleted",
+        "xml": "<set>\n<parameter name=\"tmp.plmnid\" value=\"`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].plmnid`\"/>\n<parameter name=\"tmp.cid\" value=\"`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].cid`\"/>\n<parameter name=\"tmp.alias\" value=\"`$delete-neighbor-input.alias`\"/>\n<parameter name=\"tmp.pnf-name\" value=\"`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].pnf-name`\"/>\n",
+        "comments": "",
+        "x": 978,
+        "y": 537,
+        "z": "b345f1b.2f85e1",
+        "wires": []
+    },
+    {
+        "id": "c9662b69.1edb18",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1139.9992294311523,
+        "y": 856.1110048294067,
+        "z": "b345f1b.2f85e1",
+        "wires": [
+            [
+                "cc8d9b1b.4902f8"
+            ]
+        ]
+    },
+    {
+        "id": "1330ec36.9051c4",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1153.9991455078125,
+        "y": 974.1109647750854,
+        "z": "b345f1b.2f85e1",
+        "wires": [
+            [
+                "3a574512.87fb6a"
+            ]
+        ]
+    },
+    {
+        "id": "cc8d9b1b.4902f8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1293.999179840088,
+        "y": 826.1110439300537,
+        "z": "b345f1b.2f85e1",
+        "wires": [
+            [
+                "82d98dad.fb6bd"
+            ]
+        ]
+    },
+    {
+        "id": "82d98dad.fb6bd",
+        "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 deleting a new neighbor\" />",
+        "comments": "",
+        "x": 1480.9988136291504,
+        "y": 808.1109962463379,
+        "z": "b345f1b.2f85e1",
+        "wires": []
+    },
+    {
+        "id": "3a574512.87fb6a",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1323.9989318847656,
+        "y": 959.1110053062439,
+        "z": "b345f1b.2f85e1",
+        "wires": [
+            [
+                "3383c6fe.f233ba"
+            ]
+        ]
+    },
+    {
+        "id": "3383c6fe.f233ba",
         "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/delete-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Temporary variable for Neighbor Cell #:  \"/>\n<parameter name=\"field2\" value=\"`$idx`\"/>\n<parameter name=\"field3\" value=\"`$tmp.plmnid`\"/>\n<parameter name=\"field4\" value=\"`$tmp.cid`\"/>\n<parameter name=\"field5\" value=\"`$tmp.alias`\"/>\n",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/delete-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"DELETE Neighbor Executed Successfully \"/>",
         "comments": "",
         "outputs": 1,
-        "x": 764.0104827880859,
-        "y": 195.031268119812,
-        "z": "d658c648.5b71e8",
+        "x": 1507.998950958252,
+        "y": 944.1110324859619,
+        "z": "b345f1b.2f85e1",
         "wires": [
             []
         ]
     },
     {
-        "id": "4452b556.b1699c",
+        "id": "7fdfb31b.03c91c",
+        "type": "execute",
+        "name": "generate neighbor add URL",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.lte-ran-neighbor-in-use.ransim-mounted`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.delete-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{alias}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.alias`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1039.9993896484375,
+        "y": 601.1214599609375,
+        "z": "b345f1b.2f85e1",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "92a47f6f.b8354",
         "type": "execute",
         "name": "delete a neighbor using DELETE",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/oofpcipoc-deleteNeighbor.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.add-neighbor-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"DELETE\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-delete-neighbor-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.delete-neighbor-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"DELETE\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-delete-neighbor-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 899.9992599487305,
+        "y": 936.1215114593506,
+        "z": "b345f1b.2f85e1",
+        "wires": [
+            [
+                "c9662b69.1edb18",
+                "1330ec36.9051c4"
+            ]
+        ]
+    },
+    {
+        "id": "4daa6d79.f48ee4",
+        "type": "execute",
+        "name": "Populate plmnid",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.delete-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.delete-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{plmnid}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.plmnid`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1072.9990844726562,
+        "y": 684.121337890625,
+        "z": "b345f1b.2f85e1",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "24c60b6.36e9ff4",
+        "type": "execute",
+        "name": "populate cid",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.delete-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.delete-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{cid}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.cid`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 897.9990234375,
+        "y": 814.121337890625,
+        "z": "b345f1b.2f85e1",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "76beb28c.2d0d2c",
+        "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/delete-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Delete Neighbor List URL\"/>\n<parameter name=\"field2\" value=\"`$tmp.delete-neighbor-service-url`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 932.9989624023438,
+        "y": 643.121337890625,
+        "z": "b345f1b.2f85e1",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "581aec1c.dee734",
+        "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/delete-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Delete Neighbor List URL\"/>\n<parameter name=\"field2\" value=\"`$tmp.delete-neighbor-service-url`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 970.9989013671875,
+        "y": 724.121337890625,
+        "z": "b345f1b.2f85e1",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "71e574e3.fbf1ec",
+        "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/delete-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Temporary variable for Neighbor Cell #:  \"/>\n<parameter name=\"field2\" value=\"`$idx`\"/>\n<parameter name=\"field3\" value=\"`$tmp.plmnid`\"/>\n<parameter name=\"field4\" value=\"`$tmp.cid`\"/>\n<parameter name=\"field5\" value=\"`$tmp.alias`\"/>\n<parameter name=\"field6\" value=\"`$tmp.pnf-name`\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 839.9989013671875,
+        "y": 581.121337890625,
+        "z": "b345f1b.2f85e1",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2993a017.81813",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 640.9988403320312,
+        "y": 626.1213989257812,
+        "z": "b345f1b.2f85e1",
+        "wires": [
+            [
+                "9fcb1729.58ff08",
+                "53106aea.1ed354",
+                "7fdfb31b.03c91c",
+                "92a47f6f.b8354",
+                "4daa6d79.f48ee4",
+                "24c60b6.36e9ff4",
+                "76beb28c.2d0d2c",
+                "581aec1c.dee734",
+                "71e574e3.fbf1ec",
+                "bcd9754e.de9678"
+            ]
+        ]
+    },
+    {
+        "id": "e4d06a14.c62268",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end=\"`$delete-neighbor-input.lte-cell-number-of-entries`\" >",
+        "comments": "",
+        "outputs": 1,
+        "x": 500.9990234375,
+        "y": 717.1109008789062,
+        "z": "b345f1b.2f85e1",
+        "wires": [
+            [
+                "2993a017.81813"
+            ]
+        ]
+    },
+    {
+        "id": "53106aea.1ed354",
+        "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/delete-neighbor.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for Neighbor Delete operation\"/>\n<parameter name=\"field2\" value=\"`$tmp.delete-neighbor-service-url`\"/>\n<parameter name=\"field3\" value=\"`$tmp.plmnid`\"/>\n<parameter name=\"field4\" value=\"`$tmp.cid`\"/>\n<parameter name=\"field5\" value=\"`$tmp.pnf-name`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 844.9998245239258,
+        "y": 875.1110143661499,
+        "z": "b345f1b.2f85e1",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "bcd9754e.de9678",
+        "type": "execute",
+        "name": "populate netconf mount",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.delete-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.delete-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{pnf-name}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.pnf-name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 665.0104370117188,
-        "y": 656.0104370117188,
-        "z": "d658c648.5b71e8",
+        "x": 978,
+        "y": 768,
+        "z": "b345f1b.2f85e1",
         "wires": [
             []
         ]
     }
-]
+]
\ No newline at end of file
diff --git a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_generic-neighbor-configuration.json b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_generic-neighbor-configuration.json
index 8127aaf2..fab2d021 100644
--- a/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_generic-neighbor-configuration.json
+++ b/platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_generic-neighbor-configuration.json
@@ -1,191 +1,191 @@
 [
     {
-        "id": "966e407d.9086f",
+        "id": "acb70e34.bf9d7",
         "type": "comment",
         "name": "Generic Neighbor Configuration",
         "info": "",
         "comments": "",
-        "x": 335.50001335144043,
-        "y": 20,
-        "z": "fef406db.decef8",
+        "x": 356,
+        "y": 23,
+        "z": "c197f7e7.1da478",
         "wires": []
     },
     {
-        "id": "6fb545d.b9f92bc",
+        "id": "d3fed603.f6fc28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 391.5,
-        "y": 382.01049518585205,
-        "z": "fef406db.decef8",
+        "x": 581.9999866485596,
+        "y": 252.01049518585205,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "542aa267.5de7ec",
-                "e4d83e12.5aa3c",
-                "261a200c.78536",
-                "3400b7a4.1ff4c8",
-                "fd45e824.20b968",
-                "d7ff45e9.c502f8",
-                "9e7ad97b.b26a38",
-                "a191be9b.c3b55",
-                "375845c8.cdbe7a",
-                "bedde1a6.6b5ec"
+                "dd03124b.c1ad6",
+                "bb81a2c1.93396",
+                "a007069.f2610f8",
+                "92d276da.4c88e8",
+                "198eb06.8f50d5",
+                "f75fac3.b2d7e5",
+                "1c57b1b4.beaaee",
+                "1e96218.b0f68df",
+                "15ad3471.a615dc",
+                "cc8e22e1.329b1"
             ]
         ]
     },
     {
-        "id": "71827db2.f669d4",
+        "id": "86dca6b7.e82f88",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$generic-neighbor-configuration-input.number-of-neighbor-cell-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 287.50018882751465,
-        "y": 453.99998664855957,
-        "z": "fef406db.decef8",
+        "x": 544.0001831054688,
+        "y": 401,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "6fb545d.b9f92bc"
+                "d3fed603.f6fc28"
             ]
         ]
     },
     {
-        "id": "542aa267.5de7ec",
+        "id": "dd03124b.c1ad6",
         "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": 737.5011444091797,
-        "y": 175.88909339904785,
-        "z": "fef406db.decef8",
+        "x": 928.0011596679688,
+        "y": 45.88909912109375,
+        "z": "c197f7e7.1da478",
         "wires": []
     },
     {
-        "id": "e4d83e12.5aa3c",
+        "id": "bb81a2c1.93396",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Temporary varaibles set. Neighbor #:  \"/>\n<parameter name=\"field2\" value=\"`$idx`\"/>\n<parameter name=\"field3\" value=\"`$tmp.plmnid`\"/>\n<parameter name=\"field4\" value=\"`$tmp.cid`\"/>\n<parameter name=\"field5\" value=\"`$tmp.phy-cell-id`\"/>\n<parameter name=\"field6\" value=\"`$tmp.pnf-name`\"/>\n<parameter name=\"field7\" value=\"`$tmp.blacklisted`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 602.0105209350586,
-        "y": 219.0104274749756,
-        "z": "fef406db.decef8",
+        "x": 792.5105075836182,
+        "y": 89.01042747497559,
+        "z": "c197f7e7.1da478",
         "wires": [
             []
         ]
     },
     {
-        "id": "7c2f19ac.9408c8",
+        "id": "ac8961a8.d1fb4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 98.9896125793457,
-        "y": 452.9896240234375,
-        "z": "fef406db.decef8",
+        "x": 119.48959350585938,
+        "y": 279.9896240234375,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "71827db2.f669d4",
-                "51af8168.06635",
-                "cecc5c7b.7371f",
-                "c7654668.510fc8",
-                "a6c8572f.221db8",
-                "eaa9ba03.7776a8"
+                "6501a6c8.9b7ae8",
+                "32f454b1.f5ccfc",
+                "32ca92c1.87b4ae",
+                "dc78859c.2a1938",
+                "fb252ea6.2716a",
+                "c0db2192.9d16c"
             ]
         ]
     },
     {
-        "id": "69c02c08.5e9024",
+        "id": "93ef8347.1a6f",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='generic-neighbor-configuration' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 116.50001525878906,
-        "y": 255.98958015441895,
-        "z": "fef406db.decef8",
+        "x": 105,
+        "y": 180.9895782470703,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "7c2f19ac.9408c8"
+                "ac8961a8.d1fb4"
             ]
         ]
     },
     {
-        "id": "51af8168.06635",
+        "id": "6501a6c8.9b7ae8",
         "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": 531.5003509521484,
-        "y": 808.9897384643555,
-        "z": "fef406db.decef8",
+        "x": 160.00033569335938,
+        "y": 647.98974609375,
+        "z": "c197f7e7.1da478",
         "wires": []
     },
     {
-        "id": "cecc5c7b.7371f",
+        "id": "32f454b1.f5ccfc",
         "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.number-of-neighbor-cell-entries`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 351.5003128051758,
-        "y": 85.01043033599854,
-        "z": "fef406db.decef8",
+        "x": 406.00030517578125,
+        "y": 80.01042938232422,
+        "z": "c197f7e7.1da478",
         "wires": [
             []
         ]
     },
     {
-        "id": "c7654668.510fc8",
+        "id": "32ca92c1.87b4ae",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end=\"`$generic-neighbor-configuration-input.number-of-neighbor-cell-entries`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 530.5857048034668,
-        "y": 43.95316982269287,
-        "z": "fef406db.decef8",
+        "x": 417.085693359375,
+        "y": 126.95317077636719,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "a7de08a4.309828"
+                "e3ecab0.b7f5858"
             ]
         ]
     },
     {
-        "id": "a6c8572f.221db8",
+        "id": "dc78859c.2a1938",
         "type": "execute",
         "name": "execute Properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/sdnr-oofpcipoc-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 578.5001983642578,
-        "y": 90.01041248161346,
-        "z": "fef406db.decef8",
+        "x": 420.00018310546875,
+        "y": 185.01040649414062,
+        "z": "c197f7e7.1da478",
         "wires": [
             []
         ]
     },
     {
-        "id": "eaa9ba03.7776a8",
+        "id": "fb252ea6.2716a",
         "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": 565.5003471374512,
-        "y": 137.01048946380615,
-        "z": "fef406db.decef8",
+        "x": 350.00030517578125,
+        "y": 243.010498046875,
+        "z": "c197f7e7.1da478",
         "wires": [
             []
         ]
     },
     {
-        "id": "7c1282e8.0c1fbc",
+        "id": "2071d805.4be628",
         "type": "service-logic",
         "name": "oofpcipoc-api 0.4.2-SNAPSHOT",
         "module": "oofpcipoc-api",
@@ -193,401 +193,892 @@
         "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='0.4.2-SNAPSHOT'>",
         "outputs": 1,
-        "x": 133.5,
-        "y": 141.98968315124512,
-        "z": "fef406db.decef8",
+        "x": 160.99998474121094,
+        "y": 91.98968505859375,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "69c02c08.5e9024"
+                "93ef8347.1a6f"
             ]
         ]
     },
     {
-        "id": "a7de08a4.309828",
+        "id": "e3ecab0.b7f5858",
         "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": 684.5005474090576,
-        "y": 45.989633560180664,
-        "z": "fef406db.decef8",
+        "x": 582.0005493164062,
+        "y": 110.98963165283203,
+        "z": "c197f7e7.1da478",
         "wires": [
             []
         ]
     },
     {
-        "id": "30d50b81.50d574",
+        "id": "6ed34cf7.c51b14",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 132.50001335144043,
-        "y": 59.989585876464844,
-        "z": "fef406db.decef8",
+        "x": 96,
+        "y": 29.989585876464844,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "7c1282e8.0c1fbc"
+                "2071d805.4be628"
             ]
         ]
     },
     {
-        "id": "bedde1a6.6b5ec",
+        "id": "cc8e22e1.329b1",
         "type": "execute",
         "name": "generate neighbor config URL",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.lte-ran-neighbor-in-use`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.config-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{alias}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.alias`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 673.0108947753906,
-        "y": 263.5661497116089,
-        "z": "fef406db.decef8",
+        "x": 863.5108642578125,
+        "y": 133.56614685058594,
+        "z": "c197f7e7.1da478",
         "wires": [
             []
         ]
     },
     {
-        "id": "261a200c.78536",
+        "id": "a007069.f2610f8",
         "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": 602.0105018615723,
-        "y": 314.78819274902344,
-        "z": "fef406db.decef8",
+        "x": 790.510498046875,
+        "y": 186.7882080078125,
+        "z": "c197f7e7.1da478",
         "wires": [
             []
         ]
     },
     {
-        "id": "3400b7a4.1ff4c8",
+        "id": "92d276da.4c88e8",
         "type": "execute",
-        "name": "execute slipluginutils",
+        "name": "populate plmnid",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.config-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.config-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{plmnid}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.plmnid`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 802.0106391906738,
-        "y": 328.78822231292725,
-        "z": "fef406db.decef8",
+        "x": 992.5106258392334,
+        "y": 198.78822231292725,
+        "z": "c197f7e7.1da478",
         "wires": [
             []
         ]
     },
     {
-        "id": "fd45e824.20b968",
+        "id": "198eb06.8f50d5",
         "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": 670.0104923248291,
-        "y": 372.788197517395,
-        "z": "fef406db.decef8",
+        "x": 860.5104789733887,
+        "y": 242.78819751739502,
+        "z": "c197f7e7.1da478",
         "wires": [
             []
         ]
     },
     {
-        "id": "d7ff45e9.c502f8",
+        "id": "f75fac3.b2d7e5",
         "type": "execute",
-        "name": "execute slipluginutils",
+        "name": "populate cid",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.config-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.config-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{cid}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.cid`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 693.0105209350586,
-        "y": 417.7882204055786,
-        "z": "fef406db.decef8",
+        "x": 883.5105075836182,
+        "y": 287.7882204055786,
+        "z": "c197f7e7.1da478",
         "wires": [
             []
         ]
     },
     {
-        "id": "a191be9b.c3b55",
+        "id": "1e96218.b0f68df",
         "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": 691.010498046875,
-        "y": 563.7883377075195,
-        "z": "fef406db.decef8",
+        "x": 915.510498046875,
+        "y": 427.788330078125,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "49bedeca.324b5",
-                "6c592a69.fa7804"
+                "9ab812b9.2441c",
+                "b2feb5f3.1f8718"
             ]
         ]
     },
     {
-        "id": "49bedeca.324b5",
+        "id": "9ab812b9.2441c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 986.0103988647461,
-        "y": 570.7777833938599,
-        "z": "fef406db.decef8",
+        "x": 1176.5103855133057,
+        "y": 440.77778339385986,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "defa5e8b.a3afa"
+                "94c0690e.412458"
             ]
         ]
     },
     {
-        "id": "6c592a69.fa7804",
+        "id": "b2feb5f3.1f8718",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1004.010440826416,
-        "y": 638.7776098251343,
-        "z": "fef406db.decef8",
+        "x": 1194.5104274749756,
+        "y": 508.7776098251343,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "7e9e1401.b662cc"
+                "42fa2758.89b668"
             ]
         ]
     },
     {
-        "id": "4a12d095.a60f9",
+        "id": "a8f77123.4f739",
         "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": 1342.0101928710938,
-        "y": 625.7777180671692,
-        "z": "fef406db.decef8",
+        "x": 1532.5101795196533,
+        "y": 495.7777180671692,
+        "z": "c197f7e7.1da478",
         "wires": [
             []
         ]
     },
     {
-        "id": "7e9e1401.b662cc",
+        "id": "42fa2758.89b668",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1184.0101051330566,
-        "y": 636.7776908874512,
-        "z": "fef406db.decef8",
+        "x": 1374.5100917816162,
+        "y": 506.7776908874512,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "4a12d095.a60f9"
+                "a8f77123.4f739"
             ]
         ]
     },
     {
-        "id": "defa5e8b.a3afa",
+        "id": "94c0690e.412458",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1145.0102615356445,
-        "y": 579.7777690887451,
-        "z": "fef406db.decef8",
+        "x": 1335.510248184204,
+        "y": 449.7777690887451,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "4856d409.faf5fc"
+                "8f2a4b45.9518e8"
             ]
         ]
     },
     {
-        "id": "4856d409.faf5fc",
+        "id": "8f2a4b45.9518e8",
         "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": 1321.010025024414,
-        "y": 564.7777423858643,
-        "z": "fef406db.decef8",
+        "x": 1511.5100116729736,
+        "y": 434.77774238586426,
+        "z": "c197f7e7.1da478",
         "wires": []
     },
     {
-        "id": "9e7ad97b.b26a38",
+        "id": "1c57b1b4.beaaee",
         "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": 701.0104370117188,
-        "y": 477.7882080078125,
-        "z": "fef406db.decef8",
+        "x": 913.5104370117188,
+        "y": 339.7882080078125,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "3f51c8c2.f96888",
-                "65ee4970.885748"
+                "6f64c3b4.09149c",
+                "b4abf739.6c1f68"
             ]
         ]
     },
     {
-        "id": "3f51c8c2.f96888",
+        "id": "6f64c3b4.09149c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 974.0105514526367,
-        "y": 451.4442539215088,
-        "z": "fef406db.decef8",
+        "x": 1164.5105381011963,
+        "y": 321.4442539215088,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "31328392.853cfc"
+                "a028bb53.ce35a8"
             ]
         ]
     },
     {
-        "id": "65ee4970.885748",
+        "id": "b4abf739.6c1f68",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 969.010383605957,
-        "y": 507.44440746307373,
-        "z": "fef406db.decef8",
+        "x": 1159.5103702545166,
+        "y": 377.44440746307373,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "2a0f9a0c.8b1026"
+                "f4e4f96.daf0108"
             ]
         ]
     },
     {
-        "id": "2a0f9a0c.8b1026",
+        "id": "f4e4f96.daf0108",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1121.0102005004883,
-        "y": 516.4443125724792,
-        "z": "fef406db.decef8",
+        "x": 1311.5101871490479,
+        "y": 386.44431257247925,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "17e660a2.7a5f2f"
+                "d3310510.124b48"
             ]
         ]
     },
     {
-        "id": "17e660a2.7a5f2f",
+        "id": "d3310510.124b48",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Details about Neighbor Pre-configuration\"/>\n<parameter name=\"field2\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].plmnid`\"/>\n<parameter name=\"field3\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].cid`\"/>\n<parameter name=\"field4\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].phy-cell-id`\"/>\n<parameter name=\"field5\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].pnf-name`\"/>\n<parameter name=\"field6\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].blacklisted`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1282.0101165771484,
-        "y": 510.44458293914795,
-        "z": "fef406db.decef8",
+        "x": 1472.510103225708,
+        "y": 380.44458293914795,
+        "z": "c197f7e7.1da478",
         "wires": [
             []
         ]
     },
     {
-        "id": "31328392.853cfc",
+        "id": "a028bb53.ce35a8",
         "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": 1175.010341644287,
-        "y": 457.44426250457764,
-        "z": "fef406db.decef8",
+        "x": 1365.5103282928467,
+        "y": 327.44426250457764,
+        "z": "c197f7e7.1da478",
         "wires": []
     },
     {
-        "id": "375845c8.cdbe7a",
+        "id": "15ad3471.a615dc",
         "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": 741.0104370117188,
-        "y": 715.6770629882812,
-        "z": "fef406db.decef8",
+        "x": 871.5104370117188,
+        "y": 503.67706298828125,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "256027a4.697e18",
-                "6f609efb.0848b"
+                "144ccd4d.5f33d3",
+                "6b712cb1.c5f834"
             ]
         ]
     },
     {
-        "id": "256027a4.697e18",
+        "id": "144ccd4d.5f33d3",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1014.0105514526367,
-        "y": 689.3331089019775,
-        "z": "fef406db.decef8",
+        "x": 1204.5105381011963,
+        "y": 559.3331089019775,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "9acf15fd.972cb8"
+                "5f6e00fc.ed03a"
             ]
         ]
     },
     {
-        "id": "6f609efb.0848b",
+        "id": "6b712cb1.c5f834",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1009.010383605957,
-        "y": 745.3332624435425,
-        "z": "fef406db.decef8",
+        "x": 1199.5103702545166,
+        "y": 615.3332624435425,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "68fe6d7.2d08a94"
+                "4913d618.0c8fe8"
             ]
         ]
     },
     {
-        "id": "68fe6d7.2d08a94",
+        "id": "4913d618.0c8fe8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1161.0102005004883,
-        "y": 754.333167552948,
-        "z": "fef406db.decef8",
+        "x": 1351.5101871490479,
+        "y": 624.333167552948,
+        "z": "c197f7e7.1da478",
         "wires": [
             [
-                "dcc83786.96c448"
+                "1c9c0def.8b9082"
             ]
         ]
     },
     {
-        "id": "9acf15fd.972cb8",
+        "id": "5f6e00fc.ed03a",
         "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": 1215.010341644287,
-        "y": 695.3331174850464,
-        "z": "fef406db.decef8",
+        "x": 1405.5103282928467,
+        "y": 565.3331174850464,
+        "z": "c197f7e7.1da478",
         "wires": []
     },
     {
-        "id": "dcc83786.96c448",
+        "id": "1c9c0def.8b9082",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Details about Neighbor Pre-configuration\"/>\n<parameter name=\"field2\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].plmnid`\"/>\n<parameter name=\"field3\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].cid`\"/>\n<parameter name=\"field4\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].phy-cell-id`\"/>\n<parameter name=\"field5\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].pnf-name`\"/>\n<parameter name=\"field6\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].blacklisted`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1322.010108947754,
-        "y": 747.3334121704102,
-        "z": "fef406db.decef8",
+        "x": 1512.5100955963135,
+        "y": 617.3334121704102,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1262f222.f1f98e",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 530.9999866485596,
+        "y": 869.999997138977,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            [
+                "4156eb3.49eb114",
+                "28301c50.f9a394",
+                "2aab82d0.4d643e",
+                "c0b1bda4.651cf",
+                "6b902758.7673c8",
+                "f337f894.e1cc48",
+                "fe8ae27d.83e96",
+                "359b0369.a48e7c",
+                "8d693ead.befbb",
+                "38c29228.79ba4e",
+                "411a695d.a4f048"
+            ]
+        ]
+    },
+    {
+        "id": "ae52469b.df3fe8",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end=\"`$generic-neighbor-configuration-input.number-of-neighbor-cell-entries`\" >",
+        "comments": "",
+        "outputs": 1,
+        "x": 513.0001831054688,
+        "y": 493.989501953125,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            [
+                "1262f222.f1f98e"
+            ]
+        ]
+    },
+    {
+        "id": "4156eb3.49eb114",
+        "type": "set",
+        "name": "set tmp variables for the requested fap service input parms",
+        "xml": "<set>\n<parameter name=\"tmp.alias\" value=\"`$generic-neighbor-configuration-input.alias`\"/>\n<parameter name=\"tmp.plmnid\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].plmnid`\"/>\n<parameter name=\"tmp.cid\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].cid`\"/>\n<parameter name=\"tmp.phy-cell-id\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].phy-cell-id`\"/>\n<parameter name=\"tmp.pnf-name\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].pnf-name`\"/>\n<parameter name=\"tmp.blacklisted\" value=\"`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].blacklisted`\"/>\n",
+        "comments": "",
+        "x": 839.0011596679688,
+        "y": 598.8786010742188,
+        "z": "c197f7e7.1da478",
+        "wires": []
+    },
+    {
+        "id": "28301c50.f9a394",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Temporary varaibles set. Neighbor #:  \"/>\n<parameter name=\"field2\" value=\"`$idx`\"/>\n<parameter name=\"field3\" value=\"`$tmp.plmnid`\"/>\n<parameter name=\"field4\" value=\"`$tmp.cid`\"/>\n<parameter name=\"field5\" value=\"`$tmp.phy-cell-id`\"/>\n<parameter name=\"field6\" value=\"`$tmp.pnf-name`\"/>\n<parameter name=\"field7\" value=\"`$tmp.blacklisted`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 734.510498046875,
+        "y": 642.9999389648438,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "38c29228.79ba4e",
+        "type": "execute",
+        "name": "generate neighbor config URL",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.lte-ran-neighbor-in-use.ransim-mounted`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.config-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{alias}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.alias`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 827.5108642578125,
+        "y": 691.5556640625,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2aab82d0.4d643e",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Config Neighbor List URL\"/>\n<parameter name=\"field2\" value=\"`$tmp.config-neighbor-service-url`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 768.510498046875,
+        "y": 740.7777099609375,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c0b1bda4.651cf",
+        "type": "execute",
+        "name": "populate plmnid",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.config-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.config-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{plmnid}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.plmnid`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 832.5106201171875,
+        "y": 836.7777099609375,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "6b902758.7673c8",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Config Neighbor List URL\"/>\n<parameter name=\"field2\" value=\"`$tmp.config-neighbor-service-url`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 807.510498046875,
+        "y": 884.7777099609375,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f337f894.e1cc48",
+        "type": "execute",
+        "name": "populate cid",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.config-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.config-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{cid}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.cid`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 816.510498046875,
+        "y": 921.7777099609375,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "359b0369.a48e7c",
+        "type": "execute",
+        "name": "Configure neighbor using PATCH",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/oofpcipoc-generic-neighbor-patch.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.config-neighbor-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"PATCH\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-neighbor-patch-response\"/>\n<parameter name='contentType' value='application/yang.patch+json' /> \n<parameter name='format' value='json' />\n<parameter name='accept' value='application/yang.patch-status+json' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 830.510498046875,
+        "y": 1051.77783203125,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            [
+                "aaf367ec.71a3d8",
+                "f6e2a503.cab1e8"
+            ]
+        ]
+    },
+    {
+        "id": "aaf367ec.71a3d8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1125.5103855133057,
+        "y": 1058.7672853469849,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            [
+                "d64f59f9.bbcd88"
+            ]
+        ]
+    },
+    {
+        "id": "f6e2a503.cab1e8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1143.5104274749756,
+        "y": 1126.7671117782593,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            [
+                "ad51aa4c.6dd0f8"
+            ]
+        ]
+    },
+    {
+        "id": "da0a9ad3.338348",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"PATCH Neighbor Executed Successfully \"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1481.5101795196533,
+        "y": 1113.7672200202942,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ad51aa4c.6dd0f8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1323.5100917816162,
+        "y": 1124.7671928405762,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            [
+                "da0a9ad3.338348"
+            ]
+        ]
+    },
+    {
+        "id": "d64f59f9.bbcd88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1284.510248184204,
+        "y": 1067.7672710418701,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            [
+                "1a1c9666.4c773a"
+            ]
+        ]
+    },
+    {
+        "id": "1a1c9666.4c773a",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error adding a new neighbor\" />",
+        "comments": "",
+        "x": 1460.5100116729736,
+        "y": 1052.7672443389893,
+        "z": "c197f7e7.1da478",
+        "wires": []
+    },
+    {
+        "id": "fe8ae27d.83e96",
+        "type": "execute",
+        "name": "Get neighbor details pre-configuration",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.config-neighbor-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-neighbor-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 840.5104370117188,
+        "y": 966.7777099609375,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            [
+                "dc414a11.7edb78",
+                "9db5bb73.2d55e8"
+            ]
+        ]
+    },
+    {
+        "id": "dc414a11.7edb78",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1113.5105381011963,
+        "y": 939.4337558746338,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            [
+                "64dcc609.fa2868"
+            ]
+        ]
+    },
+    {
+        "id": "9db5bb73.2d55e8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1108.5103702545166,
+        "y": 995.4339094161987,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            [
+                "47f38d6d.89f364"
+            ]
+        ]
+    },
+    {
+        "id": "47f38d6d.89f364",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1260.5101871490479,
+        "y": 1004.4338145256042,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            [
+                "ab46d61a.7a0318"
+            ]
+        ]
+    },
+    {
+        "id": "ab46d61a.7a0318",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Details about Neighbor Pre-configuration\"/>\n<parameter name=\"field2\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].plmnid`\"/>\n<parameter name=\"field3\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].cid`\"/>\n<parameter name=\"field4\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].phy-cell-id`\"/>\n<parameter name=\"field5\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].pnf-name`\"/>\n<parameter name=\"field6\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].blacklisted`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1421.510103225708,
+        "y": 998.434084892273,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "64dcc609.fa2868",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error getting details about new neighbor \" />",
+        "comments": "",
+        "x": 1314.5103282928467,
+        "y": 945.4337644577026,
+        "z": "c197f7e7.1da478",
+        "wires": []
+    },
+    {
+        "id": "8d693ead.befbb",
+        "type": "execute",
+        "name": "Get neighbor details post-configuration",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.controller.url + $tmp.config-neighbor-service-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.controller.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"oofpci-neighbor-response\"/>\n<parameter name='contentType' value='application/json' /> \n<parameter name='format' value='json' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 796.5104370117188,
+        "y": 1165.6666259765625,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            [
+                "8f75a41.6426d58",
+                "23c81cd0.efa084"
+            ]
+        ]
+    },
+    {
+        "id": "8f75a41.6426d58",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1153.5105381011963,
+        "y": 1177.3226108551025,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            [
+                "bfbdf11e.993f7"
+            ]
+        ]
+    },
+    {
+        "id": "23c81cd0.efa084",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1148.5103702545166,
+        "y": 1233.3227643966675,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            [
+                "4d4d048c.c416cc"
+            ]
+        ]
+    },
+    {
+        "id": "4d4d048c.c416cc",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1300.5101871490479,
+        "y": 1242.322669506073,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            [
+                "fcddb4e7.12b6d8"
+            ]
+        ]
+    },
+    {
+        "id": "bfbdf11e.993f7",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error getting details about new neighbor \" />",
+        "comments": "",
+        "x": 1354.5103282928467,
+        "y": 1183.3226194381714,
+        "z": "c197f7e7.1da478",
+        "wires": []
+    },
+    {
+        "id": "fcddb4e7.12b6d8",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/generic-neighbor-config.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Details about Neighbor Pre-configuration\"/>\n<parameter name=\"field2\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].plmnid`\"/>\n<parameter name=\"field3\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].cid`\"/>\n<parameter name=\"field4\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].phy-cell-id`\"/>\n<parameter name=\"field5\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].pnf-name`\"/>\n<parameter name=\"field6\" value=\"`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].blacklisted`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1461.5100955963135,
+        "y": 1235.3229141235352,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8472ac8d.f6ede",
+        "type": "outcome",
+        "name": "Not Mounted",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 420,
+        "y": 320,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            [
+                "86dca6b7.e82f88"
+            ]
+        ]
+    },
+    {
+        "id": "c0db2192.9d16c",
+        "type": "switchNode",
+        "name": "switch mounted",
+        "xml": "<switch test='`$prop.ransim-mounted`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 318,
+        "y": 409,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            [
+                "8472ac8d.f6ede",
+                "5a41edd6.afaa34"
+            ]
+        ]
+    },
+    {
+        "id": "5a41edd6.afaa34",
+        "type": "outcome",
+        "name": "Mounted",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 351,
+        "y": 487,
+        "z": "c197f7e7.1da478",
+        "wires": [
+            [
+                "ae52469b.df3fe8"
+            ]
+        ]
+    },
+    {
+        "id": "411a695d.a4f048",
+        "type": "execute",
+        "name": "populate netconf mount",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.config-neighbor-service-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.config-neighbor-service-url\"/>\n    <parameter name=\"target\" value=\"{pnf-name}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.pnf-name`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 837,
+        "y": 792,
+        "z": "c197f7e7.1da478",
         "wires": [
             []
         ]
     }
-]
+]
\ No newline at end of file
diff --git a/platform-logic/oofpcipoc-api/src/main/resources/graph.versions b/platform-logic/oofpcipoc-api/src/main/resources/graph.versions
index cce73e17..6f81edb2 100644
--- a/platform-logic/oofpcipoc-api/src/main/resources/graph.versions
+++ b/platform-logic/oofpcipoc-api/src/main/resources/graph.versions
@@ -3,3 +3,4 @@ oofpcipoc-api oofpcipoc-api_configuration-phy-cell-id ${project.version} sync
 oofpcipoc-api oofpcipoc-api_generic-neighbor-configuration ${project.version} sync
 oofpcipoc-api oofpcipoc-api_add-neighbor ${project.version} sync
 oofpcipoc-api oofpcipoc-delete-neighbor ${project.version} sync
+oofpcipoc-api oofpcipoc-api_handle-nbrlist-change-notif ${project.version} sync
diff --git a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_add-neighbor.xml b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_add-neighbor.xml
index 9893030c..fef46865 100644
--- a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_add-neighbor.xml
+++ b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_add-neighbor.xml
@@ -3,6 +3,12 @@
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='0.4.2-SNAPSHOT'>
     <method rpc='add-neighbor' mode='sync'>
         <block atomic='true'>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="RPC to add neighbors. Number of neighbors to add: "/>
+                <parameter name="field2" value="`$add-neighbor-input.lte-cell-number-of-entries`"/>
+            </record>
             <for index='idx' start='0' end="`$add-neighbor-input.lte-cell-number-of-entries`" >
                 <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                     <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
@@ -18,12 +24,6 @@
                     <parameter name="field9" value="`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].blacklisted`"/>
                 </record>
             </for>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="RPC to add neighbors. Number of neighbors to add: "/>
-                <parameter name="field2" value="`$add-neighbor-input.lte-cell-number-of-entries`"/>
-            </record>
             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/sdnr-oofpcipoc-api-dg.properties' />
                 <parameter name='contextPrefix' value='prop' />
@@ -38,129 +38,264 @@
                 <parameter name="field5" value="`$prop.controller.url`"/>
                 <parameter name="field6" value="`$prop.restapi.lte-ran-neighbor-in-use`"/>
             </record>
-            <for index='idx' start='0' end="`$add-neighbor-input.lte-cell-number-of-entries`" >
-                <block atomic='true'>
-                    <set>
-                        <parameter name="tmp.plmnid" value="`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].plmnid`"/>
-                        <parameter name="tmp.cid" value="`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].cid`"/>
-                        <parameter name="tmp.phy-cell-id" value="`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].phy-cell-id`"/>
-                        <parameter name="tmp.pnf-name" value="`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].pnf-name`"/>
-                        <parameter name="tmp.blacklisted" value="`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].blacklisted`"/>
-                        <parameter name="tmp.alias" value="`$add-neighbor-input.alias`"/>
-                    </set>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="Temporary variable for Neighbor Cell #:  "/>
-                        <parameter name="field2" value="`$idx`"/>
-                        <parameter name="field3" value="`$tmp.plmnid`"/>
-                        <parameter name="field4" value="`$tmp.cid`"/>
-                        <parameter name="field5" value="`$tmp.phy-cell-id`"/>
-                        <parameter name="field6" value="`$tmp.pnf-name`"/>
-                        <parameter name="field7" value="`$tmp.blacklisted`"/>
-                        <parameter name="field8" value="`$tmp.alias`"/>
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                        <parameter name="source" value="`$prop.restapi.lte-ran-neighbor-in-use`"/>
-                        <parameter name="outputPath" value="tmp.add-neighbor-service-url"/>
-                        <parameter name="target" value="{alias}"/>
-                        <parameter name="replacement" value="`$tmp.alias`"/>
-                    </execute>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="Add Neighbor List URL"/>
-                        <parameter name="field2" value="`$tmp.add-neighbor-service-url`"/>
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                        <parameter name="source" value="`$tmp.add-neighbor-service-url`"/>
-                        <parameter name="outputPath" value="tmp.add-neighbor-service-url"/>
-                        <parameter name="target" value="{plmnid}"/>
-                        <parameter name="replacement" value="`$tmp.plmnid`"/>
-                    </execute>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="Add Neighbor List URL"/>
-                        <parameter name="field2" value="`$tmp.add-neighbor-service-url`"/>
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                        <parameter name="source" value="`$tmp.add-neighbor-service-url`"/>
-                        <parameter name="outputPath" value="tmp.add-neighbor-service-url"/>
-                        <parameter name="target" value="{cid}"/>
-                        <parameter name="replacement" value="`$tmp.cid`"/>
-                    </execute>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="Setting variables for Neighbor Add PUT operation"/>
-                        <parameter name="field2" value="`$tmp.add-neighbor-service-url`"/>
-                        <parameter name="field3" value="`$tmp.plmnid`"/>
-                        <parameter name="field4" value="`$tmp.cid`"/>
-                        <parameter name="field5" value="`$tmp.phy-cell-id`"/>
-                        <parameter name="field6" value="`$tmp.pnf-name`"/>
-                        <parameter name="field7" value="`$tmp.blacklisted`"/>
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/oofpcipoc-addNeighbor.json'`" />
-                        <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.add-neighbor-service-url`"/>
-                        <parameter name="restapiUser" value="`$prop.controller.user`" />
-                        <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
-                        <parameter name="httpMethod" value="PUT"/>
-                        <parameter name="responsePrefix" value="oofpci-add-neighbor-response"/>
-                        <parameter name='contentType' value='application/json' />
-                        <parameter name='format' value='json' />
-                        <outcome value='failure'>
-                            <block>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="Error adding a new neighbor" />
-                                </return>
-                            </block>
-                        </outcome>
-                        <outcome value='success'>
-                            <block>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="PUT New Neighbor Executed Successfully "/>
-                                </record>
-                            </block>
-                        </outcome>
-                    </execute>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.add-neighbor-service-url`"/>
-                        <parameter name="restapiUser" value="`$prop.controller.user`" />
-                        <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
-                        <parameter name="httpMethod" value="GET"/>
-                        <parameter name="responsePrefix" value="oofpci-neighbor-response"/>
-                        <parameter name='contentType' value='application/json' />
-                        <parameter name='format' value='json' />
-                        <outcome value='failure'>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="Error getting details about new neighbor " />
-                            </return>
-                        </outcome>
-                        <outcome value='success'>
-                            <block>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="Details about newly added Neighbor"/>
-                                    <parameter name="field2" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].plmnid`"/>
-                                    <parameter name="field3" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].cid`"/>
-                                    <parameter name="field4" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].phy-cell-id`"/>
-                                    <parameter name="field5" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].pnf-name`"/>
-                                    <parameter name="field6" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].blacklisted`"/>
-                                </record>
-                            </block>
-                        </outcome>
-                    </execute>
-                </block>
-            </for>
+            <switch test='`$prop.ransim-mounted`'>
+                <outcome value='false'>
+                    <for index='idx' start='0' end="`$add-neighbor-input.lte-cell-number-of-entries`" >
+                        <block atomic='true'>
+                            <set>
+                                <parameter name="tmp.plmnid" value="`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].plmnid`"/>
+                                <parameter name="tmp.cid" value="`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].cid`"/>
+                                <parameter name="tmp.phy-cell-id" value="`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].phy-cell-id`"/>
+                                <parameter name="tmp.pnf-name" value="`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].pnf-name`"/>
+                                <parameter name="tmp.blacklisted" value="`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].blacklisted`"/>
+                                <parameter name="tmp.alias" value="`$add-neighbor-input.alias`"/>
+                            </set>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Temporary variable for Neighbor Cell #:  "/>
+                                <parameter name="field2" value="`$idx`"/>
+                                <parameter name="field3" value="`$tmp.plmnid`"/>
+                                <parameter name="field4" value="`$tmp.cid`"/>
+                                <parameter name="field5" value="`$tmp.phy-cell-id`"/>
+                                <parameter name="field6" value="`$tmp.pnf-name`"/>
+                                <parameter name="field7" value="`$tmp.blacklisted`"/>
+                                <parameter name="field8" value="`$tmp.alias`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$prop.restapi.lte-ran-neighbor-in-use`"/>
+                                <parameter name="outputPath" value="tmp.add-neighbor-service-url"/>
+                                <parameter name="target" value="{alias}"/>
+                                <parameter name="replacement" value="`$tmp.alias`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Add Neighbor List URL"/>
+                                <parameter name="field2" value="`$tmp.add-neighbor-service-url`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$tmp.add-neighbor-service-url`"/>
+                                <parameter name="outputPath" value="tmp.add-neighbor-service-url"/>
+                                <parameter name="target" value="{plmnid}"/>
+                                <parameter name="replacement" value="`$tmp.plmnid`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Add Neighbor List URL"/>
+                                <parameter name="field2" value="`$tmp.add-neighbor-service-url`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$tmp.add-neighbor-service-url`"/>
+                                <parameter name="outputPath" value="tmp.add-neighbor-service-url"/>
+                                <parameter name="target" value="{cid}"/>
+                                <parameter name="replacement" value="`$tmp.cid`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Setting variables for Neighbor Add PUT operation"/>
+                                <parameter name="field2" value="`$tmp.add-neighbor-service-url`"/>
+                                <parameter name="field3" value="`$tmp.plmnid`"/>
+                                <parameter name="field4" value="`$tmp.cid`"/>
+                                <parameter name="field5" value="`$tmp.phy-cell-id`"/>
+                                <parameter name="field6" value="`$tmp.pnf-name`"/>
+                                <parameter name="field7" value="`$tmp.blacklisted`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/oofpcipoc-addNeighbor.json'`" />
+                                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.add-neighbor-service-url`"/>
+                                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                <parameter name="httpMethod" value="PUT"/>
+                                <parameter name="responsePrefix" value="oofpci-add-neighbor-response"/>
+                                <parameter name='contentType' value='application/json' />
+                                <parameter name='format' value='json' />
+                                <outcome value='failure'>
+                                    <block>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="Error adding a new neighbor" />
+                                        </return>
+                                    </block>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="PUT New Neighbor Executed Successfully "/>
+                                        </record>
+                                    </block>
+                                </outcome>
+                            </execute>
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.add-neighbor-service-url`"/>
+                                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                <parameter name="httpMethod" value="GET"/>
+                                <parameter name="responsePrefix" value="oofpci-neighbor-response"/>
+                                <parameter name='contentType' value='application/json' />
+                                <parameter name='format' value='json' />
+                                <outcome value='failure'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error getting details about new neighbor " />
+                                    </return>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="Details about newly added Neighbor"/>
+                                            <parameter name="field2" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].plmnid`"/>
+                                            <parameter name="field3" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].cid`"/>
+                                            <parameter name="field4" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].phy-cell-id`"/>
+                                            <parameter name="field5" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].pnf-name`"/>
+                                            <parameter name="field6" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].blacklisted`"/>
+                                        </record>
+                                    </block>
+                                </outcome>
+                            </execute>
+                        </block>
+                    </for>
+                </outcome>
+                <outcome value='true'>
+                    <for index='idx' start='0' end="`$add-neighbor-input.lte-cell-number-of-entries`" >
+                        <block atomic='true'>
+                            <set>
+                                <parameter name="tmp.plmnid" value="`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].plmnid`"/>
+                                <parameter name="tmp.cid" value="`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].cid`"/>
+                                <parameter name="tmp.phy-cell-id" value="`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].phy-cell-id`"/>
+                                <parameter name="tmp.pnf-name" value="`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].pnf-name`"/>
+                                <parameter name="tmp.blacklisted" value="`$add-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].blacklisted`"/>
+                                <parameter name="tmp.alias" value="`$add-neighbor-input.alias`"/>
+                            </set>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Temporary variable for Neighbor Cell #:  "/>
+                                <parameter name="field2" value="`$idx`"/>
+                                <parameter name="field3" value="`$tmp.plmnid`"/>
+                                <parameter name="field4" value="`$tmp.cid`"/>
+                                <parameter name="field5" value="`$tmp.phy-cell-id`"/>
+                                <parameter name="field6" value="`$tmp.pnf-name`"/>
+                                <parameter name="field7" value="`$tmp.blacklisted`"/>
+                                <parameter name="field8" value="`$tmp.alias`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$prop.restapi.lte-ran-neighbor-in-use.ransim-mounted`"/>
+                                <parameter name="outputPath" value="tmp.add-neighbor-service-url"/>
+                                <parameter name="target" value="{alias}"/>
+                                <parameter name="replacement" value="`$tmp.alias`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Add Neighbor List URL"/>
+                                <parameter name="field2" value="`$tmp.add-neighbor-service-url`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$tmp.add-neighbor-service-url`"/>
+                                <parameter name="outputPath" value="tmp.add-neighbor-service-url"/>
+                                <parameter name="target" value="{pnf-name}"/>
+                                <parameter name="replacement" value="`$tmp.pnf-name`"/>
+                            </execute>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$tmp.add-neighbor-service-url`"/>
+                                <parameter name="outputPath" value="tmp.add-neighbor-service-url"/>
+                                <parameter name="target" value="{plmnid}"/>
+                                <parameter name="replacement" value="`$tmp.plmnid`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Add Neighbor List URL"/>
+                                <parameter name="field2" value="`$tmp.add-neighbor-service-url`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$tmp.add-neighbor-service-url`"/>
+                                <parameter name="outputPath" value="tmp.add-neighbor-service-url"/>
+                                <parameter name="target" value="{cid}"/>
+                                <parameter name="replacement" value="`$tmp.cid`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Setting variables for Neighbor Add PUT operation"/>
+                                <parameter name="field2" value="`$tmp.add-neighbor-service-url`"/>
+                                <parameter name="field3" value="`$tmp.plmnid`"/>
+                                <parameter name="field4" value="`$tmp.cid`"/>
+                                <parameter name="field5" value="`$tmp.phy-cell-id`"/>
+                                <parameter name="field6" value="`$tmp.pnf-name`"/>
+                                <parameter name="field7" value="`$tmp.blacklisted`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/oofpcipoc-addNeighbor.json'`" />
+                                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.add-neighbor-service-url`"/>
+                                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                <parameter name="httpMethod" value="PUT"/>
+                                <parameter name="responsePrefix" value="oofpci-add-neighbor-response"/>
+                                <parameter name='contentType' value='application/json' />
+                                <parameter name='format' value='json' />
+                                <outcome value='failure'>
+                                    <block>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="Error adding a new neighbor" />
+                                        </return>
+                                    </block>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="PUT New Neighbor Executed Successfully "/>
+                                        </record>
+                                    </block>
+                                </outcome>
+                            </execute>
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.add-neighbor-service-url`"/>
+                                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                <parameter name="httpMethod" value="GET"/>
+                                <parameter name="responsePrefix" value="oofpci-neighbor-response"/>
+                                <parameter name='contentType' value='application/json' />
+                                <parameter name='format' value='json' />
+                                <outcome value='failure'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error getting details about new neighbor " />
+                                    </return>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="Details about newly added Neighbor"/>
+                                            <parameter name="field2" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].plmnid`"/>
+                                            <parameter name="field3" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].cid`"/>
+                                            <parameter name="field4" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].phy-cell-id`"/>
+                                            <parameter name="field5" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].pnf-name`"/>
+                                            <parameter name="field6" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].blacklisted`"/>
+                                        </record>
+                                    </block>
+                                </outcome>
+                            </execute>
+                        </block>
+                    </for>
+                </outcome>
+            </switch>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
                 <parameter name="error-code" value="200" />
diff --git a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_configuration-phy-cell-id.xml b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_configuration-phy-cell-id.xml
index 501fce78..d4bd6cec 100644
--- a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_configuration-phy-cell-id.xml
+++ b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_configuration-phy-cell-id.xml
@@ -1,6 +1,6 @@
 <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='0.4.2-SNAPSHOT'>
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='${project.version}'>
     <method rpc='configuration-phy-cell-id' mode='sync'>
         <block atomic='true'>
             <for index='idx' start='0' end="`$configuration-phy-cell-id-input.fap-service-number-of-entries`" >
@@ -15,12 +15,6 @@
                     <parameter name="field6" value="`$configuration-phy-cell-id-input.fap-service[$idx].pnf-name`"/>
                 </record>
             </for>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="RPC to Configure PCI INVOKED. Number of Cells to configure: "/>
-                <parameter name="field2" value="`$configuration-phy-cell-id-input.fap-service-number-of-entries`"/>
-            </record>
             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/sdnr-oofpcipoc-api-dg.properties' />
                 <parameter name='contextPrefix' value='prop' />
@@ -33,131 +27,281 @@
                 <parameter name="field3" value="`$prop.controller.user`"/>
                 <parameter name="field4" value="`$prop.controller.pwd`"/>
                 <parameter name="field5" value="`$prop.controller.url`"/>
+                <parameter name="field6" value="ransim-mounted (true/false): "/>
+                <parameter name="field7" value="`$prop.ransim-mounted`"/>
             </record>
-            <for index='idx' start='0' end="`$configuration-phy-cell-id-input.fap-service-number-of-entries`" >
-                <block atomic='true'>
-                    <set>
-                        <parameter name="tmp.alias" value="`$configuration-phy-cell-id-input.fap-service[$idx].alias`"/>
-                        <parameter name="tmp.cid" value="`$configuration-phy-cell-id-input.fap-service[$idx].cid`"/>
-                        <parameter name="tmp.phy-cell-id-in-use" value="`$configuration-phy-cell-id-input.fap-service[$idx].phy-cell-id-in-use`"/>
-                        <parameter name="tmp.pnf-name" value="`$configuration-phy-cell-id-input.fap-service[$idx].pnf-name`"/>
-                    </set>
-                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                        <parameter name="source" value="`$prop.restapi.fap-service`"/>
-                        <parameter name="outputPath" value="tmp.fap-service-url"/>
-                        <parameter name="target" value="{alias}"/>
-                        <parameter name="replacement" value="`$tmp.alias`"/>
-                    </execute>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="Setting variables for GET operation"/>
-                        <parameter name="field2" value="`$tmp.fap-service-url`"/>
-                        <parameter name="field3" value="`$tmp.alias`"/>
-                        <parameter name="field4" value="`$tmp.cid`"/>
-                        <parameter name="field5" value="`$tmp.phy-cell-id-in-use`"/>
-                        <parameter name="field6" value="`$tmp.pnf-name`"/>
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.fap-service-url`"/>
-                        <parameter name="restapiUser" value="`$prop.controller.user`" />
-                        <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
-                        <parameter name="format" value="json"/>
-                        <parameter name="httpMethod" value="GET"/>
-                        <parameter name="responsePrefix" value="oofpcigetfapservice"/>
-                        <parameter name='contentType' value='application/json' />
-                        <outcome value='failure'>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="Error executing Get odutopo node details rest api" />
-                            </return>
-                        </outcome>
-                        <outcome value='success'>
-                            <block>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="Initial FAP Service PCI PARMS"/>
-                                    <parameter name="field2" value="`$oofpcigetfapservice.fap-service[0].alias`"/>
-                                    <parameter name="field3" value="`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.phy-cell-id-in-use`"/>
-                                    <parameter name="field4" value="`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.pnf-name`"/>
-                                </record>
-                            </block>
-                        </outcome>
-                    </execute>
-                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                        <parameter name="source" value="`$prop.restapi.x-005b9-lte`"/>
-                        <parameter name="outputPath" value="tmp.oofpcipoc.patch.pci.url"/>
-                        <parameter name="target" value="{alias}"/>
-                        <parameter name="replacement" value="`$tmp.alias`"/>
-                    </execute>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="URL and Target for PCI patch URL"/>
-                        <parameter name='field2' value="`$prop.controller.url + $tmp.oofpcipoc.patch.pci.url`" />
-                        <parameter name='field3' value="`$prop.oofpcipoc.patch.pci.target`" />
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/oofpcipoc-pci-patch.json'`" />
-                        <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.oofpcipoc.patch.pci.url`"/>
-                        <parameter name="restapiUser" value="`$prop.controller.user`" />
-                        <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
-                        <parameter name="httpMethod" value="PATCH"/>
-                        <parameter name="responsePrefix" value="oofpci-patch-response"/>
-                        <parameter name='contentType' value='application/yang.patch+json' />
-                        <parameter name='format' value='json' />
-                        <parameter name='accept' value='application/yang.patch-status+json' />
-                        <outcome value='failure'>
-                            <block>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="Error executing patch rest api" />
-                                </return>
-                            </block>
-                        </outcome>
-                        <outcome value='success'>
-                            <block>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="PUT PCI POC FAP SERVICE. Reconfigured "/>
-                                </record>
-                            </block>
-                        </outcome>
-                    </execute>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.fap-service-url`"/>
-                        <parameter name="restapiUser" value="`$prop.controller.user`" />
-                        <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
-                        <parameter name="format" value="json"/>
-                        <parameter name="httpMethod" value="GET"/>
-                        <parameter name="responsePrefix" value="oofpcigetfapservice"/>
-                        <parameter name='contentType' value='application/json' />
-                        <outcome value='failure'>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="Error executing patch rest api" />
-                            </return>
-                        </outcome>
-                        <outcome value='success'>
-                            <block>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="Post Reconfig FAP Service PCI PARMS"/>
-                                    <parameter name="field2" value="`$oofpcigetfapservice.fap-service[0].alias`"/>
-                                    <parameter name="field3" value="`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.phy-cell-id-in-use`"/>
-                                    <parameter name="field4" value="`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.pnf-name`"/>
-                                </record>
-                            </block>
-                        </outcome>
-                    </execute>
-                </block>
-            </for>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="RPC to Configure PCI INVOKED. Number of Cells to configure: "/>
+                <parameter name="field2" value="`$configuration-phy-cell-id-input.fap-service-number-of-entries`"/>
+            </record>
+            <switch test='`$prop.ransim-mounted`'>
+                <outcome value='false'>
+                    <for index='idx' start='0' end="`$configuration-phy-cell-id-input.fap-service-number-of-entries`" >
+                        <block atomic='true'>
+                            <set>
+                                <parameter name="tmp.alias" value="`$configuration-phy-cell-id-input.fap-service[$idx].alias`"/>
+                                <parameter name="tmp.cid" value="`$configuration-phy-cell-id-input.fap-service[$idx].cid`"/>
+                                <parameter name="tmp.phy-cell-id-in-use" value="`$configuration-phy-cell-id-input.fap-service[$idx].phy-cell-id-in-use`"/>
+                                <parameter name="tmp.pnf-name" value="`$configuration-phy-cell-id-input.fap-service[$idx].pnf-name`"/>
+                            </set>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$prop.restapi.fap-service`"/>
+                                <parameter name="outputPath" value="tmp.fap-service-url"/>
+                                <parameter name="target" value="{alias}"/>
+                                <parameter name="replacement" value="`$tmp.alias`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Setting variables for GET operation"/>
+                                <parameter name="field2" value="`$tmp.fap-service-url`"/>
+                                <parameter name="field3" value="`$tmp.alias`"/>
+                                <parameter name="field4" value="`$tmp.cid`"/>
+                                <parameter name="field5" value="`$tmp.phy-cell-id-in-use`"/>
+                                <parameter name="field6" value="`$tmp.pnf-name`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.fap-service-url`"/>
+                                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                <parameter name="format" value="json"/>
+                                <parameter name="httpMethod" value="GET"/>
+                                <parameter name="responsePrefix" value="oofpcigetfapservice"/>
+                                <parameter name='contentType' value='application/json' />
+                                <outcome value='failure'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error executing Get odutopo node details rest api" />
+                                    </return>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="Initial FAP Service PCI PARMS"/>
+                                            <parameter name="field2" value="`$oofpcigetfapservice.fap-service[0].alias`"/>
+                                            <parameter name="field3" value="`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.phy-cell-id-in-use`"/>
+                                            <parameter name="field4" value="`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.pnf-name`"/>
+                                        </record>
+                                    </block>
+                                </outcome>
+                            </execute>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$prop.restapi.x-005b9-lte`"/>
+                                <parameter name="outputPath" value="tmp.oofpcipoc.patch.pci.url"/>
+                                <parameter name="target" value="{alias}"/>
+                                <parameter name="replacement" value="`$tmp.alias`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="URL and Target for PCI patch URL"/>
+                                <parameter name='field2' value="`$prop.controller.url + $tmp.oofpcipoc.patch.pci.url`" />
+                                <parameter name='field3' value="`$prop.oofpcipoc.patch.pci.target`" />
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/oofpcipoc-pci-patch.json'`" />
+                                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.oofpcipoc.patch.pci.url`"/>
+                                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                <parameter name="httpMethod" value="PATCH"/>
+                                <parameter name="responsePrefix" value="oofpci-patch-response"/>
+                                <parameter name='contentType' value='application/yang.patch+json' />
+                                <parameter name='format' value='json' />
+                                <parameter name='accept' value='application/yang.patch-status+json' />
+                                <outcome value='failure'>
+                                    <block>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="Error executing patch rest api" />
+                                        </return>
+                                    </block>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="PUT PCI POC FAP SERVICE. Reconfigured "/>
+                                        </record>
+                                    </block>
+                                </outcome>
+                            </execute>
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.fap-service-url`"/>
+                                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                <parameter name="format" value="json"/>
+                                <parameter name="httpMethod" value="GET"/>
+                                <parameter name="responsePrefix" value="oofpcigetfapservice"/>
+                                <parameter name='contentType' value='application/json' />
+                                <outcome value='failure'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error executing patch rest api" />
+                                    </return>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="Post Reconfig FAP Service PCI PARMS"/>
+                                            <parameter name="field2" value="`$oofpcigetfapservice.fap-service[0].alias`"/>
+                                            <parameter name="field3" value="`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.phy-cell-id-in-use`"/>
+                                            <parameter name="field4" value="`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.pnf-name`"/>
+                                        </record>
+                                    </block>
+                                </outcome>
+                            </execute>
+                        </block>
+                    </for>
+                </outcome>
+                <outcome value='true'>
+                    <for index='idx' start='0' end="`$configuration-phy-cell-id-input.fap-service-number-of-entries`" >
+                        <block atomic='true'>
+                            <set>
+                                <parameter name="tmp.alias" value="`$configuration-phy-cell-id-input.fap-service[$idx].alias`"/>
+                                <parameter name="tmp.cid" value="`$configuration-phy-cell-id-input.fap-service[$idx].cid`"/>
+                                <parameter name="tmp.phy-cell-id-in-use" value="`$configuration-phy-cell-id-input.fap-service[$idx].phy-cell-id-in-use`"/>
+                                <parameter name="tmp.pnf-name" value="`$configuration-phy-cell-id-input.fap-service[$idx].pnf-name`"/>
+                            </set>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$prop.restapi.fap-service.ransim-mounted`"/>
+                                <parameter name="outputPath" value="tmp.fap-service-url"/>
+                                <parameter name="target" value="{alias}"/>
+                                <parameter name="replacement" value="`$tmp.alias`"/>
+                            </execute>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$tmp.fap-service-url`"/>
+                                <parameter name="outputPath" value="tmp.fap-service-url"/>
+                                <parameter name="target" value="{pnf-name}"/>
+                                <parameter name="replacement" value="`$tmp.pnf-name`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Setting variables for GET operation"/>
+                                <parameter name="field2" value="`$tmp.fap-service-url`"/>
+                                <parameter name="field3" value="`$tmp.alias`"/>
+                                <parameter name="field4" value="`$tmp.cid`"/>
+                                <parameter name="field5" value="`$tmp.phy-cell-id-in-use`"/>
+                                <parameter name="field6" value="`$tmp.pnf-name`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.fap-service-url`"/>
+                                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                <parameter name="format" value="json"/>
+                                <parameter name="httpMethod" value="GET"/>
+                                <parameter name="responsePrefix" value="oofpcigetfapservice"/>
+                                <parameter name='contentType' value='application/json' />
+                                <outcome value='failure'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error executing Get odutopo node details rest api" />
+                                    </return>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="Initial FAP Service PCI PARMS"/>
+                                            <parameter name="field2" value="`$oofpcigetfapservice.fap-service[0].alias`"/>
+                                            <parameter name="field3" value="`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.phy-cell-id-in-use`"/>
+                                            <parameter name="field4" value="`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.pnf-name`"/>
+                                        </record>
+                                    </block>
+                                </outcome>
+                            </execute>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$prop.restapi.x-005b9-lte.ransim-mounted`"/>
+                                <parameter name="outputPath" value="tmp.oofpcipoc.patch.pci.url"/>
+                                <parameter name="target" value="{alias}"/>
+                                <parameter name="replacement" value="`$tmp.alias`"/>
+                            </execute>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$tmp.oofpcipoc.patch.pci.url`"/>
+                                <parameter name="outputPath" value="tmp.oofpcipoc.patch.pci.url"/>
+                                <parameter name="target" value="{pnf-name}"/>
+                                <parameter name="replacement" value="`$tmp.pnf-name`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="URL and Target for PCI patch URL"/>
+                                <parameter name='field2' value="`$prop.controller.url + $tmp.oofpcipoc.patch.pci.url`" />
+                                <parameter name='field3' value="`$prop.oofpcipoc.patch.pci.target`" />
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/oofpcipoc-pci-patch.json'`" />
+                                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.oofpcipoc.patch.pci.url`"/>
+                                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                <parameter name="httpMethod" value="PATCH"/>
+                                <parameter name="responsePrefix" value="oofpci-patch-response"/>
+                                <parameter name='contentType' value='application/yang.patch+json' />
+                                <parameter name='format' value='json' />
+                                <parameter name='accept' value='application/yang.patch-status+json' />
+                                <outcome value='failure'>
+                                    <block>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="Error executing patch rest api" />
+                                        </return>
+                                    </block>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="PUT PCI POC FAP SERVICE. Reconfigured "/>
+                                        </record>
+                                    </block>
+                                </outcome>
+                            </execute>
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.fap-service-url`"/>
+                                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                <parameter name="format" value="json"/>
+                                <parameter name="httpMethod" value="GET"/>
+                                <parameter name="responsePrefix" value="oofpcigetfapservice"/>
+                                <parameter name='contentType' value='application/json' />
+                                <outcome value='failure'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error executing patch rest api" />
+                                    </return>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/configuration-phy-cell-id.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="Post Reconfig FAP Service PCI PARMS"/>
+                                            <parameter name="field2" value="`$oofpcigetfapservice.fap-service[0].alias`"/>
+                                            <parameter name="field3" value="`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.phy-cell-id-in-use`"/>
+                                            <parameter name="field4" value="`$oofpcigetfapservice.fap-service[0].x-0005b9-lte.pnf-name`"/>
+                                        </record>
+                                    </block>
+                                </outcome>
+                            </execute>
+                        </block>
+                    </for>
+                </outcome>
+            </switch>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
                 <parameter name="error-code" value="200" />
diff --git a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_delete-neighbor.xml b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_delete-neighbor.xml
index c6674c7e..93eeeb9a 100644
--- a/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_delete-neighbor.xml
+++ b/platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_delete-neighbor.xml
@@ -3,6 +3,12 @@
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='0.4.2-SNAPSHOT'>
     <method rpc='delete-neighbor' mode='sync'>
         <block atomic='true'>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/delete-neighbor.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="RPC to delete neighbors. Number of neighbors to delete: "/>
+                <parameter name="field2" value="`$delete-neighbor-input.lte-cell-number-of-entries`"/>
+            </record>
             <for index='idx' start='0' end="`$delete-neighbor-input.lte-cell-number-of-entries`" >
                 <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                     <parameter name="file" value="/opt/opendaylight/current/data/log/delete-neighbor.log" />
@@ -13,118 +19,212 @@
                     <parameter name="field4" value="`$idx`"/>
                     <parameter name="field5" value="`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].plmnid`"/>
                     <parameter name="field6" value="`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].cid`"/>
+                    <parameter name="field7" value="`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].pnf-name`"/>
                 </record>
             </for>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/delete-neighbor.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="RPC to delete neighbors. Number of neighbors to delete: "/>
-                <parameter name="field2" value="`$delete-neighbor-input.lte-cell-number-of-entries`"/>
-            </record>
             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/sdnr-oofpcipoc-api-dg.properties' />
                 <parameter name='contextPrefix' value='prop' />
             </execute>
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/add-neighbor.log" />
+                <parameter name="file" value="/opt/opendaylight/current/data/log/delete-neighbor.log" />
                 <parameter name="level" value="info" />
-                <parameter name="field1" value="Properties read .. neighbor-add template"/>
-                <parameter name="field2" value="`$prop.neighbor-add.templatefile`"/>
+                <parameter name="field1" value="Properties read .. neighbor-delete template"/>
+                <parameter name="field2" value="`$prop.restapi.neighbor-delete.templatefile`"/>
                 <parameter name="field3" value="`$prop.controller.user`"/>
                 <parameter name="field4" value="`$prop.controller.pwd`"/>
                 <parameter name="field5" value="`$prop.controller.url`"/>
                 <parameter name="field6" value="`$prop.restapi.lte-ran-neighbor-in-use`"/>
+                <parameter name="field7" value="`$prop.restapi.lte-ran-neighbor-in-use.ransim-mounted`"/>
             </record>
-            <for index='idx' start='0' end="`$delete-neighbor-input.lte-cell-number-of-entries`" >
-                <block atomic='true'>
-                    <set>
-                        <parameter name="tmp.plmnid" value="`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].plmnid`"/>
-                        <parameter name="tmp.cid" value="`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].cid`"/>
-                        <parameter name="tmp.alias" value="`$delete-neighbor-input.alias`"/>
-                    </set>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/delete-neighbor.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="Temporary variable for Neighbor Cell #:  "/>
-                        <parameter name="field2" value="`$idx`"/>
-                        <parameter name="field3" value="`$tmp.plmnid`"/>
-                        <parameter name="field4" value="`$tmp.cid`"/>
-                        <parameter name="field5" value="`$tmp.alias`"/>
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                        <parameter name="source" value="`$prop.restapi.lte-ran-neighbor-in-use`"/>
-                        <parameter name="outputPath" value="tmp.add-neighbor-service-url"/>
-                        <parameter name="target" value="{alias}"/>
-                        <parameter name="replacement" value="`$tmp.alias`"/>
-                    </execute>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/delete-neighbor.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="Add Neighbor List URL"/>
-                        <parameter name="field2" value="`$tmp.add-neighbor-service-url`"/>
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                        <parameter name="source" value="`$tmp.add-neighbor-service-url`"/>
-                        <parameter name="outputPath" value="tmp.add-neighbor-service-url"/>
-                        <parameter name="target" value="{plmnid}"/>
-                        <parameter name="replacement" value="`$tmp.plmnid`"/>
-                    </execute>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/delete-neighbor.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="Add Neighbor List URL"/>
-                        <parameter name="field2" value="`$tmp.add-neighbor-service-url`"/>
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                        <parameter name="source" value="`$tmp.add-neighbor-service-url`"/>
-                        <parameter name="outputPath" value="tmp.add-neighbor-service-url"/>
-                        <parameter name="target" value="{cid}"/>
-                        <parameter name="replacement" value="`$tmp.cid`"/>
-                    </execute>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/delete-neighbor.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="Setting variables for Neighbor Add PUT operation"/>
-                        <parameter name="field2" value="`$tmp.add-neighbor-service-url`"/>
-                        <parameter name="field3" value="`$tmp.plmnid`"/>
-                        <parameter name="field4" value="`$tmp.cid`"/>
-                        <parameter name="field5" value="`$tmp.phy-cell-id`"/>
-                        <parameter name="field6" value="`$tmp.pnf-name`"/>
-                        <parameter name="field7" value="`$tmp.blacklisted`"/>
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.add-neighbor-service-url`"/>
-                        <parameter name="restapiUser" value="`$prop.controller.user`" />
-                        <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
-                        <parameter name="httpMethod" value="DELETE"/>
-                        <parameter name="responsePrefix" value="oofpci-delete-neighbor-response"/>
-                        <parameter name='contentType' value='application/json' />
-                        <parameter name='format' value='json' />
-                        <outcome value='failure'>
-                            <block>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="Error adding a new neighbor" />
-                                </return>
-                            </block>
-                        </outcome>
-                        <outcome value='success'>
-                            <block>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/delete-neighbor.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="DELETE Neighbor Executed Successfully "/>
-                                </record>
-                            </block>
-                        </outcome>
-                    </execute>
-                </block>
-            </for>
+            <switch test='`$prop.ransim-mounted`'>
+                <outcome value='false'>
+                    <for index='idx' start='0' end="`$delete-neighbor-input.lte-cell-number-of-entries`" >
+                        <block atomic='true'>
+                            <set>
+                                <parameter name="tmp.plmnid" value="`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].plmnid`"/>
+                                <parameter name="tmp.cid" value="`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].cid`"/>
+                                <parameter name="tmp.alias" value="`$delete-neighbor-input.alias`"/>
+                                <parameter name="tmp.pnf-name" value="`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].pnf-name`"/>
+                            </set>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/delete-neighbor.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Temporary variable for Neighbor Cell #:  "/>
+                                <parameter name="field2" value="`$idx`"/>
+                                <parameter name="field3" value="`$tmp.plmnid`"/>
+                                <parameter name="field4" value="`$tmp.cid`"/>
+                                <parameter name="field5" value="`$tmp.alias`"/>
+                                <parameter name="field6" value="`$tmp.pnf-name`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$prop.restapi.lte-ran-neighbor-in-use`"/>
+                                <parameter name="outputPath" value="tmp.delete-neighbor-service-url"/>
+                                <parameter name="target" value="{alias}"/>
+                                <parameter name="replacement" value="`$tmp.alias`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/delete-neighbor.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Delete Neighbor List URL"/>
+                                <parameter name="field2" value="`$tmp.delete-neighbor-service-url`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$tmp.delete-neighbor-service-url`"/>
+                                <parameter name="outputPath" value="tmp.delete-neighbor-service-url"/>
+                                <parameter name="target" value="{plmnid}"/>
+                                <parameter name="replacement" value="`$tmp.plmnid`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/delete-neighbor.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Deletedd Neighbor List URL"/>
+                                <parameter name="field2" value="`$tmp.delete-neighbor-service-url`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$tmp.delete-neighbor-service-url`"/>
+                                <parameter name="outputPath" value="tmp.delete-neighbor-service-url"/>
+                                <parameter name="target" value="{cid}"/>
+                                <parameter name="replacement" value="`$tmp.cid`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/delete-neighbor.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Setting variables for Neighbor Delete operation"/>
+                                <parameter name="field2" value="`$tmp.delete-neighbor-service-url`"/>
+                                <parameter name="field3" value="`$tmp.plmnid`"/>
+                                <parameter name="field4" value="`$tmp.cid`"/>
+                                <parameter name="field5" value="`$tmp.pnf-name`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.delete-neighbor-service-url`"/>
+                                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                <parameter name="httpMethod" value="DELETE"/>
+                                <parameter name="responsePrefix" value="oofpci-delete-neighbor-response"/>
+                                <parameter name='contentType' value='application/json' />
+                                <parameter name='format' value='json' />
+                                <outcome value='failure'>
+                                    <block>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="Error deleting a new neighbor" />
+                                        </return>
+                                    </block>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/delete-neighbor.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="DELETE Neighbor Executed Successfully "/>
+                                        </record>
+                                    </block>
+                                </outcome>
+                            </execute>
+                        </block>
+                    </for>
+                </outcome>
+                <outcome value='true'>
+                    <for index='idx' start='0' end="`$delete-neighbor-input.lte-cell-number-of-entries`" >
+                        <block atomic='true'>
+                            <set>
+                                <parameter name="tmp.plmnid" value="`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].plmnid`"/>
+                                <parameter name="tmp.cid" value="`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].cid`"/>
+                                <parameter name="tmp.alias" value="`$delete-neighbor-input.alias`"/>
+                                <parameter name="tmp.pnf-name" value="`$delete-neighbor-input.lte-ran-neighbor-list-in-use-lte-cell[$idx].pnf-name`"/>
+                            </set>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/delete-neighbor.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Temporary variable for Neighbor Cell #:  "/>
+                                <parameter name="field2" value="`$idx`"/>
+                                <parameter name="field3" value="`$tmp.plmnid`"/>
+                                <parameter name="field4" value="`$tmp.cid`"/>
+                                <parameter name="field5" value="`$tmp.alias`"/>
+                                <parameter name="field6" value="`$tmp.pnf-name`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$prop.restapi.lte-ran-neighbor-in-use.ransim-mounted`"/>
+                                <parameter name="outputPath" value="tmp.delete-neighbor-service-url"/>
+                                <parameter name="target" value="{alias}"/>
+                                <parameter name="replacement" value="`$tmp.alias`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/delete-neighbor.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Delete Neighbor List URL"/>
+                                <parameter name="field2" value="`$tmp.delete-neighbor-service-url`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$tmp.delete-neighbor-service-url`"/>
+                                <parameter name="outputPath" value="tmp.delete-neighbor-service-url"/>
+                                <parameter name="target" value="{plmnid}"/>
+                                <parameter name="replacement" value="`$tmp.plmnid`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/delete-neighbor.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Delete Neighbor List URL"/>
+                                <parameter name="field2" value="`$tmp.delete-neighbor-service-url`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$tmp.delete-neighbor-service-url`"/>
+                                <parameter name="outputPath" value="tmp.delete-neighbor-service-url"/>
+                                <parameter name="target" value="{pnf-name}"/>
+                                <parameter name="replacement" value="`$tmp.pnf-name`"/>
+                            </execute>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$tmp.delete-neighbor-service-url`"/>
+                                <parameter name="outputPath" value="tmp.delete-neighbor-service-url"/>
+                                <parameter name="target" value="{cid}"/>
+                                <parameter name="replacement" value="`$tmp.cid`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/delete-neighbor.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Setting variables for Neighbor Delete operation"/>
+                                <parameter name="field2" value="`$tmp.delete-neighbor-service-url`"/>
+                                <parameter name="field3" value="`$tmp.plmnid`"/>
+                                <parameter name="field4" value="`$tmp.cid`"/>
+                                <parameter name="field5" value="`$tmp.pnf-name`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.delete-neighbor-service-url`"/>
+                                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                <parameter name="httpMethod" value="DELETE"/>
+                                <parameter name="responsePrefix" value="oofpci-delete-neighbor-response"/>
+                                <parameter name='contentType' value='application/json' />
+                                <parameter name='format' value='json' />
+                                <outcome value='failure'>
+                                    <block>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="Error deleting a new neighbor" />
+                                        </return>
+                                    </block>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/delete-neighbor.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="DELETE Neighbor Executed Successfully "/>
+                                        </record>
+                                    </block>
+                                </outcome>
+                            </execute>
+                        </block>
+                    </for>
+                </outcome>
+            </switch>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
                 <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="SUCCESSFUL add-neighbor Execution" />
+                <parameter name="error-message" value="SUCCESSFUL delete-neighbor Execution" />
             </return>
         </block>
     </method>
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 d02bb7b6..f4c1250e 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
@@ -3,6 +3,12 @@
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='oofpcipoc-api' version='0.4.2-SNAPSHOT'>
     <method rpc='generic-neighbor-configuration' mode='sync'>
         <block atomic='true'>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="RPC to Configure Neighbors INVOKED. Number of Neighbors to configure: "/>
+                <parameter name="field2" value="`$generic-neighbor-configuration-input.number-of-neighbor-cell-entries`"/>
+            </record>
             <for index='idx' start='0' end="`$generic-neighbor-configuration-input.number-of-neighbor-cell-entries`" >
                 <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                     <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
@@ -16,12 +22,6 @@
                     <parameter name="field7" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].blacklisted`"/>
                 </record>
             </for>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="RPC to Configure Neighbors INVOKED. Number of Neighbors to configure: "/>
-                <parameter name="field2" value="`$generic-neighbor-configuration-input.number-of-neighbor-cell-entries`"/>
-            </record>
             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/sdnr-oofpcipoc-api-dg.properties' />
                 <parameter name='contextPrefix' value='prop' />
@@ -35,148 +35,302 @@
                 <parameter name="field4" value="`$prop.controller.pwd`"/>
                 <parameter name="field5" value="`$prop.controller.url`"/>
             </record>
-            <for index='idx' start='0' end="`$generic-neighbor-configuration-input.number-of-neighbor-cell-entries`" >
-                <block atomic='true'>
-                    <set>
-                        <parameter name="tmp.alias" value="`$generic-neighbor-configuration-input.alias`"/>
-                        <parameter name="tmp.plmnid" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].plmnid`"/>
-                        <parameter name="tmp.cid" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].cid`"/>
-                        <parameter name="tmp.phy-cell-id" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].phy-cell-id`"/>
-                        <parameter name="tmp.pnf-name" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].pnf-name`"/>
-                        <parameter name="tmp.blacklisted" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].blacklisted`"/>
-                    </set>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="Temporary varaibles set. Neighbor #:  "/>
-                        <parameter name="field2" value="`$idx`"/>
-                        <parameter name="field3" value="`$tmp.plmnid`"/>
-                        <parameter name="field4" value="`$tmp.cid`"/>
-                        <parameter name="field5" value="`$tmp.phy-cell-id`"/>
-                        <parameter name="field6" value="`$tmp.pnf-name`"/>
-                        <parameter name="field7" value="`$tmp.blacklisted`"/>
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                        <parameter name="source" value="`$prop.restapi.lte-ran-neighbor-in-use`"/>
-                        <parameter name="outputPath" value="tmp.config-neighbor-service-url"/>
-                        <parameter name="target" value="{alias}"/>
-                        <parameter name="replacement" value="`$tmp.alias`"/>
-                    </execute>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="Config Neighbor List URL"/>
-                        <parameter name="field2" value="`$tmp.config-neighbor-service-url`"/>
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                        <parameter name="source" value="`$tmp.config-neighbor-service-url`"/>
-                        <parameter name="outputPath" value="tmp.config-neighbor-service-url"/>
-                        <parameter name="target" value="{plmnid}"/>
-                        <parameter name="replacement" value="`$tmp.plmnid`"/>
-                    </execute>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="Config Neighbor List URL"/>
-                        <parameter name="field2" value="`$tmp.config-neighbor-service-url`"/>
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                        <parameter name="source" value="`$tmp.config-neighbor-service-url`"/>
-                        <parameter name="outputPath" value="tmp.config-neighbor-service-url"/>
-                        <parameter name="target" value="{cid}"/>
-                        <parameter name="replacement" value="`$tmp.cid`"/>
-                    </execute>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.config-neighbor-service-url`"/>
-                        <parameter name="restapiUser" value="`$prop.controller.user`" />
-                        <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
-                        <parameter name="httpMethod" value="GET"/>
-                        <parameter name="responsePrefix" value="oofpci-neighbor-response"/>
-                        <parameter name='contentType' value='application/json' />
-                        <parameter name='format' value='json' />
-                        <outcome value='failure'>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="Error getting details about new neighbor " />
-                            </return>
-                        </outcome>
-                        <outcome value='success'>
-                            <block>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="Details about Neighbor Pre-configuration"/>
-                                    <parameter name="field2" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].plmnid`"/>
-                                    <parameter name="field3" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].cid`"/>
-                                    <parameter name="field4" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].phy-cell-id`"/>
-                                    <parameter name="field5" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].pnf-name`"/>
-                                    <parameter name="field6" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].blacklisted`"/>
-                                </record>
-                            </block>
-                        </outcome>
-                    </execute>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/oofpcipoc-generic-neighbor-patch.json'`" />
-                        <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.config-neighbor-service-url`"/>
-                        <parameter name="restapiUser" value="`$prop.controller.user`" />
-                        <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
-                        <parameter name="httpMethod" value="PATCH"/>
-                        <parameter name="responsePrefix" value="oofpci-neighbor-patch-response"/>
-                        <parameter name='contentType' value='application/yang.patch+json' />
-                        <parameter name='format' value='json' />
-                        <parameter name='accept' value='application/yang.patch-status+json' />
-                        <outcome value='failure'>
-                            <block>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="Error adding a new neighbor" />
-                                </return>
-                            </block>
-                        </outcome>
-                        <outcome value='success'>
-                            <block>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="PATCH Neighbor Executed Successfully "/>
-                                </record>
-                            </block>
-                        </outcome>
-                    </execute>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.config-neighbor-service-url`"/>
-                        <parameter name="restapiUser" value="`$prop.controller.user`" />
-                        <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
-                        <parameter name="httpMethod" value="GET"/>
-                        <parameter name="responsePrefix" value="oofpci-neighbor-response"/>
-                        <parameter name='contentType' value='application/json' />
-                        <parameter name='format' value='json' />
-                        <outcome value='failure'>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="Error getting details about new neighbor " />
-                            </return>
-                        </outcome>
-                        <outcome value='success'>
-                            <block>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="Details about Neighbor Pre-configuration"/>
-                                    <parameter name="field2" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].plmnid`"/>
-                                    <parameter name="field3" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].cid`"/>
-                                    <parameter name="field4" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].phy-cell-id`"/>
-                                    <parameter name="field5" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].pnf-name`"/>
-                                    <parameter name="field6" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].blacklisted`"/>
-                                </record>
-                            </block>
-                        </outcome>
-                    </execute>
-                </block>
-            </for>
+            <switch test='`$prop.ransim-mounted`'>
+                <outcome value='false'>
+                    <for index='idx' start='0' end="`$generic-neighbor-configuration-input.number-of-neighbor-cell-entries`" >
+                        <block atomic='true'>
+                            <set>
+                                <parameter name="tmp.alias" value="`$generic-neighbor-configuration-input.alias`"/>
+                                <parameter name="tmp.plmnid" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].plmnid`"/>
+                                <parameter name="tmp.cid" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].cid`"/>
+                                <parameter name="tmp.phy-cell-id" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].phy-cell-id`"/>
+                                <parameter name="tmp.pnf-name" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].pnf-name`"/>
+                                <parameter name="tmp.blacklisted" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].blacklisted`"/>
+                            </set>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Temporary varaibles set. Neighbor #:  "/>
+                                <parameter name="field2" value="`$idx`"/>
+                                <parameter name="field3" value="`$tmp.plmnid`"/>
+                                <parameter name="field4" value="`$tmp.cid`"/>
+                                <parameter name="field5" value="`$tmp.phy-cell-id`"/>
+                                <parameter name="field6" value="`$tmp.pnf-name`"/>
+                                <parameter name="field7" value="`$tmp.blacklisted`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$prop.restapi.lte-ran-neighbor-in-use`"/>
+                                <parameter name="outputPath" value="tmp.config-neighbor-service-url"/>
+                                <parameter name="target" value="{alias}"/>
+                                <parameter name="replacement" value="`$tmp.alias`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Config Neighbor List URL"/>
+                                <parameter name="field2" value="`$tmp.config-neighbor-service-url`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$tmp.config-neighbor-service-url`"/>
+                                <parameter name="outputPath" value="tmp.config-neighbor-service-url"/>
+                                <parameter name="target" value="{plmnid}"/>
+                                <parameter name="replacement" value="`$tmp.plmnid`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Config Neighbor List URL"/>
+                                <parameter name="field2" value="`$tmp.config-neighbor-service-url`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$tmp.config-neighbor-service-url`"/>
+                                <parameter name="outputPath" value="tmp.config-neighbor-service-url"/>
+                                <parameter name="target" value="{cid}"/>
+                                <parameter name="replacement" value="`$tmp.cid`"/>
+                            </execute>
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.config-neighbor-service-url`"/>
+                                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                <parameter name="httpMethod" value="GET"/>
+                                <parameter name="responsePrefix" value="oofpci-neighbor-response"/>
+                                <parameter name='contentType' value='application/json' />
+                                <parameter name='format' value='json' />
+                                <outcome value='failure'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error getting details about new neighbor " />
+                                    </return>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="Details about Neighbor Pre-configuration"/>
+                                            <parameter name="field2" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].plmnid`"/>
+                                            <parameter name="field3" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].cid`"/>
+                                            <parameter name="field4" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].phy-cell-id`"/>
+                                            <parameter name="field5" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].pnf-name`"/>
+                                            <parameter name="field6" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].blacklisted`"/>
+                                        </record>
+                                    </block>
+                                </outcome>
+                            </execute>
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/oofpcipoc-generic-neighbor-patch.json'`" />
+                                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.config-neighbor-service-url`"/>
+                                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                <parameter name="httpMethod" value="PATCH"/>
+                                <parameter name="responsePrefix" value="oofpci-neighbor-patch-response"/>
+                                <parameter name='contentType' value='application/yang.patch+json' />
+                                <parameter name='format' value='json' />
+                                <parameter name='accept' value='application/yang.patch-status+json' />
+                                <outcome value='failure'>
+                                    <block>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="Error adding a new neighbor" />
+                                        </return>
+                                    </block>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="PATCH Neighbor Executed Successfully "/>
+                                        </record>
+                                    </block>
+                                </outcome>
+                            </execute>
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.config-neighbor-service-url`"/>
+                                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                <parameter name="httpMethod" value="GET"/>
+                                <parameter name="responsePrefix" value="oofpci-neighbor-response"/>
+                                <parameter name='contentType' value='application/json' />
+                                <parameter name='format' value='json' />
+                                <outcome value='failure'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error getting details about new neighbor " />
+                                    </return>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="Details about Neighbor Pre-configuration"/>
+                                            <parameter name="field2" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].plmnid`"/>
+                                            <parameter name="field3" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].cid`"/>
+                                            <parameter name="field4" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].phy-cell-id`"/>
+                                            <parameter name="field5" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].pnf-name`"/>
+                                            <parameter name="field6" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].blacklisted`"/>
+                                        </record>
+                                    </block>
+                                </outcome>
+                            </execute>
+                        </block>
+                    </for>
+                </outcome>
+                <outcome value='true'>
+                    <for index='idx' start='0' end="`$generic-neighbor-configuration-input.number-of-neighbor-cell-entries`" >
+                        <block atomic='true'>
+                            <set>
+                                <parameter name="tmp.alias" value="`$generic-neighbor-configuration-input.alias`"/>
+                                <parameter name="tmp.plmnid" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].plmnid`"/>
+                                <parameter name="tmp.cid" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].cid`"/>
+                                <parameter name="tmp.phy-cell-id" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].phy-cell-id`"/>
+                                <parameter name="tmp.pnf-name" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].pnf-name`"/>
+                                <parameter name="tmp.blacklisted" value="`$generic-neighbor-configuration-input.neighbor-list-in-use[$idx].blacklisted`"/>
+                            </set>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Temporary varaibles set. Neighbor #:  "/>
+                                <parameter name="field2" value="`$idx`"/>
+                                <parameter name="field3" value="`$tmp.plmnid`"/>
+                                <parameter name="field4" value="`$tmp.cid`"/>
+                                <parameter name="field5" value="`$tmp.phy-cell-id`"/>
+                                <parameter name="field6" value="`$tmp.pnf-name`"/>
+                                <parameter name="field7" value="`$tmp.blacklisted`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$prop.restapi.lte-ran-neighbor-in-use.ransim-mounted`"/>
+                                <parameter name="outputPath" value="tmp.config-neighbor-service-url"/>
+                                <parameter name="target" value="{alias}"/>
+                                <parameter name="replacement" value="`$tmp.alias`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Config Neighbor List URL"/>
+                                <parameter name="field2" value="`$tmp.config-neighbor-service-url`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$tmp.config-neighbor-service-url`"/>
+                                <parameter name="outputPath" value="tmp.config-neighbor-service-url"/>
+                                <parameter name="target" value="{pnf-name}"/>
+                                <parameter name="replacement" value="`$tmp.pnf-name`"/>
+                            </execute>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$tmp.config-neighbor-service-url`"/>
+                                <parameter name="outputPath" value="tmp.config-neighbor-service-url"/>
+                                <parameter name="target" value="{plmnid}"/>
+                                <parameter name="replacement" value="`$tmp.plmnid`"/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Config Neighbor List URL"/>
+                                <parameter name="field2" value="`$tmp.config-neighbor-service-url`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                <parameter name="source" value="`$tmp.config-neighbor-service-url`"/>
+                                <parameter name="outputPath" value="tmp.config-neighbor-service-url"/>
+                                <parameter name="target" value="{cid}"/>
+                                <parameter name="replacement" value="`$tmp.cid`"/>
+                            </execute>
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.config-neighbor-service-url`"/>
+                                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                <parameter name="httpMethod" value="GET"/>
+                                <parameter name="responsePrefix" value="oofpci-neighbor-response"/>
+                                <parameter name='contentType' value='application/json' />
+                                <parameter name='format' value='json' />
+                                <outcome value='failure'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error getting details about new neighbor " />
+                                    </return>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="Details about Neighbor Pre-configuration"/>
+                                            <parameter name="field2" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].plmnid`"/>
+                                            <parameter name="field3" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].cid`"/>
+                                            <parameter name="field4" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].phy-cell-id`"/>
+                                            <parameter name="field5" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].pnf-name`"/>
+                                            <parameter name="field6" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].blacklisted`"/>
+                                        </record>
+                                    </block>
+                                </outcome>
+                            </execute>
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/oofpcipoc-generic-neighbor-patch.json'`" />
+                                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.config-neighbor-service-url`"/>
+                                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                <parameter name="httpMethod" value="PATCH"/>
+                                <parameter name="responsePrefix" value="oofpci-neighbor-patch-response"/>
+                                <parameter name='contentType' value='application/yang.patch+json' />
+                                <parameter name='format' value='json' />
+                                <parameter name='accept' value='application/yang.patch-status+json' />
+                                <outcome value='failure'>
+                                    <block>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="Error adding a new neighbor" />
+                                        </return>
+                                    </block>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="PATCH Neighbor Executed Successfully "/>
+                                        </record>
+                                    </block>
+                                </outcome>
+                            </execute>
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.config-neighbor-service-url`"/>
+                                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                <parameter name="httpMethod" value="GET"/>
+                                <parameter name="responsePrefix" value="oofpci-neighbor-response"/>
+                                <parameter name='contentType' value='application/json' />
+                                <parameter name='format' value='json' />
+                                <outcome value='failure'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error getting details about new neighbor " />
+                                    </return>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/generic-neighbor-config.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="Details about Neighbor Pre-configuration"/>
+                                            <parameter name="field2" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].plmnid`"/>
+                                            <parameter name="field3" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].cid`"/>
+                                            <parameter name="field4" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].phy-cell-id`"/>
+                                            <parameter name="field5" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].pnf-name`"/>
+                                            <parameter name="field6" value="`$oofpci-neighbor-response.lte-ran-neighbor-list-in-use-lte-cell[0].blacklisted`"/>
+                                        </record>
+                                    </block>
+                                </outcome>
+                            </execute>
+                        </block>
+                    </for>
+                </outcome>
+            </switch>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
                 <parameter name="error-code" value="200" />