From 03a1b2b63cf77790d357e15f2cd20a197ec6d26f Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Fri, 23 Jul 2021 19:50:37 +0000
Subject: [PATCH] Updating Topology Discovery DGs to align with the latest
 changes of IETF TE-Topology YANG models.

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

Former-commit-id: 83d8f398dc0acce88475c694902d5542a8e811d1
---
 .../DataChange_esr-thirdparty-sdnc-discovery.json  |  990 +++++++--------
 .../DataChange_update-network-links-to-aai.json    | 1272 ++++++++++----------
 .../json/DataChange_update-network-to-aai.json     |  756 ++++++------
 .../DataChange_esr-thirdparty-sdnc-discovery.xml   |    4 +-
 .../xml/DataChange_update-network-links-to-aai.xml |   58 +-
 .../main/xml/DataChange_update-network-to-aai.xml  |    6 +-
 6 files changed, 1543 insertions(+), 1543 deletions(-)

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 7b0ea050..ef7fa0f2 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": "e773e89.91c6b98",
+        "id": "66d82769.1d01a8",
         "type": "other",
         "name": "update",
         "xml": "<outcome value='Update'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 716,
-        "y": 331,
-        "z": "8a5117b5.c01db8",
+        "x": 739,
+        "y": 271,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "e959cc87.47852"
+                "ae6185fd.f9c2d8"
             ]
         ]
     },
     {
-        "id": "c1b624e8.c4a36",
+        "id": "3efeb782.bfc1",
         "type": "other",
         "name": "delete",
         "xml": "<outcome value='Delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 716,
-        "y": 411,
-        "z": "8a5117b5.c01db8",
+        "x": 739,
+        "y": 351,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "f94d770b.d7a21"
+                "a1ab5058.aebdf"
             ]
         ]
     },
     {
-        "id": "f94d770b.d7a21",
+        "id": "a1ab5058.aebdf",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 857.5,
-        "y": 411,
-        "z": "8a5117b5.c01db8",
+        "x": 880.5,
+        "y": 351,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "4f7d3c56.d58604"
+                "fb3f26da.0ae3f8"
             ]
         ]
     },
     {
-        "id": "a0413cd2.f1f8e8",
+        "id": "22ce6fbc.3616d",
         "type": "switchNode",
         "name": "switch aai-event-trigger",
         "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 546.5,
-        "y": 371,
-        "z": "8a5117b5.c01db8",
+        "x": 569.5,
+        "y": 311,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "e773e89.91c6b98",
-                "c1b624e8.c4a36"
+                "66d82769.1d01a8",
+                "3efeb782.bfc1"
             ]
         ]
     },
     {
-        "id": "24096151.ae8cf6",
+        "id": "8b8fad8f.084508",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1243.5,
-        "y": 242,
-        "z": "8a5117b5.c01db8",
+        "x": 1266.5,
+        "y": 182,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "d3849c0c.290268",
-                "2e3a9914.38f54e",
-                "5d9111f6.fc1a7",
-                "e1aa7ec9.6ea95",
-                "4884da36.8dcb24"
+                "cb379294.cf5aa8",
+                "43fea2be.adabc4",
+                "4f03377f.b0c4c8",
+                "590ac352.e76a14",
+                "80b5f8f0.c85808"
             ]
         ]
     },
     {
-        "id": "2e3a9914.38f54e",
+        "id": "43fea2be.adabc4",
         "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": 1516.5001983642578,
-        "y": 163.00000953674316,
-        "z": "8a5117b5.c01db8",
+        "x": 1539.5001983642578,
+        "y": 103.00000953674316,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "e0b90864.1c659",
-                "2d5ac090.7f4d28"
+                "1315a46.1a747dc",
+                "5b12ff34.641e88"
             ]
         ]
     },
     {
-        "id": "e0b90864.1c659",
+        "id": "1315a46.1a747dc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1806.000244140625,
-        "y": 155,
-        "z": "8a5117b5.c01db8",
+        "x": 1829.000244140625,
+        "y": 95,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "fbadc5f1.b9042"
+                "396d79e7.1bf7ce"
             ]
         ]
     },
     {
-        "id": "2d5ac090.7f4d28",
+        "id": "5b12ff34.641e88",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1802.000244140625,
-        "y": 195,
-        "z": "8a5117b5.c01db8",
+        "x": 1825.000244140625,
+        "y": 135,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "8ebd62d2.d420b"
+                "20884b0c.6135fc"
             ]
         ]
     },
     {
-        "id": "fbadc5f1.b9042",
+        "id": "396d79e7.1bf7ce",
         "type": "set",
         "name": "set token-id",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
         "comments": "",
-        "x": 1956.500244140625,
-        "y": 155,
-        "z": "8a5117b5.c01db8",
+        "x": 1979.500244140625,
+        "y": 95,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "74d21b60.35097c",
+        "id": "794a42a5.7ff634",
         "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": 2023.500244140625,
-        "y": 275,
-        "z": "8a5117b5.c01db8",
+        "x": 2046.500244140625,
+        "y": 215,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "73b2188f.535b88",
-                "e3942d82.1d981"
+                "38377ff8.a67d2",
+                "b0153eb4.a0abb"
             ]
         ]
     },
     {
-        "id": "73b2188f.535b88",
+        "id": "38377ff8.a67d2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2266.000244140625,
-        "y": 295,
-        "z": "8a5117b5.c01db8",
+        "x": 2289.000244140625,
+        "y": 235,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "4a760f4a.5cb7e8"
+                "1c21d3a8.a908bc"
             ]
         ]
     },
     {
-        "id": "4a760f4a.5cb7e8",
+        "id": "1c21d3a8.a908bc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2423.500244140625,
-        "y": 295,
-        "z": "8a5117b5.c01db8",
+        "x": 2446.500244140625,
+        "y": 235,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "300a5bac.b9481c",
-                "ad97aa98.c768d"
+                "6ecea195.591998",
+                "10fd3c36.34f02c"
             ]
         ]
     },
     {
-        "id": "8f9fe5f7.1e28d",
+        "id": "e2c46cc9.208aa",
         "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": 2400.000244140625,
-        "y": 195,
-        "z": "8a5117b5.c01db8",
+        "x": 2423.000244140625,
+        "y": 135,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "e3942d82.1d981",
+        "id": "b0153eb4.a0abb",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2262.000244140625,
-        "y": 195,
-        "z": "8a5117b5.c01db8",
+        "x": 2285.000244140625,
+        "y": 135,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "8f9fe5f7.1e28d"
+                "e2c46cc9.208aa"
             ]
         ]
     },
     {
-        "id": "52ac41c0.5bfd18",
+        "id": "8bce8e2f.0d81e8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 169,
-        "y": 106,
-        "z": "8a5117b5.c01db8",
+        "x": 192,
+        "y": 46,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "2f07965a.1dd8e2"
+                "75e87f6c.a6d9e"
             ]
         ]
     },
     {
-        "id": "2f07965a.1dd8e2",
+        "id": "75e87f6c.a6d9e",
         "type": "service-logic",
         "name": "DataChange ${project.version}",
         "module": "DataChange",
@@ -245,1255 +245,1255 @@
         "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": 182,
-        "y": 166,
-        "z": "8a5117b5.c01db8",
+        "x": 205,
+        "y": 106,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "be9d83e5.bff8b"
+                "11c7e938.bc92c7"
             ]
         ]
     },
     {
-        "id": "be9d83e5.bff8b",
+        "id": "11c7e938.bc92c7",
         "type": "method",
         "name": "method esr-thirdparty-sdnc-discovery",
         "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 202,
-        "y": 246,
-        "z": "8a5117b5.c01db8",
+        "x": 225,
+        "y": 186,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "dc3c6fc7.178d18"
+                "e3374842.e3f818"
             ]
         ]
     },
     {
-        "id": "dc3c6fc7.178d18",
+        "id": "e3374842.e3f818",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 449.5,
-        "y": 246,
-        "z": "8a5117b5.c01db8",
+        "x": 472.5,
+        "y": 186,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "febec156.8b3598"
+                "f09b5855.16ea9"
             ]
         ]
     },
     {
-        "id": "300a5bac.b9481c",
+        "id": "6ecea195.591998",
         "type": "for",
         "name": "for each Network",
         "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2642.500244140625,
-        "y": 224,
-        "z": "8a5117b5.c01db8",
+        "x": 2665.500244140625,
+        "y": 164,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "2eec7c8a.0065d4"
+                "6ca8b7e7.59b19"
             ]
         ]
     },
     {
-        "id": "2eec7c8a.0065d4",
+        "id": "6ca8b7e7.59b19",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2791.000244140625,
-        "y": 224,
-        "z": "8a5117b5.c01db8",
+        "x": 2814.000244140625,
+        "y": 164,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "c6d65b06.9b8418",
-                "d5bb0470.a0963",
-                "51f49074.c67e58"
+                "43a0eef1.e5c518",
+                "e94a8c36.a2247",
+                "92aeb11c.309eb8"
             ]
         ]
     },
     {
-        "id": "c6d65b06.9b8418",
+        "id": "43a0eef1.e5c518",
         "type": "call",
         "name": "call update-network-to-aai",
         "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2970.000244140625,
-        "y": 244,
-        "z": "8a5117b5.c01db8",
+        "x": 2993.000244140625,
+        "y": 184,
+        "z": "dc90116d.356cd8",
         "wires": [
             []
         ]
     },
     {
-        "id": "d5bb0470.a0963",
+        "id": "e94a8c36.a2247",
         "type": "set",
         "name": "set network",
         "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
         "comments": "",
-        "x": 2923.000244140625,
-        "y": 204,
-        "z": "8a5117b5.c01db8",
+        "x": 2946.000244140625,
+        "y": 144,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "8ebd62d2.d420b",
+        "id": "20884b0c.6135fc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1922.000244140625,
-        "y": 195,
-        "z": "8a5117b5.c01db8",
+        "x": 1945.000244140625,
+        "y": 135,
+        "z": "dc90116d.356cd8",
         "wires": [
             []
         ]
     },
     {
-        "id": "e262d253.cb79",
+        "id": "62ce2665.d3bbc",
         "type": "comment",
         "name": "Do Nothing",
         "info": "",
         "comments": "",
-        "x": 2092.000244140625,
-        "y": 235,
-        "z": "8a5117b5.c01db8",
+        "x": 2115.000244140625,
+        "y": 175,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "a6bffc76.37edc",
+        "id": "c35780c2.b517a8",
         "type": "switchNode",
         "name": "switch type",
         "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 969,
-        "y": 331,
-        "z": "8a5117b5.c01db8",
+        "x": 992,
+        "y": 271,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "6f99e35d.de977c",
-                "c02a6e99.4562c",
-                "3d7935ef.04d57a",
-                "cfd2103d.fd26"
+                "4be7af0d.179fe8",
+                "9d611449.5dcd4",
+                "88a47a49.6947f",
+                "c116943.cd1a8e8"
             ]
         ]
     },
     {
-        "id": "e959cc87.47852",
+        "id": "ae6185fd.f9c2d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 836,
-        "y": 331,
-        "z": "8a5117b5.c01db8",
+        "x": 859,
+        "y": 271,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "a6bffc76.37edc"
+                "c35780c2.b517a8"
             ]
         ]
     },
     {
-        "id": "6f99e35d.de977c",
+        "id": "4be7af0d.179fe8",
         "type": "other",
         "name": "WAN",
         "xml": "<outcome value='WAN'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1082,
-        "y": 242,
-        "z": "8a5117b5.c01db8",
+        "x": 1105,
+        "y": 182,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "24096151.ae8cf6"
+                "8b8fad8f.084508"
             ]
         ]
     },
     {
-        "id": "c02a6e99.4562c",
+        "id": "9d611449.5dcd4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1111.5,
-        "y": 703.5001220703125,
-        "z": "8a5117b5.c01db8",
+        "x": 1134.5,
+        "y": 643.5001220703125,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "1f5381b5.13672e"
+                "8a5453eb.ab4e28"
             ]
         ]
     },
     {
-        "id": "1f5381b5.13672e",
+        "id": "8a5453eb.ab4e28",
         "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": 1297.75,
-        "y": 729.5001220703125,
-        "z": "8a5117b5.c01db8",
+        "x": 1320.75,
+        "y": 669.5001220703125,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "d3849c0c.290268",
+        "id": "cb379294.cf5aa8",
         "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": 1463.0001983642578,
-        "y": 123.00000953674316,
-        "z": "8a5117b5.c01db8",
+        "x": 1486.0001983642578,
+        "y": 63.000009536743164,
+        "z": "dc90116d.356cd8",
         "wires": [
             []
         ]
     },
     {
-        "id": "5d9111f6.fc1a7",
+        "id": "4f03377f.b0c4c8",
         "type": "switchNode",
         "name": "switch prop.sdncRestApi.token_id",
         "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1509.5001983642578,
-        "y": 243.00000953674316,
-        "z": "8a5117b5.c01db8",
+        "x": 1532.5001983642578,
+        "y": 183.00000953674316,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "8bff0ee3.9c1d08",
-                "46defe8b.c98d58"
+                "e2260a6c.d9a708",
+                "536e3c2c.29577c"
             ]
         ]
     },
     {
-        "id": "8bff0ee3.9c1d08",
+        "id": "e2260a6c.d9a708",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1802.000244140625,
-        "y": 235,
-        "z": "8a5117b5.c01db8",
+        "x": 1825.000244140625,
+        "y": 175,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "4af5b25c.a6728c"
+                "9626e71e.38aeb8"
             ]
         ]
     },
     {
-        "id": "46defe8b.c98d58",
+        "id": "536e3c2c.29577c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1802.000244140625,
-        "y": 275,
-        "z": "8a5117b5.c01db8",
+        "x": 1825.000244140625,
+        "y": 215,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "74d21b60.35097c"
+                "794a42a5.7ff634"
             ]
         ]
     },
     {
-        "id": "4af5b25c.a6728c",
+        "id": "9626e71e.38aeb8",
         "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": 2023.500244140625,
-        "y": 235,
-        "z": "8a5117b5.c01db8",
+        "x": 2046.500244140625,
+        "y": 175,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "e3942d82.1d981",
-                "73b2188f.535b88"
+                "b0153eb4.a0abb",
+                "38377ff8.a67d2"
             ]
         ]
     },
     {
-        "id": "4884da36.8dcb24",
+        "id": "80b5f8f0.c85808",
         "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": 1506.0001983642578,
-        "y": 383.00000953674316,
-        "z": "8a5117b5.c01db8",
+        "x": 1529.0001983642578,
+        "y": 323.00000953674316,
+        "z": "dc90116d.356cd8",
         "wires": [
             []
         ]
     },
     {
-        "id": "e1aa7ec9.6ea95",
+        "id": "590ac352.e76a14",
         "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": 1466.0001983642578,
-        "y": 343.00000953674316,
-        "z": "8a5117b5.c01db8",
+        "x": 1489.0001983642578,
+        "y": 283.00000953674316,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "bbab4551.0a236",
+        "id": "50fcae42.2c2a8",
         "type": "comment",
         "name": "Notification subscription",
         "info": "",
         "comments": "",
-        "x": 1471.000343322754,
-        "y": 300.00000858306885,
-        "z": "8a5117b5.c01db8",
+        "x": 1494.000343322754,
+        "y": 240.00000858306885,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "febec156.8b3598",
+        "id": "f09b5855.16ea9",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$prop.sdncRestApi.vendor == 'ZTE'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 156,
-        "y": 371,
-        "z": "8a5117b5.c01db8",
+        "x": 179,
+        "y": 311,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "9a519619.b1895",
-                "48ffb5b3.b827e4"
+                "bf78bf6d.9dbf38",
+                "2804a0b9.d69f28"
             ]
         ]
     },
     {
-        "id": "9a519619.b1895",
+        "id": "bf78bf6d.9dbf38",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 343,
-        "y": 371,
-        "z": "8a5117b5.c01db8",
+        "x": 366,
+        "y": 311,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "a0413cd2.f1f8e8"
+                "22ce6fbc.3616d"
             ]
         ]
     },
     {
-        "id": "48ffb5b3.b827e4",
+        "id": "2804a0b9.d69f28",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 117.00003051757812,
-        "y": 1127.75,
-        "z": "8a5117b5.c01db8",
+        "x": 140.00003051757812,
+        "y": 1067.75,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "9ffa3ea5.b70bf"
+                "53ab0ac2.38d284"
             ]
         ]
     },
     {
-        "id": "9ffa3ea5.b70bf",
+        "id": "53ab0ac2.38d284",
         "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": 348.75,
-        "y": 1144.5000610351562,
-        "z": "8a5117b5.c01db8",
+        "x": 371.75,
+        "y": 1084.5000610351562,
+        "z": "dc90116d.356cd8",
         "wires": [
             []
         ]
     },
     {
-        "id": "3d7935ef.04d57a",
+        "id": "88a47a49.6947f",
         "type": "other",
         "name": "TAPI",
         "xml": "<outcome value='TAPI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1160,
-        "y": 476,
-        "z": "8a5117b5.c01db8",
+        "x": 1183,
+        "y": 416,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "4fe6a7b1.5767f"
+                "d5710d01.9be8f8"
             ]
         ]
     },
     {
-        "id": "4fe6a7b1.5767f",
+        "id": "d5710d01.9be8f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1323,
-        "y": 475,
-        "z": "8a5117b5.c01db8",
+        "x": 1346,
+        "y": 415,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "f9123ca9.fc888"
+                "a039ff23.d54198"
             ]
         ]
     },
     {
-        "id": "f9123ca9.fc888",
+        "id": "a039ff23.d54198",
         "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": 1484,
-        "y": 474,
-        "z": "8a5117b5.c01db8",
+        "x": 1507,
+        "y": 414,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "cc52ed00.f5d2c",
-                "dd1ac4e1.b59088"
+                "44a0211d.fd2598",
+                "493dc7eb.c52f08"
             ]
         ]
     },
     {
-        "id": "dd1ac4e1.b59088",
+        "id": "493dc7eb.c52f08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1626,
-        "y": 550,
-        "z": "8a5117b5.c01db8",
+        "x": 1649,
+        "y": 490,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "f1e8f88.8710a88"
+                "2d7698ce.b0a7a"
             ]
         ]
     },
     {
-        "id": "cc52ed00.f5d2c",
+        "id": "44a0211d.fd2598",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1660,
-        "y": 471,
-        "z": "8a5117b5.c01db8",
+        "x": 1683,
+        "y": 411,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "54fdb7ce.6dd1a"
+                "fe95a25e.cdaa98"
             ]
         ]
     },
     {
-        "id": "54fdb7ce.6dd1a",
+        "id": "fe95a25e.cdaa98",
         "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": 1830,
-        "y": 470,
-        "z": "8a5117b5.c01db8",
+        "x": 1853,
+        "y": 410,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "f1e8f88.8710a88",
+        "id": "2d7698ce.b0a7a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1787,
-        "y": 549,
-        "z": "8a5117b5.c01db8",
+        "x": 1810,
+        "y": 489,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "f8f968a.7a53a98"
+                "1dc691cb.358196"
             ]
         ]
     },
     {
-        "id": "f8f968a.7a53a98",
+        "id": "1dc691cb.358196",
         "type": "for",
         "name": "for each topology",
         "xml": "<for index='tidx' start='0' end=\"`$topologies.topology_length`\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1966,
-        "y": 549,
-        "z": "8a5117b5.c01db8",
+        "x": 1989,
+        "y": 489,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "3fb827df.939078"
+                "48d82ee8.688dd"
             ]
         ]
     },
     {
-        "id": "3fb827df.939078",
+        "id": "48d82ee8.688dd",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2133,
-        "y": 550,
-        "z": "8a5117b5.c01db8",
+        "x": 2156,
+        "y": 490,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "6c8666ff.44e6e8",
-                "8622f8e6.4ca888"
+                "d5ce9061.b89e98",
+                "b1436387.1231d8"
             ]
         ]
     },
     {
-        "id": "6c8666ff.44e6e8",
+        "id": "d5ce9061.b89e98",
         "type": "set",
         "name": "set topology",
         "xml": "<set>\n<parameter name='topology.' value='`$topologies.topology[$tidx].`' />\n",
         "comments": "",
-        "x": 2292,
-        "y": 551,
-        "z": "8a5117b5.c01db8",
+        "x": 2315,
+        "y": 491,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "8622f8e6.4ca888",
+        "id": "b1436387.1231d8",
         "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": 2283,
-        "y": 617,
-        "z": "8a5117b5.c01db8",
+        "x": 2306,
+        "y": 557,
+        "z": "dc90116d.356cd8",
         "wires": [
             []
         ]
     },
     {
-        "id": "cfd2103d.fd26",
+        "id": "c116943.cd1a8e8",
         "type": "outcome",
         "name": "MSA",
         "xml": "<outcome value='MSA'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1130.677324295044,
-        "y": 632.8993349075317,
-        "z": "8a5117b5.c01db8",
+        "x": 1153.677324295044,
+        "y": 572.8993349075317,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "787c580c.21a83"
+                "9d338868.302c1"
             ]
         ]
     },
     {
-        "id": "787c580c.21a83",
+        "id": "9d338868.302c1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1292.6773872375488,
-        "y": 630.899335861206,
-        "z": "8a5117b5.c01db8",
+        "x": 1315.6773872375488,
+        "y": 570.899335861206,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "cb55af39.dad0b"
+                "b0b285cb.6ebea"
             ]
         ]
     },
     {
-        "id": "cb55af39.dad0b",
+        "id": "b0b285cb.6ebea",
         "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": 1469.6771354675293,
-        "y": 622.8992919921875,
-        "z": "8a5117b5.c01db8",
+        "x": 1492.6771354675293,
+        "y": 562.8992919921875,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "55b8f3fc.f2c404",
-                "dba7d725.59fa18"
+                "8054b37a.3900a8",
+                "37099c40.484064"
             ]
         ]
     },
     {
-        "id": "55b8f3fc.f2c404",
+        "id": "8054b37a.3900a8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1622.6771354675293,
-        "y": 619.8992919921875,
-        "z": "8a5117b5.c01db8",
+        "x": 1645.6771354675293,
+        "y": 559.8992919921875,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "2cc6fdd5.2640a2"
+                "ee854a40.fe1848"
             ]
         ]
     },
     {
-        "id": "2cc6fdd5.2640a2",
+        "id": "ee854a40.fe1848",
         "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": 1797.6771354675293,
-        "y": 618.8992919921875,
-        "z": "8a5117b5.c01db8",
+        "x": 1820.6771354675293,
+        "y": 558.8992919921875,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "dba7d725.59fa18",
+        "id": "37099c40.484064",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1628.6771354675293,
-        "y": 692.8992919921875,
-        "z": "8a5117b5.c01db8",
+        "x": 1651.6771354675293,
+        "y": 632.8992919921875,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "170b822d.317ece"
+                "6b6e7027.f016d"
             ]
         ]
     },
     {
-        "id": "170b822d.317ece",
+        "id": "6b6e7027.f016d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1812.6771354675293,
-        "y": 694.8992919921875,
-        "z": "8a5117b5.c01db8",
+        "x": 1835.6771354675293,
+        "y": 634.8992919921875,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "8f4caf49.c88e68"
+                "5444f8a5.36fed"
             ]
         ]
     },
     {
-        "id": "8f4caf49.c88e68",
+        "id": "5444f8a5.36fed",
         "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": 2091.677001953125,
-        "y": 692.8992919921875,
-        "z": "8a5117b5.c01db8",
+        "x": 2114.677001953125,
+        "y": 632.8992919921875,
+        "z": "dc90116d.356cd8",
         "wires": [
             []
         ]
     },
     {
-        "id": "4f7d3c56.d58604",
+        "id": "fb3f26da.0ae3f8",
         "type": "switchNode",
         "name": "switch type",
         "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 262.566650390625,
-        "y": 861.5666809082031,
-        "z": "8a5117b5.c01db8",
+        "x": 285.566650390625,
+        "y": 801.5666809082031,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "7c479945.15b6c",
-                "41dab8d.79e9dc8",
-                "fb32359d.de7e3"
+                "57cb25c2.9e9be4",
+                "30ce121c.bfe97e",
+                "d3232a5d.18a288"
             ]
         ]
     },
     {
-        "id": "7c479945.15b6c",
+        "id": "57cb25c2.9e9be4",
         "type": "outcome",
         "name": "MSA",
         "xml": "<outcome value='MSA'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 441.857177734375,
-        "y": 778.9285888671875,
-        "z": "8a5117b5.c01db8",
+        "x": 464.857177734375,
+        "y": 718.9285888671875,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "d9d0d78b.47d9f"
+                "7a4cfe82.92d42"
             ]
         ]
     },
     {
-        "id": "41dab8d.79e9dc8",
+        "id": "30ce121c.bfe97e",
         "type": "other",
         "name": "TAPI",
         "xml": "<outcome value='TAPI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 450.6070556640625,
-        "y": 1029.6428527832031,
-        "z": "8a5117b5.c01db8",
+        "x": 473.6070556640625,
+        "y": 969.6428527832031,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "1a2de346.3f0ebd"
+                "d394227.d0cf06"
             ]
         ]
     },
     {
-        "id": "d9d0d78b.47d9f",
+        "id": "7a4cfe82.92d42",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 595.607177734375,
-        "y": 775.7143249511719,
-        "z": "8a5117b5.c01db8",
+        "x": 618.607177734375,
+        "y": 715.7143249511719,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "e787c325.7a3d48",
-                "e74f02d1.684a5"
+                "b595413f.cfe8e8",
+                "8c8fae68.b08168"
             ]
         ]
     },
     {
-        "id": "1a2de346.3f0ebd",
+        "id": "d394227.d0cf06",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 600,
-        "y": 1029.5,
-        "z": "8a5117b5.c01db8",
+        "x": 623,
+        "y": 969.5,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "39caa350.271204",
-                "14436f1d.f47b89"
+                "6724f8a4.5cbe3",
+                "c711ca11.6e628"
             ]
         ]
     },
     {
-        "id": "fb32359d.de7e3",
+        "id": "d3232a5d.18a288",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 553,
-        "y": 1193.5,
-        "z": "8a5117b5.c01db8",
+        "x": 576,
+        "y": 1133.5,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "33b66d76.b73a6a"
+                "ba5f29b3.a93ac8"
             ]
         ]
     },
     {
-        "id": "33b66d76.b73a6a",
+        "id": "ba5f29b3.a93ac8",
         "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": 715,
-        "y": 1232.5,
-        "z": "8a5117b5.c01db8",
+        "x": 738,
+        "y": 1172.5,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "e787c325.7a3d48",
+        "id": "b595413f.cfe8e8",
         "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": 827.5,
-        "y": 823.5,
-        "z": "8a5117b5.c01db8",
+        "x": 850.5,
+        "y": 763.5,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "48ef075d.23d478",
-                "6aefa7bc.0e864",
-                "b6643c83.4fa068"
+                "74d7baba.1daacc",
+                "582fc831.36e3c",
+                "b559176c.28e268"
             ]
         ]
     },
     {
-        "id": "e74f02d1.684a5",
+        "id": "8c8fae68.b08168",
         "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": 757.5,
-        "z": "8a5117b5.c01db8",
+        "x": 810.5,
+        "y": 697.5,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "48ef075d.23d478",
+        "id": "74d7baba.1daacc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1066.5,
-        "y": 843.5,
-        "z": "8a5117b5.c01db8",
+        "x": 1089.5,
+        "y": 783.5,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "3a0200d5.7fabc"
+                "c192dc38.daa8b8"
             ]
         ]
     },
     {
-        "id": "3a0200d5.7fabc",
+        "id": "c192dc38.daa8b8",
         "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": 1235.5,
-        "y": 850.5,
-        "z": "8a5117b5.c01db8",
+        "x": 1258.5,
+        "y": 790.5,
+        "z": "dc90116d.356cd8",
         "wires": [
             []
         ]
     },
     {
-        "id": "39caa350.271204",
+        "id": "6724f8a4.5cbe3",
         "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": 764.5,
-        "y": 985.5,
-        "z": "8a5117b5.c01db8",
+        "x": 787.5,
+        "y": 925.5,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "14436f1d.f47b89",
+        "id": "c711ca11.6e628",
         "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": 777.5,
-        "y": 1074.5,
-        "z": "8a5117b5.c01db8",
+        "x": 800.5,
+        "y": 1014.5,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "82076a69.af01a",
-                "7b1e0312.764db4",
-                "5cc08e4.aa9e2f"
+                "9c302232.f8804",
+                "b1ece16a.0f3c9",
+                "3da8c72e.feda78"
             ]
         ]
     },
     {
-        "id": "82076a69.af01a",
+        "id": "9c302232.f8804",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1002.5,
-        "y": 1089.5,
-        "z": "8a5117b5.c01db8",
+        "x": 1025.5,
+        "y": 1029.5,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "dc7dee5b.44e56"
+                "dd99da73.f2065"
             ]
         ]
     },
     {
-        "id": "dc7dee5b.44e56",
+        "id": "dd99da73.f2065",
         "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": 1173.5,
-        "y": 1090.5,
-        "z": "8a5117b5.c01db8",
+        "x": 1196.5,
+        "y": 1030.5,
+        "z": "dc90116d.356cd8",
         "wires": [
             []
         ]
     },
     {
-        "id": "6aefa7bc.0e864",
+        "id": "582fc831.36e3c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1052.5,
-        "y": 922.5,
-        "z": "8a5117b5.c01db8",
+        "x": 1075.5,
+        "y": 862.5,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "2c713fb3.4d6888"
+                "b099b128.5136c8"
             ]
         ]
     },
     {
-        "id": "7b1e0312.764db4",
+        "id": "b1ece16a.0f3c9",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 983.5,
-        "y": 1162.5,
-        "z": "8a5117b5.c01db8",
+        "x": 1006.5,
+        "y": 1102.5,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "2bfd8d24.d64f22"
+                "c581f585.410918"
             ]
         ]
     },
     {
-        "id": "2c713fb3.4d6888",
+        "id": "b099b128.5136c8",
         "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": 1213.5,
-        "y": 927.5,
-        "z": "8a5117b5.c01db8",
+        "x": 1236.5,
+        "y": 867.5,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "b6643c83.4fa068",
+        "id": "b559176c.28e268",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1043.5,
-        "y": 982.5,
-        "z": "8a5117b5.c01db8",
+        "x": 1066.5,
+        "y": 922.5,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "a2919cf8.1bf828"
+                "50ff2098.8d83d"
             ]
         ]
     },
     {
-        "id": "a2919cf8.1bf828",
+        "id": "50ff2098.8d83d",
         "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": 1192.5,
-        "y": 984.5,
-        "z": "8a5117b5.c01db8",
+        "x": 1215.5,
+        "y": 924.5,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "2bfd8d24.d64f22",
+        "id": "c581f585.410918",
         "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": 1131.5,
-        "y": 1163.5,
-        "z": "8a5117b5.c01db8",
+        "x": 1154.5,
+        "y": 1103.5,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "5cc08e4.aa9e2f",
+        "id": "3da8c72e.feda78",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 983.5,
-        "y": 1206.5,
-        "z": "8a5117b5.c01db8",
+        "x": 1006.5,
+        "y": 1146.5,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "2f855e70.bc0c7a"
+                "37d6a3b7.1cca8c"
             ]
         ]
     },
     {
-        "id": "2f855e70.bc0c7a",
+        "id": "37d6a3b7.1cca8c",
         "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": 1148.5,
-        "y": 1203.5,
-        "z": "8a5117b5.c01db8",
+        "x": 1171.5,
+        "y": 1143.5,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "ad97aa98.c768d",
+        "id": "10fd3c36.34f02c",
         "type": "switchNode",
         "name": "switch network_length",
         "xml": "<switch test='`$topology.networks.network_length >= 2`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2659,
-        "y": 355,
-        "z": "8a5117b5.c01db8",
+        "x": 2682,
+        "y": 295,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "47f11a60.715fe4"
+                "fbaeb9ed.a2e628"
             ]
         ]
     },
     {
-        "id": "47f11a60.715fe4",
+        "id": "fbaeb9ed.a2e628",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2841,
-        "y": 356,
-        "z": "8a5117b5.c01db8",
+        "x": 2864,
+        "y": 296,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "610c5ba8.ab12f4"
+                "93fe6a3d.a61a8"
             ]
         ]
     },
     {
-        "id": "3f621874.83f7b",
+        "id": "c8aabe3a.b7443",
         "type": "for",
         "name": "for each Network",
         "xml": "<for index='netidx' start='0' end='`$topology.networks.network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3214,
-        "y": 349,
-        "z": "8a5117b5.c01db8",
+        "x": 3237,
+        "y": 289,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "47e16032.729b78"
+                "c5d07173.a82"
             ]
         ]
     },
     {
-        "id": "47e16032.729b78",
+        "id": "c5d07173.a82",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3432,
-        "y": 346,
-        "z": "8a5117b5.c01db8",
+        "x": 3455,
+        "y": 286,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "cc7e5bc4.9fb7e8",
-                "8fc85a95.09a108",
-                "c99c88.f08ccb78"
+                "6173b924.39e6a8",
+                "a7527c77.d05fd8",
+                "17750ab4.92778d"
             ]
         ]
     },
     {
-        "id": "40eac1bc.82a228",
+        "id": "1c54dabe.e430a5",
         "type": "call",
         "name": "call update-tp-ttp-relationship",
         "xml": "<call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3247,
-        "y": 409,
-        "z": "8a5117b5.c01db8",
+        "x": 3270,
+        "y": 349,
+        "z": "dc90116d.356cd8",
         "wires": [
             []
         ]
     },
     {
-        "id": "610c5ba8.ab12f4",
+        "id": "93fe6a3d.a61a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3011,
-        "y": 352,
-        "z": "8a5117b5.c01db8",
+        "x": 3034,
+        "y": 292,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "3f621874.83f7b",
-                "40eac1bc.82a228"
+                "c8aabe3a.b7443",
+                "1c54dabe.e430a5"
             ]
         ]
     },
     {
-        "id": "c99c88.f08ccb78",
+        "id": "17750ab4.92778d",
         "type": "set",
         "name": "unset network",
         "xml": "<set>\n<parameter name='network.' value='' />\n",
         "comments": "",
-        "x": 3591,
-        "y": 286,
-        "z": "8a5117b5.c01db8",
+        "x": 3614,
+        "y": 226,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "cc7e5bc4.9fb7e8",
+        "id": "6173b924.39e6a8",
         "type": "set",
         "name": "set network",
         "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$netidx].`' />\n",
         "comments": "",
-        "x": 3585,
-        "y": 334,
-        "z": "8a5117b5.c01db8",
+        "x": 3608,
+        "y": 274,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "8fc85a95.09a108",
+        "id": "a7527c77.d05fd8",
         "type": "switchNode",
         "name": "switch network-types with topologyId",
-        "xml": "<switch test='`$network.te-topology-id`'>\n",
+        "xml": "<switch test='`$network.te-topology-identifier.topology-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3662,
-        "y": 381,
-        "z": "8a5117b5.c01db8",
+        "x": 3685,
+        "y": 321,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "a101ef60.461f68",
-                "46ddd7fc.c3c038"
+                "de52bd0e.85db08",
+                "fa3a626b.d125c8"
             ]
         ]
     },
     {
-        "id": "a101ef60.461f68",
+        "id": "de52bd0e.85db08",
         "type": "outcome",
         "name": "1",
         "xml": "<outcome value='1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3888,
-        "y": 350,
-        "z": "8a5117b5.c01db8",
+        "x": 3911,
+        "y": 290,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "9f9b045e.002478"
+                "84c7d418.e115f8"
             ]
         ]
     },
     {
-        "id": "46ddd7fc.c3c038",
+        "id": "fa3a626b.d125c8",
         "type": "outcome",
         "name": "2",
         "xml": "<outcome value='2'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3888,
-        "y": 411,
-        "z": "8a5117b5.c01db8",
+        "x": 3911,
+        "y": 351,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "c00ddb6e.187aa"
+                "caaba956.377e8"
             ]
         ]
     },
     {
-        "id": "55fe80ee.35e4c",
+        "id": "23780bd3.2604dc",
         "type": "set",
         "name": "set network-otn",
         "xml": "<set>\n<parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />\n",
         "comments": "",
-        "x": 4183,
-        "y": 350,
-        "z": "8a5117b5.c01db8",
+        "x": 4206,
+        "y": 290,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "b736da6.72f0128",
+        "id": "6f9e8e73.c1bc3",
         "type": "set",
         "name": "set network eth",
         "xml": "<set>\n<parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />\n",
         "comments": "",
-        "x": 4183,
-        "y": 411,
-        "z": "8a5117b5.c01db8",
+        "x": 4206,
+        "y": 351,
+        "z": "dc90116d.356cd8",
         "wires": []
     },
     {
-        "id": "9f9b045e.002478",
+        "id": "84c7d418.e115f8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4022,
-        "y": 350,
-        "z": "8a5117b5.c01db8",
+        "x": 4045,
+        "y": 290,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "55fe80ee.35e4c"
+                "23780bd3.2604dc"
             ]
         ]
     },
     {
-        "id": "c00ddb6e.187aa",
+        "id": "caaba956.377e8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4023,
-        "y": 411,
-        "z": "8a5117b5.c01db8",
+        "x": 4046,
+        "y": 351,
+        "z": "dc90116d.356cd8",
         "wires": [
             [
-                "b736da6.72f0128"
+                "6f9e8e73.c1bc3"
             ]
         ]
     },
     {
-        "id": "51f49074.c67e58",
+        "id": "92aeb11c.309eb8",
         "type": "set",
         "name": "unset network",
         "xml": "<set>\n<parameter name='network.' value='' />\n",
         "comments": "",
-        "x": 2929,
-        "y": 154,
-        "z": "8a5117b5.c01db8",
+        "x": 2952,
+        "y": 94,
+        "z": "dc90116d.356cd8",
         "wires": []
     }
 ]
