From 550fe5b30603ff6da993acc5aeea83d1096433eb Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Fri, 30 Oct 2020 03:29:17 +0000
Subject: Completing the logic and the call flow for Transport Slicing
 operations:  - Allocate a Transport Slice  - Activate a Transport Slice  -
 DeActivate a Transport Slice  - Delete a Transport Slice

Bug Fixing and cleaning up the DGs.

Issue-ID: SDNC-1202
Issue-ID: SDNC-1404
Change-Id: Ib2eae06c543ae8277ee2014fda87ca2ca3a516af
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>

Former-commit-id: 7d1d841fd7271844c65ca1e9754ad5eec2487c4d
---
 .../DataChange_esr-thirdparty-sdnc-discovery.json  |  986 ++++++++--------
 .../main/json/DataChange_esr-thirdparty-sdnc.json  |  297 +++--
 .../DataChange_update-network-links-to-aai.json    | 1243 ++++++++++----------
 .../json/DataChange_update-network-to-aai.json     |  767 ++++++------
 .../DataChange_update-tp-ttp-relationship.json     |  392 +++---
 .../DataChange_esr-thirdparty-sdnc-discovery.xml   |   28 +-
 .../main/xml/DataChange_esr-thirdparty-sdnc.xml    |   12 +-
 .../xml/DataChange_update-network-links-to-aai.xml |  114 +-
 .../main/xml/DataChange_update-network-to-aai.xml  |   98 +-
 .../xml/DataChange_update-tp-ttp-relationship.xml  |    8 +-
 10 files changed, 1947 insertions(+), 1998 deletions(-)

(limited to 'platform-logic/datachange/src/main')

diff --git a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
index 81060bf3..ead08f44 100644
--- a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
+++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
@@ -1,243 +1,243 @@
 [
     {
-        "id": "c3dc4adb.8c6008",
+        "id": "3872acaa.809c44",
         "type": "other",
         "name": "update",
         "xml": "<outcome value='Update'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 739,
-        "y": 311,
-        "z": "fcc91756.c8d038",
+        "x": 710,
+        "y": 305,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "bd0845c9.41d478"
+                "5a988226.7d9fdc"
             ]
         ]
     },
     {
-        "id": "71253ee0.23906",
+        "id": "dbb694.b27a417",
         "type": "other",
         "name": "delete",
         "xml": "<outcome value='Delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 739,
-        "y": 391,
-        "z": "fcc91756.c8d038",
+        "x": 710,
+        "y": 385,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "3f0bf71e.180588"
+                "754f4acc.eae6dc"
             ]
         ]
     },
     {
-        "id": "3f0bf71e.180588",
+        "id": "754f4acc.eae6dc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 880.5,
-        "y": 391,
-        "z": "fcc91756.c8d038",
+        "x": 851.5,
+        "y": 385,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "67540de7.5dd14c"
+                "983792ba.976408"
             ]
         ]
     },
     {
-        "id": "de801ea6.e90758",
+        "id": "4cc508ad.f5c7d",
         "type": "switchNode",
         "name": "switch aai-event-trigger",
         "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 569.5,
-        "y": 351,
-        "z": "fcc91756.c8d038",
+        "x": 540.5,
+        "y": 345,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "c3dc4adb.8c6008",
-                "71253ee0.23906"
+                "3872acaa.809c44",
+                "dbb694.b27a417"
             ]
         ]
     },
     {
-        "id": "1007cea6.282501",
+        "id": "f974c517.d68cd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1266.5,
-        "y": 222,
-        "z": "fcc91756.c8d038",
+        "x": 1237.5,
+        "y": 216,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "95e785b5.d067b",
-                "7a1058d1.4b2d6",
-                "558bdafc.122dbc",
-                "54848569.ec4d54",
-                "25993b47.1f060c"
+                "29d0fcfc.c3657c",
+                "80deb47b.7e9e",
+                "f9b155cc.d14098",
+                "c374fd8f.2c9bc8",
+                "31237f4.62f8c"
             ]
         ]
     },
     {
-        "id": "7a1058d1.4b2d6",
+        "id": "80deb47b.7e9e",
         "type": "execute",
         "name": "execute RestApiCallNode Get token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1539.5001983642578,
-        "y": 143.00000953674316,
-        "z": "fcc91756.c8d038",
+        "x": 1510.5001983642578,
+        "y": 137.00000953674316,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "1f13ca65.eddc8e",
-                "fa7642f7.a126c8"
+                "6d5b07.e87e6cf8",
+                "403286df.c4eed8"
             ]
         ]
     },
     {
-        "id": "1f13ca65.eddc8e",
+        "id": "6d5b07.e87e6cf8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1829.000244140625,
-        "y": 135,
-        "z": "fcc91756.c8d038",
+        "x": 1800.000244140625,
+        "y": 129,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "a5768e87.aa1bb"
+                "b95a0f0f.c5f4"
             ]
         ]
     },
     {
-        "id": "fa7642f7.a126c8",
+        "id": "403286df.c4eed8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1825.000244140625,
-        "y": 175,
-        "z": "fcc91756.c8d038",
+        "x": 1796.000244140625,
+        "y": 169,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "334af206.383786"
+                "f35984bc.58f298"
             ]
         ]
     },
     {
-        "id": "a5768e87.aa1bb",
+        "id": "b95a0f0f.c5f4",
         "type": "set",
         "name": "set token-id",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
         "comments": "",
-        "x": 1979.500244140625,
-        "y": 135,
-        "z": "fcc91756.c8d038",
+        "x": 1950.500244140625,
+        "y": 129,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "272f0d19.0aa972",
+        "id": "c03c3a2.5764a48",
         "type": "execute",
         "name": "execute RestApiCallNode Get Topology",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"get\"/>\n<parameter name=\"responsePrefix\" value=\"topology\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2046.500244140625,
-        "y": 255,
-        "z": "fcc91756.c8d038",
+        "x": 2017.500244140625,
+        "y": 249,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "c0f8711f.5047d8",
-                "6134ff85.3a875"
+                "986cb045.40c5",
+                "e9ec571f.c3cfe8"
             ]
         ]
     },
     {
-        "id": "c0f8711f.5047d8",
+        "id": "986cb045.40c5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2289.000244140625,
-        "y": 275,
-        "z": "fcc91756.c8d038",
+        "x": 2260.000244140625,
+        "y": 269,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "f5e8d64.1d84ba8"
+                "7a144ec7.8a9348"
             ]
         ]
     },
     {
-        "id": "f5e8d64.1d84ba8",
+        "id": "7a144ec7.8a9348",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2446.500244140625,
-        "y": 275,
-        "z": "fcc91756.c8d038",
+        "x": 2417.500244140625,
+        "y": 269,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "f392518f.1c82f",
-                "f7bc5da7.da31b"
+                "55ea6ad.8497214",
+                "ad96f3f.ca0439"
             ]
         ]
     },
     {
-        "id": "dd9ef895.8d06e8",
+        "id": "c2f07a72.d9a858",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",
         "comments": "",
-        "x": 2423.000244140625,
-        "y": 175,
-        "z": "fcc91756.c8d038",
+        "x": 2394.000244140625,
+        "y": 169,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "6134ff85.3a875",
+        "id": "e9ec571f.c3cfe8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2285.000244140625,
-        "y": 175,
-        "z": "fcc91756.c8d038",
+        "x": 2256.000244140625,
+        "y": 169,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "dd9ef895.8d06e8"
+                "c2f07a72.d9a858"
             ]
         ]
     },
     {
-        "id": "bca2c88c.f5748",
+        "id": "7d5868e5.98eab",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 192,
-        "y": 86,
-        "z": "fcc91756.c8d038",
+        "x": 163,
+        "y": 80,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "1c8eebdb.be2d0c"
+                "22d8189e.4866f"
             ]
         ]
     },
     {
-        "id": "1c8eebdb.be2d0c",
+        "id": "22d8189e.4866f",
         "type": "service-logic",
         "name": "DataChange ${project.version}",
         "module": "DataChange",
@@ -245,1242 +245,1242 @@
         "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='DataChange' version='${project.version}'>",
         "outputs": 1,
-        "x": 205,
-        "y": 146,
-        "z": "fcc91756.c8d038",
+        "x": 176,
+        "y": 140,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "a6fcf3ab.5f9578"
+                "3a8b8af3.4d4416"
             ]
         ]
     },
     {
-        "id": "a6fcf3ab.5f9578",
+        "id": "3a8b8af3.4d4416",
         "type": "method",
         "name": "method esr-thirdparty-sdnc-discovery",
         "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 225,
-        "y": 226,
-        "z": "fcc91756.c8d038",
+        "x": 196,
+        "y": 220,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "6420c8d3.d15ee"
+                "c8a85a4d.9e66f"
             ]
         ]
     },
     {
-        "id": "6420c8d3.d15ee",
+        "id": "c8a85a4d.9e66f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 472.5,
-        "y": 226,
-        "z": "fcc91756.c8d038",
+        "x": 443.5,
+        "y": 220,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "39152f22.f0d4a8"
+                "cbd24389.ade708"
             ]
         ]
     },
     {
-        "id": "f392518f.1c82f",
+        "id": "55ea6ad.8497214",
         "type": "for",
         "name": "for each Network",
         "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2665.500244140625,
-        "y": 204,
-        "z": "fcc91756.c8d038",
+        "x": 2636.500244140625,
+        "y": 198,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "48caa041.662da"
+                "1ed2d22d.82cc36"
             ]
         ]
     },
     {
-        "id": "48caa041.662da",
+        "id": "1ed2d22d.82cc36",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2814.000244140625,
-        "y": 204,
-        "z": "fcc91756.c8d038",
+        "x": 2785.000244140625,
+        "y": 198,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "f9d6723a.6cdf78",
-                "929dfcd4.4e318"
+                "852144d1.2cc6d",
+                "530a9a06.d69fc4"
             ]
         ]
     },
     {
-        "id": "f9d6723a.6cdf78",
+        "id": "852144d1.2cc6d",
         "type": "call",
         "name": "call update-network-to-aai",
         "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2993.000244140625,
-        "y": 224,
-        "z": "fcc91756.c8d038",
+        "x": 2964.000244140625,
+        "y": 218,
+        "z": "8cb67e95.d771b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "929dfcd4.4e318",
+        "id": "530a9a06.d69fc4",
         "type": "set",
         "name": "set network",
         "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
         "comments": "",
-        "x": 2948.000244140625,
-        "y": 184,
-        "z": "fcc91756.c8d038",
+        "x": 2919.000244140625,
+        "y": 178,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "334af206.383786",
+        "id": "f35984bc.58f298",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1945.000244140625,
-        "y": 175,
-        "z": "fcc91756.c8d038",
+        "x": 1916.000244140625,
+        "y": 169,
+        "z": "8cb67e95.d771b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "2b9bc1fc.7f9d86",
+        "id": "a473b7cc.4471d8",
         "type": "comment",
         "name": "Do Nothing",
         "info": "",
         "comments": "",
-        "x": 2115.000244140625,
-        "y": 215,
-        "z": "fcc91756.c8d038",
+        "x": 2086.000244140625,
+        "y": 209,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "ec977bcd.52b8a8",
+        "id": "d9afda1.5ca9828",
         "type": "switchNode",
         "name": "switch type",
         "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 992,
-        "y": 311,
-        "z": "fcc91756.c8d038",
+        "x": 963,
+        "y": 305,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "e6327558.85a0e",
-                "ece3c1dc.08a25",
-                "57f0cdff.7f0d04",
-                "e6efb547.0bd5a8"
+                "7ea96e84.4a184",
+                "e5a11dd.415fde",
+                "11ea46b7.9ad609",
+                "a5c3b391.3c4aa"
             ]
         ]
     },
     {
-        "id": "bd0845c9.41d478",
+        "id": "5a988226.7d9fdc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 859,
-        "y": 311,
-        "z": "fcc91756.c8d038",
+        "x": 830,
+        "y": 305,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "ec977bcd.52b8a8"
+                "d9afda1.5ca9828"
             ]
         ]
     },
     {
-        "id": "e6327558.85a0e",
+        "id": "7ea96e84.4a184",
         "type": "other",
         "name": "SOTN",
         "xml": "<outcome value='SOTN'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1105,
-        "y": 222,
-        "z": "fcc91756.c8d038",
+        "x": 1076,
+        "y": 216,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "1007cea6.282501"
+                "f974c517.d68cd"
             ]
         ]
     },
     {
-        "id": "ece3c1dc.08a25",
+        "id": "e5a11dd.415fde",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1134.5,
-        "y": 683.5001220703125,
-        "z": "fcc91756.c8d038",
+        "x": 1105.5,
+        "y": 677.5001220703125,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "752a836e.32daf4"
+                "4a0581b6.8cbdf"
             ]
         ]
     },
     {
-        "id": "752a836e.32daf4",
+        "id": "4a0581b6.8cbdf",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n\n",
         "comments": "",
-        "x": 1320.75,
-        "y": 709.5001220703125,
-        "z": "fcc91756.c8d038",
+        "x": 1291.75,
+        "y": 703.5001220703125,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "95e785b5.d067b",
+        "id": "29d0fcfc.c3657c",
         "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%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1486.0001983642578,
-        "y": 103.00000953674316,
-        "z": "fcc91756.c8d038",
+        "x": 1457.0001983642578,
+        "y": 97.00000953674316,
+        "z": "8cb67e95.d771b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "558bdafc.122dbc",
+        "id": "f9b155cc.d14098",
         "type": "switchNode",
         "name": "switch prop.sdncRestApi.token_id",
         "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1532.5001983642578,
-        "y": 223.00000953674316,
-        "z": "fcc91756.c8d038",
+        "x": 1503.5001983642578,
+        "y": 217.00000953674316,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "9764857a.46386",
-                "b55a5855.1b4c4"
+                "4e229170.2e1108",
+                "495c5d16.740274"
             ]
         ]
     },
     {
-        "id": "9764857a.46386",
+        "id": "4e229170.2e1108",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1825.000244140625,
-        "y": 215,
-        "z": "fcc91756.c8d038",
+        "x": 1796.000244140625,
+        "y": 209,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "d18413fb.5938e8"
+                "b14dd129.fcf7f"
             ]
         ]
     },
     {
-        "id": "b55a5855.1b4c4",
+        "id": "495c5d16.740274",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1825.000244140625,
-        "y": 255,
-        "z": "fcc91756.c8d038",
+        "x": 1796.000244140625,
+        "y": 249,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "272f0d19.0aa972"
+                "c03c3a2.5764a48"
             ]
         ]
     },
     {
-        "id": "d18413fb.5938e8",
+        "id": "b14dd129.fcf7f",
         "type": "execute",
         "name": "execute RestApiCallNode Get Topology",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"get\"/>\n<parameter name=\"responsePrefix\" value=\"topology\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2046.500244140625,
-        "y": 215,
-        "z": "fcc91756.c8d038",
+        "x": 2017.500244140625,
+        "y": 209,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "6134ff85.3a875",
-                "c0f8711f.5047d8"
+                "e9ec571f.c3cfe8",
+                "986cb045.40c5"
             ]
         ]
     },
     {
-        "id": "25993b47.1f060c",
+        "id": "31237f4.62f8c",
         "type": "execute",
         "name": "execute RestconfDiscoveryNode",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscription' >\n<parameter name=\"subscriberId\" value=\"sotn-controller\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n<parameter name=\"module\" value=\"DataChange\" />\n<parameter name=\"rpc\" value=\"sotn-notification-handler\" />\n<parameter name=\"mode\" value=\"sync\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1529.0001983642578,
-        "y": 363.00000953674316,
-        "z": "fcc91756.c8d038",
+        "x": 1500.0001983642578,
+        "y": 357.00000953674316,
+        "z": "8cb67e95.d771b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "54848569.ec4d54",
+        "id": "c374fd8f.2c9bc8",
         "type": "set",
         "name": "set encoding-format",
         "xml": "<set>\n<parameter name='input' value='ietf-subscribed-notifications:establish-subscription.input.' />\n<parameter name=\"`$input + 'encoding'`\" value=\"encode-json\" />",
         "comments": "",
-        "x": 1489.0001983642578,
-        "y": 323.00000953674316,
-        "z": "fcc91756.c8d038",
+        "x": 1460.0001983642578,
+        "y": 317.00000953674316,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "c147e994.7edd08",
+        "id": "47fcc4e5.c080a4",
         "type": "comment",
         "name": "Notification subscription",
         "info": "",
         "comments": "",
-        "x": 1494.000343322754,
-        "y": 280.00000858306885,
-        "z": "fcc91756.c8d038",
+        "x": 1465.000343322754,
+        "y": 274.00000858306885,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "39152f22.f0d4a8",
+        "id": "cbd24389.ade708",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$prop.sdncRestApi.vendor == 'ZTE'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 179,
-        "y": 351,
-        "z": "fcc91756.c8d038",
+        "x": 150,
+        "y": 345,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "404d2f08.96ad7",
-                "74ffd1db.2f31c8"
+                "f624fdf6.4a4ef8",
+                "67364ea6.885738"
             ]
         ]
     },
     {
-        "id": "404d2f08.96ad7",
+        "id": "f624fdf6.4a4ef8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 366,
-        "y": 351,
-        "z": "fcc91756.c8d038",
+        "x": 337,
+        "y": 345,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "de801ea6.e90758"
+                "4cc508ad.f5c7d"
             ]
         ]
     },
     {
-        "id": "74ffd1db.2f31c8",
+        "id": "67364ea6.885738",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 140.00003051757812,
-        "y": 1107.75,
-        "z": "fcc91756.c8d038",
+        "x": 111.00003051757812,
+        "y": 1101.75,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "c3886c05.a14928"
+                "48c54790.7a017"
             ]
         ]
     },
     {
-        "id": "c3886c05.a14928",
+        "id": "48c54790.7a017",
         "type": "call",
         "name": "call esr-thirdparty-sdnc-of-zte",
         "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 371.75,
-        "y": 1124.5000610351562,
-        "z": "fcc91756.c8d038",
+        "x": 342.75,
+        "y": 1118.5000610351562,
+        "z": "8cb67e95.d771b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "57f0cdff.7f0d04",
+        "id": "11ea46b7.9ad609",
         "type": "other",
         "name": "TAPI",
         "xml": "<outcome value='TAPI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1183,
-        "y": 456,
-        "z": "fcc91756.c8d038",
+        "x": 1154,
+        "y": 450,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "9159c5db.f9ecb"
+                "a1313060.f8d7d"
             ]
         ]
     },
     {
-        "id": "9159c5db.f9ecb",
+        "id": "a1313060.f8d7d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1346,
-        "y": 455,
-        "z": "fcc91756.c8d038",
+        "x": 1317,
+        "y": 449,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "359e52a9.fb7c36"
+                "f271610b.da5a3"
             ]
         ]
     },
     {
-        "id": "359e52a9.fb7c36",
+        "id": "f271610b.da5a3",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/cxf/tapi/v2/topologies?topology-id-or-name=otn'`\"/>  \n    <parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>  \n    <parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>  \n    <parameter name=\"format\" value=\"json\"/>  \n    <parameter name=\"httpMethod\" value=\"get\"/>  \n    <parameter name=\"responsePrefix\" value=\"topologies\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n    <parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n    <parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n    <parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1507,
-        "y": 454,
-        "z": "fcc91756.c8d038",
+        "x": 1478,
+        "y": 448,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "bdd5dc28.9d2908",
-                "a872bbb4.c3aec8"
+                "878204ba.609a58",
+                "1c89864.e323d7a"
             ]
         ]
     },
     {
-        "id": "a872bbb4.c3aec8",
+        "id": "1c89864.e323d7a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1649,
-        "y": 530,
-        "z": "fcc91756.c8d038",
+        "x": 1620,
+        "y": 524,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "e24829ea.497098"
+                "5d965dcc.6101a4"
             ]
         ]
     },
     {
-        "id": "bdd5dc28.9d2908",
+        "id": "878204ba.609a58",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1683,
-        "y": 451,
-        "z": "fcc91756.c8d038",
+        "x": 1654,
+        "y": 445,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "ba70e873.59e928"
+                "4052d329.1b779c"
             ]
         ]
     },
     {
-        "id": "ba70e873.59e928",
+        "id": "4052d329.1b779c",
         "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 topology TAPI rest api\" />\n\n",
         "comments": "",
-        "x": 1853,
-        "y": 450,
-        "z": "fcc91756.c8d038",
+        "x": 1824,
+        "y": 444,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "e24829ea.497098",
+        "id": "5d965dcc.6101a4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1810,
-        "y": 529,
-        "z": "fcc91756.c8d038",
+        "x": 1781,
+        "y": 523,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "e5d11bee.6d3f3"
+                "d1531df6.3732f"
             ]
         ]
     },
     {
-        "id": "e5d11bee.6d3f3",
+        "id": "d1531df6.3732f",
         "type": "for",
         "name": "for each topology",
         "xml": "<for index='tidx' start='0' end=\"`$topologies.topology_length`\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1989,
-        "y": 529,
-        "z": "fcc91756.c8d038",
+        "x": 1960,
+        "y": 523,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "f9dbd640.006d18"
+                "8b55167c.96333"
             ]
         ]
     },
     {
-        "id": "f9dbd640.006d18",
+        "id": "8b55167c.96333",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2156,
-        "y": 530,
-        "z": "fcc91756.c8d038",
+        "x": 2127,
+        "y": 524,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "c60ea7f.3bd2058",
-                "b4f9b29d.c49458"
+                "e7e4969d.73ce58",
+                "9e2e1ddf.baa2b"
             ]
         ]
     },
     {
-        "id": "c60ea7f.3bd2058",
+        "id": "e7e4969d.73ce58",
         "type": "set",
         "name": "set topology",
         "xml": "<set>\n<parameter name='topology.' value='`$topologies.topology[$tidx].`' />\n",
         "comments": "",
-        "x": 2315,
-        "y": 531,
-        "z": "fcc91756.c8d038",
+        "x": 2286,
+        "y": 525,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "b4f9b29d.c49458",
+        "id": "9e2e1ddf.baa2b",
         "type": "call",
         "name": "call tapi-update-network-to-aai",
         "xml": "<call module='DataChange' rpc='tapi-update-network-to-aai' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2306,
-        "y": 597,
-        "z": "fcc91756.c8d038",
+        "x": 2277,
+        "y": 591,
+        "z": "8cb67e95.d771b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "e6efb547.0bd5a8",
+        "id": "a5c3b391.3c4aa",
         "type": "outcome",
         "name": "MSA",
         "xml": "<outcome value='MSA'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1153.677324295044,
-        "y": 612.8993349075317,
-        "z": "fcc91756.c8d038",
+        "x": 1124.677324295044,
+        "y": 606.8993349075317,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "e1657417.9cefe8"
+                "1925d7f4.b889a8"
             ]
         ]
     },
     {
-        "id": "e1657417.9cefe8",
+        "id": "1925d7f4.b889a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1315.6773872375488,
-        "y": 610.899335861206,
-        "z": "fcc91756.c8d038",
+        "x": 1286.6773872375488,
+        "y": 604.899335861206,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "1f0bde0a.fa2cb2"
+                "7ba5724d.ffaffc"
             ]
         ]
     },
     {
-        "id": "1f0bde0a.fa2cb2",
+        "id": "7ba5724d.ffaffc",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/cxf/openroadm/v2/networks/otn-topology'`\"/>  \n    <parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>  \n    <parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>  \n    <parameter name=\"format\" value=\"json\"/>  \n    <parameter name=\"httpMethod\" value=\"get\"/>  \n    <parameter name=\"responsePrefix\" value=\"networks\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.msa.jks\"/>  \n    <parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n    <parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n    <parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1492.6771354675293,
-        "y": 602.8992919921875,
-        "z": "fcc91756.c8d038",
+        "x": 1463.6771354675293,
+        "y": 596.8992919921875,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "7133cad2.99b11c",
-                "c3d837c.d0ca2c8"
+                "6946de0a.deebc",
+                "5d4a6514.4c3a9c"
             ]
         ]
     },
     {
-        "id": "7133cad2.99b11c",
+        "id": "6946de0a.deebc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1645.6771354675293,
-        "y": 599.8992919921875,
-        "z": "fcc91756.c8d038",
+        "x": 1616.6771354675293,
+        "y": 593.8992919921875,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "eab907ff.882ae8"
+                "e290e7ee.1a21f"
             ]
         ]
     },
     {
-        "id": "eab907ff.882ae8",
+        "id": "e290e7ee.1a21f",
         "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 topology MSA rest api\" />\n\n",
         "comments": "",
-        "x": 1820.6771354675293,
-        "y": 598.8992919921875,
-        "z": "fcc91756.c8d038",
+        "x": 1791.6771354675293,
+        "y": 592.8992919921875,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "c3d837c.d0ca2c8",
+        "id": "5d4a6514.4c3a9c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1651.6771354675293,
-        "y": 672.8992919921875,
-        "z": "fcc91756.c8d038",
+        "x": 1622.6771354675293,
+        "y": 666.8992919921875,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "224d6e37.21354a"
+                "815556fb.bd9668"
             ]
         ]
     },
     {
-        "id": "224d6e37.21354a",
+        "id": "815556fb.bd9668",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1835.6771354675293,
-        "y": 674.8992919921875,
-        "z": "fcc91756.c8d038",
+        "x": 1806.6771354675293,
+        "y": 668.8992919921875,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "622b9c10.ebdeac"
+                "9834a552.e8e02"
             ]
         ]
     },
     {
-        "id": "622b9c10.ebdeac",
+        "id": "9834a552.e8e02",
         "type": "call",
         "name": "call msa-update-network-to-aai",
         "xml": "<call module='DataChange' rpc='msa-update-network-to-aai' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2114.677001953125,
-        "y": 672.8992919921875,
-        "z": "fcc91756.c8d038",
+        "x": 2085.677001953125,
+        "y": 666.8992919921875,
+        "z": "8cb67e95.d771b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "67540de7.5dd14c",
+        "id": "983792ba.976408",
         "type": "switchNode",
         "name": "switch type",
         "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 285.566650390625,
-        "y": 841.5666809082031,
-        "z": "fcc91756.c8d038",
+        "x": 256.566650390625,
+        "y": 835.5666809082031,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "ed11f93e.13815",
-                "b9986099.553ab8",
-                "eeccf78a.d71e3"
+                "674a6a9f.8c143c",
+                "42c7b2ab.76125c",
+                "1501fed.f113881"
             ]
         ]
     },
     {
-        "id": "ed11f93e.13815",
+        "id": "674a6a9f.8c143c",
         "type": "outcome",
         "name": "MSA",
         "xml": "<outcome value='MSA'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 464.857177734375,
-        "y": 758.9285888671875,
-        "z": "fcc91756.c8d038",
+        "x": 435.857177734375,
+        "y": 752.9285888671875,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "40980c29.103654"
+                "8b3cf345.6948d"
             ]
         ]
     },
     {
-        "id": "b9986099.553ab8",
+        "id": "42c7b2ab.76125c",
         "type": "other",
         "name": "TAPI",
         "xml": "<outcome value='TAPI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 473.6070556640625,
-        "y": 1009.6428527832031,
-        "z": "fcc91756.c8d038",
+        "x": 444.6070556640625,
+        "y": 1003.6428527832031,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "b9906adb.aedb"
+                "ec6a41aa.381fd"
             ]
         ]
     },
     {
-        "id": "40980c29.103654",
+        "id": "8b3cf345.6948d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 618.607177734375,
-        "y": 755.7143249511719,
-        "z": "fcc91756.c8d038",
+        "x": 589.607177734375,
+        "y": 749.7143249511719,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "f4759d50.5acb",
-                "6300b23d.858844"
+                "49d8550e.67af3c",
+                "db848d25.52ee9"
             ]
         ]
     },
     {
-        "id": "b9906adb.aedb",
+        "id": "ec6a41aa.381fd",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 623,
-        "y": 1009.5,
-        "z": "fcc91756.c8d038",
+        "x": 594,
+        "y": 1003.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "ee72aef0.96b35",
-                "80047dba.a18518"
+                "1335976f.2d9b19",
+                "16c45478.af99e4"
             ]
         ]
     },
     {
-        "id": "eeccf78a.d71e3",
+        "id": "1501fed.f113881",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 576,
-        "y": 1173.5,
-        "z": "fcc91756.c8d038",
+        "x": 547,
+        "y": 1167.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "a7ccb229.5cc45"
+                "41c63854.9379a8"
             ]
         ]
     },
     {
-        "id": "a7ccb229.5cc45",
+        "id": "41c63854.9379a8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n\n",
         "comments": "",
-        "x": 738,
-        "y": 1212.5,
-        "z": "fcc91756.c8d038",
+        "x": 709,
+        "y": 1206.5,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "f4759d50.5acb",
+        "id": "49d8550e.67af3c",
         "type": "get-resource",
         "name": "get resources from DB -controller_id",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT controller_id\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE controller_id = $controllerid'\npfx='dbcontrollerid'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 850.5,
-        "y": 803.5,
-        "z": "fcc91756.c8d038",
+        "x": 821.5,
+        "y": 797.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "418351d.550fdb",
-                "5d9de12a.c40778",
-                "4f52ba75.31f414"
+                "1a8d1895.ab6a47",
+                "47ef9d8f.3964f4",
+                "d98324ce.97ca8"
             ]
         ]
     },
     {
-        "id": "6300b23d.858844",
+        "id": "db848d25.52ee9",
         "type": "set",
         "name": "set controller_id",
         "xml": "<set>\n<parameter name='controllerid' value=\"`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`\" />\n\n\n\n",
         "comments": "",
-        "x": 810.5,
-        "y": 737.5,
-        "z": "fcc91756.c8d038",
+        "x": 781.5,
+        "y": 731.5,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "418351d.550fdb",
+        "id": "1a8d1895.ab6a47",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1089.5,
-        "y": 823.5,
-        "z": "fcc91756.c8d038",
+        "x": 1060.5,
+        "y": 817.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "7d4b021f.b58864"
+                "d1f9e1a7.c7f19"
             ]
         ]
     },
     {
-        "id": "7d4b021f.b58864",
+        "id": "d1f9e1a7.c7f19",
         "type": "delete",
         "name": "delete from db",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n    resource=\"SQL\"\n    key=\"DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid\">",
         "comments": "",
         "outputs": 1,
-        "x": 1258.5,
-        "y": 830.5,
-        "z": "fcc91756.c8d038",
+        "x": 1229.5,
+        "y": 824.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ee72aef0.96b35",
+        "id": "1335976f.2d9b19",
         "type": "set",
         "name": "set controller_id",
         "xml": "<set>\n<parameter name='controllerid' value=\"`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`\" />\n\n\n\n",
         "comments": "",
-        "x": 787.5,
-        "y": 965.5,
-        "z": "fcc91756.c8d038",
+        "x": 758.5,
+        "y": 959.5,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "80047dba.a18518",
+        "id": "16c45478.af99e4",
         "type": "get-resource",
         "name": "get resources from DB -controller_id",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT controller_id\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE controller_id = $controllerid'\npfx='dbcontrollerid'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 800.5,
-        "y": 1054.5,
-        "z": "fcc91756.c8d038",
+        "x": 771.5,
+        "y": 1048.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "193e8ffa.2d1e68",
-                "392a4087.7340c",
-                "3b51b50f.fabfaa"
+                "a8a3e82f.8a5a8",
+                "ae0994a7.403ab8",
+                "e57ecfd9.55df58"
             ]
         ]
     },
     {
-        "id": "193e8ffa.2d1e68",
+        "id": "a8a3e82f.8a5a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1025.5,
-        "y": 1069.5,
-        "z": "fcc91756.c8d038",
+        "x": 996.5,
+        "y": 1063.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "7c3655cf.c7356c"
+                "d7aae079.2ca2a"
             ]
         ]
     },
     {
-        "id": "7c3655cf.c7356c",
+        "id": "d7aae079.2ca2a",
         "type": "delete",
         "name": "delete from db",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n    resource=\"SQL\"\n    key=\"DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid\">",
         "comments": "",
         "outputs": 1,
-        "x": 1196.5,
-        "y": 1070.5,
-        "z": "fcc91756.c8d038",
+        "x": 1167.5,
+        "y": 1064.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "5d9de12a.c40778",
+        "id": "47ef9d8f.3964f4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1075.5,
-        "y": 902.5,
-        "z": "fcc91756.c8d038",
+        "x": 1046.5,
+        "y": 896.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "44b36cb9.4f203c"
+                "1e298c8c.f0408b"
             ]
         ]
     },
     {
-        "id": "392a4087.7340c",
+        "id": "ae0994a7.403ab8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1006.5,
-        "y": 1142.5,
-        "z": "fcc91756.c8d038",
+        "x": 977.5,
+        "y": 1136.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "568e56df.183be8"
+                "c236971a.ee197"
             ]
         ]
     },
     {
-        "id": "44b36cb9.4f203c",
+        "id": "1e298c8c.f0408b",
         "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=\"Failure in getting controller-id from DB\" />\n\n",
         "comments": "",
-        "x": 1236.5,
-        "y": 907.5,
-        "z": "fcc91756.c8d038",
+        "x": 1207.5,
+        "y": 901.5,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "4f52ba75.31f414",
+        "id": "d98324ce.97ca8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1066.5,
-        "y": 962.5,
-        "z": "fcc91756.c8d038",
+        "x": 1037.5,
+        "y": 956.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "67091014.c5cb48"
+                "3416464c.a143ea"
             ]
         ]
     },
     {
-        "id": "67091014.c5cb48",
+        "id": "3416464c.a143ea",
         "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=\"controller-id could not be found in DB\" />\n\n",
         "comments": "",
-        "x": 1215.5,
-        "y": 964.5,
-        "z": "fcc91756.c8d038",
+        "x": 1186.5,
+        "y": 958.5,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "568e56df.183be8",
+        "id": "c236971a.ee197",
         "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=\"Failure in getting controller-id from DB\" />\n\n",
         "comments": "",
-        "x": 1154.5,
-        "y": 1143.5,
-        "z": "fcc91756.c8d038",
+        "x": 1125.5,
+        "y": 1137.5,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "3b51b50f.fabfaa",
+        "id": "e57ecfd9.55df58",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1006.5,
-        "y": 1186.5,
-        "z": "fcc91756.c8d038",
+        "x": 977.5,
+        "y": 1180.5,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "74792395.d77524"
+                "d5ad8139.acdf48"
             ]
         ]
     },
     {
-        "id": "74792395.d77524",
+        "id": "d5ad8139.acdf48",
         "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=\"controller-id could not be found in DB\" />\n\n",
         "comments": "",
-        "x": 1171.5,
-        "y": 1183.5,
-        "z": "fcc91756.c8d038",
+        "x": 1142.5,
+        "y": 1177.5,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "f7bc5da7.da31b",
+        "id": "ad96f3f.ca0439",
         "type": "switchNode",
         "name": "switch network_length",
         "xml": "<switch test='`$topology.networks.network_length >= 2`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2682,
-        "y": 335,
-        "z": "fcc91756.c8d038",
+        "x": 2653,
+        "y": 329,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "aa4a8663.38bb68"
+                "d135440e.332828"
             ]
         ]
     },
     {
-        "id": "aa4a8663.38bb68",
+        "id": "d135440e.332828",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2864,
-        "y": 336,
-        "z": "fcc91756.c8d038",
+        "x": 2835,
+        "y": 330,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "efdac693.289728"
+                "9dfbe1b1.0501b8"
             ]
         ]
     },
     {
-        "id": "6a7f62ea.d32524",
+        "id": "27de91fe.6ca4f6",
         "type": "for",
         "name": "for each Network",
         "xml": "<for index='netidx' start='0' end='`$topology.networks.network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3237,
-        "y": 329,
-        "z": "fcc91756.c8d038",
+        "x": 3208,
+        "y": 323,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "de962ed4.8e2558"
+                "7ec0ad88.0666cc"
             ]
         ]
     },
     {
-        "id": "de962ed4.8e2558",
+        "id": "7ec0ad88.0666cc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3455,
-        "y": 326,
-        "z": "fcc91756.c8d038",
+        "x": 3426,
+        "y": 320,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "d31ddaea.690348",
-                "bbbca45f.8e2228",
-                "acccc325.a38838"
+                "8fdc47cc.432ab",
+                "b5eed741.5fbb08",
+                "1656178e.3ba998"
             ]
         ]
     },
     {
-        "id": "73e20b64.41827c",
+        "id": "5634a256.4e2744",
         "type": "call",
         "name": "call update-tp-ttp-relationship",
         "xml": "<call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3270,
-        "y": 389,
-        "z": "fcc91756.c8d038",
+        "x": 3241,
+        "y": 383,
+        "z": "8cb67e95.d771b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "efdac693.289728",
+        "id": "9dfbe1b1.0501b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3034,
-        "y": 332,
-        "z": "fcc91756.c8d038",
+        "x": 3005,
+        "y": 326,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "6a7f62ea.d32524",
-                "73e20b64.41827c"
+                "27de91fe.6ca4f6",
+                "5634a256.4e2744"
             ]
         ]
     },
     {
-        "id": "acccc325.a38838",
+        "id": "1656178e.3ba998",
         "type": "set",
         "name": "unset network",
         "xml": "<set>\n<parameter name='network.' value='' />\n",
         "comments": "",
-        "x": 3614,
-        "y": 266,
-        "z": "fcc91756.c8d038",
+        "x": 3585,
+        "y": 260,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "d31ddaea.690348",
+        "id": "8fdc47cc.432ab",
         "type": "set",
         "name": "set network",
         "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$netidx].`' />\n",
         "comments": "",
-        "x": 3608,
-        "y": 314,
-        "z": "fcc91756.c8d038",
+        "x": 3579,
+        "y": 308,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "bbbca45f.8e2228",
+        "id": "b5eed741.5fbb08",
         "type": "switchNode",
         "name": "switch network-types with topologyId",
         "xml": "<switch test='`$network.te-topology-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3685,
-        "y": 361,
-        "z": "fcc91756.c8d038",
+        "x": 3656,
+        "y": 355,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "e4f22bce.03ea18",
-                "2f6da0f9.e964d8"
+                "c1423a29.1c46e8",
+                "ab490ddf.8e1c1"
             ]
         ]
     },
     {
-        "id": "e4f22bce.03ea18",
+        "id": "c1423a29.1c46e8",
         "type": "outcome",
-        "name": "11",
-        "xml": "<outcome value='11'>\n",
+        "name": "1",
+        "xml": "<outcome value='1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3911,
-        "y": 330,
-        "z": "fcc91756.c8d038",
+        "x": 3882,
+        "y": 324,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "a545d36e.f0b618"
+                "3c6e5d11.fbd2b2"
             ]
         ]
     },
     {
-        "id": "2f6da0f9.e964d8",
+        "id": "ab490ddf.8e1c1",
         "type": "outcome",
-        "name": "33",
-        "xml": "<outcome value='33'>\n",
+        "name": "2",
+        "xml": "<outcome value='2'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3911,
-        "y": 391,
-        "z": "fcc91756.c8d038",
+        "x": 3882,
+        "y": 385,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "d2ccc5d0.bc949"
+                "654a57a4.0fd38"
             ]
         ]
     },
     {
-        "id": "dcbdf3ee.469d4",
+        "id": "adf965cc.3e515",
         "type": "set",
         "name": "set network-otn",
         "xml": "<set>\n<parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />\n",
         "comments": "",
-        "x": 4206,
-        "y": 330,
-        "z": "fcc91756.c8d038",
+        "x": 4177,
+        "y": 324,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "6a7bd0f0.92b65",
+        "id": "f1dbbcab.0dda4",
         "type": "set",
         "name": "set network eth",
         "xml": "<set>\n<parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />\n",
         "comments": "",
-        "x": 4206,
-        "y": 391,
-        "z": "fcc91756.c8d038",
+        "x": 4177,
+        "y": 385,
+        "z": "8cb67e95.d771b8",
         "wires": []
     },
     {
-        "id": "a545d36e.f0b618",
+        "id": "3c6e5d11.fbd2b2",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4045,
-        "y": 330,
-        "z": "fcc91756.c8d038",
+        "x": 4016,
+        "y": 324,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "dcbdf3ee.469d4"
+                "adf965cc.3e515"
             ]
         ]
     },
     {
-        "id": "d2ccc5d0.bc949",
+        "id": "654a57a4.0fd38",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4046,
-        "y": 391,
-        "z": "fcc91756.c8d038",
+        "x": 4017,
+        "y": 385,
+        "z": "8cb67e95.d771b8",
         "wires": [
             [
-                "6a7bd0f0.92b65"
+                "f1dbbcab.0dda4"
             ]
         ]
     }