\ No newline at end of file
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 67136feb..51c85001 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": "77244695.5fe13",
+        "id": "2a44484a.6f4af",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 124,
-        "y": 98,
-        "z": "11329427.2301e4",
+        "x": 177,
+        "y": 373,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "61db70e6.96f4f"
+                "b261b6d7.5f8108"
             ]
         ]
     },
     {
-        "id": "61db70e6.96f4f",
+        "id": "b261b6d7.5f8108",
         "type": "service-logic",
         "name": "DataChange ${project.version}",
         "module": "DataChange",
@@ -22,1884 +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": 181,
-        "y": 177.888916015625,
-        "z": "11329427.2301e4",
+        "x": 234,
+        "y": 452.888916015625,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "1788c320.44101d"
+                "ab04b014.5bd13"
             ]
         ]
     },
     {
-        "id": "1788c320.44101d",
+        "id": "ab04b014.5bd13",
         "type": "method",
         "name": "method update-network-links-to-aai",
         "xml": "<method rpc='update-network-links-to-aai' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 195,
-        "y": 254.22222900390625,
-        "z": "11329427.2301e4",
+        "x": 248,
+        "y": 529.2222290039062,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "325d107f.de4c6"
+                "80f3a913.52e318"
             ]
         ]
     },
     {
-        "id": "325d107f.de4c6",
+        "id": "80f3a913.52e318",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 206.33343505859375,
-        "y": 331.7779235839844,
-        "z": "11329427.2301e4",
+        "x": 259.33343505859375,
+        "y": 606.7779235839844,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "772b5f61.91c448"
+                "a23199c4.d516d"
             ]
         ]
     },
     {
-        "id": "ea8c4290.e9fc4",
+        "id": "cc2ac29e.5b4cb8",
         "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": 1081.111083984375,
-        "y": 756.111083984375,
-        "z": "11329427.2301e4",
+        "x": 1134.111083984375,
+        "y": 1031.111083984375,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "772b5f61.91c448",
+        "id": "a23199c4.d516d",
         "type": "for",
         "name": "for each link",
         "xml": "<for index='pidx' start='0' end='`$network.link_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 234.88885498046875,
-        "y": 425.33331298828125,
-        "z": "11329427.2301e4",
+        "x": 287.88885498046875,
+        "y": 700.3333129882812,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "34a89003.2e2b",
-                "ba3960a8.1467",
-                "f48b8987.2973f8",
-                "37181089.2d209",
-                "f2821395.fcaa08"
+                "40edda8d.1f7304",
+                "80b56a94.abd878",
+                "df65a3f.afb7d6",
+                "1a9f47eb.9dd1b8",
+                "d95166a6.786718"
             ]
         ]
     },
     {
-        "id": "34a89003.2e2b",
+        "id": "40edda8d.1f7304",
         "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": 567.111083984375,
-        "y": 130.2222137451172,
-        "z": "11329427.2301e4",
+        "x": 620.111083984375,
+        "y": 405.2222137451172,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "8fd33aa8.985138",
+        "id": "3d730288.0a9e8e",
         "type": "for",
         "name": "for each label-restriction",
-        "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",
+        "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restrictions.label-restrictions.label-restriction_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1607.4444580078125,
-        "y": 976.111083984375,
-        "z": "11329427.2301e4",
+        "x": 1660.4444580078125,
+        "y": 1251.111083984375,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "5a96ae47.c33778",
-                "6a43eee0.04c1f8",
-                "1f83fd3d.b74253",
-                "db4d2563.f4f978",
-                "49c5f91d.be38c8",
-                "b8324dab.347198"
+                "389d6db2.d73662",
+                "776b3468.2e107c",
+                "c048257b.948878",
+                "186e1728.625819",
+                "b47043c.925bdc",
+                "b74e25a8.02a68"
             ]
         ]
     },
     {
-        "id": "5a96ae47.c33778",
+        "id": "389d6db2.d73662",
         "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": 1912.111328125,
-        "y": 941.0000610351562,
-        "z": "11329427.2301e4",
+        "x": 1965.111328125,
+        "y": 1216.0000610351562,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "16e2b4ec.afe953",
+        "id": "384d69e2.32009e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2025.4998779296875,
-        "y": 983.74609375,
-        "z": "11329427.2301e4",
+        "x": 2078.4998779296875,
+        "y": 1258.74609375,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "180e1ac0.c84c2d"
+                "6f478b20.e94c3c"
             ]
         ]
     },
     {
-        "id": "e2eddabf.7af6b",
+        "id": "969cafe8.9f0d68",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2033.178466796875,
-        "y": 1042.9604187011719,
-        "z": "11329427.2301e4",
+        "x": 2086.178466796875,
+        "y": 1317.9604187011719,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "c411750f.6a79e8"
+                "227afca0.40453c"
             ]
         ]
     },
     {
-        "id": "180e1ac0.c84c2d",
+        "id": "6f478b20.e94c3c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2186,
-        "y": 983.0000305175781,
-        "z": "11329427.2301e4",
+        "x": 2239,
+        "y": 1258.0000305175781,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "1718031e.d8e1cd",
+        "id": "c43aca83.435d68",
         "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": 2594.5001220703125,
-        "y": 2445.545135498047,
-        "z": "11329427.2301e4",
+        "x": 2647.5001220703125,
+        "y": 2720.545135498047,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "df5f7631.41cd8",
+        "id": "c3c98fb1.6530b8",
         "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": 2628.0001220703125,
-        "y": 2485.545135498047,
-        "z": "11329427.2301e4",
+        "x": 2681.0001220703125,
+        "y": 2760.545135498047,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "39d523bc.136384",
+        "id": "3e4af052.d590d8",
         "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": 2628.0001220703125,
-        "y": 2525.545135498047,
-        "z": "11329427.2301e4",
+        "x": 2681.0001220703125,
+        "y": 2800.545135498047,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "c411750f.6a79e8",
+        "id": "227afca0.40453c",
         "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",
+        "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.otn-tpn`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.restriction`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2217,
-        "y": 1043.0000305175781,
-        "z": "11329427.2301e4",
+        "x": 2270,
+        "y": 1318.0000305175781,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "a7ae4edd.c4cd68",
+        "id": "cb52235a.4de398",
         "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": 1928,
-        "y": 1239,
-        "z": "11329427.2301e4",
+        "x": 1981,
+        "y": 1514,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "6a43eee0.04c1f8",
+        "id": "776b3468.2e107c",
         "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",
+        "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.otn-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label.otn-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step.otn-tpn`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.restriction`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1866.815185546875,
-        "y": 1015.5556640625,
-        "z": "11329427.2301e4",
+        "x": 1919.815185546875,
+        "y": 1290.5556640625,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "16e2b4ec.afe953",
-                "e2eddabf.7af6b"
+                "384d69e2.32009e",
+                "969cafe8.9f0d68"
             ]
         ]
     },
     {
-        "id": "30955035.7652f",
+        "id": "cd94c0c7.dca99",
         "type": "switchNode",
         "name": "switch te-link-attributes label-restriction_length",
-        "xml": "<switch test='`$link.te.te-link-attributes.label-restriction_length`'>\n",
+        "xml": "<switch test='`$link.te.te-link-attributes.label-restrictions.label-restriction_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1126,
-        "y": 976,
-        "z": "11329427.2301e4",
+        "x": 1179,
+        "y": 1251,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "57ae4e2f.8a93c8",
-                "7f343bab.e4c8cc",
-                "22cb05f1.da2172"
+                "90c65e1e.1b46a",
+                "bba73be.8f0e648",
+                "89bc22d1.34b6f8"
             ]
         ]
     },
     {
-        "id": "ba3960a8.1467",
+        "id": "80b56a94.abd878",
         "type": "switchNode",
         "name": "switch link.destination",
         "xml": "<switch test='`$link.destination.dest-node`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 543,
-        "y": 235,
-        "z": "11329427.2301e4",
+        "x": 596,
+        "y": 510,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "a0306127.0ff848",
-                "d09a2f1e.24e0c8"
+                "96f5218a.ce7508",
+                "bcdde385.d6a18"
             ]
         ]
     },
     {
-        "id": "a0306127.0ff848",
+        "id": "96f5218a.ce7508",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 747,
-        "y": 196,
-        "z": "11329427.2301e4",
+        "x": 800,
+        "y": 471,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "da99d9fe.83172"
+                "9cac56eb.170248"
             ]
         ]
     },
     {
-        "id": "d09a2f1e.24e0c8",
+        "id": "bcdde385.d6a18",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 744,
-        "y": 258,
-        "z": "11329427.2301e4",
+        "x": 797,
+        "y": 533,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "e7a5a1e8.6ee3f"
+                "c79f771b.d3d4f"
             ]
         ]
     },
     {
-        "id": "e7a5a1e8.6ee3f",
+        "id": "c79f771b.d3d4f",
         "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": 973,
-        "y": 221,
-        "z": "11329427.2301e4",
+        "x": 1026,
+        "y": 496,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "a3f68296.d7ae38",
+        "id": "4a74efae.a400d",
         "type": "set",
         "name": "set is-open-ended-link",
         "xml": "<set>\n<parameter name='is-open-ended-link' value='true' />\n\n",
         "comments": "",
-        "x": 1151,
-        "y": 96,
-        "z": "11329427.2301e4",
+        "x": 1204,
+        "y": 371,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "be73ca4d.23f61",
+        "id": "fd4572f8.4a1fc8",
         "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": 1154,
-        "y": 181,
-        "z": "11329427.2301e4",
+        "x": 1207,
+        "y": 456,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "d126c02c.3bacd",
-                "4b20a2f1.df693c",
-                "d6c67e44.d54828"
+                "d91d5461.237b08",
+                "554f3cd2.29aafc",
+                "26188ec7.d70682"
             ]
         ]
     },
     {
-        "id": "d126c02c.3bacd",
+        "id": "d91d5461.237b08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1397,
-        "y": 176,
-        "z": "11329427.2301e4",
+        "x": 1450,
+        "y": 451,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "56d01481.fc3d34"
+                "642df634.9cfcd"
             ]
         ]
     },
     {
-        "id": "4b20a2f1.df693c",
+        "id": "554f3cd2.29aafc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1395,
-        "y": 265,
-        "z": "11329427.2301e4",
+        "x": 1448,
+        "y": 540,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "b4b8cef1.bd5508"
+                "da5c053.247edf8"
             ]
         ]
     },
     {
-        "id": "67c0b205.d4f6ec",
+        "id": "cc6294bd.db47a",
         "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": 2070,
-        "y": 193,
-        "z": "11329427.2301e4",
+        "x": 2123,
+        "y": 468,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "b4b8cef1.bd5508",
+        "id": "da5c053.247edf8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1564,
-        "y": 266,
-        "z": "11329427.2301e4",
+        "x": 1617,
+        "y": 541,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "5276aaa7.05e024",
+        "id": "db2a7a96.c095e8",
         "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": 862,
-        "y": 702,
-        "z": "11329427.2301e4",
+        "x": 915,
+        "y": 977,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "1ee6e430.75131c",
-                "e692eeb1.80fc1"
+                "9cc79665.b0c1d8",
+                "ccb57d13.8728a"
             ]
         ]
     },
     {
-        "id": "d6c67e44.d54828",
+        "id": "26188ec7.d70682",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1406.490966796875,
-        "y": 218.57403564453125,
-        "z": "11329427.2301e4",
+        "x": 1459.490966796875,
+        "y": 493.57403564453125,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "ce500e8a.13e1b"
+                "2d6aa2de.7cc37e"
             ]
         ]
     },
     {
-        "id": "ce500e8a.13e1b",
+        "id": "2d6aa2de.7cc37e",
         "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": 1560.0623779296875,
-        "y": 221.85977172851562,
-        "z": "11329427.2301e4",
+        "x": 1613.0623779296875,
+        "y": 496.8597717285156,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "52680ac9.74c6bc",
+        "id": "e1b7cfff.245f78",
         "type": "switchNode",
         "name": "switch is-open-ended-link",
         "xml": "<switch test='`$is-open-ended-link`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 441,
-        "y": 741,
-        "z": "11329427.2301e4",
+        "x": 494,
+        "y": 1016,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "c8f3bc4d.123c58",
-                "d068e94c.b6bab"
+                "23bae704.e702f8",
+                "41118ce4.589e94"
             ]
         ]
     },
     {
-        "id": "c8f3bc4d.123c58",
+        "id": "23bae704.e702f8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 658,
-        "y": 763,
-        "z": "11329427.2301e4",
+        "x": 711,
+        "y": 1038,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "62f182d2.b1427c"
+                "b47ecf24.d0d53"
             ]
         ]
     },
     {
-        "id": "d068e94c.b6bab",
+        "id": "41118ce4.589e94",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 661,
-        "y": 703,
-        "z": "11329427.2301e4",
+        "x": 714,
+        "y": 978,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "5276aaa7.05e024"
+                "db2a7a96.c095e8"
             ]
         ]
     },
     {
-        "id": "1ee6e430.75131c",
+        "id": "9cc79665.b0c1d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1106,
-        "y": 372,
-        "z": "11329427.2301e4",
+        "x": 1159,
+        "y": 647,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "5326eda4.cd9dac"
+                "472cc2a1.3bea84"
             ]
         ]
     },
     {
-        "id": "e692eeb1.80fc1",
+        "id": "ccb57d13.8728a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1131.490966796875,
-        "y": 567.5740356445312,
-        "z": "11329427.2301e4",
+        "x": 1184.490966796875,
+        "y": 842.5740356445312,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "169999f1.cf3e56"
+                "3f879bbb.1b856c"
             ]
         ]
     },
     {
-        "id": "df93f1df.e408b",
+        "id": "2fc9a33.5368fdc",
         "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": 1603,
-        "y": 589,
-        "z": "11329427.2301e4",
+        "x": 1656,
+        "y": 864,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "62f182d2.b1427c",
+        "id": "b47ecf24.d0d53",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 836,
-        "y": 771,
-        "z": "11329427.2301e4",
+        "x": 889,
+        "y": 1046,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "ea8c4290.e9fc4",
-                "30955035.7652f",
-                "cdc97515.c97b28",
-                "43ca3bbb.8af21c"
+                "cc2ac29e.5b4cb8",
+                "cd94c0c7.dca99",
+                "8b256a3b.c9fcf8",
+                "7d71c761.5d3918"
             ]
         ]
     },
     {
-        "id": "922e1b5e.413f38",
+        "id": "1a18f983.2948b6",
         "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": 2517,
-        "y": 418,
-        "z": "11329427.2301e4",
+        "x": 2570,
+        "y": 693,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "b261d13e.1146f",
-                "acda2064.208dd8"
+                "8f7a6405.a639e",
+                "980c7498.2f0248"
             ]
         ]
     },
     {
-        "id": "a65d4fc9.cbb8f8",
+        "id": "74e95a4e.aaf1fc",
         "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": 1066,
-        "y": 1210,
-        "z": "11329427.2301e4",
+        "x": 1119,
+        "y": 1485,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "da99d9fe.83172",
+        "id": "9cac56eb.170248",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 935,
-        "y": 157,
-        "z": "11329427.2301e4",
+        "x": 988,
+        "y": 432,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "a3f68296.d7ae38",
-                "be73ca4d.23f61",
-                "7e55092c.663d38"
+                "4a74efae.a400d",
+                "fd4572f8.4a1fc8",
+                "33c2b566.b310c2"
             ]
         ]
     },
     {
-        "id": "169999f1.cf3e56",
+        "id": "3f879bbb.1b856c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1320,
-        "y": 570,
-        "z": "11329427.2301e4",
+        "x": 1373,
+        "y": 845,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "df93f1df.e408b",
-                "396e80a6.960c58",
-                "57d29a3c.fe54c4",
-                "3f800f5b.cc91f8"
+                "2fc9a33.5368fdc",
+                "2a78ca83.6ff14e",
+                "2b39dd9d.727772",
+                "a907e1c3.c2be48"
             ]
         ]
     },
     {
-        "id": "396e80a6.960c58",
+        "id": "2a78ca83.6ff14e",
         "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": 1532,
-        "y": 650,
-        "z": "11329427.2301e4",
+        "x": 1585,
+        "y": 925,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "19afd467.bf4a8c",
+        "id": "cccf5ee2.02af4",
         "type": "for",
         "name": "for each label-restriction",
-        "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",
+        "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restrictions.label-restriction_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2059,
-        "y": 776,
-        "z": "11329427.2301e4",
+        "x": 2112,
+        "y": 1051,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "93dd8916.c138b",
-                "e065f5f8.a10718",
-                "667c042d.d704cc",
-                "1b0b9ceb.8ee5ab",
-                "98a97ae5.7ea6d",
-                "54564b15.ad996c"
+                "e6f77baa.2a01a8",
+                "9164022b.f6d8e",
+                "d3edd22f.77b2c8",
+                "500f0218.4a402c",
+                "7b4521e8.06bc6",
+                "2f592aeb.8ac8a6"
             ]
         ]
     },
     {
-        "id": "93dd8916.c138b",
+        "id": "e6f77baa.2a01a8",
         "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",
+        "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restrictions.label-restriction[$tidx].`' />\n",
         "comments": "",
-        "x": 2349.6669921875,
-        "y": 654.8889770507812,
-        "z": "11329427.2301e4",
+        "x": 2402.6669921875,
+        "y": 929.8889770507812,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "adaa1c19.7064b",
+        "id": "aa6afabb.060108",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2491.0555419921875,
-        "y": 733.635009765625,
-        "z": "11329427.2301e4",
+        "x": 2544.0555419921875,
+        "y": 1008.635009765625,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "c7ff7951.db72b8"
+                "56ad069a.c01ff"
             ]
         ]
     },
     {
-        "id": "85c8d180.3fabc",
+        "id": "a11a19e6.f83db",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2498.734130859375,
-        "y": 792.8493347167969,
-        "z": "11329427.2301e4",
+        "x": 2551.734130859375,
+        "y": 1067.8493347167969,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "82edaa01.6319c"
+                "a2c16cc9.f432d8"
             ]
         ]
     },
     {
-        "id": "c7ff7951.db72b8",
+        "id": "56ad069a.c01ff",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2651.5556640625,
-        "y": 732.8889465332031,
-        "z": "11329427.2301e4",
+        "x": 2704.5556640625,
+        "y": 1007.8889465332031,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "82edaa01.6319c",
+        "id": "a2c16cc9.f432d8",
         "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",
+        "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.otn-tpn`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.restriction`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2682.5556640625,
-        "y": 792.8889465332031,
-        "z": "11329427.2301e4",
+        "x": 2735.5556640625,
+        "y": 1067.8889465332031,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "66919d0c.15300c",
+        "id": "97715e1e.68cf18",
         "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": 2358.5556640625,
-        "y": 925.888916015625,
-        "z": "11329427.2301e4",
+        "x": 2411.5556640625,
+        "y": 1200.888916015625,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "e065f5f8.a10718",
+        "id": "9164022b.f6d8e",
         "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",
+        "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.otn-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label.otn-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step.otn-tpn`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.restriction`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2300.370849609375,
-        "y": 765.444580078125,
-        "z": "11329427.2301e4",
+        "x": 2353.370849609375,
+        "y": 1040.444580078125,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "adaa1c19.7064b",
-                "85c8d180.3fabc"
+                "aa6afabb.060108",
+                "a11a19e6.f83db"
             ]
         ]
     },
     {
-        "id": "f48b8987.2973f8",
+        "id": "df65a3f.afb7d6",
         "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": 544,
-        "y": 180,
-        "z": "11329427.2301e4",
+        "x": 597,
+        "y": 455,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "aa54070.82178f8",
+        "id": "8ffa23a3.fdd688",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1486,
-        "y": 93,
-        "z": "11329427.2301e4",
+        "x": 1539,
+        "y": 368,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "56d01481.fc3d34",
+        "id": "642df634.9cfcd",
         "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": 1636,
-        "y": 173,
-        "z": "11329427.2301e4",
+        "x": 1689,
+        "y": 448,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "21fe7bc0.8046c4",
-                "ad83b45.12739c8"
+                "398a73a4.c141b4",
+                "b976aae8.9f6bf"
             ]
         ]
     },
     {
-        "id": "21fe7bc0.8046c4",
+        "id": "398a73a4.c141b4",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1866,
-        "y": 120,
-        "z": "11329427.2301e4",
+        "x": 1919,
+        "y": 395,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "82a5af1.d5baf5"
+                "1c8478c5.1051c7"
             ]
         ]
     },
     {
-        "id": "ad83b45.12739c8",
+        "id": "b976aae8.9f6bf",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1870,
-        "y": 193,
-        "z": "11329427.2301e4",
+        "x": 1923,
+        "y": 468,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "67c0b205.d4f6ec"
+                "cc6294bd.db47a"
             ]
         ]
     },
     {
-        "id": "82a5af1.d5baf5",
+        "id": "1c8478c5.1051c7",
         "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": 2054,
-        "y": 116,
-        "z": "11329427.2301e4",
+        "x": 2107,
+        "y": 391,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "6944be1e.90178",
+        "id": "d68a82dd.baafa",
         "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": 2035,
-        "y": 65,
-        "z": "11329427.2301e4",
+        "x": 2088,
+        "y": 340,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "37181089.2d209",
+        "id": "1a9f47eb.9dd1b8",
         "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": 572,
-        "y": 72,
-        "z": "11329427.2301e4",
+        "x": 625,
+        "y": 347,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "d1dc92f0.18d3d",
+        "id": "95689fab.742d9",
         "type": "switchNode",
         "name": "switch is-invalid-open-ended-link",
         "xml": "<switch test='`$is-invalid-open-ended-link`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 662,
-        "y": 1188,
-        "z": "11329427.2301e4",
+        "x": 715,
+        "y": 1463,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "927f7161.cc38b",
-                "df6ba571.497fe8"
+                "34ef56f.9c47daa",
+                "5046d09d.03023"
             ]
         ]
     },
     {
-        "id": "df6ba571.497fe8",
+        "id": "5046d09d.03023",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 869,
-        "y": 1156,
-        "z": "11329427.2301e4",
+        "x": 922,
+        "y": 1431,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "fabfad0b.ca8968"
+                "62591c1c.412984"
             ]
         ]
     },
     {
-        "id": "927f7161.cc38b",
+        "id": "34ef56f.9c47daa",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 866,
-        "y": 1216,
-        "z": "11329427.2301e4",
+        "x": 919,
+        "y": 1491,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "a65d4fc9.cbb8f8"
+                "74e95a4e.aaf1fc"
             ]
         ]
     },
     {
-        "id": "fabfad0b.ca8968",
+        "id": "62591c1c.412984",
         "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": 1049,
-        "y": 1155,
-        "z": "11329427.2301e4",
+        "x": 1102,
+        "y": 1430,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "19677d78.14b74b",
+        "id": "25746d3c.4940aa",
         "type": "switchNode",
         "name": "switch relationship-list_length",
         "xml": "<switch test='`$tmp.aai.logical-link.relationship-list_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1378,
-        "y": 345,
-        "z": "11329427.2301e4",
+        "x": 1431,
+        "y": 620,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "d7971422.333fa8",
-                "18cbfa68.3dd856",
-                "31f7a610.b076e2"
+                "746a8004.09cff",
+                "73e19277.cd0d74",
+                "54f3128.186c6ec"
             ]
         ]
     },
     {
-        "id": "aa6b17d7.21416",
+        "id": "f940a5cf.482c7",
         "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": 1829,
-        "y": 359,
-        "z": "11329427.2301e4",
+        "x": 1882,
+        "y": 634,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "b03e88ee.6fe68"
+                "f5773dbe.bfd0b"
             ]
         ]
     },
     {
-        "id": "d7971422.333fa8",
+        "id": "746a8004.09cff",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1596,
-        "y": 304,
-        "z": "11329427.2301e4",
+        "x": 1649,
+        "y": 579,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "33af6da8.d2ef82"
+                "72a8794.b4b8e08"
             ]
         ]
     },
     {
-        "id": "18cbfa68.3dd856",
+        "id": "73e19277.cd0d74",
         "type": "outcome",
         "name": "1",
         "xml": "<outcome value='1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1593,
-        "y": 341,
-        "z": "11329427.2301e4",
+        "x": 1646,
+        "y": 616,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "aa6b17d7.21416"
+                "f940a5cf.482c7"
             ]
         ]
     },
     {
-        "id": "31f7a610.b076e2",
+        "id": "54f3128.186c6ec",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1603,
-        "y": 415,
-        "z": "11329427.2301e4",
+        "x": 1656,
+        "y": 690,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "6e8cc864.7485f8"
+                "5ae33948.bc4e98"
             ]
         ]
     },
     {
-        "id": "6e8cc864.7485f8",
+        "id": "5ae33948.bc4e98",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1740,
-        "y": 416,
-        "z": "11329427.2301e4",
+        "x": 1793,
+        "y": 691,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "899a17e9.aedab8"
+                "40998ac8.7fdebc"
             ]
         ]
     },
     {
-        "id": "33af6da8.d2ef82",
+        "id": "72a8794.b4b8e08",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1738,
-        "y": 312,
-        "z": "11329427.2301e4",
+        "x": 1791,
+        "y": 587,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "af13ae20.bebac"
+                "cd475089.f525c8"
             ]
         ]
     },
     {
-        "id": "f2821395.fcaa08",
+        "id": "d95166a6.786718",
         "type": "switchNode",
         "name": "switch is-invalid-open-ended-link",
         "xml": "<switch test='`$is-invalid-open-ended-link`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 439,
-        "y": 569,
-        "z": "11329427.2301e4",
+        "x": 492,
+        "y": 844,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "9c119bdb.5496e8",
-                "d08739e0.57fa3"
+                "931f9360.8959a8",
+                "c70eb2bc.c116e"
             ]
         ]
     },
     {
-        "id": "d08739e0.57fa3",
+        "id": "c70eb2bc.c116e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 646,
-        "y": 537,
-        "z": "11329427.2301e4",
+        "x": 699,
+        "y": 812,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "1951ba10.65f9fe"
+                "6d40a852.3c30b8"
             ]
         ]
     },
     {
-        "id": "9c119bdb.5496e8",
+        "id": "931f9360.8959a8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 643,
-        "y": 597,
-        "z": "11329427.2301e4",
+        "x": 696,
+        "y": 872,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "52680ac9.74c6bc"
+                "e1b7cfff.245f78"
             ]
         ]
     },
     {
-        "id": "1951ba10.65f9fe",
+        "id": "6d40a852.3c30b8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 797,
-        "y": 537,
-        "z": "11329427.2301e4",
+        "x": 850,
+        "y": 812,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "cdc97515.c97b28",
+        "id": "8b256a3b.c9fcf8",
         "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": 1064,
-        "y": 859,
-        "z": "11329427.2301e4",
+        "x": 1117,
+        "y": 1134,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "b03e88ee.6fe68",
+        "id": "f5773dbe.bfd0b",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2076,
-        "y": 350,
-        "z": "11329427.2301e4",
+        "x": 2129,
+        "y": 625,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "57515da6.acd334",
+        "id": "4a8ff8f3.1a9e6",
         "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": 1009,
-        "y": 804,
-        "z": "11329427.2301e4",
+        "x": 1062,
+        "y": 1079,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "7e55092c.663d38",
+        "id": "33c2b566.b310c2",
         "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": 1152,
-        "y": 134,
-        "z": "11329427.2301e4",
+        "x": 1205,
+        "y": 409,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "4b963b57.e5bedc",
+        "id": "4fdf002d.f301b8",
         "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": 2392,
-        "y": 322,
-        "z": "11329427.2301e4",
+        "x": 2445,
+        "y": 597,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "5326eda4.cd9dac",
+        "id": "472cc2a1.3bea84",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2068,
-        "y": 567,
-        "z": "11329427.2301e4",
+        "x": 2121,
+        "y": 842,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "4b963b57.e5bedc",
-                "922e1b5e.413f38",
-                "a18dc6ab.ac0e98",
-                "6723873e.80324"
+                "4fdf002d.f301b8",
+                "1a18f983.2948b6",
+                "54aa9c80.30f7ac",
+                "beafe2da.650458"
             ]
         ]
     },
     {
-        "id": "b261d13e.1146f",
+        "id": "8f7a6405.a639e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2806,
-        "y": 388,
-        "z": "11329427.2301e4",
+        "x": 2859,
+        "y": 663,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "9a2a7ebb.6f02f"
+                "80d026e.3108fd8"
             ]
         ]
     },
     {
-        "id": "acda2064.208dd8",
+        "id": "980c7498.2f0248",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2813.6785888671875,
-        "y": 447.2143249511719,
-        "z": "11329427.2301e4",
+        "x": 2866.6785888671875,
+        "y": 722.2143249511719,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "693b3172.16e028"
+                "e9dc5e3a.d617b8"
             ]
         ]
     },
     {
-        "id": "9a2a7ebb.6f02f",
+        "id": "80d026e.3108fd8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2954,
-        "y": 383,
-        "z": "11329427.2301e4",
+        "x": 3007,
+        "y": 658,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "24d0b2c2.21a89e"
+                "36bd5bef.3c952c"
             ]
         ]
     },
     {
-        "id": "24d0b2c2.21a89e",
+        "id": "36bd5bef.3c952c",
         "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": 3099,
-        "y": 383,
-        "z": "11329427.2301e4",
+        "x": 3152,
+        "y": 658,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "693b3172.16e028",
+        "id": "e9dc5e3a.d617b8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2961,
-        "y": 445,
-        "z": "11329427.2301e4",
+        "x": 3014,
+        "y": 720,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "cbdf69e4.857a38"
+                "aad51072.1ab57"
             ]
         ]
     },
     {
-        "id": "af13ae20.bebac",
+        "id": "cd475089.f525c8",
         "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": 1874,
-        "y": 310,
-        "z": "11329427.2301e4",
+        "x": 1927,
+        "y": 585,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "899a17e9.aedab8",
+        "id": "40998ac8.7fdebc",
         "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": 1885,
-        "y": 425,
-        "z": "11329427.2301e4",
+        "x": 1938,
+        "y": 700,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "cbdf69e4.857a38",
+        "id": "aad51072.1ab57",
         "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": 3106,
-        "y": 445,
-        "z": "11329427.2301e4",
+        "x": 3159,
+        "y": 720,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "57ae4e2f.8a93c8",
+        "id": "90c65e1e.1b46a",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1420,
-        "y": 874,
-        "z": "11329427.2301e4",
+        "x": 1473,
+        "y": 1149,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "9036593c.1672f"
+                "5ece6154.9b4de8"
             ]
         ]
     },
     {
-        "id": "7f343bab.e4c8cc",
+        "id": "bba73be.8f0e648",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1422,
-        "y": 922,
-        "z": "11329427.2301e4",
+        "x": 1475,
+        "y": 1197,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "9036593c.1672f"
+                "5ece6154.9b4de8"
             ]
         ]
     },
     {
-        "id": "22cb05f1.da2172",
+        "id": "89bc22d1.34b6f8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1419,
-        "y": 976,
-        "z": "11329427.2301e4",
+        "x": 1472,
+        "y": 1251,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "8fd33aa8.985138"
+                "3d730288.0a9e8e"
             ]
         ]
     },
     {
-        "id": "9036593c.1672f",
+        "id": "5ece6154.9b4de8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1575,
-        "y": 874,
-        "z": "11329427.2301e4",
+        "x": 1628,
+        "y": 1149,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "57d29a3c.fe54c4",
+        "id": "2b39dd9d.727772",
         "type": "switchNode",
         "name": "switch te-link-attributes label-restriction_length",
-        "xml": "<switch test='`$link.te.te-link-attributes.label-restriction_length`'>\n",
+        "xml": "<switch test='`$link.te.te-link-attributes.label-restrictions.label-restriction_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1601,
-        "y": 767,
-        "z": "11329427.2301e4",
+        "x": 1654,
+        "y": 1042,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "681fa8f6.5d2f28",
-                "ec4baaa9.ef82",
-                "7ddd884.112ddf8"
+                "63fb4c18.c74d64",
+                "2a270231.4c1bfe",
+                "e61a6187.46dbb"
             ]
         ]
     },
     {
-        "id": "681fa8f6.5d2f28",
+        "id": "63fb4c18.c74d64",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1873,
-        "y": 677,
-        "z": "11329427.2301e4",
+        "x": 1926,
+        "y": 952,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "ef3a31b6.0b2b58"
+                "8419c37f.a7c378"
             ]
         ]
     },
     {
-        "id": "ef3a31b6.0b2b58",
+        "id": "8419c37f.a7c378",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2028,
-        "y": 677,
-        "z": "11329427.2301e4",
+        "x": 2081,
+        "y": 952,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "ec4baaa9.ef82",
+        "id": "2a270231.4c1bfe",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1875,
-        "y": 725,
-        "z": "11329427.2301e4",
+        "x": 1928,
+        "y": 1000,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "ef3a31b6.0b2b58"
+                "8419c37f.a7c378"
             ]
         ]
     },
     {
-        "id": "7ddd884.112ddf8",
+        "id": "e61a6187.46dbb",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1874,
-        "y": 776,
-        "z": "11329427.2301e4",
+        "x": 1927,
+        "y": 1051,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "19afd467.bf4a8c"
+                "cccf5ee2.02af4"
             ]
         ]
     },
     {
-        "id": "667c042d.d704cc",
+        "id": "d3edd22f.77b2c8",
         "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": 2355,
-        "y": 603,
-        "z": "11329427.2301e4",
+        "x": 2408,
+        "y": 878,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "1f83fd3d.b74253",
+        "id": "c048257b.948878",
         "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": 1909,
-        "y": 830,
-        "z": "11329427.2301e4",
+        "x": 1962,
+        "y": 1105,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "a18dc6ab.ac0e98",
+        "id": "54aa9c80.30f7ac",
         "type": "switchNode",
         "name": "switch te-link-attributes label-restriction_length",
-        "xml": "<switch test='`$link.te.te-link-attributes.label-restriction_length`'>\n",
+        "xml": "<switch test='`$link.te.te-link-attributes.label-restrictions.label-restriction_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2693,
-        "y": 554,
-        "z": "11329427.2301e4",
+        "x": 2746,
+        "y": 829,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "22753c60.a6d58c",
-                "56afa73f.b3618",
-                "2c831306.1c7d44"
+                "553db7a2.c22418",
+                "1cc0503b.5a6d68",
+                "b8719fd0.e9e07"
             ]
         ]
     },
     {
-        "id": "22753c60.a6d58c",
+        "id": "553db7a2.c22418",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2963,
-        "y": 516,
-        "z": "11329427.2301e4",
+        "x": 3016,
+        "y": 791,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "ee39387a.68929"
+                "416529b9.98998"
             ]
         ]
     },
     {
-        "id": "ee39387a.68929",
+        "id": "416529b9.98998",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3118,
-        "y": 516,
-        "z": "11329427.2301e4",
+        "x": 3171,
+        "y": 791,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "56afa73f.b3618",
+        "id": "1cc0503b.5a6d68",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2965,
-        "y": 564,
-        "z": "11329427.2301e4",
+        "x": 3018,
+        "y": 839,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "ee39387a.68929"
+                "416529b9.98998"
             ]
         ]
     },
     {
-        "id": "2c831306.1c7d44",
+        "id": "b8719fd0.e9e07",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2964,
-        "y": 615,
-        "z": "11329427.2301e4",
+        "x": 3017,
+        "y": 890,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "37acde41.902402"
+                "7c7df4.0399fa0c"
             ]
         ]
     },
     {
-        "id": "37acde41.902402",
+        "id": "7c7df4.0399fa0c",
         "type": "for",
         "name": "for each label-restriction",
-        "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",
+        "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restrictions.label-restriction_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3149,
-        "y": 615,
-        "z": "11329427.2301e4",
+        "x": 3202,
+        "y": 890,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "322257af.c0621",
-                "a96bc34a.edf08",
-                "85a3ce07.1ccf48",
-                "6745622e.a105dc",
-                "81205454.92f138",
-                "22ab235a.53f29c"
+                "26ef8a14.1b2d0e",
+                "48b544fa.8f9e04",
+                "60812efb.8cb68",
+                "3261da0c.acaf2e",
+                "e930ab18.78d978",
+                "2bb6c31b.5fcc04"
             ]
         ]
     },
     {
-        "id": "85a3ce07.1ccf48",
+        "id": "60812efb.8cb68",
         "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": 3447,
-        "y": 430,
-        "z": "11329427.2301e4",
+        "x": 3500,
+        "y": 705,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "322257af.c0621",
+        "id": "26ef8a14.1b2d0e",
         "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",
+        "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restrictions.label-restriction[$tidx].`' />\n",
         "comments": "",
-        "x": 3436.6669921875,
-        "y": 476.88897705078125,
-        "z": "11329427.2301e4",
+        "x": 3489.6669921875,
+        "y": 751.8889770507812,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "a96bc34a.edf08",
+        "id": "48b544fa.8f9e04",
         "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",
+        "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.otn-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label.otn-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step.otn-tpn`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.restriction`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3390.370849609375,
-        "y": 604.444580078125,
-        "z": "11329427.2301e4",
+        "x": 3443.370849609375,
+        "y": 879.444580078125,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "e2988e4e.9965d8",
-                "7f7d13.46dcb2ec"
+                "5cd8f390.b6a584",
+                "dea4e969.6c5628"
             ]
         ]
     },
     {
-        "id": "d0f09020.f9dd48",
+        "id": "2c2affa2.8c3e2",
         "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": 3464.5556640625,
-        "y": 788.888916015625,
-        "z": "11329427.2301e4",
+        "x": 3517.5556640625,
+        "y": 1063.888916015625,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "e2988e4e.9965d8",
+        "id": "5cd8f390.b6a584",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3581.0555419921875,
-        "y": 572.635009765625,
-        "z": "11329427.2301e4",
+        "x": 3634.0555419921875,
+        "y": 847.635009765625,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "fbf9ca41.08cd48"
+                "3d107091.6c1e18"
             ]
         ]
     },
     {
-        "id": "7f7d13.46dcb2ec",
+        "id": "dea4e969.6c5628",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3588.734130859375,
-        "y": 631.8493347167969,
-        "z": "11329427.2301e4",
+        "x": 3641.734130859375,
+        "y": 906.8493347167969,
+        "z": "9586b8f9.18f7b",
         "wires": [
             [
-                "84622b72.0f60f8"
+                "27136cba.661bb4"
             ]
         ]
     },
     {
-        "id": "fbf9ca41.08cd48",
+        "id": "3d107091.6c1e18",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3741.5556640625,
-        "y": 571.8889465332031,
-        "z": "11329427.2301e4",
+        "x": 3794.5556640625,
+        "y": 846.8889465332031,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "84622b72.0f60f8",
+        "id": "27136cba.661bb4",
         "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",
+        "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.otn-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label.otn-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step.otn-tpn`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.restriction`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3772.5556640625,
-        "y": 631.8889465332031,
-        "z": "11329427.2301e4",
+        "x": 3825.5556640625,
+        "y": 906.8889465332031,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "6745622e.a105dc",
+        "id": "3261da0c.acaf2e",
         "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": 3437,
-        "y": 526,
-        "z": "11329427.2301e4",
+        "x": 3490,
+        "y": 801,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "1b0b9ceb.8ee5ab",
+        "id": "500f0218.4a402c",
         "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": 2351,
-        "y": 695,
-        "z": "11329427.2301e4",
+        "x": 2404,
+        "y": 970,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "db4d2563.f4f978",
+        "id": "186e1728.625819",
         "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",
+        "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restrictions.label-restriction[$tidx].`' />\n",
         "comments": "",
-        "x": 1906,
-        "y": 882,
-        "z": "11329427.2301e4",
+        "x": 1959,
+        "y": 1157,
+        "z": "9586b8f9.18f7b",
         "wires": []
     },
     {
-        "id": "43ca3bbb.8af21c",
+        "id": "7d71c761.5d3918",
         "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": 1047,
-        "y": 904,
-        "z": "11329427.2301e4",
+        "x": 1100,
+        "y": 1179,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "b8324dab.347198",
+        "id": "b74e25a8.02a68",
         "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": 1938,
-        "y": 1173,
-        "z": "11329427.2301e4",
+        "x": 1991,
+        "y": 1448,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "49c5f91d.be38c8",
+        "id": "b47043c.925bdc",
         "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": 1947,
-        "y": 1113,
-        "z": "11329427.2301e4",
+        "x": 2000,
+        "y": 1388,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "3f800f5b.cc91f8",
+        "id": "a907e1c3.c2be48",
         "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": 1538,
-        "y": 702,
-        "z": "11329427.2301e4",
+        "x": 1591,
+        "y": 977,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "6723873e.80324",
+        "id": "beafe2da.650458",
         "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": 2418,
-        "y": 487,
-        "z": "11329427.2301e4",
+        "x": 2471,
+        "y": 762,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "98a97ae5.7ea6d",
+        "id": "7b4521e8.06bc6",
         "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": 2383,
-        "y": 833,
-        "z": "11329427.2301e4",
+        "x": 2436,
+        "y": 1108,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "54564b15.ad996c",
+        "id": "2f592aeb.8ac8a6",
         "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": 2376,
-        "y": 879,
-        "z": "11329427.2301e4",
+        "x": 2429,
+        "y": 1154,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "22ab235a.53f29c",
+        "id": "2bb6c31b.5fcc04",
         "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": 3473,
-        "y": 731,
-        "z": "11329427.2301e4",
+        "x": 3526,
+        "y": 1006,
+        "z": "9586b8f9.18f7b",
         "wires": [
             []
         ]
     },
     {
-        "id": "81205454.92f138",
+        "id": "e930ab18.78d978",
         "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": 3480,
-        "y": 685,
-        "z": "11329427.2301e4",
+        "x": 3533,
+        "y": 960,
+        "z": "9586b8f9.18f7b",
         "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 f589905c..5cf9d15e 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": "edeab341.54bb4",
+        "id": "761e68a4.20d828",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 126,
-        "y": 105.00650024414062,
-        "z": "a1dc56fc.25a538",
+        "x": 138,
+        "y": 118,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "fa7cab2b.24d26"
+                "77bd0709.0316f8"
             ]
         ]
     },
     {
-        "id": "fa7cab2b.24d26",
+        "id": "77bd0709.0316f8",
         "type": "service-logic",
         "name": "DataChange ${project.version}",
         "module": "DataChange",
@@ -22,1119 +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": 215.00003051757812,
-        "y": 195.89541244506836,
-        "z": "a1dc56fc.25a538",
+        "x": 227.00003051757812,
+        "y": 208.88891220092773,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "6ea5e78a.d4f118"
+                "ce4c01c9.aadb6"
             ]
         ]
     },
     {
-        "id": "6ea5e78a.d4f118",
+        "id": "ce4c01c9.aadb6",
         "type": "method",
         "name": "update-network-to-aai",
         "xml": "<method rpc='update-network-to-aai' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 251.1112518310547,
-        "y": 266.2287368774414,
-        "z": "a1dc56fc.25a538",
+        "x": 263.1112518310547,
+        "y": 279.2222366333008,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "d9721e0.ea910e"
+                "d7c571d2.ba17"
             ]
         ]
     },
     {
-        "id": "d9721e0.ea910e",
+        "id": "d7c571d2.ba17",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 476.33343505859375,
-        "y": 265.784423828125,
-        "z": "a1dc56fc.25a538",
+        "x": 488.33343505859375,
+        "y": 278.7779235839844,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "fe85cd4e.468048",
-                "e705d0b4.a9ae58",
-                "2ddaf91a.d98b16",
-                "ff89ecd9.d9563",
-                "e471027b.286e6",
-                "159870db.58eb07"
+                "bbf04729.a6b23",
+                "e453d9fe.dac3d",
+                "5625b915.f4097",
+                "c5a21baf.a8c168",
+                "6179e02b.bcf5",
+                "1d5c0100.129fd7"
             ]
         ]
     },
     {
-        "id": "e705d0b4.a9ae58",
+        "id": "e453d9fe.dac3d",
         "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",
+        "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.te-topology-identifier.client-id`' />\n<parameter name='te-topo-id' value='`$network.te-topology-identifier.topology-id`' />\n<parameter name='provider-id' value='`$network.te-topology-identifier.provider-id`' />\n\n<parameter name='network-type' value='`$network.network-types`' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 706.333251953125,
-        "y": 171.0065155029297,
-        "z": "a1dc56fc.25a538",
+        "x": 718.333251953125,
+        "y": 184.00001525878906,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "cb2cfb3d.12f0a8",
+        "id": "375be865.3c0f",
         "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": 906.1111450195312,
-        "y": 542.1175842285156,
-        "z": "a1dc56fc.25a538",
+        "x": 918.1111450195312,
+        "y": 555.111083984375,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "2ddaf91a.d98b16",
+        "id": "5625b915.f4097",
         "type": "for",
         "name": "for each node",
         "xml": "<for index='pidx' start='0' end='`$network.node_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 677.8888549804688,
-        "y": 522.3398132324219,
-        "z": "a1dc56fc.25a538",
+        "x": 689.8888549804688,
+        "y": 535.3333129882812,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "cb2cfb3d.12f0a8",
-                "fc39e59f.e19f7",
-                "404895b3.1b9a0c",
-                "38f275a2.ec1422",
-                "dcf15e98.55cd98",
-                "2d8d0a77.affafe",
-                "1758985b.dd13f8",
-                "7f99493d.24ad2"
+                "375be865.3c0f",
+                "4ec17378.333f8c",
+                "56584a7c.bcf26c",
+                "e61a37ad.722b58",
+                "53212212.eee0d4",
+                "d084b3c7.e9a8d8",
+                "b406de10.4f976",
+                "10825cf6.777533"
             ]
         ]
     },
     {
-        "id": "fc39e59f.e19f7",
+        "id": "4ec17378.333f8c",
         "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": 911.111083984375,
-        "y": 438.2287139892578,
-        "z": "a1dc56fc.25a538",
+        "x": 923.111083984375,
+        "y": 451.2222137451172,
+        "z": "602a9cf3.38fe14",
         "wires": []
     },
     {
-        "id": "38f275a2.ec1422",
+        "id": "e61a37ad.722b58",
         "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": 1002.7779541015625,
-        "y": 717.4509782791138,
-        "z": "a1dc56fc.25a538",
+        "x": 1014.7779541015625,
+        "y": 730.4444780349731,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "f06afd2d.6a87a8",
+        "id": "663dfab3.1deedc",
         "type": "for",
         "name": "for each termination point",
         "xml": "<for index='tidx' start='0' end='`$node.termination-point_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1310.4444580078125,
-        "y": 633.1175537109375,
-        "z": "a1dc56fc.25a538",
+        "x": 1322.4444580078125,
+        "y": 646.1110534667969,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "641e627.90ce71c",
-                "62e3b2b7.0e1854",
-                "7c4704e9.f42bfc",
-                "cdce39b5.3e2ce8",
-                "c12a9ec.a16bae"
+                "34b91b9e.a21bbc",
+                "8ee77851.c5edd8",
+                "15e31265.27a116",
+                "bdd15a8d.477f28",
+                "847fbf7b.b4b66"
             ]
         ]
     },
     {
-        "id": "641e627.90ce71c",
+        "id": "34b91b9e.a21bbc",
         "type": "set",
         "name": "set termination point",
         "xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tidx].`' />\n",
         "comments": "",
-        "x": 1580.111328125,
-        "y": 616.0065307617188,
-        "z": "a1dc56fc.25a538",
+        "x": 1592.111328125,
+        "y": 629.0000305175781,
+        "z": "602a9cf3.38fe14",
         "wires": []
     },
     {
-        "id": "7c4704e9.f42bfc",
+        "id": "15e31265.27a116",
         "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": 1574.815185546875,
-        "y": 803.5620727539062,
-        "z": "a1dc56fc.25a538",
+        "x": 1586.815185546875,
+        "y": 816.5555725097656,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "99a9f83c.592fb",
-                "2cd1ffbf.d1e38"
+                "3101a3f2.5441ec",
+                "1a80d066.48736"
             ]
         ]
     },
     {
-        "id": "6c4885ee.2512d4",
+        "id": "923c5d7b.98959",
         "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": 1395.703857421875,
-        "y": 1716.33984375,
-        "z": "a1dc56fc.25a538",
+        "x": 1407.703857421875,
+        "y": 1729.3333435058594,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "62e3b2b7.0e1854",
+        "id": "8ee77851.c5edd8",
         "type": "set",
         "name": "set unique-ltpId",
         "xml": "<set>\n<parameter name='unique-ltpId' value=\"`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`\" />\n",
         "comments": "",
-        "x": 1564.000244140625,
-        "y": 673.1175537109375,
-        "z": "a1dc56fc.25a538",
+        "x": 1576.000244140625,
+        "y": 686.1110534667969,
+        "z": "602a9cf3.38fe14",
         "wires": []
     },
     {
-        "id": "fe85cd4e.468048",
+        "id": "bbf04729.a6b23",
         "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": 662.9935302734375,
-        "y": 80,
-        "z": "a1dc56fc.25a538",
+        "x": 674.9935302734375,
+        "y": 92.99349975585938,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "404895b3.1b9a0c",
+        "id": "56584a7c.bcf26c",
         "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/' + $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": 984,
-        "y": 754,
-        "z": "a1dc56fc.25a538",
+        "x": 996,
+        "y": 766.9934997558594,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "99a9f83c.592fb",
+        "id": "3101a3f2.5441ec",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1746.499885559082,
-        "y": 790.7525482177734,
-        "z": "a1dc56fc.25a538",
+        "x": 1758.499885559082,
+        "y": 803.7460479736328,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "7275269b.187718"
+                "f0102e05.0d4918"
             ]
         ]
     },
     {
-        "id": "2cd1ffbf.d1e38",
+        "id": "1a80d066.48736",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1740.1784744262695,
-        "y": 842.9668598175049,
-        "z": "a1dc56fc.25a538",
+        "x": 1752.1784744262695,
+        "y": 855.9603595733643,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "6558158e.20a7e4"
+                "851b8afc.ed0d6"
             ]
         ]
     },
     {
-        "id": "7275269b.187718",
+        "id": "f0102e05.0d4918",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1897.0000457763672,
-        "y": 790.0064792633057,
-        "z": "a1dc56fc.25a538",
+        "x": 1909.0000457763672,
+        "y": 802.999979019165,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "6558158e.20a7e4",
+        "id": "851b8afc.ed0d6",
         "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": 1926,
-        "y": 844.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1938,
+        "y": 856.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "b62e74a8.72d8f8",
+        "id": "95d00fe5.3c431",
         "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": 1640,
-        "y": 1095.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1652,
+        "y": 1107.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "7c8389d1.ee45",
-                "bbd909f2.ba2d1"
+                "fd2c3c98.e696c",
+                "ddcea662.a71648"
             ]
         ]
     },
     {
-        "id": "b69752f.a47b03",
+        "id": "9b51f802.015ec",
         "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": 1303,
-        "y": 1083.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1315,
+        "y": 1095.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "25de11e2.0dd0ae",
-                "b2448024.6d9268",
-                "b62e74a8.72d8f8",
-                "4cb5cbe8.ee37a4",
-                "3ba1d3d8.7bd96c",
-                "ead9d9cc.bab4f8"
+                "f4695d4f.8e6e6",
+                "5bac7584.0c80fc",
+                "95d00fe5.3c431",
+                "215e84ff.a6a76c",
+                "27c88040.1575b8",
+                "cbf87dc2.898dc8"
             ]
         ]
     },
     {
-        "id": "25de11e2.0dd0ae",
+        "id": "f4695d4f.8e6e6",
         "type": "set",
         "name": "set tunnel termination point",
         "xml": "<set>\n<parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />\n",
         "comments": "",
-        "x": 1638,
-        "y": 1003.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1650,
+        "y": 1015.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": []
     },
     {
-        "id": "b2448024.6d9268",
+        "id": "5bac7584.0c80fc",
         "type": "set",
         "name": "set unique-ttpId",
         "xml": "<set>\n<parameter name='unique-ttpId' value=\"`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 1596.888916015625,
-        "y": 1041.1175537109375,
-        "z": "a1dc56fc.25a538",
+        "x": 1608.888916015625,
+        "y": 1054.1110534667969,
+        "z": "602a9cf3.38fe14",
         "wires": []
     },
     {
-        "id": "7c8389d1.ee45",
+        "id": "fd2c3c98.e696c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1906,
-        "y": 1081.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1918,
+        "y": 1093.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "49e600b2.247268"
+                "17cf7c51.7123dc"
             ]
         ]
     },
     {
-        "id": "bbd909f2.ba2d1",
+        "id": "ddcea662.a71648",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1899.6785888671875,
-        "y": 1133.220781326294,
-        "z": "a1dc56fc.25a538",
+        "x": 1911.6785888671875,
+        "y": 1146.2142810821533,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "8a380f1a.fa11e"
+                "44867d6a.9d6f04"
             ]
         ]
     },
     {
-        "id": "49e600b2.247268",
+        "id": "17cf7c51.7123dc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2056.500160217285,
-        "y": 1080.2604007720947,
-        "z": "a1dc56fc.25a538",
+        "x": 2068.500160217285,
+        "y": 1093.253900527954,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "8a380f1a.fa11e",
+        "id": "44867d6a.9d6f04",
         "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": 2137,
-        "y": 1135.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 2149,
+        "y": 1147.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "dcf15e98.55cd98",
+        "id": "53212212.eee0d4",
         "type": "set",
         "name": "set local variables",
         "xml": "<set>\n<parameter name='unique-nodeId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`\" />\n",
         "comments": "",
-        "x": 936,
-        "y": 485.0065002441406,
-        "z": "a1dc56fc.25a538",
+        "x": 948,
+        "y": 498,
+        "z": "602a9cf3.38fe14",
         "wires": []
     },
     {
-        "id": "ff89ecd9.d9563",
+        "id": "c5a21baf.a8c168",
         "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": 620,
-        "y": 648.0065002441406,
-        "z": "a1dc56fc.25a538",
+        "x": 632,
+        "y": 661,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "d7b3037a.697688",
+        "id": "bb1cacb7.ad451",
         "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": 1402,
-        "y": 1672.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1414,
+        "y": 1684.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "4cb5cbe8.ee37a4",
+        "id": "215e84ff.a6a76c",
         "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": 1711,
-        "y": 1187.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1723,
+        "y": 1199.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "477ea94a.d9b708",
-                "1857aab6.41528d"
+                "b2ce5e57.725c48",
+                "ecae58d2.6c42a"
             ]
         ]
     },
     {
-        "id": "2d8d0a77.affafe",
+        "id": "d084b3c7.e9a8d8",
         "type": "switchNode",
         "name": "switch node ttp",
         "xml": "<switch test='`$node.te.tunnel-termination-point_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 875,
-        "y": 1059.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 887,
+        "y": 1071.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "df28f111.dccd78",
-                "56382251.f0ed44",
-                "836a4c10.0f5058"
+                "4865cde2.7cfebc",
+                "3d27675.a149b18",
+                "57deece8.01b8cc"
             ]
         ]
     },
     {
-        "id": "efccb4e8.6c1f7",
+        "id": "35cbe11c.dd6a16",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1223,
-        "y": 1011.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1235,
+        "y": 1023.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "836a4c10.0f5058",
+        "id": "57deece8.01b8cc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1070,
-        "y": 1094.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1082,
+        "y": 1106.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "b69752f.a47b03"
+                "9b51f802.015ec"
             ]
         ]
     },
     {
-        "id": "1758985b.dd13f8",
+        "id": "b406de10.4f976",
         "type": "switchNode",
         "name": "switch node tp",
         "xml": "<switch test='`$node.termination-point_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 924,
-        "y": 609.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 936,
+        "y": 621.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "9b64d5a2.85c768",
-                "9d78d705.498a28",
-                "fec4616c.fd5128"
+                "d2843fed.623f28",
+                "35baa2d4.5e4b66",
+                "ea06dcd1.7022d8"
             ]
         ]
     },
     {
-        "id": "9b64d5a2.85c768",
+        "id": "d2843fed.623f28",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1103,
-        "y": 561.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1115,
+        "y": 573.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "31b2e806.d617f"
+                "6b24c820.32a928"
             ]
         ]
     },
     {
-        "id": "9d78d705.498a28",
+        "id": "35baa2d4.5e4b66",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1102,
-        "y": 663.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1114,
+        "y": 675.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "f06afd2d.6a87a8"
+                "663dfab3.1deedc"
             ]
         ]
     },
     {
-        "id": "31b2e806.d617f",
+        "id": "6b24c820.32a928",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1258,
-        "y": 561.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1270,
+        "y": 573.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "264d4645.5fe58a",
+        "id": "c2dd2cff.e58418",
         "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": 853,
-        "y": 1103.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 865,
+        "y": 1115.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "df28f111.dccd78",
+        "id": "4865cde2.7cfebc",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1063,
-        "y": 945.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1075,
+        "y": 957.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "efccb4e8.6c1f7"
+                "35cbe11c.dd6a16"
             ]
         ]
     },
     {
-        "id": "56382251.f0ed44",
+        "id": "3d27675.a149b18",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1068,
-        "y": 1020.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1080,
+        "y": 1032.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "efccb4e8.6c1f7"
+                "35cbe11c.dd6a16"
             ]
         ]
     },
     {
-        "id": "fec4616c.fd5128",
+        "id": "ea06dcd1.7022d8",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1113,
-        "y": 609.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1125,
+        "y": 621.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "31b2e806.d617f"
+                "6b24c820.32a928"
             ]
         ]
     },
     {
-        "id": "7f99493d.24ad2",
+        "id": "10825cf6.777533",
         "type": "set",
         "name": "unset node",
         "xml": "<set>\n<parameter name='node.' value='' />\n\n",
         "comments": "",
-        "x": 908,
-        "y": 387.0065002441406,
-        "z": "a1dc56fc.25a538",
+        "x": 920,
+        "y": 400,
+        "z": "602a9cf3.38fe14",
         "wires": []
     },
     {
-        "id": "cdce39b5.3e2ce8",
+        "id": "bdd15a8d.477f28",
         "type": "set",
         "name": "unset termination point",
         "xml": "<set>\n<parameter name='tp.' value='' />\n",
         "comments": "",
-        "x": 1592,
-        "y": 559.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1604,
+        "y": 571.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": []
     },
     {
-        "id": "3ba1d3d8.7bd96c",
+        "id": "27c88040.1575b8",
         "type": "set",
         "name": "unset tunnel termination point",
         "xml": "<set>\n<parameter name='ttp.' value='' />\n",
         "comments": "",
-        "x": 1638,
-        "y": 955.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1650,
+        "y": 967.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": []
     },
     {
-        "id": "477ea94a.d9b708",
+        "id": "b2ce5e57.725c48",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2043,
-        "y": 1190.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 2055,
+        "y": 1202.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "1857aab6.41528d",
+        "id": "ecae58d2.6c42a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2040,
-        "y": 1238.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 2052,
+        "y": 1250.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "7abfb291.6dcbac",
+        "id": "66810254.224164",
         "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": 2198,
-        "y": 1191.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 2210,
+        "y": 1203.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "ec345a2.2004e28",
+        "id": "1bb980b.9e20b7f",
         "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": 2199,
-        "y": 1239.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 2211,
+        "y": 1251.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "49dd63ef.87e564",
+        "id": "7353d26c.dd96ec",
         "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": 2058,
-        "y": 728.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 2070,
+        "y": 740.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "fafe42.8d2fb9c",
-                "2c876749.ba8618"
+                "5edff614.826d5",
+                "1737b2af.9f2d45"
             ]
         ]
     },
     {
-        "id": "c12a9ec.a16bae",
+        "id": "847fbf7b.b4b66",
         "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": 1628,
-        "y": 729.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1640,
+        "y": 741.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "a32fa569.0a3c28",
-                "b8de06da.79eb1"
+                "c7b2022.f3821",
+                "cdd8e382.236ad"
             ]
         ]
     },
     {
-        "id": "b8de06da.79eb1",
+        "id": "cdd8e382.236ad",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1855,
-        "y": 682.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1867,
+        "y": 694.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "578202f3.fbbe74"
+                "7cffd999.b3b1b8"
             ]
         ]
     },
     {
-        "id": "a32fa569.0a3c28",
+        "id": "c7b2022.f3821",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1856,
-        "y": 728.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 1868,
+        "y": 740.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "49dd63ef.87e564"
+                "7353d26c.dd96ec"
             ]
         ]
     },
     {
-        "id": "578202f3.fbbe74",
+        "id": "7cffd999.b3b1b8",
         "type": "set",
         "name": "unset tmp.decoded-plug-id",
         "xml": "<set>\n<parameter name='tmp.decoded-plug-id' value='' />\n",
         "comments": "",
-        "x": 2059,
-        "y": 682.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 2071,
+        "y": 694.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": []
     },
     {
-        "id": "fafe42.8d2fb9c",
+        "id": "5edff614.826d5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2263,
-        "y": 705.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 2275,
+        "y": 717.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "cad449b6.73c6d"
+                "c0e19e99.143c08"
             ]
         ]
     },
     {
-        "id": "2c876749.ba8618",
+        "id": "1737b2af.9f2d45",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2256.6785888671875,
-        "y": 757.220781326294,
-        "z": "a1dc56fc.25a538",
+        "x": 2268.6785888671875,
+        "y": 770.2142810821533,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "92336385.660b18"
+                "d55c12df.ae4af8"
             ]
         ]
     },
     {
-        "id": "cad449b6.73c6d",
+        "id": "c0e19e99.143c08",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2404,
-        "y": 705.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 2416,
+        "y": 717.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "92336385.660b18",
+        "id": "d55c12df.ae4af8",
         "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": 2463,
-        "y": 757.0064697265625,
-        "z": "a1dc56fc.25a538",
+        "x": 2475,
+        "y": 769.9999694824219,
+        "z": "602a9cf3.38fe14",
         "wires": []
     },
     {
-        "id": "e471027b.286e6",
+        "id": "6179e02b.bcf5",
         "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<parameter name='tmp.network-id' value=\"`$tmp.original-network-id`\" />\n\n",
         "comments": "",
-        "x": 688,
-        "y": 121.00650024414062,
-        "z": "a1dc56fc.25a538",
+        "x": 700,
+        "y": 134,
+        "z": "602a9cf3.38fe14",
         "wires": []
     },
     {
-        "id": "159870db.58eb07",
+        "id": "1d5c0100.129fd7",
         "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": 749,
-        "y": 260,
-        "z": "a1dc56fc.25a538",
+        "x": 761,
+        "y": 272.9934997558594,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "f22633be.4476e8",
-                "4f55d446.34a7f4",
-                "beabc6d6.2806f"
+                "90eb31b2.77c238",
+                "f3a7ce78.cbd56",
+                "9f7c8245.3dec38"
             ]
         ]
     },
     {
-        "id": "f22633be.4476e8",
+        "id": "90eb31b2.77c238",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 995,
-        "y": 220,
-        "z": "a1dc56fc.25a538",
+        "x": 1007,
+        "y": 232.99349975585938,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "543559cc.c24e08"
+                "8f122881.12a378"
             ]
         ]
     },
     {
-        "id": "4f55d446.34a7f4",
+        "id": "f3a7ce78.cbd56",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 999,
-        "y": 260,
-        "z": "a1dc56fc.25a538",
+        "x": 1011,
+        "y": 272.9934997558594,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "50076a10.d4e1b4"
+                "ecbad826.8cc148"
             ]
         ]
     },
     {
-        "id": "beabc6d6.2806f",
+        "id": "9f7c8245.3dec38",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 991,
-        "y": 300,
-        "z": "a1dc56fc.25a538",
+        "x": 1003,
+        "y": 312.9934997558594,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "a9b8ac2f.1b4d8"
+                "cf84ec83.d6cc78"
             ]
         ]
     },
     {
-        "id": "50076a10.d4e1b4",
+        "id": "ecbad826.8cc148",
         "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": 1149,
-        "y": 260,
-        "z": "a1dc56fc.25a538",
+        "x": 1161,
+        "y": 272.9934997558594,
+        "z": "602a9cf3.38fe14",
         "wires": []
     },
     {
-        "id": "a9b8ac2f.1b4d8",
+        "id": "cf84ec83.d6cc78",
         "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": 1149,
-        "y": 300,
-        "z": "a1dc56fc.25a538",
+        "x": 1161,
+        "y": 312.9934997558594,
+        "z": "602a9cf3.38fe14",
         "wires": []
     },
     {
-        "id": "543559cc.c24e08",
+        "id": "8f122881.12a378",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1139,
-        "y": 218,
-        "z": "a1dc56fc.25a538",
+        "x": 1151,
+        "y": 230.99349975585938,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "627ad99d.a81fa"
+                "1e7c71ae.903b3e"
             ]
         ]
     },
     {
-        "id": "627ad99d.a81fa",
+        "id": "1e7c71ae.903b3e",
         "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": 1442,
-        "y": 219,
-        "z": "a1dc56fc.25a538",
+        "x": 1454,
+        "y": 231.99349975585938,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "ead9d9cc.bab4f8",
+        "id": "cbf87dc2.898dc8",
         "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": 1572,
-        "y": 1359,
-        "z": "a1dc56fc.25a538",
+        "x": 1584,
+        "y": 1371.9934997558594,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "adf88b82.7a0f88",
-                "67300142.b2942",
-                "fa1d40a0.27dcc"
+                "63cc82cd.b17e4c",
+                "7a2ef7bd.18409",
+                "bb4f9fb3.43afc8"
             ]
         ]
     },
     {
-        "id": "adf88b82.7a0f88",
+        "id": "63cc82cd.b17e4c",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1760,
-        "y": 1245,
-        "z": "a1dc56fc.25a538",
+        "x": 1772,
+        "y": 1257.9934997558594,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "f1f92de8.0da378"
+                "6223b1f1.46672"
             ]
         ]
     },
     {
-        "id": "67300142.b2942",
+        "id": "7a2ef7bd.18409",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1765,
-        "y": 1320,
-        "z": "a1dc56fc.25a538",
+        "x": 1777,
+        "y": 1332.9934997558594,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "f1f92de8.0da378"
+                "6223b1f1.46672"
             ]
         ]
     },
     {
-        "id": "fa1d40a0.27dcc",
+        "id": "bb4f9fb3.43afc8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1767,
-        "y": 1394,
-        "z": "a1dc56fc.25a538",
+        "x": 1779,
+        "y": 1406.9934997558594,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "945bda0b.acb23"
+                "3a444976.a40cae"
             ]
         ]
     },
     {
-        "id": "f1f92de8.0da378",
+        "id": "6223b1f1.46672",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1920,
-        "y": 1311,
-        "z": "a1dc56fc.25a538",
+        "x": 1932,
+        "y": 1323.9934997558594,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "489cfee9.f3ca9",
+        "id": "7f51d8cc.cf481",
         "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": 2148,
-        "y": 1397,
-        "z": "a1dc56fc.25a538",
+        "x": 2160,
+        "y": 1409.9934997558594,
+        "z": "602a9cf3.38fe14",
         "wires": [
             []
         ]
     },
     {
-        "id": "5109bb9b.43b29c",
+        "id": "23d6e8d8.b0dc08",
         "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": 2097,
-        "y": 1353,
-        "z": "a1dc56fc.25a538",
+        "x": 2109,
+        "y": 1365.9934997558594,
+        "z": "602a9cf3.38fe14",
         "wires": []
     },
     {
-        "id": "945bda0b.acb23",
+        "id": "3a444976.a40cae",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1907,
-        "y": 1390,
-        "z": "a1dc56fc.25a538",
+        "x": 1919,
+        "y": 1402.9934997558594,
+        "z": "602a9cf3.38fe14",
         "wires": [
             [
-                "5109bb9b.43b29c",
-                "489cfee9.f3ca9"
+                "23d6e8d8.b0dc08",
+                "7f51d8cc.cf481"
             ]
         ]
     }
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 b49057ed..ebed9d63 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
@@ -78,7 +78,7 @@
                                                                                     <set>
                                                                                         <parameter name='network.' value='`$topology.networks.network[$netidx].`' />
                                                                                     </set>
-                                                                                    <switch test='`$network.te-topology-id`'>
+                                                                                    <switch test='`$network.te-topology-identifier.topology-id`'>
                                                                                         <outcome value='1'>
                                                                                             <block>
                                                                                                 <set>
@@ -148,7 +148,7 @@
                                                                                     <set>
                                                                                         <parameter name='network.' value='`$topology.networks.network[$netidx].`' />
                                                                                     </set>
-                                                                                    <switch test='`$network.te-topology-id`'>
+                                                                                    <switch test='`$network.te-topology-identifier.topology-id`'>
                                                                                         <outcome value='1'>
                                                                                             <block>
                                                                                                 <set>
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 8bac2e29..0a5d05ec 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
@@ -144,7 +144,7 @@
                                                 <parameter name='id' value='`$link.te.te-link-attributes.name`' />
                                                 <parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />
                                             </save>
-                                            <switch test='`$link.te.te-link-attributes.label-restriction_length`'>
+                                            <switch test='`$link.te.te-link-attributes.label-restrictions.label-restriction_length`'>
                                                 <outcome value=''>
                                                     <block></block>
                                                 </outcome>
@@ -152,13 +152,13 @@
                                                     <block></block>
                                                 </outcome>
                                                 <outcome value='Other'>
-                                                    <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >
+                                                    <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restrictions.label-restriction_length`' >
                                                         <set>
                                                             <parameter name='label-restriction.' value='' />
                                                             <parameter name='unique-lrId' value="" />
                                                         </set>
                                                         <set>
-                                                            <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />
+                                                            <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restrictions.label-restriction[$tidx].`' />
                                                         </set>
                                                         <set>
                                                             <parameter name='unique-lrId' value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`" />
@@ -166,11 +166,11 @@
                                                         <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`' />