diff --git a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json
index 4e0b325a..489b429d 100644
--- a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json
+++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "99e701a0.2410d",
+        "id": "ef9f11e3.e25b8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 136,
-        "y": 137,
-        "z": "3ca15a5b.03f956",
+        "x": 162,
+        "y": 62,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "6330fb87.7056d4"
+                "8cba6f11.c1b35"
             ]
         ]
     },
     {
-        "id": "6330fb87.7056d4",
+        "id": "8cba6f11.c1b35",
         "type": "service-logic",
         "name": "DataChange ${project.version}",
         "module": "DataChange",
@@ -22,429 +22,428 @@
         "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='DataChange' version='${project.version}'>",
         "outputs": 1,
-        "x": 322.1111488342285,
-        "y": 241.44447135925293,
-        "z": "3ca15a5b.03f956",
+        "x": 348.1111488342285,
+        "y": 166.44447135925293,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "5d3152d6.fc261c"
+                "b34b0f2b.a26b6"
             ]
         ]
     },
     {
-        "id": "5d3152d6.fc261c",
+        "id": "b34b0f2b.a26b6",
         "type": "method",
         "name": "method esr-thirdparty-sdnc",
         "xml": "<method rpc='esr-thirdparty-sdnc' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 319.5556983947754,
-        "y": 405.2222566604614,
-        "z": "3ca15a5b.03f956",
+        "x": 345.5556983947754,
+        "y": 330.2222566604614,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "fd1dfef.d4b4b"
+                "c51c8801.1083a8"
             ]
         ]
     },
     {
-        "id": "fd1dfef.d4b4b",
+        "id": "c51c8801.1083a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 274.7779655456543,
-        "y": 540.1113119125366,
-        "z": "3ca15a5b.03f956",
+        "x": 300.7779655456543,
+        "y": 465.1113119125366,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "9b412bae.4b0eb8",
-                "cceae5d2.b0de18",
-                "ec471744.eb69b8",
-                "ca9b8814.58fc88"
+                "b07b5277.3d4a68",
+                "b9203f9f.499548",
+                "d3ed9870.114e5"
             ]
         ]
     },
     {
-        "id": "cceae5d2.b0de18",
+        "id": "76c0732c.b84824",
         "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/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"data-change-notification\"/>\n<parameter name=\"field3\" value=\"Config\"/>\n<parameter name=\"field4\" value=\"`service-url`\"/>\n<parameter name=\"field5\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 564,
-        "y": 611,
-        "z": "3ca15a5b.03f956",
+        "x": 590,
+        "y": 536,
+        "z": "aef0e494.212df8",
         "wires": [
             []
         ]
     },
     {
-        "id": "9b412bae.4b0eb8",
+        "id": "b07b5277.3d4a68",
         "type": "for",
         "name": "for 0..key-data_length",
         "xml": "<for index='idx' start='0' end='`$data-change-notification-input.key-data_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 612.4441070556641,
-        "y": 556.190788269043,
-        "z": "3ca15a5b.03f956",
+        "x": 638.4441070556641,
+        "y": 481.19078826904297,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "d38c4e0c.d3a8e"
+                "e5460d9.eb92a7"
             ]
         ]
     },
     {
-        "id": "d38c4e0c.d3a8e",
+        "id": "e5460d9.eb92a7",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 784.3335723876953,
-        "y": 555.4130334854126,
-        "z": "3ca15a5b.03f956",
+        "x": 810.3335723876953,
+        "y": 480.4130334854126,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "923e10da.3124e",
-                "ad127485.a941f8",
-                "39c9791a.a004c6",
-                "2bf6fbdd.98dd24",
-                "e16dffa9.206d5",
-                "74936d17.d58244",
-                "f60efc3e.9d559"
+                "1f482195.4aed1e",
+                "e326585b.5a2c8",
+                "62f527aa.843a1",
+                "a3b99d23.ded5b8",
+                "6c2b24b6.182ef4",
+                "7c3962c6.d95fe4",
+                "27459292.aa5326"
             ]
         ]
     },
     {
-        "id": "923e10da.3124e",
+        "id": "1f482195.4aed1e",
         "type": "switchNode",
         "name": "switch service-url",
         "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'service-url'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 996.5552749633789,
-        "y": 465.5241861343384,
-        "z": "3ca15a5b.03f956",
+        "x": 1022.5552749633789,
+        "y": 390.5241861343384,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "62882f3b.f43fb"
+                "e24bf338.0aa118"
             ]
         ]
     },
     {
-        "id": "62882f3b.f43fb",
+        "id": "e24bf338.0aa118",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1160.5553970336914,
-        "y": 464.5554189682007,
-        "z": "3ca15a5b.03f956",
+        "x": 1186.5553970336914,
+        "y": 389.5554189682007,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "d288b1fe.c97e8"
+                "6a8ce1d8.40cb08"
             ]
         ]
     },
     {
-        "id": "d288b1fe.c97e8",
+        "id": "6a8ce1d8.40cb08",
         "type": "set",
         "name": "set service-url",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
         "comments": "",
-        "x": 1314.5554885864258,
-        "y": 464.1554126739502,
-        "z": "3ca15a5b.03f956",
+        "x": 1340.5554885864258,
+        "y": 389.1554126739502,
+        "z": "aef0e494.212df8",
         "wires": []
     },
     {
-        "id": "ad127485.a941f8",
+        "id": "e326585b.5a2c8",
         "type": "switchNode",
         "name": "switch user-name",
         "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'user-name'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 993.8450202941895,
-        "y": 534.7712459564209,
-        "z": "3ca15a5b.03f956",
+        "x": 1019.8450202941895,
+        "y": 459.7712459564209,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "32e92192.48f84e"
+                "6369ccba.44219c"
             ]
         ]
     },
     {
-        "id": "32e92192.48f84e",
+        "id": "6369ccba.44219c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1162.8450088500977,
-        "y": 532.8024892807007,
-        "z": "3ca15a5b.03f956",
+        "x": 1188.8450088500977,
+        "y": 457.8024892807007,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "e32de5c0.443f28"
+                "29fc0e59.2a42b2"
             ]
         ]
     },
     {
-        "id": "e32de5c0.443f28",
+        "id": "29fc0e59.2a42b2",
         "type": "set",
         "name": "set user",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
         "comments": "",
-        "x": 1298.8451614379883,
-        "y": 532.4024801254272,
-        "z": "3ca15a5b.03f956",
+        "x": 1324.8451614379883,
+        "y": 457.40248012542725,
+        "z": "aef0e494.212df8",
         "wires": []
     },
     {
-        "id": "39c9791a.a004c6",
+        "id": "62f527aa.843a1",
         "type": "switchNode",
         "name": "switch password",
         "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'password'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 991.6228523254395,
-        "y": 600.3267955780029,
-        "z": "3ca15a5b.03f956",
+        "x": 1017.6228523254395,
+        "y": 525.3267955780029,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "699a3ade.cb3b24"
+                "4646e0ce.227428"
             ]
         ]
     },
     {
-        "id": "699a3ade.cb3b24",
+        "id": "4646e0ce.227428",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1163.6228103637695,
-        "y": 600.3580408096313,
-        "z": "3ca15a5b.03f956",
+        "x": 1189.6228103637695,
+        "y": 525.3580408096313,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "b4409b06.1c7a48"
+                "95ef44fa.193e88"
             ]
         ]
     },
     {
-        "id": "b4409b06.1c7a48",
+        "id": "95ef44fa.193e88",
         "type": "set",
         "name": "set password",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
         "comments": "",
-        "x": 1318.6230545043945,
-        "y": 598.9580202102661,
-        "z": "3ca15a5b.03f956",
+        "x": 1344.6230545043945,
+        "y": 523.9580202102661,
+        "z": "aef0e494.212df8",
         "wires": []
     },
     {
-        "id": "ec471744.eb69b8",
+        "id": "b9203f9f.499548",
         "type": "call",
         "name": "call esr-thirdparty-sdnc-discovery",
         "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-discovery' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 635.4377593994141,
-        "y": 682.5490007400513,
-        "z": "3ca15a5b.03f956",
+        "x": 661.4377593994141,
+        "y": 607.5490007400513,
+        "z": "aef0e494.212df8",
         "wires": [
             []
         ]
     },
     {
-        "id": "2bf6fbdd.98dd24",
+        "id": "a3b99d23.ded5b8",
         "type": "switchNode",
         "name": "switch esr-system-info-id",
         "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'esr-system-info-id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1013.4441528320312,
-        "y": 654.3331909179688,
-        "z": "3ca15a5b.03f956",
+        "x": 1039.4441528320312,
+        "y": 579.3331909179688,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "6b800452.92b53c"
+                "1ac41cc3.373a63"
             ]
         ]
     },
     {
-        "id": "6b800452.92b53c",
+        "id": "1ac41cc3.373a63",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1188.4441375732422,
-        "y": 652.3643522262573,
-        "z": "3ca15a5b.03f956",
+        "x": 1214.4441375732422,
+        "y": 577.3643522262573,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "5fb25642.fe13a8"
+                "e82e9936.a40cf"
             ]
         ]
     },
     {
-        "id": "5fb25642.fe13a8",
+        "id": "e82e9936.a40cf",
         "type": "set",
         "name": "set esr-system-info-id",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.system-info-id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
         "comments": "",
-        "x": 1354.444107055664,
-        "y": 653.964376449585,
-        "z": "3ca15a5b.03f956",
+        "x": 1380.444107055664,
+        "y": 578.964376449585,
+        "z": "aef0e494.212df8",
         "wires": []
     },
     {
-        "id": "e16dffa9.206d5",
+        "id": "6c2b24b6.182ef4",
         "type": "switchNode",
         "name": "switch thirdparty-sdnc-id",
         "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'thirdparty-sdnc-id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1008,
-        "y": 699,
-        "z": "3ca15a5b.03f956",
+        "x": 1034,
+        "y": 624,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "c89a0c6d.1572e"
+                "ce1afedb.52692"
             ]
         ]
     },
     {
-        "id": "c89a0c6d.1572e",
+        "id": "ce1afedb.52692",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1182.999984741211,
-        "y": 697.0311613082886,
-        "z": "3ca15a5b.03f956",
+        "x": 1208.999984741211,
+        "y": 622.0311613082886,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "a9287f8e.79595"
+                "a512db5a.75ca9"
             ]
         ]
     },
     {
-        "id": "a9287f8e.79595",
+        "id": "a512db5a.75ca9",
         "type": "set",
         "name": "set thirdparty-sdnc-id",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
         "comments": "",
-        "x": 1348.9999542236328,
-        "y": 698.6311855316162,
-        "z": "3ca15a5b.03f956",
+        "x": 1374.9999542236328,
+        "y": 623.6311855316162,
+        "z": "aef0e494.212df8",
         "wires": []
     },
     {
-        "id": "74936d17.d58244",
+        "id": "7c3962c6.d95fe4",
         "type": "switchNode",
         "name": "switch type",
         "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'type'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 958.0000305175781,
-        "y": 748.0000200271606,
-        "z": "3ca15a5b.03f956",
+        "x": 984.0000305175781,
+        "y": 673.0000200271606,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "b33cf82.eefe308"
+                "32efc971.8d4076"
             ]
         ]
     },
     {
-        "id": "b33cf82.eefe308",
+        "id": "32efc971.8d4076",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1103.0000343322754,
-        "y": 747.0311889648438,
-        "z": "3ca15a5b.03f956",
+        "x": 1129.0000343322754,
+        "y": 672.0311889648438,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "dfc8eb6b.f283a8"
+                "fdd2a7f.f2554d8"
             ]
         ]
     },
     {
-        "id": "dfc8eb6b.f283a8",
+        "id": "fdd2a7f.f2554d8",
         "type": "set",
         "name": "set type",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.type' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
         "comments": "",
-        "x": 1235.0000381469727,
-        "y": 746.6312046051025,
-        "z": "3ca15a5b.03f956",
+        "x": 1261.0000381469727,
+        "y": 671.6312046051025,
+        "z": "aef0e494.212df8",
         "wires": []
     },
     {
-        "id": "f60efc3e.9d559",
+        "id": "27459292.aa5326",
         "type": "switchNode",
         "name": "switch vendor",
         "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'vendor'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 959.0000267028809,
-        "y": 804.0000219345093,
-        "z": "3ca15a5b.03f956",
+        "x": 985.0000267028809,
+        "y": 729.0000219345093,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "f02e6468.4f1ca8"
+                "597caf68.90ecf"
             ]
         ]
     },
     {
-        "id": "f02e6468.4f1ca8",
+        "id": "597caf68.90ecf",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1104.0000305175781,
-        "y": 803.0311908721924,
-        "z": "3ca15a5b.03f956",
+        "x": 1130.0000305175781,
+        "y": 728.0311908721924,
+        "z": "aef0e494.212df8",
         "wires": [
             [
-                "4287418.30ed9c"
+                "f6b454f7.14ca"
             ]
         ]
     },
     {
-        "id": "4287418.30ed9c",
+        "id": "f6b454f7.14ca",
         "type": "set",
         "name": "set vendor",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.vendor' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
         "comments": "",
-        "x": 1236.0000343322754,
-        "y": 802.6312065124512,
-        "z": "3ca15a5b.03f956",
+        "x": 1262.0000343322754,
+        "y": 727.6312065124512,
+        "z": "aef0e494.212df8",
         "wires": []
     },
     {
-        "id": "ca9b8814.58fc88",
+        "id": "d3ed9870.114e5",
         "type": "call",
         "name": "call validate-esr-thirdparty-sdnc-input",
         "xml": "<call module='DataChange' rpc='validate-esr-thirdparty-sdnc-input' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 677.7776336669922,
-        "y": 473.9998035430908,
-        "z": "3ca15a5b.03f956",
+        "x": 703.7776336669922,
+        "y": 398.9998035430908,
+        "z": "aef0e494.212df8",
         "wires": [
             []
         ]
diff --git a/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json
index 0d6a2784..67136feb 100644
--- a/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "ebe56983.0d3a9",
+        "id": "77244695.5fe13",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 134,
-        "y": 65,
-        "z": "3cbec5d5.54ea02",
+        "x": 124,
+        "y": 98,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "13e5c84a.55bf3"
+                "61db70e6.96f4f"
             ]
         ]
     },
     {
-        "id": "13e5c84a.55bf3",
+        "id": "61db70e6.96f4f",
         "type": "service-logic",
         "name": "DataChange ${project.version}",
         "module": "DataChange",
@@ -22,1885 +22,1884 @@
         "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='DataChange' version='${project.version}'>",
         "outputs": 1,
-        "x": 191,
-        "y": 144.888916015625,
-        "z": "3cbec5d5.54ea02",
+        "x": 181,
+        "y": 177.888916015625,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "66a22ecb.fd2f58"
+                "1788c320.44101d"
             ]
         ]
     },
     {
-        "id": "66a22ecb.fd2f58",
+        "id": "1788c320.44101d",
         "type": "method",
         "name": "method update-network-links-to-aai",
         "xml": "<method rpc='update-network-links-to-aai' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 205,
-        "y": 221.22222900390625,
-        "z": "3cbec5d5.54ea02",
+        "x": 195,
+        "y": 254.22222900390625,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "6e3553b1.ce5dcc"
+                "325d107f.de4c6"
             ]
         ]
     },
     {
-        "id": "6e3553b1.ce5dcc",
+        "id": "325d107f.de4c6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 216.33343505859375,
-        "y": 298.7779235839844,
-        "z": "3cbec5d5.54ea02",
+        "x": 206.33343505859375,
+        "y": 331.7779235839844,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "ce48b85e.94f938"
+                "772b5f61.91c448"
             ]
         ]
     },
     {
-        "id": "a43a6e87.7bb85",
+        "id": "ea8c4290.e9fc4",
         "type": "update",
         "name": "save logical-link with regular id",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \n      key='logical-link.link-name = $unique-linkId' >\n<parameter name='link-name' value='`$unique-linkId`' />\n<parameter name='link-id' value='`$link.link-id`' />\n<parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1091.111083984375,
-        "y": 723.111083984375,
-        "z": "3cbec5d5.54ea02",
+        "x": 1081.111083984375,
+        "y": 756.111083984375,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "ce48b85e.94f938",
+        "id": "772b5f61.91c448",
         "type": "for",
         "name": "for each link",
         "xml": "<for index='pidx' start='0' end='`$network.link_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 244.88885498046875,
-        "y": 392.33331298828125,
-        "z": "3cbec5d5.54ea02",
+        "x": 234.88885498046875,
+        "y": 425.33331298828125,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "dec42fbf.1e3dc8",
-                "faf4c2c8.a313e8",
-                "6624aa74.606e14",
-                "dbc86076.1de4f",
-                "4c4fa03a.a50f2"
+                "34a89003.2e2b",
+                "ba3960a8.1467",
+                "f48b8987.2973f8",
+                "37181089.2d209",
+                "f2821395.fcaa08"
             ]
         ]
     },
     {
-        "id": "dec42fbf.1e3dc8",
+        "id": "34a89003.2e2b",
         "type": "set",
         "name": "set network link's local variables",
         "xml": "<set>\n<parameter name='link.' value='`$network.link[$pidx].`' />\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n\n",
         "comments": "",
-        "x": 577.111083984375,
-        "y": 97.22221374511719,
-        "z": "3cbec5d5.54ea02",
+        "x": 567.111083984375,
+        "y": 130.2222137451172,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "9f28786b.9755c",
+        "id": "8fd33aa8.985138",
         "type": "for",
         "name": "for each label-restriction",
         "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1617.4444580078125,
-        "y": 943.111083984375,
-        "z": "3cbec5d5.54ea02",
+        "x": 1607.4444580078125,
+        "y": 976.111083984375,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "a10e9de3.90e708",
-                "9f6f811c.bccf8",
-                "7166bef0.82e4a",
-                "c6ea0cbf.fb7cd",
-                "441a859d.1c08ec",
-                "e1339bff.8f7f98"
+                "5a96ae47.c33778",
+                "6a43eee0.04c1f8",
+                "1f83fd3d.b74253",
+                "db4d2563.f4f978",
+                "49c5f91d.be38c8",
+                "b8324dab.347198"
             ]
         ]
     },
     {
-        "id": "a10e9de3.90e708",
+        "id": "5a96ae47.c33778",
         "type": "set",
         "name": "set label-restriction's local variables",
         "xml": "<set>\n<parameter name='unique-lrId' value=\"`$unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
         "comments": "",
-        "x": 1922.111328125,
-        "y": 908.0000610351562,
-        "z": "3cbec5d5.54ea02",
+        "x": 1912.111328125,
+        "y": 941.0000610351562,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "481ae7ff.84ac9",
+        "id": "16e2b4ec.afe953",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2035.4998779296875,
-        "y": 950.74609375,
-        "z": "3cbec5d5.54ea02",
+        "x": 2025.4998779296875,
+        "y": 983.74609375,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "4b5e8d4c.a2cfc4"
+                "180e1ac0.c84c2d"
             ]
         ]
     },
     {
-        "id": "958898b9.8616a",
+        "id": "e2eddabf.7af6b",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2043.178466796875,
-        "y": 1009.9604187011719,
-        "z": "3cbec5d5.54ea02",
+        "x": 2033.178466796875,
+        "y": 1042.9604187011719,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "76714a99.5b6304"
+                "c411750f.6a79e8"
             ]
         ]
     },
     {
-        "id": "4b5e8d4c.a2cfc4",
+        "id": "180e1ac0.c84c2d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2196,
-        "y": 950.0000305175781,
-        "z": "3cbec5d5.54ea02",
+        "x": 2186,
+        "y": 983.0000305175781,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "1494b149.c9a337",
+        "id": "1718031e.d8e1cd",
         "type": "set",
         "name": "set src-ltpId dst-ltpId",
         "xml": "<set>\n<parameter name='src-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.src-access-ltp-id`\" />\n<parameter name='dst-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.dst-access-ltp-id`\" />",
         "comments": "",
-        "x": 2604.5001220703125,
-        "y": 2412.545135498047,
-        "z": "3cbec5d5.54ea02",
+        "x": 2594.5001220703125,
+        "y": 2445.545135498047,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "ed0f5687.170a7",
+        "id": "df5f7631.41cd8",
         "type": "save",
         "name": "save srcLTP relationship in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2638.0001220703125,
-        "y": 2452.545135498047,
-        "z": "3cbec5d5.54ea02",
+        "x": 2628.0001220703125,
+        "y": 2485.545135498047,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "c964af3.a8439d",
+        "id": "39d523bc.136384",
         "type": "save",
         "name": "save dstLTP relationship in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$dst-ltpId`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2638.0001220703125,
-        "y": 2492.545135498047,
-        "z": "3cbec5d5.54ea02",
+        "x": 2628.0001220703125,
+        "y": 2525.545135498047,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "76714a99.5b6304",
+        "id": "c411750f.6a79e8",
         "type": "update",
         "name": "save label-restriction",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2227,
-        "y": 1010.0000305175781,
-        "z": "3cbec5d5.54ea02",
+        "x": 2217,
+        "y": 1043.0000305175781,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "df8f6a30.0e19f",
+        "id": "a7ae4edd.c4cd68",
         "type": "save",
         "name": "save link relationship to label-restriction in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1938,
-        "y": 1206,
-        "z": "3cbec5d5.54ea02",
+        "x": 1928,
+        "y": 1239,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "9f6f811c.bccf8",
+        "id": "6a43eee0.04c1f8",
         "type": "update",
         "name": "save label-restriction",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1876.815185546875,
-        "y": 982.5556640625,
-        "z": "3cbec5d5.54ea02",
+        "x": 1866.815185546875,
+        "y": 1015.5556640625,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "481ae7ff.84ac9",
-                "958898b9.8616a"
+                "16e2b4ec.afe953",
+                "e2eddabf.7af6b"
             ]
         ]
     },
     {
-        "id": "e7971b0b.c3d0c",
+        "id": "30955035.7652f",
         "type": "switchNode",
         "name": "switch te-link-attributes label-restriction_length",
         "xml": "<switch test='`$link.te.te-link-attributes.label-restriction_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1136,
-        "y": 943,
-        "z": "3cbec5d5.54ea02",
+        "x": 1126,
+        "y": 976,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "d0a27e5d.161cf",
-                "c301ff98.2e6928",
-                "4d75dbb8.4d6b04"
+                "57ae4e2f.8a93c8",
+                "7f343bab.e4c8cc",
+                "22cb05f1.da2172"
             ]
         ]
     },
     {
-        "id": "faf4c2c8.a313e8",
+        "id": "ba3960a8.1467",
         "type": "switchNode",
         "name": "switch link.destination",
         "xml": "<switch test='`$link.destination.dest-node`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 553,
-        "y": 202,
-        "z": "3cbec5d5.54ea02",
+        "x": 543,
+        "y": 235,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "998d07b5.34538",
-                "4877c101.9ce65"
+                "a0306127.0ff848",
+                "d09a2f1e.24e0c8"
             ]
         ]
     },
     {
-        "id": "998d07b5.34538",
+        "id": "a0306127.0ff848",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 757,
-        "y": 163,
-        "z": "3cbec5d5.54ea02",
+        "x": 747,
+        "y": 196,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "c3ced1a5.7034b"
+                "da99d9fe.83172"
             ]
         ]
     },
     {
-        "id": "4877c101.9ce65",
+        "id": "d09a2f1e.24e0c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 754,
-        "y": 225,
-        "z": "3cbec5d5.54ea02",
+        "x": 744,
+        "y": 258,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "d4197495.299218"
+                "e7a5a1e8.6ee3f"
             ]
         ]
     },
     {
-        "id": "d4197495.299218",
+        "id": "e7a5a1e8.6ee3f",
         "type": "set",
         "name": "set network link's destination variables",
         "xml": "<set>\n<parameter name='dst-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`\" />\n<parameter name='unique-dst-node-Id' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node`\" />\n<parameter name='is-open-ended-link' value='false' />\n\n",
         "comments": "",
-        "x": 983,
-        "y": 188,
-        "z": "3cbec5d5.54ea02",
+        "x": 973,
+        "y": 221,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "c382f34.d97691",
+        "id": "a3f68296.d7ae38",
         "type": "set",
         "name": "set is-open-ended-link",
         "xml": "<set>\n<parameter name='is-open-ended-link' value='true' />\n\n",
         "comments": "",
-        "x": 1161,
-        "y": 63,
-        "z": "3cbec5d5.54ea02",
+        "x": 1151,
+        "y": 96,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "ff450949.dbf658",
+        "id": "be73ca4d.23f61",
         "type": "save",
         "name": "get p-interface from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $unique-src-node-Id\n\t        and p-interface.interface-name = $src-tpId\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.p-interface\" >",
         "comments": "",
         "outputs": 1,
-        "x": 1164,
-        "y": 148,
-        "z": "3cbec5d5.54ea02",
+        "x": 1154,
+        "y": 181,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "5da3043a.2acbac",
-                "1bf53d3.d439ac3",
-                "8f4faa5b.7a92c"
+                "d126c02c.3bacd",
+                "4b20a2f1.df693c",
+                "d6c67e44.d54828"
             ]
         ]
     },
     {
-        "id": "5da3043a.2acbac",
+        "id": "d126c02c.3bacd",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1407,
-        "y": 143,
-        "z": "3cbec5d5.54ea02",
+        "x": 1397,
+        "y": 176,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "ce061615.442fb"
+                "56d01481.fc3d34"
             ]
         ]
     },
     {
-        "id": "1bf53d3.d439ac3",
+        "id": "4b20a2f1.df693c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1405,
-        "y": 232,
-        "z": "3cbec5d5.54ea02",
+        "x": 1395,
+        "y": 265,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "8dce7fe6.cbf1f"
+                "b4b8cef1.bd5508"
             ]
         ]
     },
     {
-        "id": "863e663a.20d8f8",
+        "id": "67c0b205.d4f6ec",
         "type": "set",
         "name": "set alternative unique link id",
         "xml": "<set>\n<parameter name='alt-unique-linkId' value=\"`$tmp.aai.p-interface.inter-domain-plug-id`\" />\n<!--<parameter name='alt-unique-linkId' value=\"`'networkId-' + $unique-networkId + '-linkId-' + $tmp.aai.p-interface.inter-domain-plug-id`\" />-->\n\n",
         "comments": "",
-        "x": 2080,
-        "y": 160,
-        "z": "3cbec5d5.54ea02",
+        "x": 2070,
+        "y": 193,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "8dce7fe6.cbf1f",
+        "id": "b4b8cef1.bd5508",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1574,
-        "y": 233,
-        "z": "3cbec5d5.54ea02",
+        "x": 1564,
+        "y": 266,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "2b1dcd15.312222",
+        "id": "5276aaa7.05e024",
         "type": "save",
         "name": "get logical-link from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\t    key=\"logical-link.link-name = $alt-unique-linkId\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.logical-link\" >",
         "comments": "",
         "outputs": 1,
-        "x": 872,
-        "y": 669,
-        "z": "3cbec5d5.54ea02",
+        "x": 862,
+        "y": 702,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "ec693039.84dc28",
-                "3de532fd.f494f6"
+                "1ee6e430.75131c",
+                "e692eeb1.80fc1"
             ]
         ]
     },
     {
-        "id": "8f4faa5b.7a92c",
+        "id": "d6c67e44.d54828",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1416.490966796875,
-        "y": 185.57403564453125,
-        "z": "3cbec5d5.54ea02",
+        "x": 1406.490966796875,
+        "y": 218.57403564453125,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "788cf8a5.93c298"
+                "ce500e8a.13e1b"
             ]
         ]
     },
     {
-        "id": "788cf8a5.93c298",
+        "id": "ce500e8a.13e1b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1570.0623779296875,
-        "y": 188.85977172851562,
-        "z": "3cbec5d5.54ea02",
+        "x": 1560.0623779296875,
+        "y": 221.85977172851562,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "98f67a1e.d79eb",
+        "id": "52680ac9.74c6bc",
         "type": "switchNode",
         "name": "switch is-open-ended-link",
         "xml": "<switch test='`$is-open-ended-link`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 451,
-        "y": 708,
-        "z": "3cbec5d5.54ea02",
+        "x": 441,
+        "y": 741,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "6cd18165.d49da8",
-                "a4b87205.849aa"
+                "c8f3bc4d.123c58",
+                "d068e94c.b6bab"
             ]
         ]
     },
     {
-        "id": "6cd18165.d49da8",
+        "id": "c8f3bc4d.123c58",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 668,
-        "y": 730,
-        "z": "3cbec5d5.54ea02",
+        "x": 658,
+        "y": 763,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "6eb10efe.79be58"
+                "62f182d2.b1427c"
             ]
         ]
     },
     {
-        "id": "a4b87205.849aa",
+        "id": "d068e94c.b6bab",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 671,
-        "y": 670,
-        "z": "3cbec5d5.54ea02",
+        "x": 661,
+        "y": 703,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "2b1dcd15.312222"
+                "5276aaa7.05e024"
             ]
         ]
     },
     {
-        "id": "ec693039.84dc28",
+        "id": "1ee6e430.75131c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1116,
-        "y": 339,
-        "z": "3cbec5d5.54ea02",
+        "x": 1106,
+        "y": 372,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "7e014e1e.a8dd8"
+                "5326eda4.cd9dac"
             ]
         ]
     },
     {
-        "id": "3de532fd.f494f6",
+        "id": "e692eeb1.80fc1",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1141.490966796875,
-        "y": 534.5740356445312,
-        "z": "3cbec5d5.54ea02",
+        "x": 1131.490966796875,
+        "y": 567.5740356445312,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "308dc22b.73a67e"
+                "169999f1.cf3e56"
             ]
         ]
     },
     {
-        "id": "2e5d2820.63e8c",
+        "id": "df93f1df.e408b",
         "type": "update",
         "name": "save logical-link with alternative link id",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \n      key='logical-link.link-name = $alt-unique-linkId' >\n<parameter name='link-name' value='`$alt-unique-linkId`' />\n<parameter name='link-id' value='`$link.link-id`' />\n<parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />\n<parameter name='link-role' value='cross-domain' />\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1613,
-        "y": 556,
-        "z": "3cbec5d5.54ea02",
+        "x": 1603,
+        "y": 589,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "6eb10efe.79be58",
+        "id": "62f182d2.b1427c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 846,
-        "y": 738,
-        "z": "3cbec5d5.54ea02",
+        "x": 836,
+        "y": 771,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "a43a6e87.7bb85",
-                "e7971b0b.c3d0c",
-                "a6b6ae44.7eb2a8",
-                "370b414a.4eba76",
-                "4aadddbd.521a8c"
+                "ea8c4290.e9fc4",
+                "30955035.7652f",
+                "cdc97515.c97b28",
+                "43ca3bbb.8af21c"
             ]
         ]
     },
     {
-        "id": "521f891d.91cfc8",
+        "id": "922e1b5e.413f38",
         "type": "save",
         "name": "update dest TP by putting src TP of the current link",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $alt-unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-tpId`\" />-->\n\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-tpId`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2527,
-        "y": 385,
-        "z": "3cbec5d5.54ea02",
+        "x": 2517,
+        "y": 418,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "27e614a8.33d2f4",
-                "5b692078.dcecc"
+                "b261d13e.1146f",
+                "acda2064.208dd8"
             ]
         ]
     },
     {
-        "id": "6468635a.9e6d94",
+        "id": "a65d4fc9.cbb8f8",
         "type": "save",
         "name": "save source and dest TP",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-tpId`\" />\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$dst-tpId`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1076,
-        "y": 1177,
-        "z": "3cbec5d5.54ea02",
+        "x": 1066,
+        "y": 1210,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "c3ced1a5.7034b",
+        "id": "da99d9fe.83172",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 945,
-        "y": 124,
-        "z": "3cbec5d5.54ea02",
+        "x": 935,
+        "y": 157,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "c382f34.d97691",
-                "ff450949.dbf658",
-                "b85c23da.8517d"
+                "a3f68296.d7ae38",
+                "be73ca4d.23f61",
+                "7e55092c.663d38"
             ]
         ]
     },
     {
-        "id": "308dc22b.73a67e",
+        "id": "169999f1.cf3e56",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1330,
-        "y": 537,
-        "z": "3cbec5d5.54ea02",
+        "x": 1320,
+        "y": 570,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "2e5d2820.63e8c",
-                "3996c800.afa0a8",
-                "d3a8ab71.fccb7",
-                "6c137df8.722b8c"
+                "df93f1df.e408b",
+                "396e80a6.960c58",
+                "57d29a3c.fe54c4",
+                "3f800f5b.cc91f8"
             ]
         ]
     },
     {
-        "id": "3996c800.afa0a8",
+        "id": "396e80a6.960c58",
         "type": "save",
         "name": "save source only",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $alt-unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-tpId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1542,
-        "y": 617,
-        "z": "3cbec5d5.54ea02",
+        "x": 1532,
+        "y": 650,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "51ef22a.000c3dc",
+        "id": "19afd467.bf4a8c",
         "type": "for",
         "name": "for each label-restriction",
         "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2069,
-        "y": 743,
-        "z": "3cbec5d5.54ea02",
+        "x": 2059,
+        "y": 776,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "cb31166c.2edd2",
-                "db1f7d98.2def68",
-                "c4dd69cd.d872b",
-                "f581a4e4.841408",
-                "f2fac409.beeaf8",
-                "ea1f1d76.87207"
+                "93dd8916.c138b",
+                "e065f5f8.a10718",
+                "667c042d.d704cc",
+                "1b0b9ceb.8ee5ab",
+                "98a97ae5.7ea6d",
+                "54564b15.ad996c"
             ]
         ]
     },
     {
-        "id": "cb31166c.2edd2",
+        "id": "93dd8916.c138b",
         "type": "set",
         "name": "set label-restriction's local variables",
         "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n",
         "comments": "",
-        "x": 2359.6669921875,
-        "y": 621.8889770507812,
-        "z": "3cbec5d5.54ea02",
+        "x": 2349.6669921875,
+        "y": 654.8889770507812,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "1dcb5e38.622da2",
+        "id": "adaa1c19.7064b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2501.0555419921875,
-        "y": 700.635009765625,
-        "z": "3cbec5d5.54ea02",
+        "x": 2491.0555419921875,
+        "y": 733.635009765625,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "2526017c.1c252e"
+                "c7ff7951.db72b8"
             ]
         ]
     },
     {
-        "id": "19906550.30ac83",
+        "id": "85c8d180.3fabc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2508.734130859375,
-        "y": 759.8493347167969,
-        "z": "3cbec5d5.54ea02",
+        "x": 2498.734130859375,
+        "y": 792.8493347167969,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "52d0ed95.142f34"
+                "82edaa01.6319c"
             ]
         ]
     },
     {
-        "id": "2526017c.1c252e",
+        "id": "c7ff7951.db72b8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2661.5556640625,
-        "y": 699.8889465332031,
-        "z": "3cbec5d5.54ea02",
+        "x": 2651.5556640625,
+        "y": 732.8889465332031,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "52d0ed95.142f34",
+        "id": "82edaa01.6319c",
         "type": "update",
         "name": "save label-restriction",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $alt-unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2692.5556640625,
-        "y": 759.8889465332031,
-        "z": "3cbec5d5.54ea02",
+        "x": 2682.5556640625,
+        "y": 792.8889465332031,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "e7979ea6.dbce4",
+        "id": "66919d0c.15300c",
         "type": "save",
         "name": "save link relationship to label-restriction in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $alt-unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2368.5556640625,
-        "y": 892.888916015625,
-        "z": "3cbec5d5.54ea02",
+        "x": 2358.5556640625,
+        "y": 925.888916015625,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "db1f7d98.2def68",
+        "id": "e065f5f8.a10718",
         "type": "update",
         "name": "save label-restriction",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2310.370849609375,
-        "y": 732.444580078125,
-        "z": "3cbec5d5.54ea02",
+        "x": 2300.370849609375,
+        "y": 765.444580078125,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "1dcb5e38.622da2",
-                "19906550.30ac83"
+                "adaa1c19.7064b",
+                "85c8d180.3fabc"
             ]
         ]
     },
     {
-        "id": "6624aa74.606e14",
+        "id": "f48b8987.2973f8",
         "type": "set",
         "name": "set more local variables",
         "xml": "<set>\n<parameter name='unique-linkId' value=\"`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`\" />\n<parameter name='src-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`\" />\n<parameter name='unique-src-node-Id' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node`\" />\n",
         "comments": "",
-        "x": 554,
-        "y": 147,
-        "z": "3cbec5d5.54ea02",
+        "x": 544,
+        "y": 180,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "6e337c6f.cd362c",
+        "id": "aa54070.82178f8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1496,
-        "y": 60,
-        "z": "3cbec5d5.54ea02",
+        "x": 1486,
+        "y": 93,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "ce061615.442fb",
+        "id": "56d01481.fc3d34",
         "type": "switchNode",
         "name": "switch inter-domain-plug-id of the src tp",
         "xml": "<switch test='`$tmp.aai.p-interface.inter-domain-plug-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1646,
-        "y": 140,
-        "z": "3cbec5d5.54ea02",
+        "x": 1636,
+        "y": 173,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "a445a8a1.87665",
-                "7abf5d27.d789e4"
+                "21fe7bc0.8046c4",
+                "ad83b45.12739c8"
             ]
         ]
     },
     {
-        "id": "a445a8a1.87665",
+        "id": "21fe7bc0.8046c4",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1876,
-        "y": 87,
-        "z": "3cbec5d5.54ea02",
+        "x": 1866,
+        "y": 120,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "85dfc9e9.b205a8"
+                "82a5af1.d5baf5"
             ]
         ]
     },
     {
-        "id": "7abf5d27.d789e4",
+        "id": "ad83b45.12739c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1880,
-        "y": 160,
-        "z": "3cbec5d5.54ea02",
+        "x": 1870,
+        "y": 193,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "863e663a.20d8f8"
+                "67c0b205.d4f6ec"
             ]
         ]
     },
     {
-        "id": "85dfc9e9.b205a8",
+        "id": "82a5af1.d5baf5",
         "type": "set",
         "name": "unset is-open-ended-link",
         "xml": "<set>\n<parameter name='is-open-ended-link' value='false' />\n<parameter name='is-invalid-open-ended-link' value='true' />\n\n",
         "comments": "",
-        "x": 2064,
-        "y": 83,
-        "z": "3cbec5d5.54ea02",
+        "x": 2054,
+        "y": 116,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "5df859b8.6bf788",
+        "id": "6944be1e.90178",
         "type": "save",
         "name": "delete logical-link",
         "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\" \n\tkey=\"logical-link.link-name = $tmp.link-name\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2045,
-        "y": 32,
-        "z": "3cbec5d5.54ea02",
+        "x": 2035,
+        "y": 65,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "dbc86076.1de4f",
+        "id": "37181089.2d209",
         "type": "set",
         "name": "unset network link's local variables",
         "xml": "<set>\n<parameter name='link.' value='' />\n<parameter name='dst-tpId' value='' />\n<parameter name='unique-dst-node-Id' value='' />\n<parameter name='is-open-ended-link' value='false' />\n<parameter name='is-invalid-open-ended-link' value='false' />\n\n",
         "comments": "",
-        "x": 582,
-        "y": 39,
-        "z": "3cbec5d5.54ea02",
+        "x": 572,
+        "y": 72,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "5be7d94e.325bd",
+        "id": "d1dc92f0.18d3d",
         "type": "switchNode",
         "name": "switch is-invalid-open-ended-link",
         "xml": "<switch test='`$is-invalid-open-ended-link`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 672,
-        "y": 1155,
-        "z": "3cbec5d5.54ea02",
+        "x": 662,
+        "y": 1188,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "3a021903.aa35de",
-                "bd6a87fb.60cad"
+                "927f7161.cc38b",
+                "df6ba571.497fe8"
             ]
         ]
     },
     {
-        "id": "bd6a87fb.60cad",
+        "id": "df6ba571.497fe8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 879,
-        "y": 1123,
-        "z": "3cbec5d5.54ea02",
+        "x": 869,
+        "y": 1156,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "7d536275.1f7f6c"
+                "fabfad0b.ca8968"
             ]
         ]
     },
     {
-        "id": "3a021903.aa35de",
+        "id": "927f7161.cc38b",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 876,
-        "y": 1183,
-        "z": "3cbec5d5.54ea02",
+        "x": 866,
+        "y": 1216,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "6468635a.9e6d94"
+                "a65d4fc9.cbb8f8"
             ]
         ]
     },
     {
-        "id": "7d536275.1f7f6c",
+        "id": "fabfad0b.ca8968",
         "type": "save",
         "name": "save source only",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-tpId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1059,
-        "y": 1122,
-        "z": "3cbec5d5.54ea02",
+        "x": 1049,
+        "y": 1155,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "c290c25a.9cb058",
+        "id": "19677d78.14b74b",
         "type": "switchNode",
         "name": "switch relationship-list_length",
         "xml": "<switch test='`$tmp.aai.logical-link.relationship-list_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1388,
-        "y": 312,
-        "z": "3cbec5d5.54ea02",
+        "x": 1378,
+        "y": 345,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "8171cd76.e9b4d",
-                "9c1be6a.eb1c998",
-                "be2751bf.fc2318"
+                "d7971422.333fa8",
+                "18cbfa68.3dd856",
+                "31f7a610.b076e2"
             ]
         ]
     },
     {
-        "id": "8ea0dfd0.e04d5",
+        "id": "aa6b17d7.21416",
         "type": "switchNode",
         "name": "switch relationship-list_length != $src-tpId",
         "xml": "<switch test='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value != $src-tpId`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1839,
-        "y": 326,
-        "z": "3cbec5d5.54ea02",
+        "x": 1829,
+        "y": 359,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "f6fe2af1.32bcd"
+                "b03e88ee.6fe68"
             ]
         ]
     },
     {
-        "id": "8171cd76.e9b4d",
+        "id": "d7971422.333fa8",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1606,
-        "y": 271,
-        "z": "3cbec5d5.54ea02",
+        "x": 1596,
+        "y": 304,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "6d799180.26117"
+                "33af6da8.d2ef82"
             ]
         ]
     },
     {
-        "id": "9c1be6a.eb1c998",
+        "id": "18cbfa68.3dd856",
         "type": "outcome",
         "name": "1",
         "xml": "<outcome value='1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1603,
-        "y": 308,
-        "z": "3cbec5d5.54ea02",
+        "x": 1593,
+        "y": 341,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "8ea0dfd0.e04d5"
+                "aa6b17d7.21416"
             ]
         ]
     },
     {
-        "id": "be2751bf.fc2318",
+        "id": "31f7a610.b076e2",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1613,
-        "y": 382,
-        "z": "3cbec5d5.54ea02",
+        "x": 1603,
+        "y": 415,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "a1d91cb.fcaede"
+                "6e8cc864.7485f8"
             ]
         ]
     },
     {
-        "id": "a1d91cb.fcaede",
+        "id": "6e8cc864.7485f8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1750,
-        "y": 383,
-        "z": "3cbec5d5.54ea02",
+        "x": 1740,
+        "y": 416,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "9a538487.c08aa"
+                "899a17e9.aedab8"
             ]
         ]
     },
     {
-        "id": "6d799180.26117",
+        "id": "33af6da8.d2ef82",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1748,
-        "y": 279,
-        "z": "3cbec5d5.54ea02",
+        "x": 1738,
+        "y": 312,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "92abbd48.ac3ab"
+                "af13ae20.bebac"
             ]
         ]
     },
     {
-        "id": "4c4fa03a.a50f2",
+        "id": "f2821395.fcaa08",
         "type": "switchNode",
         "name": "switch is-invalid-open-ended-link",
         "xml": "<switch test='`$is-invalid-open-ended-link`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 449,
-        "y": 536,
-        "z": "3cbec5d5.54ea02",
+        "x": 439,
+        "y": 569,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "7a803037.7fbd88",
-                "a043c19c.e11a18"
+                "9c119bdb.5496e8",
+                "d08739e0.57fa3"
             ]
         ]
     },
     {
-        "id": "a043c19c.e11a18",
+        "id": "d08739e0.57fa3",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 656,
-        "y": 504,
-        "z": "3cbec5d5.54ea02",
+        "x": 646,
+        "y": 537,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "2aea0930.46cd5e"
+                "1951ba10.65f9fe"
             ]
         ]
     },
     {
-        "id": "7a803037.7fbd88",
+        "id": "9c119bdb.5496e8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 653,
-        "y": 564,
-        "z": "3cbec5d5.54ea02",
+        "x": 643,
+        "y": 597,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "98f67a1e.d79eb"
+                "52680ac9.74c6bc"
             ]
         ]
     },
     {
-        "id": "2aea0930.46cd5e",
+        "id": "1951ba10.65f9fe",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 807,
-        "y": 504,
-        "z": "3cbec5d5.54ea02",
+        "x": 797,
+        "y": 537,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "a6b6ae44.7eb2a8",
+        "id": "cdc97515.c97b28",
         "type": "save",
         "name": "save source and dest TP",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-tpId`\" />\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$dst-tpId`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1074,
-        "y": 826,
-        "z": "3cbec5d5.54ea02",
+        "x": 1064,
+        "y": 859,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "f6fe2af1.32bcd",
+        "id": "b03e88ee.6fe68",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2086,
-        "y": 317,
-        "z": "3cbec5d5.54ea02",
+        "x": 2076,
+        "y": 350,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "370b414a.4eba76",
+        "id": "57515da6.acd334",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logTopologyDiscovery.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"uniqueLinkId\" />\n    <parameter name=\"field3\" value=\"`$unique-linkId`\" />\n    <parameter name=\"field4\" value=\"srcTpId\" />\n    <parameter name=\"field5\" value=\"`$src-tpId`\" />\n    <parameter name=\"field6\" value=\"dstTpId\" />\n    <parameter name=\"field7\" value=\"`$dst-tpId`\" />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 1019,
-        "y": 771,
-        "z": "3cbec5d5.54ea02",
+        "x": 1009,
+        "y": 804,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "b85c23da.8517d",
+        "id": "7e55092c.663d38",
         "type": "set",
         "name": "unset tmp.aai.p-interface",
         "xml": "<set>\n<parameter name='tmp.aai.p-interface' value='' />\n<parameter name='tmp.aai.p-interface.inter-domain-plug-id' value='' />\n\n",
         "comments": "",
-        "x": 1162,
-        "y": 101,
-        "z": "3cbec5d5.54ea02",
+        "x": 1152,
+        "y": 134,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "e0d728fb.03e448",
+        "id": "4b963b57.e5bedc",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logMerge.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"altUniqueLinkId\" />\n    <parameter name=\"field3\" value=\"`$alt-unique-linkId`\" />\n    <parameter name=\"field4\" value=\"srcTpId\" />\n    <parameter name=\"field5\" value=\"`$src-tpId`\" />\n    <parameter name=\"field6\" value=\"relationship-value\" />\n    <parameter name=\"field7\" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 2402,
-        "y": 289,
-        "z": "3cbec5d5.54ea02",
+        "x": 2392,
+        "y": 322,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "7e014e1e.a8dd8",
+        "id": "5326eda4.cd9dac",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2078,
-        "y": 534,
-        "z": "3cbec5d5.54ea02",
+        "x": 2068,
+        "y": 567,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "e0d728fb.03e448",
-                "521f891d.91cfc8",
-                "cedaeaf5.78fef8",
-                "740002f8.4aedac"
+                "4b963b57.e5bedc",
+                "922e1b5e.413f38",
+                "a18dc6ab.ac0e98",
+                "6723873e.80324"
             ]
         ]
     },
     {
-        "id": "27e614a8.33d2f4",
+        "id": "b261d13e.1146f",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2816,
-        "y": 355,
-        "z": "3cbec5d5.54ea02",
+        "x": 2806,
+        "y": 388,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "c5f6a36b.0845d8"
+                "9a2a7ebb.6f02f"
             ]
         ]
     },
     {
-        "id": "5b692078.dcecc",
+        "id": "acda2064.208dd8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2823.6785888671875,
-        "y": 414.2143249511719,
-        "z": "3cbec5d5.54ea02",
+        "x": 2813.6785888671875,
+        "y": 447.2143249511719,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "b2044c9b.8096a"
+                "693b3172.16e028"
             ]
         ]
     },
     {
-        "id": "c5f6a36b.0845d8",
+        "id": "9a2a7ebb.6f02f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2964,
-        "y": 350,
-        "z": "3cbec5d5.54ea02",
+        "x": 2954,
+        "y": 383,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "ad2b40a6.ff37f8"
+                "24d0b2c2.21a89e"
             ]
         ]
     },
     {
-        "id": "ad2b40a6.ff37f8",
+        "id": "24d0b2c2.21a89e",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logMergeSuccess.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"altUniqueLinkId\" />\n    <parameter name=\"field3\" value=\"`$alt-unique-linkId`\" />\n    <parameter name=\"field4\" value=\"srcTpId\" />\n    <parameter name=\"field5\" value=\"`$src-tpId`\" />\n    <parameter name=\"field6\" value=\"relationship-value\" />\n    <parameter name=\"field7\" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 3109,
-        "y": 350,
-        "z": "3cbec5d5.54ea02",
+        "x": 3099,
+        "y": 383,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "b2044c9b.8096a",
+        "id": "693b3172.16e028",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2971,
-        "y": 412,
-        "z": "3cbec5d5.54ea02",
+        "x": 2961,
+        "y": 445,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "a8dbf2db.72f548"
+                "cbdf69e4.857a38"
             ]
         ]
     },
     {
-        "id": "92abbd48.ac3ab",
+        "id": "af13ae20.bebac",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logNoRelationship.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"noRelationshipForLink:\" />\n    <parameter name=\"field3\" value=\"`$tmp.aai.logical-link.link-name`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1884,
-        "y": 277,
-        "z": "3cbec5d5.54ea02",
+        "x": 1874,
+        "y": 310,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "9a538487.c08aa",
+        "id": "899a17e9.aedab8",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logNoRelationship.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"moreThanOneRelationshipForLink:\" />\n    <parameter name=\"field3\" value=\"`$tmp.aai.logical-link.link-name`\" />\n    <parameter name=\"field4\" value=\"HowMany:\" />\n    <parameter name=\"field5\" value=\"`$tmp.aai.logical-link.relationship-list_length`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1895,
-        "y": 392,
-        "z": "3cbec5d5.54ea02",
+        "x": 1885,
+        "y": 425,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "a8dbf2db.72f548",
+        "id": "cbdf69e4.857a38",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logMergeFailure.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"altUniqueLinkId\" />\n    <parameter name=\"field3\" value=\"`$alt-unique-linkId`\" />\n    <parameter name=\"field4\" value=\"srcTpId\" />\n    <parameter name=\"field5\" value=\"`$src-tpId`\" />\n    <parameter name=\"field6\" value=\"relationship-value\" />\n    <parameter name=\"field7\" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 3116,
-        "y": 412,
-        "z": "3cbec5d5.54ea02",
+        "x": 3106,
+        "y": 445,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "d0a27e5d.161cf",
+        "id": "57ae4e2f.8a93c8",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1430,
-        "y": 841,
-        "z": "3cbec5d5.54ea02",
+        "x": 1420,
+        "y": 874,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "53c3433b.ea3fa4"
+                "9036593c.1672f"
             ]
         ]
     },
     {
-        "id": "c301ff98.2e6928",
+        "id": "7f343bab.e4c8cc",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1432,
-        "y": 889,
-        "z": "3cbec5d5.54ea02",
+        "x": 1422,
+        "y": 922,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "53c3433b.ea3fa4"
+                "9036593c.1672f"
             ]
         ]
     },
     {
-        "id": "4d75dbb8.4d6b04",
+        "id": "22cb05f1.da2172",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1429,
-        "y": 943,
-        "z": "3cbec5d5.54ea02",
+        "x": 1419,
+        "y": 976,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "9f28786b.9755c"
+                "8fd33aa8.985138"
             ]
         ]
     },
     {
-        "id": "53c3433b.ea3fa4",
+        "id": "9036593c.1672f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1585,
-        "y": 841,
-        "z": "3cbec5d5.54ea02",
+        "x": 1575,
+        "y": 874,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "d3a8ab71.fccb7",
+        "id": "57d29a3c.fe54c4",
         "type": "switchNode",
         "name": "switch te-link-attributes label-restriction_length",
         "xml": "<switch test='`$link.te.te-link-attributes.label-restriction_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1611,
-        "y": 734,
-        "z": "3cbec5d5.54ea02",
+        "x": 1601,
+        "y": 767,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "d2a47af.0c53388",
-                "6ac8d49a.12d694",
-                "7da4e2ad.ccfb34"
+                "681fa8f6.5d2f28",
+                "ec4baaa9.ef82",
+                "7ddd884.112ddf8"
             ]
         ]
     },
     {
-        "id": "d2a47af.0c53388",
+        "id": "681fa8f6.5d2f28",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1883,
-        "y": 644,
-        "z": "3cbec5d5.54ea02",
+        "x": 1873,
+        "y": 677,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "70211305.a9bd74"
+                "ef3a31b6.0b2b58"
             ]
         ]
     },
     {
-        "id": "70211305.a9bd74",
+        "id": "ef3a31b6.0b2b58",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2038,
-        "y": 644,
-        "z": "3cbec5d5.54ea02",
+        "x": 2028,
+        "y": 677,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "6ac8d49a.12d694",
+        "id": "ec4baaa9.ef82",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1885,
-        "y": 692,
-        "z": "3cbec5d5.54ea02",
+        "x": 1875,
+        "y": 725,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "70211305.a9bd74"
+                "ef3a31b6.0b2b58"
             ]
         ]
     },
     {
-        "id": "7da4e2ad.ccfb34",
+        "id": "7ddd884.112ddf8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1884,
-        "y": 743,
-        "z": "3cbec5d5.54ea02",
+        "x": 1874,
+        "y": 776,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "51ef22a.000c3dc"
+                "19afd467.bf4a8c"
             ]
         ]
     },
     {
-        "id": "c4dd69cd.d872b",
+        "id": "667c042d.d704cc",
         "type": "set",
         "name": "unset label-restriction's local variables",
         "xml": "<set>\n<parameter name='label-restriction.' value='' />\n<parameter name='unique-lrId' value=\"\" />\n",
         "comments": "",
-        "x": 2365,
-        "y": 570,
-        "z": "3cbec5d5.54ea02",
+        "x": 2355,
+        "y": 603,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "7166bef0.82e4a",
+        "id": "1f83fd3d.b74253",
         "type": "set",
         "name": "unset label-restriction's local variables",
         "xml": "<set>\n<parameter name='label-restriction.' value='' />\n<parameter name='unique-lrId' value=\"\" />\n",
         "comments": "",
-        "x": 1919,
-        "y": 797,
-        "z": "3cbec5d5.54ea02",
+        "x": 1909,
+        "y": 830,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "cedaeaf5.78fef8",
+        "id": "a18dc6ab.ac0e98",
         "type": "switchNode",
         "name": "switch te-link-attributes label-restriction_length",
         "xml": "<switch test='`$link.te.te-link-attributes.label-restriction_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2703,
-        "y": 521,
-        "z": "3cbec5d5.54ea02",
+        "x": 2693,
+        "y": 554,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "e2267c99.350348",
-                "3e0a9900.cec47e",
-                "ab55b067.791f5"
+                "22753c60.a6d58c",
+                "56afa73f.b3618",
+                "2c831306.1c7d44"
             ]
         ]
     },
     {
-        "id": "e2267c99.350348",
+        "id": "22753c60.a6d58c",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2973,
-        "y": 483,
-        "z": "3cbec5d5.54ea02",
+        "x": 2963,
+        "y": 516,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "8e66b008.2f7c48"
+                "ee39387a.68929"
             ]
         ]
     },
     {
-        "id": "8e66b008.2f7c48",
+        "id": "ee39387a.68929",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3128,
-        "y": 483,
-        "z": "3cbec5d5.54ea02",
+        "x": 3118,
+        "y": 516,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "3e0a9900.cec47e",
+        "id": "56afa73f.b3618",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2975,
-        "y": 531,
-        "z": "3cbec5d5.54ea02",
+        "x": 2965,
+        "y": 564,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "8e66b008.2f7c48"
+                "ee39387a.68929"
             ]
         ]
     },
     {
-        "id": "ab55b067.791f5",
+        "id": "2c831306.1c7d44",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2974,
-        "y": 582,
-        "z": "3cbec5d5.54ea02",
+        "x": 2964,
+        "y": 615,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "ef26b767.51cb"
+                "37acde41.902402"
             ]
         ]
     },
     {
-        "id": "ef26b767.51cb",
+        "id": "37acde41.902402",
         "type": "for",
         "name": "for each label-restriction",
         "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3159,
-        "y": 582,
-        "z": "3cbec5d5.54ea02",
+        "x": 3149,
+        "y": 615,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "1e98f683.1aa1c9",
-                "fb05e52d.520ed8",
-                "d6c4c7a0.0d9e8",
-                "c76088aa.f470c8",
-                "4bfdac8d.42ab7c",
-                "fab9bbde.d7c01"
+                "322257af.c0621",
+                "a96bc34a.edf08",
+                "85a3ce07.1ccf48",
+                "6745622e.a105dc",
+                "81205454.92f138",
+                "22ab235a.53f29c"
             ]
         ]
     },
     {
-        "id": "d6c4c7a0.0d9e8",
+        "id": "85a3ce07.1ccf48",
         "type": "set",
         "name": "unset label-restriction's local variables",
         "xml": "<set>\n<parameter name='label-restriction.' value='' />\n<parameter name='unique-lrId' value=\"\" />\n",
         "comments": "",
-        "x": 3457,
-        "y": 397,
-        "z": "3cbec5d5.54ea02",
+        "x": 3447,
+        "y": 430,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "1e98f683.1aa1c9",
+        "id": "322257af.c0621",
         "type": "set",
         "name": "set label-restriction's local variables",
         "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n",
         "comments": "",
-        "x": 3446.6669921875,
-        "y": 443.88897705078125,
-        "z": "3cbec5d5.54ea02",
+        "x": 3436.6669921875,
+        "y": 476.88897705078125,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "fb05e52d.520ed8",
+        "id": "a96bc34a.edf08",
         "type": "update",
         "name": "save label-restriction",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3400.370849609375,
-        "y": 571.444580078125,
-        "z": "3cbec5d5.54ea02",
+        "x": 3390.370849609375,
+        "y": 604.444580078125,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "d9005ccd.b320e8",
-                "c6b7c3e3.521e98"
+                "e2988e4e.9965d8",
+                "7f7d13.46dcb2ec"
             ]
         ]
     },
     {
-        "id": "9c6aaa8e.65077",
+        "id": "d0f09020.f9dd48",
         "type": "save",
         "name": "save link relationship to label-restriction in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $alt-unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3474.5556640625,
-        "y": 755.888916015625,
-        "z": "3cbec5d5.54ea02",
+        "x": 3464.5556640625,
+        "y": 788.888916015625,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "d9005ccd.b320e8",
+        "id": "e2988e4e.9965d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3591.0555419921875,
-        "y": 539.635009765625,
-        "z": "3cbec5d5.54ea02",
+        "x": 3581.0555419921875,
+        "y": 572.635009765625,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "85dd0f0d.ac434"
+                "fbf9ca41.08cd48"
             ]
         ]
     },
     {
-        "id": "c6b7c3e3.521e98",
+        "id": "7f7d13.46dcb2ec",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3598.734130859375,
-        "y": 598.8493347167969,
-        "z": "3cbec5d5.54ea02",
+        "x": 3588.734130859375,
+        "y": 631.8493347167969,
+        "z": "11329427.2301e4",
         "wires": [
             [
-                "d138a600.db5b8"
+                "84622b72.0f60f8"
             ]
         ]
     },
     {
-        "id": "85dd0f0d.ac434",
+        "id": "fbf9ca41.08cd48",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3751.5556640625,
-        "y": 538.8889465332031,
-        "z": "3cbec5d5.54ea02",
+        "x": 3741.5556640625,
+        "y": 571.8889465332031,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "d138a600.db5b8",
+        "id": "84622b72.0f60f8",
         "type": "update",
         "name": "save label-restriction",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3782.5556640625,
-        "y": 598.8889465332031,
-        "z": "3cbec5d5.54ea02",
+        "x": 3772.5556640625,
+        "y": 631.8889465332031,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "c76088aa.f470c8",
+        "id": "6745622e.a105dc",
         "type": "set",
         "name": "set label-restriction's local variables",
         "xml": "<set>\n<parameter name='unique-lrId' value=\"`$alt-unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
         "comments": "",
-        "x": 3447,
-        "y": 493,
-        "z": "3cbec5d5.54ea02",
+        "x": 3437,
+        "y": 526,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "f581a4e4.841408",
+        "id": "1b0b9ceb.8ee5ab",
         "type": "set",
         "name": "set label-restriction's local variables",
         "xml": "<set>\n<parameter name='unique-lrId' value=\"`$alt-unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
         "comments": "",
-        "x": 2361,
-        "y": 662,
-        "z": "3cbec5d5.54ea02",
+        "x": 2351,
+        "y": 695,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "c6ea0cbf.fb7cd",
+        "id": "db4d2563.f4f978",
         "type": "set",
         "name": "set label-restriction's local variables",
         "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n",
         "comments": "",
-        "x": 1916,
-        "y": 849,
-        "z": "3cbec5d5.54ea02",
+        "x": 1906,
+        "y": 882,
+        "z": "11329427.2301e4",
         "wires": []
     },
     {
-        "id": "4aadddbd.521a8c",
+        "id": "43ca3bbb.8af21c",
         "type": "update",
         "name": "save te-link-attribute",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' >      \n<parameter name='id' value='`$link.te.te-link-attributes.name`' />\n<parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1057,
-        "y": 871,
-        "z": "3cbec5d5.54ea02",
+        "x": 1047,
+        "y": 904,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "e1339bff.8f7f98",
+        "id": "b8324dab.347198",
         "type": "save",
         "name": "save te-link-attribute relationship to label-restriction",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1948,
-        "y": 1140,
-        "z": "3cbec5d5.54ea02",
+        "x": 1938,
+        "y": 1173,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "441a859d.1c08ec",
+        "id": "49c5f91d.be38c8",
         "type": "save",
         "name": "save te-link-attribute relationship to logical-link in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"logical-link\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/logical-links/logical-link/' + $unique-linkId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"logical-link.link-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-linkId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1957,
-        "y": 1080,
-        "z": "3cbec5d5.54ea02",
+        "x": 1947,
+        "y": 1113,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "6c137df8.722b8c",
+        "id": "3f800f5b.cc91f8",
         "type": "update",
         "name": "save te-link-attribute",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' >      \n<parameter name='id' value='`$link.te.te-link-attributes.name`' />\n<parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1548,
-        "y": 669,
-        "z": "3cbec5d5.54ea02",
+        "x": 1538,
+        "y": 702,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "740002f8.4aedac",
+        "id": "6723873e.80324",
         "type": "update",
         "name": "update te-link-attribute",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' >      \n<parameter name='id' value='`$link.te.te-link-attributes.name`' />\n<parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2428,
-        "y": 454,
-        "z": "3cbec5d5.54ea02",
+        "x": 2418,
+        "y": 487,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "f2fac409.beeaf8",
+        "id": "98a97ae5.7ea6d",
         "type": "save",
         "name": "save te-link-attribute relationship to logical-link in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"logical-link\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/logical-links/logical-link/' + $alt-unique-linkId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"logical-link.link-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$alt-unique-linkId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2393,
-        "y": 800,
-        "z": "3cbec5d5.54ea02",
+        "x": 2383,
+        "y": 833,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "ea1f1d76.87207",
+        "id": "54564b15.ad996c",
         "type": "save",
         "name": "save te-link-attribute relationship to label-restriction",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2386,
-        "y": 846,
-        "z": "3cbec5d5.54ea02",
+        "x": 2376,
+        "y": 879,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "fab9bbde.d7c01",
+        "id": "22ab235a.53f29c",
         "type": "save",
         "name": "save te-link-attribute relationship to label-restriction",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3483,
-        "y": 698,
-        "z": "3cbec5d5.54ea02",
+        "x": 3473,
+        "y": 731,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "4bfdac8d.42ab7c",
+        "id": "81205454.92f138",
         "type": "save",
         "name": "save te-link-attribute relationship to logical-link in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"logical-link\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/logical-links/logical-link/' + $alt-unique-linkId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"logical-link.link-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$alt-unique-linkId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3490,
-        "y": 652,
-        "z": "3cbec5d5.54ea02",
+        "x": 3480,
+        "y": 685,
+        "z": "11329427.2301e4",
         "wires": [
             []
         ]
diff --git a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
index 411e70d3..f589905c 100644
--- a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "b9fcda31.4ec79",
+        "id": "edeab341.54bb4",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 113,
-        "y": 65.00650024414062,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 126,
+        "y": 105.00650024414062,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "3760ce9c.1bf2e2"
+                "fa7cab2b.24d26"
             ]
         ]
     },
     {
-        "id": "3760ce9c.1bf2e2",
+        "id": "fa7cab2b.24d26",
         "type": "service-logic",
         "name": "DataChange ${project.version}",
         "module": "DataChange",
@@ -22,1124 +22,1119 @@
         "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='DataChange' version='${project.version}'>",
         "outputs": 1,
-        "x": 202.00003051757812,
-        "y": 155.89541244506836,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 215.00003051757812,
+        "y": 195.89541244506836,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "de74005b.f44ce8"
+                "6ea5e78a.d4f118"
             ]
         ]
     },
     {
-        "id": "de74005b.f44ce8",
+        "id": "6ea5e78a.d4f118",
         "type": "method",
         "name": "update-network-to-aai",
         "xml": "<method rpc='update-network-to-aai' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 238.1112518310547,
-        "y": 226.2287368774414,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 251.1112518310547,
+        "y": 266.2287368774414,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "1541ad9c.69aa8a"
+                "d9721e0.ea910e"
             ]
         ]
     },
     {
-        "id": "1541ad9c.69aa8a",
+        "id": "d9721e0.ea910e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 463.33343505859375,
-        "y": 225.784423828125,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 476.33343505859375,
+        "y": 265.784423828125,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "dbbcebe5.6f422",
-                "e66d9ed0.3d3d8",
-                "f1256a59.e632c",
-                "1dca15d7.0a7a3a",
-                "1c1d34a0.adaa8b",
-                "4469da89.6a377c"
+                "fe85cd4e.468048",
+                "e705d0b4.a9ae58",
+                "2ddaf91a.d98b16",
+                "ff89ecd9.d9563",
+                "e471027b.286e6",
+                "159870db.58eb07"
             ]
         ]
     },
     {
-        "id": "e66d9ed0.3d3d8",
+        "id": "e705d0b4.a9ae58",
         "type": "save",
         "name": "save network-resource",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'  \n     key='network-resource.network-id = $tmp.network-id' >\n<parameter name='network-id' value='`$tmp.network-id`' />\n<parameter name='client-id' value='`$network.client-id`' />\n<parameter name='te-topo-id' value='`$network.te-topology-id`' />\n<parameter name='provider-id' value='`$network.provider-id`' />\n\n<parameter name='network-type' value='`$network.network-types`' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 693.333251953125,
-        "y": 131.0065155029297,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 706.333251953125,
+        "y": 171.0065155029297,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "40545c4b.9221f4",
+        "id": "cb2cfb3d.12f0a8",
         "type": "save",
         "name": "save pnf",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n      key='pnf.pnf-name = $unique-nodeId' >\n<parameter name='pnf-name' value='`$unique-nodeId`' />\n<parameter name='pnf-id' value='`$node.node-id`' />\n<parameter name='operational-status' value='`$node.te.oper-status`' />\n<parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 893.1111450195312,
-        "y": 502.1175842285156,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 906.1111450195312,
+        "y": 542.1175842285156,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "f1256a59.e632c",
+        "id": "2ddaf91a.d98b16",
         "type": "for",
         "name": "for each node",
         "xml": "<for index='pidx' start='0' end='`$network.node_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 664.8888549804688,
-        "y": 482.3398132324219,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 677.8888549804688,
+        "y": 522.3398132324219,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "40545c4b.9221f4",
-                "eba2ef35.33c428",
-                "4817116d.5f593",
-                "466a40bd.9d277",
-                "1acdca56.b6e67e",
-                "3e1f14bc.ee90c4",
-                "6de7541f.0e2a24",
-                "8794be9f.289a08",
-                "1b6896a8.e62c19"
+                "cb2cfb3d.12f0a8",
+                "fc39e59f.e19f7",
+                "404895b3.1b9a0c",
+                "38f275a2.ec1422",
+                "dcf15e98.55cd98",
+                "2d8d0a77.affafe",
+                "1758985b.dd13f8",
+                "7f99493d.24ad2"
             ]
         ]
     },
     {
-        "id": "eba2ef35.33c428",
+        "id": "fc39e59f.e19f7",
         "type": "set",
         "name": "set node",
         "xml": "<set>\n<parameter name='node.' value='`$network.node[$pidx].`' />\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n\n",
         "comments": "",
-        "x": 898.111083984375,
-        "y": 398.2287139892578,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 911.111083984375,
+        "y": 438.2287139892578,
+        "z": "a1dc56fc.25a538",
         "wires": []
     },
     {
-        "id": "466a40bd.9d277",
+        "id": "38f275a2.ec1422",
         "type": "save",
         "name": "save pnf relationship to network-resource in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $unique-nodeId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-resource.network-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.network-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 989.7779541015625,
-        "y": 677.4509782791138,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1002.7779541015625,
+        "y": 717.4509782791138,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "3d4b777c.0e42f",
+        "id": "f06afd2d.6a87a8",
         "type": "for",
         "name": "for each termination point",
         "xml": "<for index='tidx' start='0' end='`$node.termination-point_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1297.4444580078125,
-        "y": 593.1175537109375,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1310.4444580078125,
+        "y": 633.1175537109375,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "95dfcdd1.046e6",
-                "1ac320c7.c54f67",
-                "aa2f70cf.6e112",
-                "64896027.57fb78",
-                "fe275075.949f1"
+                "641e627.90ce71c",
+                "62e3b2b7.0e1854",
+                "7c4704e9.f42bfc",
+                "cdce39b5.3e2ce8",
+                "c12a9ec.a16bae"
             ]
         ]
     },
     {
-        "id": "95dfcdd1.046e6",
+        "id": "641e627.90ce71c",
         "type": "set",
         "name": "set termination point",
         "xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tidx].`' />\n",
         "comments": "",
-        "x": 1567.111328125,
-        "y": 576.0065307617188,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1580.111328125,
+        "y": 616.0065307617188,
+        "z": "a1dc56fc.25a538",
         "wires": []
     },
     {
-        "id": "aa2f70cf.6e112",
+        "id": "7c4704e9.f42bfc",
         "type": "save",
         "name": "save p-interface",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $unique-nodeId\n      AND p-interface.interface-name = $unique-ltpId' >      \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n<parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\n<!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->\n<parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1561.815185546875,
-        "y": 763.5620727539062,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1574.815185546875,
+        "y": 803.5620727539062,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "673078d4.a5cb68",
-                "5651def0.2c85b8"
+                "99a9f83c.592fb",
+                "2cd1ffbf.d1e38"
             ]
         ]
     },
     {
-        "id": "6cce4024.476ad",
+        "id": "6c4885ee.2512d4",
         "type": "save",
         "name": "save pnf relationship to p-interface in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $unique-nodeId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $unique-nodeId '/p-interfaces/p-interface/' + $unique-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ltpId`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1382.703857421875,
-        "y": 1676.33984375,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1395.703857421875,
+        "y": 1716.33984375,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "1ac320c7.c54f67",
+        "id": "62e3b2b7.0e1854",
         "type": "set",
         "name": "set unique-ltpId",
         "xml": "<set>\n<parameter name='unique-ltpId' value=\"`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`\" />\n",
         "comments": "",
-        "x": 1551.000244140625,
-        "y": 633.1175537109375,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1564.000244140625,
+        "y": 673.1175537109375,
+        "z": "a1dc56fc.25a538",
         "wires": []
     },
     {
-        "id": "dbbcebe5.6f422",
+        "id": "fe85cd4e.468048",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$network.network-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.original-network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 649.9935302734375,
-        "y": 40,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 662.9935302734375,
+        "y": 80,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "4817116d.5f593",
+        "id": "404895b3.1b9a0c",
         "type": "save",
         "name": "save pnf relation with esr-thirdparty-sdnc",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $node.node-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$node.node-id`\" />\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-nodeId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-nodeId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 971,
-        "y": 714,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 984,
+        "y": 754,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "673078d4.a5cb68",
+        "id": "99a9f83c.592fb",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1733.499885559082,
-        "y": 750.7525482177734,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1746.499885559082,
+        "y": 790.7525482177734,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "72e23ce3.0ceb8c"
+                "7275269b.187718"
             ]
         ]
     },
     {
-        "id": "5651def0.2c85b8",
+        "id": "2cd1ffbf.d1e38",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1727.1784744262695,
-        "y": 802.9668598175049,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1740.1784744262695,
+        "y": 842.9668598175049,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "936d0942.79b6"
+                "6558158e.20a7e4"
             ]
         ]
     },
     {
-        "id": "72e23ce3.0ceb8c",
+        "id": "7275269b.187718",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1884.0000457763672,
-        "y": 750.0064792633057,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1897.0000457763672,
+        "y": 790.0064792633057,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "936d0942.79b6",
+        "id": "6558158e.20a7e4",
         "type": "update",
         "name": "update p-interface",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $unique-nodeId\n      AND p-interface.interface-name = $unique-ltpId' >      \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n<parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\n<!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->\n<parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />",
         "comments": "",
         "outputs": 1,
-        "x": 1913,
-        "y": 804.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1926,
+        "y": 844.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "7077dcc4.1aa314",
+        "id": "b62e74a8.72d8f8",
         "type": "save",
         "name": "save tunnel-termination-point",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n      key='tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id[0]`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1627,
-        "y": 1055.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1640,
+        "y": 1095.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "ee093e46.66c7d8",
-                "e9c7ad6a.1577f"
+                "7c8389d1.ee45",
+                "bbd909f2.ba2d1"
             ]
         ]
     },
     {
-        "id": "3a45511d.adcf26",
+        "id": "b69752f.a47b03",
         "type": "for",
         "name": "for each tunnel termination point",
         "xml": "<for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1290,
-        "y": 1043.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1303,
+        "y": 1083.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "2ea4deaf.40bdfa",
-                "458ce581.77bfe4",
-                "7077dcc4.1aa314",
-                "dad1a90d.61b018",
-                "7da29c03.1dbdf4",
-                "58b65656.8480c8"
+                "25de11e2.0dd0ae",
+                "b2448024.6d9268",
+                "b62e74a8.72d8f8",
+                "4cb5cbe8.ee37a4",
+                "3ba1d3d8.7bd96c",
+                "ead9d9cc.bab4f8"
             ]
         ]
     },
     {
-        "id": "2ea4deaf.40bdfa",
+        "id": "25de11e2.0dd0ae",
         "type": "set",
         "name": "set tunnel termination point",
         "xml": "<set>\n<parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />\n",
         "comments": "",
-        "x": 1625,
-        "y": 963.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1638,
+        "y": 1003.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": []
     },
     {
-        "id": "458ce581.77bfe4",
+        "id": "b2448024.6d9268",
         "type": "set",
         "name": "set unique-ttpId",
         "xml": "<set>\n<parameter name='unique-ttpId' value=\"`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 1583.888916015625,
-        "y": 1001.1175537109375,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1596.888916015625,
+        "y": 1041.1175537109375,
+        "z": "a1dc56fc.25a538",
         "wires": []
     },
     {
-        "id": "ee093e46.66c7d8",
+        "id": "7c8389d1.ee45",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1893,
-        "y": 1041.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1906,
+        "y": 1081.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "1b7d5a60.835d5e"
+                "49e600b2.247268"
             ]
         ]
     },
     {
-        "id": "e9c7ad6a.1577f",
+        "id": "bbd909f2.ba2d1",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1886.6785888671875,
-        "y": 1093.220781326294,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1899.6785888671875,
+        "y": 1133.220781326294,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "652a4eb1.3c9f7"
+                "8a380f1a.fa11e"
             ]
         ]
     },
     {
-        "id": "1b7d5a60.835d5e",
+        "id": "49e600b2.247268",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2043.5001602172852,
-        "y": 1040.2604007720947,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 2056.500160217285,
+        "y": 1080.2604007720947,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "652a4eb1.3c9f7",
+        "id": "8a380f1a.fa11e",
         "type": "update",
         "name": "update tunnel-termination-point",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n      key='tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id[0]`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2124,
-        "y": 1095.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 2137,
+        "y": 1135.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "1acdca56.b6e67e",
+        "id": "dcf15e98.55cd98",
         "type": "set",
         "name": "set local variables",
         "xml": "<set>\n<parameter name='unique-nodeId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`\" />\n",
         "comments": "",
-        "x": 923,
-        "y": 445.0065002441406,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 936,
+        "y": 485.0065002441406,
+        "z": "a1dc56fc.25a538",
         "wires": []
     },
     {
-        "id": "1dca15d7.0a7a3a",
+        "id": "ff89ecd9.d9563",
         "type": "call",
         "name": "call update-network-links-to-aai",
         "xml": "<call module='DataChange' rpc='update-network-links-to-aai' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 607,
-        "y": 608.0065002441406,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 620,
+        "y": 648.0065002441406,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "c87f71c.204801",
+        "id": "d7b3037a.697688",
         "type": "save",
         "name": "save pnf-interface relationship to pnf in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' \n      key='pnf.pnf-name = $unique-nodeId\n      AND p-interface.interface-name = $unique-ltpId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-nodeId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-nodeId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1389,
-        "y": 1632.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1402,
+        "y": 1672.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "dad1a90d.61b018",
+        "id": "4cb5cbe8.ee37a4",
         "type": "save",
         "name": "save pnf relationship to tunnel termination point in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $unique-nodeId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"tunnel-termination-point\" />\n<!--<parameter name=\"relationship-list.relationship[$ttidx].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`\" />-->\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"tunnel-termination-point.ttp-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ttpId`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1698,
-        "y": 1147.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1711,
+        "y": 1187.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "486bef2.804149",
-                "8297f8e3.32f2f"
+                "477ea94a.d9b708",
+                "1857aab6.41528d"
             ]
         ]
     },
     {
-        "id": "3e1f14bc.ee90c4",
+        "id": "2d8d0a77.affafe",
         "type": "switchNode",
         "name": "switch node ttp",
         "xml": "<switch test='`$node.te.tunnel-termination-point_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 862,
-        "y": 1019.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 875,
+        "y": 1059.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "3564e5a8.68c49a",
-                "fd68b5a4.a3a878",
-                "f36d0950.312798"
+                "df28f111.dccd78",
+                "56382251.f0ed44",
+                "836a4c10.0f5058"
             ]
         ]
     },
     {
-        "id": "d6240165.9d9a1",
+        "id": "efccb4e8.6c1f7",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1210,
-        "y": 971.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1223,
+        "y": 1011.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "f36d0950.312798",
+        "id": "836a4c10.0f5058",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1057,
-        "y": 1054.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1070,
+        "y": 1094.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "3a45511d.adcf26"
+                "b69752f.a47b03"
             ]
         ]
     },
     {
-        "id": "6de7541f.0e2a24",
+        "id": "1758985b.dd13f8",
         "type": "switchNode",
         "name": "switch node tp",
         "xml": "<switch test='`$node.termination-point_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 911,
-        "y": 569.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 924,
+        "y": 609.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "d28496d2.5ae628",
-                "74698dba.4a5d9c",
-                "f51e137e.4b4cd"
+                "9b64d5a2.85c768",
+                "9d78d705.498a28",
+                "fec4616c.fd5128"
             ]
         ]
     },
     {
-        "id": "d28496d2.5ae628",
+        "id": "9b64d5a2.85c768",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1090,
-        "y": 521.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1103,
+        "y": 561.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "1912a08f.2e751f"
+                "31b2e806.d617f"
             ]
         ]
     },
     {
-        "id": "74698dba.4a5d9c",
+        "id": "9d78d705.498a28",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1089,
-        "y": 623.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1102,
+        "y": 663.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "3d4b777c.0e42f"
+                "f06afd2d.6a87a8"
             ]
         ]
     },
     {
-        "id": "1912a08f.2e751f",
+        "id": "31b2e806.d617f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1245,
-        "y": 521.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1258,
+        "y": 561.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "8794be9f.289a08",
+        "id": "264d4645.5fe58a",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logTopologyDiscovery.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"sucess executing Hesam log file\" />\n    <parameter name=\"field3\" value=\"`$node.te.tunnel-termination-point_length`\" />\n    <parameter name=\"field4\" value=\"`$node.termination-point_length`\" />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 840,
-        "y": 1063.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 853,
+        "y": 1103.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "3564e5a8.68c49a",
+        "id": "df28f111.dccd78",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1050,
-        "y": 905.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1063,
+        "y": 945.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "d6240165.9d9a1"
+                "efccb4e8.6c1f7"
             ]
         ]
     },
     {
-        "id": "fd68b5a4.a3a878",
+        "id": "56382251.f0ed44",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1055,
-        "y": 980.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1068,
+        "y": 1020.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "d6240165.9d9a1"
+                "efccb4e8.6c1f7"
             ]
         ]
     },
     {
-        "id": "f51e137e.4b4cd",
+        "id": "fec4616c.fd5128",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1100,
-        "y": 569.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1113,
+        "y": 609.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "1912a08f.2e751f"
+                "31b2e806.d617f"
             ]
         ]
     },
     {
-        "id": "1b6896a8.e62c19",
+        "id": "7f99493d.24ad2",
         "type": "set",
         "name": "unset node",
         "xml": "<set>\n<parameter name='node.' value='' />\n\n",
         "comments": "",
-        "x": 895,
-        "y": 347.0065002441406,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 908,
+        "y": 387.0065002441406,
+        "z": "a1dc56fc.25a538",
         "wires": []
     },
     {
-        "id": "64896027.57fb78",
+        "id": "cdce39b5.3e2ce8",
         "type": "set",
         "name": "unset termination point",
         "xml": "<set>\n<parameter name='tp.' value='' />\n",
         "comments": "",
-        "x": 1579,
-        "y": 519.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1592,
+        "y": 559.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": []
     },
     {
-        "id": "7da29c03.1dbdf4",
+        "id": "3ba1d3d8.7bd96c",
         "type": "set",
         "name": "unset tunnel termination point",
         "xml": "<set>\n<parameter name='ttp.' value='' />\n",
         "comments": "",
-        "x": 1625,
-        "y": 915.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1638,
+        "y": 955.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": []
     },
     {
-        "id": "486bef2.804149",
+        "id": "477ea94a.d9b708",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2030,
-        "y": 1150.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 2043,
+        "y": 1190.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
-            [
-                "f859267c.20dd3"
-            ]
+            []
         ]
     },
     {
-        "id": "8297f8e3.32f2f",
+        "id": "1857aab6.41528d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2027,
-        "y": 1198.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 2040,
+        "y": 1238.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
-            [
-                "19a686f.52c17f9"
-            ]
+            []
         ]
     },
     {
-        "id": "f859267c.20dd3",
+        "id": "7abfb291.6dcbac",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logTopologyDiscovery.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"sucess executing Hesam log file\" />\n    <parameter name=\"field3\" value=\"`$node.te.tunnel-termination-point_length`\" />\n    <parameter name=\"field4\" value=\"`$node.termination-point_length`\" />\n    <parameter name=\"field5\" value=\"sucessfully saved ttp\" />\n    <parameter name=\"field6\" value=\"`relationship-list.relationship[$ttidx].related-link`\" />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 2185,
-        "y": 1151.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 2198,
+        "y": 1191.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "19a686f.52c17f9",
+        "id": "ec345a2.2004e28",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logTopologyDiscovery.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"sucess executing Hesam log file\" />\n    <parameter name=\"field3\" value=\"`$node.te.tunnel-termination-point_length`\" />\n    <parameter name=\"field4\" value=\"`$node.termination-point_length`\" />\n    <parameter name=\"field5\" value=\"failuire on saving ttp\" />\n    <parameter name=\"field6\" value=\"`relationship-list.relationship[$ttidx].related-link`\" />\n\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 2186,
-        "y": 1199.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 2199,
+        "y": 1239.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "c991cb25.a4c41",
+        "id": "49dd63ef.87e564",
         "type": "execute",
         "name": "execute Base64 Converter",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='base64DecodingAlgo' >\n    <parameter name=\"encodedValue\" value='`$tp.te.inter-domain-plug-id`'/>\n    <parameter name=\"decodedValue\" value=\"tmp.decoded-plug-id\"/>\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 2045,
-        "y": 688.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 2058,
+        "y": 728.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "dcbfdbac.4106e8",
-                "25f66573.5f2caa"
+                "fafe42.8d2fb9c",
+                "2c876749.ba8618"
             ]
         ]
     },
     {
-        "id": "fe275075.949f1",
+        "id": "c12a9ec.a16bae",
         "type": "switchNode",
         "name": "switch inter-domain-plug-id empty?",
         "xml": "<switch test='`length($tp.te.inter-domain-plug-id) == 0`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1615,
-        "y": 689.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1628,
+        "y": 729.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "2202ef19.0cb66",
-                "a44d5e08.8645a8"
+                "a32fa569.0a3c28",
+                "b8de06da.79eb1"
             ]
         ]
     },
     {
-        "id": "a44d5e08.8645a8",
+        "id": "b8de06da.79eb1",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1842,
-        "y": 642.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1855,
+        "y": 682.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "77ac957f.8f7e64"
+                "578202f3.fbbe74"
             ]
         ]
     },
     {
-        "id": "2202ef19.0cb66",
+        "id": "a32fa569.0a3c28",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1843,
-        "y": 688.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1856,
+        "y": 728.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "c991cb25.a4c41"
+                "49dd63ef.87e564"
             ]
         ]
     },
     {
-        "id": "77ac957f.8f7e64",
+        "id": "578202f3.fbbe74",
         "type": "set",
         "name": "unset tmp.decoded-plug-id",
         "xml": "<set>\n<parameter name='tmp.decoded-plug-id' value='' />\n",
         "comments": "",
-        "x": 2046,
-        "y": 642.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 2059,
+        "y": 682.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": []
     },
     {
-        "id": "dcbfdbac.4106e8",
+        "id": "fafe42.8d2fb9c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2250,
-        "y": 665.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 2263,
+        "y": 705.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "21836a86.63b72e"
+                "cad449b6.73c6d"
             ]
         ]
     },
     {
-        "id": "25f66573.5f2caa",
+        "id": "2c876749.ba8618",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2243.6785888671875,
-        "y": 717.220781326294,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 2256.6785888671875,
+        "y": 757.220781326294,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "8297f536.6bb4a"
+                "92336385.660b18"
             ]
         ]
     },
     {
-        "id": "21836a86.63b72e",
+        "id": "cad449b6.73c6d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2391,
-        "y": 665.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 2404,
+        "y": 705.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "8297f536.6bb4a",
+        "id": "92336385.660b18",
         "type": "set",
         "name": "unset tmp.decoded-plug-id",
         "xml": "<set>\n<parameter name='tmp.decoded-plug-id' value='`$tp.te.inter-domain-plug-id`' />\n",
         "comments": "",
-        "x": 2450,
-        "y": 717.0064697265625,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 2463,
+        "y": 757.0064697265625,
+        "z": "a1dc56fc.25a538",
         "wires": []
     },
     {
-        "id": "1c1d34a0.adaa8b",
+        "id": "e471027b.286e6",
         "type": "set",
         "name": "set tmp.network-if",
-        "xml": "<set>\n<parameter name='tmp.network-id' value=\"`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`\" />\n\n",
+        "xml": "<set>\n<!--<parameter name='tmp.network-id' value=\"`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`\" />-->\n<parameter name='tmp.network-id' value=\"`$tmp.original-network-id`\" />\n\n",
         "comments": "",
-        "x": 675,
-        "y": 81.00650024414062,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 688,
+        "y": 121.00650024414062,
+        "z": "a1dc56fc.25a538",
         "wires": []
     },
     {
-        "id": "4469da89.6a377c",
+        "id": "159870db.58eb07",
         "type": "get-resource",
         "name": "get-resource esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 736,
-        "y": 220,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 749,
+        "y": 260,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "259a6f10.d859c",
-                "2643a1bc.bc0f46",
-                "7a6e0ac1.83425c"
+                "f22633be.4476e8",
+                "4f55d446.34a7f4",
+                "beabc6d6.2806f"
             ]
         ]
     },
     {
-        "id": "259a6f10.d859c",
+        "id": "f22633be.4476e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 982,
-        "y": 180,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 995,
+        "y": 220,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "83c13ac.c0250c8"
+                "543559cc.c24e08"
             ]
         ]
     },
     {
-        "id": "2643a1bc.bc0f46",
+        "id": "4f55d446.34a7f4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 986,
-        "y": 220,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 999,
+        "y": 260,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "7add65bd.d43c1c"
+                "50076a10.d4e1b4"
             ]
         ]
     },
     {
-        "id": "7a6e0ac1.83425c",
+        "id": "beabc6d6.2806f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 978,
-        "y": 260,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 991,
+        "y": 300,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "a3451a06.01294"
+                "a9b8ac2f.1b4d8"
             ]
         ]
     },
     {
-        "id": "7add65bd.d43c1c",
+        "id": "50076a10.d4e1b4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
         "comments": "",
-        "x": 1136,
-        "y": 220,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1149,
+        "y": 260,
+        "z": "a1dc56fc.25a538",
         "wires": []
     },
     {
-        "id": "a3451a06.01294",
+        "id": "a9b8ac2f.1b4d8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
         "comments": "",
-        "x": 1136,
-        "y": 260,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1149,
+        "y": 300,
+        "z": "a1dc56fc.25a538",
         "wires": []
     },
     {
-        "id": "83c13ac.c0250c8",
+        "id": "543559cc.c24e08",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1126,
-        "y": 178,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1139,
+        "y": 218,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "70f6d2fc.749b0c"
+                "627ad99d.a81fa"
             ]
         ]
     },
     {
-        "id": "70f6d2fc.749b0c",
+        "id": "627ad99d.a81fa",
         "type": "save",
         "name": "save network-resource relationship to esr-thirdparty-sdnc",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource:relationship-list' \n      key='network-resource.network-id = $tmp.network-id'\n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"esr-thirdparty-sdnc\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/' + $prop.sdncRestApi.thirdpartySdnc.id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"esr-thirdparty-sdnc.thirdparty-sdnc-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sdncRestApi.thirdpartySdnc.id`\" />\n\n<!--/aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/SOTNControllerDomain2-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 1429,
-        "y": 179,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1442,
+        "y": 219,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "58b65656.8480c8",
+        "id": "ead9d9cc.bab4f8",
         "type": "switchNode",
         "name": "switch llcl length",
         "xml": "<switch test='`$node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1559,
-        "y": 1319,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1572,
+        "y": 1359,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "cf6621ae.60449",
-                "a969fa1e.a9262",
-                "31cb7972.09206e"
+                "adf88b82.7a0f88",
+                "67300142.b2942",
+                "fa1d40a0.27dcc"
             ]
         ]
     },
     {
-        "id": "cf6621ae.60449",
+        "id": "adf88b82.7a0f88",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1747,
-        "y": 1205,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1760,
+        "y": 1245,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "95b8f366.2c9b38"
+                "f1f92de8.0da378"
             ]
         ]
     },
     {
-        "id": "a969fa1e.a9262",
+        "id": "67300142.b2942",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1752,
-        "y": 1280,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1765,
+        "y": 1320,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "95b8f366.2c9b38"
+                "f1f92de8.0da378"
             ]
         ]
     },
     {
-        "id": "31cb7972.09206e",
+        "id": "fa1d40a0.27dcc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1754,
-        "y": 1354,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1767,
+        "y": 1394,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "df66f384.e71e78"
+                "945bda0b.acb23"
             ]
         ]
     },
     {
-        "id": "95b8f366.2c9b38",
+        "id": "f1f92de8.0da378",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1907,
-        "y": 1271,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1920,
+        "y": 1311,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "ba6a5053.fa9158",
+        "id": "489cfee9.f3ca9",
         "type": "save",
         "name": "save ttp relationship to tp in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point:relationship-list' \n      key='tunnel-termination-point.ttp-id = $unique-ttpId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-nodeId + '/p-interfaces/p-interface/' + $unique-ltpId-second`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ltpId-second`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2135,
-        "y": 1357,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 2148,
+        "y": 1397,
+        "z": "a1dc56fc.25a538",
         "wires": [
             []
         ]
     },
     {
-        "id": "f20766b0.56af",
+        "id": "5109bb9b.43b29c",
         "type": "set",
         "name": "set unique-ltpId second",
         "xml": "<set>\n<parameter name='unique-ltpId-second' value=\"`$unique-nodeId + '-ltpId-' + $node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity[0].link-tp-ref`\" />\n",
         "comments": "",
-        "x": 2084,
-        "y": 1313,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 2097,
+        "y": 1353,
+        "z": "a1dc56fc.25a538",
         "wires": []
     },
     {
-        "id": "df66f384.e71e78",
+        "id": "945bda0b.acb23",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1894,
-        "y": 1350,
-        "z": "6d6b8a1f.be1cb4",
+        "x": 1907,
+        "y": 1390,
+        "z": "a1dc56fc.25a538",
         "wires": [
             [
-                "f20766b0.56af",
-                "ba6a5053.fa9158"
+                "5109bb9b.43b29c",
+                "489cfee9.f3ca9"
             ]
         ]
     }