+                                                            <parameter name='label-start' value='`$label-restriction.label-start.te-label.otn-tpn`' />
+                                                            <parameter name='label-end' value='`$label-restriction.label-end.te-label.otn-tpn`' />
                                                             <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
-                                                            <parameter name='label-step' value='`$label-restriction.label-step`' />
-                                                            <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
+                                                            <parameter name='label-step' value='`$label-restriction.label-step.otn-tpn`' />
+                                                            <parameter name='inclusive-exclusive' value='`$label-restriction.restriction`' />
                                                             <outcome value='success'>
                                                                 <block></block>
                                                             </outcome>
@@ -178,11 +178,11 @@
                                                                 <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`' />
+                                                                    <parameter name='label-start' value='`$label-restriction.label-start.te-label.otn-tpn`' />
+                                                                    <parameter name='label-end' value='`$label-restriction.label-end.te-label.otn-tpn`' />
                                                                     <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
-                                                                    <parameter name='label-step' value='`$label-restriction.label-step`' />
-                                                                    <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
+                                                                    <parameter name='label-step' value='`$label-restriction.label-step.otn-tpn`' />
+                                                                    <parameter name='inclusive-exclusive' value='`$label-restriction.restriction`' />
                                                                 </save>
                                                             </outcome>
                                                         </save>
@@ -226,7 +226,7 @@
                                                 <parameter name='id' value='`$link.te.te-link-attributes.name`' />
                                                 <parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />
                                             </save>
-                                            <switch test='`$link.te.te-link-attributes.label-restriction_length`'>
+                                            <switch test='`$link.te.te-link-attributes.label-restrictions.label-restriction_length`'>
                                                 <outcome value=''>
                                                     <block></block>
                                                 </outcome>
@@ -234,13 +234,13 @@
                                                     <block></block>
                                                 </outcome>
                                                 <outcome value='Other'>
-                                                    <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >
+                                                    <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restrictions.label-restriction_length`' >
                                                         <set>
                                                             <parameter name='label-restriction.' value='' />
                                                             <parameter name='unique-lrId' value="" />
                                                         </set>
                                                         <set>