diff --git a/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json b/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json
index a22a5bdd..dec44df1 100644
--- a/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "f3e0b928.e8c7e",
+        "id": "cba977f9.85534",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 128,
-        "y": 83,
-        "z": "8966128c.40fc9",
+        "x": 137,
+        "y": 125.77778625488281,
+        "z": "b3282176.32be28",
         "wires": [
             [
-                "2b8024f5.a0b3e4"
+                "dde6a42.304b158"
             ]
         ]
     },
     {
-        "id": "2b8024f5.a0b3e4",
+        "id": "dde6a42.304b158",
         "type": "service-logic",
         "name": "DataChange ${project.version}",
         "module": "DataChange",
@@ -22,540 +22,540 @@
         "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='DataChange' version='${project.version}'>",
         "outputs": 1,
-        "x": 217.00003051757812,
-        "y": 173.88891220092773,
-        "z": "8966128c.40fc9",
+        "x": 226.00003051757812,
+        "y": 216.66669845581055,
+        "z": "b3282176.32be28",
         "wires": [
             [
-                "e0b4218d.2d604"
+                "459043f1.b44bbc"
             ]
         ]
     },
     {
-        "id": "e0b4218d.2d604",
+        "id": "459043f1.b44bbc",
         "type": "method",
         "name": "method update-tp-ttp-relationship",
         "xml": "<method rpc='update-tp-ttp-relationship' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 253.1112518310547,
-        "y": 244.22223663330078,
-        "z": "8966128c.40fc9",
+        "x": 262.1112518310547,
+        "y": 287.0000228881836,
+        "z": "b3282176.32be28",
         "wires": [
             [
-                "36afdba8.70bb5c"
+                "186c55de.c4aa02"
             ]
         ]
     },
     {
-        "id": "36afdba8.70bb5c",
+        "id": "186c55de.c4aa02",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 478.33343505859375,
-        "y": 243.77792358398438,
-        "z": "8966128c.40fc9",
+        "x": 487.33343505859375,
+        "y": 286.5557098388672,
+        "z": "b3282176.32be28",
         "wires": [
             [
-                "63bd9611.390fd8",
-                "1ed8c21a.583ede",
-                "232a5f0a.159568",
-                "e63ab049.15d1f"
+                "bae21f69.72b29",
+                "c754730e.915558",
+                "1242acf2.9455a3",
+                "f448c5cf.144de8"
             ]
         ]
     },
     {
-        "id": "1ed8c21a.583ede",
+        "id": "c754730e.915558",
         "type": "for",
         "name": "for each node in network-eth",
         "xml": "<for index='pethidx' start='0' end='`$network-eth.node_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 710.8888549804688,
-        "y": 198.33331298828125,
-        "z": "8966128c.40fc9",
+        "x": 719.8888549804688,
+        "y": 241.11109924316406,
+        "z": "b3282176.32be28",
         "wires": [
             [
-                "d25c4b67.5fdd7",
-                "7e336092.2a08",
-                "d912c615.382f4",
-                "e1c780a1.bce018"
+                "3d9e22e8.4c63be",
+                "8255778d.4bbb18",
+                "fc2531d8.c81378",
+                "c794ebab.b4d2b8"
             ]
         ]
     },
     {
-        "id": "d25c4b67.5fdd7",
+        "id": "3d9e22e8.4c63be",
         "type": "set",
         "name": "set node-eth",
         "xml": "<set>\n<parameter name='node-eth.' value='`$network-eth.node[$pethidx].`' />",
         "comments": "",
-        "x": 973.111083984375,
-        "y": 42.22221374511719,
-        "z": "8966128c.40fc9",
+        "x": 982.111083984375,
+        "y": 85,
+        "z": "b3282176.32be28",
         "wires": []
     },
     {
-        "id": "68049.3760dfb7c",
+        "id": "f02496e2.4d8238",
         "type": "set",
         "name": "set termination point tp-eth",
         "xml": "<set>\n<parameter name='tp-eth.' value='`$node-eth.termination-point[$tidx].`' />\n",
         "comments": "",
-        "x": 1215.111328125,
-        "y": 232.00006103515625,
-        "z": "8966128c.40fc9",
+        "x": 1224.111328125,
+        "y": 274.77784729003906,
+        "z": "b3282176.32be28",
         "wires": []
     },
     {
-        "id": "78ae2560.1cea4c",
+        "id": "3b37c604.4d197a",
         "type": "set",
         "name": "set unique-ltpethId",
         "xml": "<set>\n<parameter name='unique-ltpethId' value=\"`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`\" />\n",
         "comments": "",
-        "x": 1193.000244140625,
-        "y": 269.111083984375,
-        "z": "8966128c.40fc9",
+        "x": 1202.000244140625,
+        "y": 311.8888702392578,
+        "z": "b3282176.32be28",
         "wires": []
     },
     {
-        "id": "63bd9611.390fd8",
+        "id": "bae21f69.72b29",
         "type": "execute",
         "name": "execute set tmp.network-eth.network-id",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$network-eth.network-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.original-network-eth.network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 668.9935302734375,
-        "y": 62.993499755859375,
-        "z": "8966128c.40fc9",
+        "x": 677.9935302734375,
+        "y": 105.77128601074219,
+        "z": "b3282176.32be28",
         "wires": [
             []
         ]
     },
     {
-        "id": "7e336092.2a08",
+        "id": "8255778d.4bbb18",
         "type": "set",
         "name": "set local variables",
         "xml": "<set>\n<parameter name='unique-network-ethId' value='`$tmp.network-eth.network-id`' />\n",
         "comments": "",
-        "x": 987,
-        "y": 97,
-        "z": "8966128c.40fc9",
+        "x": 996,
+        "y": 139.7777862548828,
+        "z": "b3282176.32be28",
         "wires": []
     },
     {
-        "id": "232a5f0a.159568",
+        "id": "1242acf2.9455a3",
         "type": "execute",
         "name": "execute set tmp.network-otn.network-id",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$network-otn.network-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.original-network-otn.network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 666,
-        "y": 102,
-        "z": "8966128c.40fc9",
+        "x": 675,
+        "y": 144.7777862548828,
+        "z": "b3282176.32be28",
         "wires": [
             []
         ]
     },
     {
-        "id": "5ced7489.3fd33c",
+        "id": "a7f3a830.3d5f7",
         "type": "for",
         "name": "for each tunnel termination point in otn",
         "xml": "<for index='ttidx' start='0' end='`$node-otn.te.tunnel-termination-point_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1570,
-        "y": 629,
-        "z": "8966128c.40fc9",
+        "x": 1579,
+        "y": 671.7777862548828,
+        "z": "b3282176.32be28",
         "wires": [
             [
-                "c149dbcd.dbc5b",
-                "a007e2e5.f8d76",
-                "1e876a82.9683f5",
-                "a5938665.3779c8",
-                "a06a50c9.82a2f"
+                "10ff0cec.24339b",
+                "9056ce37.3f1b1",
+                "52a7d8e5.f166d",
+                "dbe73ecc.1015c8",
+                "734513b1.8f6e74"
             ]
         ]
     },
     {
-        "id": "c149dbcd.dbc5b",
+        "id": "10ff0cec.24339b",
         "type": "set",
         "name": "set tunnel termination point",
         "xml": "<set>\n<parameter name='ttp.' value='`$node-otn.te.tunnel-termination-point[$ttidx].`' />\n",
         "comments": "",
-        "x": 1939,
-        "y": 341,
-        "z": "8966128c.40fc9",
+        "x": 1948,
+        "y": 383.7777862548828,
+        "z": "b3282176.32be28",
         "wires": []
     },
     {
-        "id": "a007e2e5.f8d76",
+        "id": "9056ce37.3f1b1",
         "type": "set",
         "name": "set unique-ttpId",
         "xml": "<set>\n<parameter name='unique-ttpId' value=\"`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 1906.888916015625,
-        "y": 405.111083984375,
-        "z": "8966128c.40fc9",
+        "x": 1915.888916015625,
+        "y": 447.8888702392578,
+        "z": "b3282176.32be28",
         "wires": []
     },
     {
-        "id": "b56a229e.94c8d8",
+        "id": "588044e.57930bc",
         "type": "set",
         "name": "set tp-inter-layer-lock-id",
         "xml": "<set>\n<parameter name='tp-inter-layer-lock-id' value='`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`' />\n",
         "comments": "",
-        "x": 1233,
-        "y": 309,
-        "z": "8966128c.40fc9",
+        "x": 1242,
+        "y": 351.7777862548828,
+        "z": "b3282176.32be28",
         "wires": []
     },
     {
-        "id": "91b08f38.b7b1f",
+        "id": "5be60218.18e4f4",
         "type": "for",
         "name": "for each node in network-otn",
         "xml": "<for index='potnidx' start='0' end='`$network-otn.node_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1251,
-        "y": 358,
-        "z": "8966128c.40fc9",
+        "x": 1260,
+        "y": 400.7777862548828,
+        "z": "b3282176.32be28",
         "wires": [
             [
-                "2a04c22a.d38706",
-                "747557f8.e08f6",
-                "23d7e732.31c878",
-                "7fec5669.9d797",
-                "5525a122.db022"
+                "bcce7947.89d4e",
+                "6a38d3e2.fd7954",
+                "85e0a40f.e7ed",
+                "4764cff0.412538",
+                "46555423.5326e4"
             ]
         ]
     },
     {
-        "id": "2a04c22a.d38706",
+        "id": "bcce7947.89d4e",
         "type": "set",
         "name": "set node-otn",
         "xml": "<set>\n<parameter name='node-otn.' value='`$network-otn.node[$potnidx].`' />",
         "comments": "",
-        "x": 1545,
-        "y": 328,
-        "z": "8966128c.40fc9",
+        "x": 1554,
+        "y": 370.7777862548828,
+        "z": "b3282176.32be28",
         "wires": []
     },
     {
-        "id": "747557f8.e08f6",
+        "id": "6a38d3e2.fd7954",
         "type": "set",
         "name": "set local variables",
         "xml": "<set>\n<parameter name='unique-network-otnId' value='`$tmp.network-otn.network-id`' />\n",
         "comments": "",
-        "x": 1543.888916015625,
-        "y": 375.7777862548828,
-        "z": "8966128c.40fc9",
+        "x": 1552.888916015625,
+        "y": 418.5555725097656,
+        "z": "b3282176.32be28",
         "wires": []
     },
     {
-        "id": "1e876a82.9683f5",
+        "id": "52a7d8e5.f166d",
         "type": "set",
         "name": "set ttp-inter-layer-lock-id",
         "xml": "<set>\n<parameter name='ttp-inter-layer-lock-id' value='`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id[0]`' />\n",
         "comments": "",
-        "x": 1931,
-        "y": 459,
-        "z": "8966128c.40fc9",
+        "x": 1940,
+        "y": 501.7777862548828,
+        "z": "b3282176.32be28",
         "wires": []
     },
     {
-        "id": "a5938665.3779c8",
+        "id": "dbe73ecc.1015c8",
         "type": "switchNode",
         "name": "switch tp-inter-layer-lock-id",
         "xml": "<switch test='`$tp-inter-layer-lock-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1938,
-        "y": 515,
-        "z": "8966128c.40fc9",
+        "x": 1947,
+        "y": 557.7777862548828,
+        "z": "b3282176.32be28",
         "wires": [
             [
-                "48b284bc.31f88c"
+                "dd2d2104.bc9a18"
             ]
         ]
     },
     {
-        "id": "48b284bc.31f88c",
+        "id": "dd2d2104.bc9a18",
         "type": "outcome",
         "name": "ttp-inter-layer-lock-id",
         "xml": "<outcome value='`$ttp-inter-layer-lock-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1996,
-        "y": 611,
-        "z": "8966128c.40fc9",
+        "x": 2005,
+        "y": 653.7777862548828,
+        "z": "b3282176.32be28",
         "wires": [
             [
-                "d5168225.118b5"
+                "48fc2c75.77d024"
             ]
         ]
     },
     {
-        "id": "d5168225.118b5",
+        "id": "48fc2c75.77d024",
         "type": "save",
         "name": "save p-interface relationship to ttp in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' \n      key='p-interface.interface-name = $unique-ltpethId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"tunnel-termination-point\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"tunnel-termination-point.tunnel-tp-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ttpId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2314,
-        "y": 611,
-        "z": "8966128c.40fc9",
+        "x": 2323,
+        "y": 653.7777862548828,
+        "z": "b3282176.32be28",
         "wires": [
             []
         ]
     },
     {
-        "id": "679b8e41.9ed698",
+        "id": "f7880100.7c4d78",
         "type": "set",
         "name": "unset termination point tp-eth",
         "xml": "<set>\n<parameter name='tp-eth.' value='' />\n",
         "comments": "",
-        "x": 1210,
-        "y": 194.99349975585938,
-        "z": "8966128c.40fc9",
+        "x": 1219,
+        "y": 237.7712860107422,
+        "z": "b3282176.32be28",
         "wires": []
     },
     {
-        "id": "a06a50c9.82a2f",
+        "id": "734513b1.8f6e74",
         "type": "set",
         "name": "unset tunnel termination point",
         "xml": "<set>\n<parameter name='ttp.' value='' />\n",
         "comments": "",
-        "x": 1947,
-        "y": 287.9934997558594,
-        "z": "8966128c.40fc9",
+        "x": 1956,
+        "y": 330.7712860107422,
+        "z": "b3282176.32be28",
         "wires": []
     },
     {
-        "id": "d912c615.382f4",
+        "id": "fc2531d8.c81378",
         "type": "switchNode",
         "name": "switch node-eth tp",
         "xml": "<switch test='`$node-eth.termination-point_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 577,
-        "y": 377,
-        "z": "8966128c.40fc9",
+        "x": 586,
+        "y": 419.7777862548828,
+        "z": "b3282176.32be28",
         "wires": [
             [
-                "a5220607.a1fd88",
-                "ed33421.4d77fc",
-                "60e52ea8.adce88"
+                "601d7951.71e8b",
+                "d861b589.14035",
+                "7f887585.d4b524"
             ]
         ]
     },
     {
-        "id": "a5220607.a1fd88",
+        "id": "601d7951.71e8b",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 756,
-        "y": 329,
-        "z": "8966128c.40fc9",
+        "x": 765,
+        "y": 371.7777862548828,
+        "z": "b3282176.32be28",
         "wires": [
             [
-                "f8847f3a.3586c"
+                "7824b45e.78053c"
             ]
         ]
     },
     {
-        "id": "f8847f3a.3586c",
+        "id": "7824b45e.78053c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 911,
-        "y": 329,
-        "z": "8966128c.40fc9",
+        "x": 920,
+        "y": 371.7777862548828,
+        "z": "b3282176.32be28",
         "wires": [
             []
         ]
     },
     {
-        "id": "60e52ea8.adce88",
+        "id": "7f887585.d4b524",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 766,
-        "y": 377,
-        "z": "8966128c.40fc9",
+        "x": 775,
+        "y": 419.7777862548828,
+        "z": "b3282176.32be28",
         "wires": [
             [
-                "f8847f3a.3586c"
+                "7824b45e.78053c"
             ]
         ]
     },
     {
-        "id": "ed33421.4d77fc",
+        "id": "d861b589.14035",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 755,
-        "y": 431,
-        "z": "8966128c.40fc9",
+        "x": 764,
+        "y": 473.7777862548828,
+        "z": "b3282176.32be28",
         "wires": [
             [
-                "4137593c.5397c"
+                "a6890129.4d77c"
             ]
         ]
     },
     {
-        "id": "4137593c.5397c",
+        "id": "a6890129.4d77c",
         "type": "for",
         "name": "for each termination point",
         "xml": "<for index='tidx' start='0' end='`$node-eth.termination-point_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 963.4444580078125,
-        "y": 401.111083984375,
-        "z": "8966128c.40fc9",
+        "x": 972.4444580078125,
+        "y": 443.8888702392578,
+        "z": "b3282176.32be28",
         "wires": [
             [
-                "679b8e41.9ed698",
-                "68049.3760dfb7c",
-                "78ae2560.1cea4c",
-                "b56a229e.94c8d8",
-                "91b08f38.b7b1f"
+                "f7880100.7c4d78",
+                "f02496e2.4d8238",
+                "3b37c604.4d197a",
+                "588044e.57930bc",
+                "5be60218.18e4f4"
             ]
         ]
     },
     {
-        "id": "23d7e732.31c878",
+        "id": "85e0a40f.e7ed",
         "type": "set",
         "name": "unset node-otn",
         "xml": "<set>\n<parameter name='node-otn.' value='' />\n<parameter name='unique-network-otnId' value='' />\n<parameter name='unique-node-otnId' value=\"\" />\n",
         "comments": "",
-        "x": 1546,
-        "y": 277,
-        "z": "8966128c.40fc9",
+        "x": 1555,
+        "y": 319.7777862548828,
+        "z": "b3282176.32be28",
         "wires": []
     },
     {
-        "id": "7fec5669.9d797",
+        "id": "4764cff0.412538",
         "type": "switchNode",
         "name": "switch node-otn ttp",
         "xml": "<switch test='`$node-otn.te.tunnel-termination-point_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1143,
-        "y": 608,
-        "z": "8966128c.40fc9",
+        "x": 1152,
+        "y": 650.7777862548828,
+        "z": "b3282176.32be28",
         "wires": [
             [
-                "c2495d37.4f1a88",
-                "4a7d6e3.4a2c99",
-                "e5a8fd10.f52c58"
+                "abfc6cbb.6eaee8",
+                "6c6ea4d2.be42cc",
+                "1f3ac3bf.46c73c"
             ]
         ]
     },
     {
-        "id": "c2495d37.4f1a88",
+        "id": "abfc6cbb.6eaee8",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1331,
-        "y": 494,
-        "z": "8966128c.40fc9",
+        "x": 1340,
+        "y": 536.7777862548828,
+        "z": "b3282176.32be28",
         "wires": [
             [
-                "50aa44cc.08445c"
+                "ceb636f.d5bb7c8"
             ]
         ]
     },
     {
-        "id": "4a7d6e3.4a2c99",
+        "id": "6c6ea4d2.be42cc",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1336,
-        "y": 569,
-        "z": "8966128c.40fc9",
+        "x": 1345,
+        "y": 611.7777862548828,
+        "z": "b3282176.32be28",
         "wires": [
             [
-                "50aa44cc.08445c"
+                "ceb636f.d5bb7c8"
             ]
         ]
     },
     {
-        "id": "e5a8fd10.f52c58",
+        "id": "1f3ac3bf.46c73c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1333,
-        "y": 631,
-        "z": "8966128c.40fc9",
+        "x": 1342,
+        "y": 673.7777862548828,
+        "z": "b3282176.32be28",
         "wires": [
             [
-                "5ced7489.3fd33c"
+                "a7f3a830.3d5f7"
             ]
         ]
     },
     {
-        "id": "50aa44cc.08445c",
+        "id": "ceb636f.d5bb7c8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1491,
-        "y": 560,
-        "z": "8966128c.40fc9",
+        "x": 1500,
+        "y": 602.7777862548828,
+        "z": "b3282176.32be28",
         "wires": [
             []
         ]
     },
     {
-        "id": "e1c780a1.bce018",
+        "id": "c794ebab.b4d2b8",
         "type": "set",
         "name": "set local variables",
         "xml": "<set>\n<parameter name='unique-node-ethId' value=\"`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`\" />\n",
         "comments": "",
-        "x": 989,
-        "y": 153,
-        "z": "8966128c.40fc9",
+        "x": 998,
+        "y": 195.7777862548828,
+        "z": "b3282176.32be28",
         "wires": []
     },
     {
-        "id": "e63ab049.15d1f",
+        "id": "f448c5cf.144de8",
         "type": "set",
         "name": "set local variables",
         "xml": "<set>\n<parameter name='tmp.network-eth.network-id' value=\"`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-eth.network-id`\" />\n<parameter name='tmp.network-otn.network-id' value=\"`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-otn.network-id`\" />\n\n",
         "comments": "",
-        "x": 658,
-        "y": 144,
-        "z": "8966128c.40fc9",
+        "x": 667,
+        "y": 186.7777862548828,
+        "z": "b3282176.32be28",
         "wires": []
     },
     {
-        "id": "5525a122.db022",
+        "id": "46555423.5326e4",
         "type": "set",
         "name": "set local variables",
         "xml": "<set>\n<parameter name='unique-node-otnId' value=\"`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`\" />\n",
         "comments": "",
-        "x": 1544,
-        "y": 425,
-        "z": "8966128c.40fc9",
+        "x": 1553,
+        "y": 467.7777862548828,
+        "z": "b3282176.32be28",
         "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
index 057f6313..98585dbd 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.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='DataChange' version='${project.version}'>
+        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='DataChange' version='${project.version}'>
     <method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>
         <block atomic="true">
             <switch test="`$prop.sdncRestApi.vendor == 'ZTE'`">
@@ -76,14 +76,14 @@
                                                                                         <parameter name='network.' value='`$topology.networks.network[$netidx].`' />
                                                                                     </set>
                                                                                     <switch test='`$network.te-topology-id`'>
-                                                                                        <outcome value='11'>
+                                                                                        <outcome value='1'>
                                                                                             <block>
                                                                                                 <set>
                                                                                                     <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />
                                                                                                 </set>
                                                                                             </block>
                                                                                         </outcome>
-                                                                                        <outcome value='33'>
+                                                                                        <outcome value='2'>
                                                                                             <block>
                                                                                                 <set>
                                                                                                     <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />
@@ -143,14 +143,14 @@
                                                                                         <parameter name='network.' value='`$topology.networks.network[$netidx].`' />
                                                                                     </set>
                                                                                     <switch test='`$network.te-topology-id`'>
-                                                                                        <outcome value='11'>
+                                                                                        <outcome value='1'>
                                                                                             <block>
                                                                                                 <set>
                                                                                                     <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />
                                                                                                 </set>
                                                                                             </block>
                                                                                         </outcome>
-                                                                                        <outcome value='33'>
+                                                                                        <outcome value='2'>
                                                                                             <block>
                                                                                                 <set>
                                                                                                     <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />
@@ -275,14 +275,14 @@
                                                 <parameter name='controllerid' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`" />
                                             </set>
                                             <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-key='SELECT controller_id
+                                                          key='SELECT controller_id
 from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
 WHERE controller_id = $controllerid'
-pfx='dbcontrollerid'>
+                                                          pfx='dbcontrollerid'>
                                                 <outcome value='success'>
                                                     <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
-    resource="SQL"
-    key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>
+                                                            resource="SQL"
+                                                            key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>
                                                 </outcome>
                                                 <outcome value='failure'>
                                                     <return status='failure'>
@@ -307,14 +307,14 @@ pfx='dbcontrollerid'>
                                                 <parameter name='controllerid' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`" />
                                             </set>
                                             <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-key='SELECT controller_id
+                                                          key='SELECT controller_id
 from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
 WHERE controller_id = $controllerid'
-pfx='dbcontrollerid'>
+                                                          pfx='dbcontrollerid'>
                                                 <outcome value='success'>
                                                     <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
-    resource="SQL"
-    key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>
+                                                            resource="SQL"
+                                                            key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>
                                                 </outcome>
                                                 <outcome value='failure'>
                                                     <return status='failure'>
diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml
index 15ac4016..46d85060 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.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='DataChange' version='${project.version}'>
+        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='DataChange' version='${project.version}'>
     <method rpc='esr-thirdparty-sdnc' mode='sync'>
         <block atomic="true">
             <call module='DataChange' rpc='validate-esr-thirdparty-sdnc-input' mode='sync' ></call>
@@ -57,14 +57,6 @@
                     </switch>
                 </block>
             </for>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>
-                <parameter name="field1" value="__TIMESTAMP__"/>
-                <parameter name="field2" value="data-change-notification"/>
-                <parameter name="field3" value="Config"/>
-                <parameter name="field4" value="`service-url`"/>
-                <parameter name="field5" value="`$prop.sdncRestApi.thirdpartySdnc.url`"/>
-            </record>
             <call module='DataChange' rpc='esr-thirdparty-sdnc-discovery' mode='sync' ></call>
         </block>
     </method>
diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml
index f870e369..8bac2e29 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.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='DataChange' version='${project.version}'>
+        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='DataChange' version='${project.version}'>
     <method rpc='update-network-links-to-aai' mode='sync'>
         <block atomic="true">
             <for index='pidx' start='0' end='`$network.link_length`' >
@@ -30,12 +30,12 @@
                                 <parameter name='tmp.aai.p-interface' value='' />
                                 <parameter name='tmp.aai.p-interface.inter-domain-plug-id' value='' />
                             </set>
-                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="p-interface"
-	    key="pnf.pnf-name = $unique-src-node-Id
+                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                          resource="p-interface"
+                                          key="pnf.pnf-name = $unique-src-node-Id
 	        and p-interface.interface-name = $src-tpId"
-		local-only="false" 
-		pfx="tmp.aai.p-interface" >
+                                          local-only="false"
+                                          pfx="tmp.aai.p-interface" >
                                 <outcome value='success'>
                                     <switch test='`$tmp.aai.p-interface.inter-domain-plug-id`'>
                                         <outcome value=''>
@@ -83,11 +83,11 @@
                     <outcome value='false'>
                         <switch test='`$is-open-ended-link`'>
                             <outcome value='true'>
-                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="logical-link"
-	    key="logical-link.link-name = $alt-unique-linkId"
-		local-only="false" 
-		pfx="tmp.aai.logical-link" >
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="logical-link"
+                                              key="logical-link.link-name = $alt-unique-linkId"
+                                              local-only="false"
+                                              pfx="tmp.aai.logical-link" >
                                     <outcome value='success'>
                                         <block>
                                             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
@@ -100,8 +100,8 @@
                                                 <parameter name="field6" value="relationship-value" />
                                                 <parameter name="field7" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />
                                             </record>
-                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' 
-      key='logical-link.link-name = $alt-unique-linkId' force="true" pfx="tmp.AnAI-data">
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list'
+                                                  key='logical-link.link-name = $alt-unique-linkId' force="true" pfx="tmp.AnAI-data">
                                                 <!--<parameter name="relationship-list.relationship[0].related-to" value="p-interface" />-->
                                                 <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />-->
                                                 <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />-->
@@ -139,8 +139,8 @@
                                                     </block>
                                                 </outcome>
                                             </save>
-                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' 
-      key='te-link-attribute.id = $link.te.te-link-attributes.name' >
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute'
+                                                  key='te-link-attribute.id = $link.te.te-link-attributes.name' >
                                                 <parameter name='id' value='`$link.te.te-link-attributes.name`' />
                                                 <parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />
                                             </save>
@@ -163,8 +163,8 @@
                                                         <set>
                                                             <parameter name='unique-lrId' value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`" />
                                                         </set>
-                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' 
-      key='label-restriction.id = $unique-lrId' >
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
+                                                              key='label-restriction.id = $unique-lrId' >
                                                             <parameter name='id' value='`$unique-lrId`' />
                                                             <parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />
                                                             <parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />
@@ -175,8 +175,8 @@
                                                                 <block></block>
                                                             </outcome>
                                                             <outcome value='failure'>
-                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' 
-      key='label-restriction.id = $unique-lrId' >
+                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
+                                                                      key='label-restriction.id = $unique-lrId' >
                                                                     <parameter name='id' value='`$unique-lrId`' />
                                                                     <parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />
                                                                     <parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />
@@ -186,15 +186,15 @@
                                                                 </save>
                                                             </outcome>
                                                         </save>
-                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' 
-      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list'
+                                                              key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
                                                             <parameter name="relationship-list.relationship[0].related-to" value="logical-link" />
                                                             <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $alt-unique-linkId`" />
                                                             <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name" />
                                                             <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$alt-unique-linkId`" />
                                                         </save>
-                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' 
-      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list'
+                                                              key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
                                                             <parameter name="relationship-list.relationship[0].related-to" value="label-restriction" />
                                                             <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />
                                                             <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id" />
@@ -207,22 +207,22 @@
                                     </outcome>
                                     <outcome value='not-found'>
                                         <block atomic='true'>
-                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' 
-      key='logical-link.link-name = $alt-unique-linkId' >
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link'
+                                                  key='logical-link.link-name = $alt-unique-linkId' >
                                                 <parameter name='link-name' value='`$alt-unique-linkId`' />
                                                 <parameter name='link-id' value='`$link.link-id`' />
                                                 <parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />
                                                 <parameter name='link-role' value='cross-domain' />
                                             </save>
-                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' 
-      key='logical-link.link-name = $alt-unique-linkId' force="true" pfx="tmp.AnAI-data">
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list'
+                                                  key='logical-link.link-name = $alt-unique-linkId' force="true" pfx="tmp.AnAI-data">
                                                 <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
                                                 <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />
                                                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
                                                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`" />
                                             </save>
-                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' 
-      key='te-link-attribute.id = $link.te.te-link-attributes.name' >
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute'
+                                                  key='te-link-attribute.id = $link.te.te-link-attributes.name' >
                                                 <parameter name='id' value='`$link.te.te-link-attributes.name`' />
                                                 <parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />
                                             </save>
@@ -245,8 +245,8 @@
                                                         <set>
                                                             <parameter name='unique-lrId' value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`" />
                                                         </set>
-                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' 
-      key='label-restriction.id = $unique-lrId' >
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
+                                                              key='label-restriction.id = $unique-lrId' >
                                                             <parameter name='id' value='`$unique-lrId`' />
                                                             <parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />
                                                             <parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />
@@ -257,8 +257,8 @@
                                                                 <block></block>
                                                             </outcome>
                                                             <outcome value='failure'>
-                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' 
-      key='logical-link.link-name = $alt-unique-linkId
+                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
+                                                                      key='logical-link.link-name = $alt-unique-linkId
       AND label-restriction.id = $unique-lrId' >
                                                                     <parameter name='id' value='`$unique-lrId`' />
                                                                     <parameter name='label-start' value='`$label-restriction.label-start`' />
@@ -269,15 +269,15 @@
                                                                 </save>
                                                             </outcome>
                                                         </save>
-                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' 
-      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list'
+                                                              key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
                                                             <parameter name="relationship-list.relationship[0].related-to" value="logical-link" />
                                                             <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $alt-unique-linkId`" />
                                                             <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name" />
                                                             <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$alt-unique-linkId`" />
                                                         </save>
-                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' 
-      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list'
+                                                              key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
                                                             <parameter name="relationship-list.relationship[0].related-to" value="label-restriction" />
                                                             <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />
                                                             <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id" />
@@ -292,24 +292,14 @@
                             </outcome>
                             <outcome value='false'>
                                 <block atomic='true'>
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' 
-      key='logical-link.link-name = $unique-linkId' >
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link'
+                                          key='logical-link.link-name = $unique-linkId' >
                                         <parameter name='link-name' value='`$unique-linkId`' />
                                         <parameter name='link-id' value='`$link.link-id`' />
                                         <parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />
                                     </save>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />
-                                        <parameter name="field1" value="__TIMESTAMP__" />
-                                        <parameter name="field2" value="uniqueLinkId" />
-                                        <parameter name="field3" value="`$unique-linkId`" />
-                                        <parameter name="field4" value="srcTpId" />
-                                        <parameter name="field5" value="`$src-tpId`" />
-                                        <parameter name="field6" value="dstTpId" />
-                                        <parameter name="field7" value="`$dst-tpId`" />
-                                    </record>
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' 
-      key='logical-link.link-name = $unique-linkId' force="true" pfx="tmp.AnAI-data">
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list'
+                                          key='logical-link.link-name = $unique-linkId' force="true" pfx="tmp.AnAI-data">
                                         <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
                                         <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />
                                         <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
@@ -319,8 +309,8 @@
                                         <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name" />
                                         <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$dst-tpId`" />
                                     </save>
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' 
-      key='te-link-attribute.id = $link.te.te-link-attributes.name' >
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute'
+                                          key='te-link-attribute.id = $link.te.te-link-attributes.name' >
                                         <parameter name='id' value='`$link.te.te-link-attributes.name`' />
                                         <parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />
                                     </save>
@@ -343,8 +333,8 @@
                                                 <set>
                                                     <parameter name='unique-lrId' value="`$unique-linkId + '-lrId-' + $label-restriction.index`" />
                                                 </set>
-                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' 
-      key='label-restriction.id = $unique-lrId' >
+                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
+                                                      key='label-restriction.id = $unique-lrId' >
                                                     <parameter name='id' value='`$unique-lrId`' />
                                                     <parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />
                                                     <parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />
@@ -355,8 +345,8 @@
                                                         <block></block>
                                                     </outcome>
                                                     <outcome value='failure'>
-                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' 
-      key='logical-link.link-name = $unique-linkId
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
+                                                              key='logical-link.link-name = $unique-linkId
       AND label-restriction.id = $unique-lrId' >
                                                             <parameter name='id' value='`$unique-lrId`' />
                                                             <parameter name='label-start' value='`$label-restriction.label-start`' />
@@ -367,15 +357,15 @@
                                                         </save>
                                                     </outcome>
                                                 </save>
-                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' 
-      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
+                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list'
+                                                      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
                                                     <parameter name="relationship-list.relationship[0].related-to" value="logical-link" />
                                                     <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $unique-linkId`" />
                                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name" />
                                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-linkId`" />
                                                 </save>
-                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' 
-      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
+                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list'
+                                                      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
                                                     <parameter name="relationship-list.relationship[0].related-to" value="label-restriction" />
                                                     <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />
                                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id" />
diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
index 4b3906ee..9d59adf7 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.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='DataChange' version='${project.version}'>
+        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='DataChange' version='${project.version}'>
     <method rpc='update-network-to-aai' mode='sync'>
         <block atomic="true">
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
@@ -10,26 +10,27 @@
                 <parameter name="replacement" value="-"/>
             </execute>
             <set>
-                <parameter name='tmp.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`" />
+                <!--<parameter name='tmp.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`" />-->
+                <parameter name='tmp.network-id' value="`$tmp.original-network-id`" />
             </set>
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'  
-     key='network-resource.network-id = $tmp.network-id' >
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'
+                  key='network-resource.network-id = $tmp.network-id' >
                 <parameter name='network-id' value='`$tmp.network-id`' />
                 <parameter name='client-id' value='`$network.client-id`' />
                 <parameter name='te-topo-id' value='`$network.te-topology-id`' />
                 <parameter name='provider-id' value='`$network.provider-id`' />
                 <parameter name='network-type' value='`$network.network-types`' />
             </save>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="esr-thirdparty-sdnc" 
-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND 
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                          resource="esr-thirdparty-sdnc"
+                          key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND
 		     depth = '1'"
-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
+                          pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
                 <outcome value='success'>
                     <block>
-                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource:relationship-list' 
-      key='network-resource.network-id = $tmp.network-id'
-      force="true" pfx="tmp.AnAI-data">
+                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource:relationship-list'
+                              key='network-resource.network-id = $tmp.network-id'
+                              force="true" pfx="tmp.AnAI-data">
                             <parameter name="relationship-list.relationship[0].related-to" value="esr-thirdparty-sdnc" />
                             <parameter name="relationship-list.relationship[0].related-link" value="`'/aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/' + $prop.sdncRestApi.thirdpartySdnc.id`" />
                             <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="esr-thirdparty-sdnc.thirdparty-sdnc-id" />
@@ -64,8 +65,8 @@
                 <set>
                     <parameter name='unique-nodeId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`" />
                 </set>
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' 
-      key='pnf.pnf-name = $unique-nodeId' >
+                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf'
+                      key='pnf.pnf-name = $unique-nodeId' >
                     <parameter name='pnf-name' value='`$unique-nodeId`' />
                     <parameter name='pnf-id' value='`$node.node-id`' />
                     <parameter name='operational-status' value='`$node.te.oper-status`' />
@@ -111,8 +112,8 @@
                                     </execute>
                                 </outcome>
                             </switch>
-                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' 
-      key='pnf.pnf-name = $unique-nodeId
+                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'
+                                  key='pnf.pnf-name = $unique-nodeId
       AND p-interface.interface-name = $unique-ltpId' >
                                 <parameter name='interface-name' value='`$unique-ltpId`' />
                                 <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />
@@ -127,8 +128,8 @@
                                     <block></block>
                                 </outcome>
                                 <outcome value='failure'>
-                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' 
-      key='pnf.pnf-name = $unique-nodeId
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'
+                                            key='pnf.pnf-name = $unique-nodeId
       AND p-interface.interface-name = $unique-ltpId' >
                                         <parameter name='interface-name' value='`$unique-ltpId`' />
                                         <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />
@@ -145,20 +146,20 @@
                         </for>
                     </outcome>
                 </switch>
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' 
-      key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">
+                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list'
+                      key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">
                     <parameter name="relationship-list.relationship[0].related-to" value="network-resource" />
                     <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id`" />
                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id" />
                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`" />
                 </save>
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' 
-      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' 
-      force="true" pfx="tmp.AnAI-data">
+                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list'
+                      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id'
+                      force="true" pfx="tmp.AnAI-data">
                     <parameter name="relationship-list.relationship[0].related-to" value="pnf" />
-                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`" />
+                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-nodeId`" />
                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`" />
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-nodeId`" />
                 </save>
                 <switch test='`$node.te.tunnel-termination-point_length`'>
                     <outcome value=''>
@@ -178,8 +179,8 @@
                             <set>
                                 <parameter name='unique-ttpId' value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`" />
                             </set>
-                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' 
-      key='tunnel-termination-point.ttp-id = $unique-ttpId' >
+                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point'
+                                  key='tunnel-termination-point.ttp-id = $unique-ttpId' >
                                 <parameter name='ttp-id' value='`$unique-ttpId`' />
                                 <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />
                                 <parameter name='name' value='`$ttp.name`' />
@@ -193,8 +194,8 @@
                                     <block></block>
                                 </outcome>
                                 <outcome value='failure'>
-                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' 
-      key='tunnel-termination-point.ttp-id = $unique-ttpId' >
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point'
+                                            key='tunnel-termination-point.ttp-id = $unique-ttpId' >
                                         <parameter name='ttp-id' value='`$unique-ttpId`' />
                                         <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />
                                         <parameter name='name' value='`$ttp.name`' />
@@ -207,35 +208,15 @@
                                     </update>
                                 </outcome>
                             </save>
-                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' 
-      key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">
+                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list'
+                                  key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">
                                 <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point" />
                                 <!--<parameter name="relationship-list.relationship[$ttidx].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />-->
                                 <parameter name="relationship-list.relationship[0].related-link" value="`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />
                                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.ttp-id" />
                                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`" />
-                                <outcome value='success'>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />
-                                        <parameter name="field1" value="__TIMESTAMP__" />
-                                        <parameter name="field2" value="sucess executing Hesam log file" />
-                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />
-                                        <parameter name="field4" value="`$node.termination-point_length`" />
-                                        <parameter name="field5" value="sucessfully saved ttp" />
-                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`" />
-                                    </record>
-                                </outcome>
-                                <outcome value='failure'>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />
-                                        <parameter name="field1" value="__TIMESTAMP__" />
-                                        <parameter name="field2" value="sucess executing Hesam log file" />
-                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />
-                                        <parameter name="field4" value="`$node.termination-point_length`" />
-                                        <parameter name="field5" value="failuire on saving ttp" />
-                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`" />
-                                    </record>
-                                </outcome>
+                                <outcome value='success'></outcome>
+                                <outcome value='failure'></outcome>
                             </save>
                             <switch test='`$node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity_length`'>
                                 <outcome value=''>
@@ -249,8 +230,8 @@
                                         <set>
                                             <parameter name='unique-ltpId-second' value="`$unique-nodeId + '-ltpId-' + $node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity[0].link-tp-ref`" />
                                         </set>
-                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point:relationship-list' 
-      key='tunnel-termination-point.ttp-id = $unique-ttpId' force="true" pfx="tmp.AnAI-data">
+                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point:relationship-list'
+                                              key='tunnel-termination-point.ttp-id = $unique-ttpId' force="true" pfx="tmp.AnAI-data">
                                             <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
                                             <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-nodeId + '/p-interfaces/p-interface/' + $unique-ltpId-second`" />
                                             <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
@@ -262,13 +243,6 @@
                         </for>
                     </outcome>
                 </switch>
-                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                    <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />
-                    <parameter name="field1" value="__TIMESTAMP__" />
-                    <parameter name="field2" value="sucess executing Hesam log file" />
-                    <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />
-                    <parameter name="field4" value="`$node.termination-point_length`" />
-                </record>
             </for>
             <call module='DataChange' rpc='update-network-links-to-aai' mode='sync' ></call>
         </block>
diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml b/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml
index 30eddfd8..fd3a67d9 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.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='DataChange' version='${project.version}'>
+        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='DataChange' version='${project.version}'>
     <method rpc='update-tp-ttp-relationship' mode='sync'>
         <block atomic="true">
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
@@ -88,8 +88,8 @@
                                             </set>
                                             <switch test='`$tp-inter-layer-lock-id`'>
                                                 <outcome value='`$ttp-inter-layer-lock-id`'>
-                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' 
-      key='p-interface.interface-name = $unique-ltpethId' force="true" pfx="tmp.AnAI-data">
+                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list'
+                                                          key='p-interface.interface-name = $unique-ltpethId' force="true" pfx="tmp.AnAI-data">
                                                         <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point" />
                                                         <parameter name="relationship-list.relationship[0].related-link" value="/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`" />
                                                         <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.tunnel-tp-id" />
-- 
cgit 1.2.3-korg