-                                                            <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />
+                                                            <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restrictions.label-restriction[$tidx].`' />
                                                         </set>
                                                         <set>
                                                             <parameter name='unique-lrId' value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`" />
@@ -248,11 +248,11 @@
                                                         <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`' />
+                                                            <parameter name='label-start' value='`$label-restriction.label-start.te-label.otn-tpn`' />
+                                                            <parameter name='label-end' value='`$label-restriction.label-end.te-label.otn-tpn`' />
                                                             <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
-                                                            <parameter name='label-step' value='`$label-restriction.label-step`' />
-                                                            <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
+                                                            <parameter name='label-step' value='`$label-restriction.label-step.otn-tpn`' />
+                                                            <parameter name='inclusive-exclusive' value='`$label-restriction.restriction`' />
                                                             <outcome value='success'>
                                                                 <block></block>
                                                             </outcome>
@@ -264,8 +264,8 @@
                                                                     <parameter name='label-start' value='`$label-restriction.label-start`' />
                                                                     <parameter name='label-end' value='`$label-restriction.label-end`' />
                                                                     <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
-                                                                    <parameter name='label-step' value='`$label-restriction.label-step`' />
-                                                                    <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
+                                                                    <parameter name='label-step' value='`$label-restriction.label-step.otn-tpn`' />
+                                                                    <parameter name='inclusive-exclusive' value='`$label-restriction.restriction`' />
                                                                 </save>
                                                             </outcome>
                                                         </save>
@@ -314,7 +314,7 @@
                                         <parameter name='id' value='`$link.te.te-link-attributes.name`' />
                                         <parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />
                                     </save>
-                                    <switch test='`$link.te.te-link-attributes.label-restriction_length`'>
+                                    <switch test='`$link.te.te-link-attributes.label-restrictions.label-restriction_length`'>
                                         <outcome value=''>
                                             <block></block>
                                         </outcome>
@@ -322,13 +322,13 @@
                                             <block></block>
                                         </outcome>
                                         <outcome value='Other'>
-                                            <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >
+                                            <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restrictions.label-restrictions.label-restriction_length`' >
                                                 <set>
                                                     <parameter name='label-restriction.' value='' />
                                                     <parameter name='unique-lrId' value="" />
                                                 </set>
                                                 <set>
-                                                    <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />
+                                                    <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restrictions.label-restriction[$tidx].`' />
                                                 </set>
                                                 <set>
                                                     <parameter name='unique-lrId' value="`$unique-linkId + '-lrId-' + $label-restriction.index`" />
@@ -336,11 +336,11 @@
                                                 <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`' />
+                                                    <parameter name='label-start' value='`$label-restriction.label-start.te-label.otn-tpn`' />
+                                                    <parameter name='label-end' value='`$label-restriction.label-end.te-label.otn-tpn`' />
                                                     <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
-                                                    <parameter name='label-step' value='`$label-restriction.label-step`' />
-                                                    <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
+                                                    <parameter name='label-step' value='`$label-restriction.label-step.otn-tpn`' />
+                                                    <parameter name='inclusive-exclusive' value='`$label-restriction.restriction`' />
                                                     <outcome value='success'>
                                                         <block></block>
                                                     </outcome>
@@ -352,8 +352,8 @@
                                                             <parameter name='label-start' value='`$label-restriction.label-start`' />
                                                             <parameter name='label-end' value='`$label-restriction.label-end`' />
                                                             <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
-                                                            <parameter name='label-step' value='`$label-restriction.label-step`' />
-                                                            <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
+                                                            <parameter name='label-step' value='`$label-restriction.label-step.otn-tpn`' />
+                                                            <parameter name='inclusive-exclusive' value='`$label-restriction.restriction`' />
                                                         </save>
                                                     </outcome>
                                                 </save>
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 9d59adf7..311514bd 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
@@ -16,9 +16,9 @@
             <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='client-id' value='`$network.te-topology-identifier.client-id`' />
+                <parameter name='te-topo-id' value='`$network.te-topology-identifier.topology-id`' />
+                <parameter name='provider-id' value='`$network.te-topology-identifier.provider-id`' />
                 <parameter name='network-type' value='`$network.network-types`' />
             </save>
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-- 
2.16.6