From 3e46010ac38c6b738439e718e8b771371317f932 Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Wed, 8 Apr 2020 22:53:30 +0000
Subject: Cross-domain topology discovery for ACTN, bug fixing.

Issue-ID: SDNC-899
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I3b399f1c8f4ded5ea7fea5dd3fbdec71b11a7601
(cherry picked from commit 7dc3fff566f520cd9adc5bcbd373a2a76f6910a9 [formerly 6f6176c4f74c5cf128077a14b9dd085ec0f346e9])

Former-commit-id: 6d3a724e8f0d060441aef42692f0af054a96a250
---
 .../DataChange_esr-thirdparty-sdnc-discovery.json  | 1248 ++++++----
 .../DataChange_update-network-links-to-aai.json    | 2376 ++++++++++++--------
 .../json/DataChange_update-network-to-aai.json     | 1405 ++++++------
 .../DataChange_update-tp-ttp-relationship.json     |  676 +++---
 .../DataChange_esr-thirdparty-sdnc-discovery.xml   |  252 +--
 .../xml/DataChange_update-network-links-to-aai.xml |  481 ++--
 .../main/xml/DataChange_update-network-to-aai.xml  |  250 +-
 .../xml/DataChange_update-tp-ttp-relationship.xml  |  146 +-
 8 files changed, 3938 insertions(+), 2896 deletions(-)

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

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 232afae4..c3b31275 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,253 +1,252 @@
 [
     {
-        "id": "b49e6ed1.c8dcb",
+        "id": "cd2352df.fe133",
         "type": "other",
         "name": "update",
         "xml": "<outcome value='Update'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 663,
-        "y": 290,
-        "z": "1b18cff5.bba51",
+        "x": 717,
+        "y": 280,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "afc79595.03a058"
+                "d7605eba.de53c8"
             ]
         ]
     },
     {
-        "id": "93d3a809.23d83",
+        "id": "a5fb8600.92c56",
         "type": "other",
         "name": "delete",
         "xml": "<outcome value='delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 663,
-        "y": 370,
-        "z": "1b18cff5.bba51",
+        "x": 717,
+        "y": 360,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "87f5ce3d.163be8"
+                "a9fa59c4.23eb88"
             ]
         ]
     },
     {
-        "id": "87f5ce3d.163be8",
+        "id": "a9fa59c4.23eb88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 804.5,
-        "y": 370,
-        "z": "1b18cff5.bba51",
+        "x": 858.5,
+        "y": 360,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             []
         ]
     },
     {
-        "id": "ed89d8e2.366518",
+        "id": "4266435.e82743c",
         "type": "comment",
         "name": "TODO: Delete topology from AAI",
         "info": "",
         "comments": "",
-        "x": 737.3335189819336,
-        "y": 337.96899485588074,
-        "z": "1b18cff5.bba51",
+        "x": 791.3335189819336,
+        "y": 327.96899485588074,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "493ee223.06b5cc",
+        "id": "78227710.8145c",
         "type": "switchNode",
         "name": "switch aai-event-trigger",
         "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 493.5,
-        "y": 330,
-        "z": "1b18cff5.bba51",
+        "x": 547.5,
+        "y": 320,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "b49e6ed1.c8dcb",
-                "93d3a809.23d83"
+                "cd2352df.fe133",
+                "a5fb8600.92c56"
             ]
         ]
     },
     {
-        "id": "c970e0d9.988dc8",
+        "id": "6a609919.dbddb",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1190.5,
-        "y": 201,
-        "z": "1b18cff5.bba51",
+        "x": 1244.5,
+        "y": 191,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "b93333aa.1c0a7",
-                "8e89ec86.381848",
-                "6bfd56ef.86aba8",
-                "29c878c8.6e2e3",
-                "9dd42ebd.c3ec58"
+                "a8db8257.07cda8",
+                "6c3c4f73.322ab8",
+                "49ad06a0.4e0b98",
+                "5d1f20b8.954bc8",
+                "8b00173e.a90248"
             ]
         ]
     },
     {
-        "id": "8e89ec86.381848",
+        "id": "6c3c4f73.322ab8",
         "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": 1463.5001983642578,
-        "y": 122.00000953674316,
-        "z": "1b18cff5.bba51",
+        "x": 1517.5001983642578,
+        "y": 112.00000953674316,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "37b02225.daaf3e",
-                "e44faed5.0a562"
+                "4ca383bd.7f19f4",
+                "a7b25c4e.37855"
             ]
         ]
     },
     {
-        "id": "37b02225.daaf3e",
+        "id": "4ca383bd.7f19f4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1753.000244140625,
-        "y": 114,
-        "z": "1b18cff5.bba51",
+        "x": 1807.000244140625,
+        "y": 104,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "9ee82b4c.027258"
+                "bb6558fe.165e6"
             ]
         ]
     },
     {
-        "id": "e44faed5.0a562",
+        "id": "a7b25c4e.37855",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1749.000244140625,
-        "y": 154,
-        "z": "1b18cff5.bba51",
+        "x": 1803.000244140625,
+        "y": 144,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "95fadd6c.fb4588"
+                "929ec7a5.9a46b8"
             ]
         ]
     },
     {
-        "id": "9ee82b4c.027258",
+        "id": "bb6558fe.165e6",
         "type": "set",
         "name": "set token-id",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
         "comments": "",
-        "x": 1903.500244140625,
-        "y": 114,
-        "z": "1b18cff5.bba51",
+        "x": 1957.500244140625,
+        "y": 104,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "d863483.fe451b8",
+        "id": "3afa5b8a.d8b45c",
         "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": 1970.500244140625,
-        "y": 234,
-        "z": "1b18cff5.bba51",
+        "x": 2024.500244140625,
+        "y": 224,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "27150b59.a15c7c",
-                "10804f14.8fac71"
+                "fe4ed86b.9ca41",
+                "6e1598d4.05ae"
             ]
         ]
     },
     {
-        "id": "27150b59.a15c7c",
+        "id": "fe4ed86b.9ca41",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2213.000244140625,
-        "y": 254,
-        "z": "1b18cff5.bba51",
+        "x": 2267.000244140625,
+        "y": 244,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "45766a62.487964"
+                "f8f7918f.b05da"
             ]
         ]
     },
     {
-        "id": "45766a62.487964",
+        "id": "f8f7918f.b05da",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2370.500244140625,
-        "y": 254,
-        "z": "1b18cff5.bba51",
+        "x": 2424.500244140625,
+        "y": 244,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "ed8abc6a.23da9",
-                "3075f0c3.b7397",
-                "5530fe3e.d46a6"
+                "6837c77a.4d245",
+                "945331d0.def158"
             ]
         ]
     },
     {
-        "id": "679734df.7d768c",
+        "id": "c26cc871.32d778",
         "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": 2347.000244140625,
-        "y": 154,
-        "z": "1b18cff5.bba51",
+        "x": 2401.000244140625,
+        "y": 144,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "10804f14.8fac71",
+        "id": "6e1598d4.05ae",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2209.000244140625,
-        "y": 154,
-        "z": "1b18cff5.bba51",
+        "x": 2263.000244140625,
+        "y": 144,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "679734df.7d768c"
+                "c26cc871.32d778"
             ]
         ]
     },
     {
-        "id": "fb65e652.c18e18",
+        "id": "74011233.c1b04c",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 116,
-        "y": 65,
-        "z": "1b18cff5.bba51",
+        "x": 170,
+        "y": 55,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "5fd8c6ae.cf15e8"
+                "7dcd2a77.b03e04"
             ]
         ]
     },
     {
-        "id": "5fd8c6ae.cf15e8",
+        "id": "7dcd2a77.b03e04",
         "type": "service-logic",
         "name": "DataChange ${project.version}",
         "module": "DataChange",
@@ -255,1234 +254,1501 @@
         "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": 129,
-        "y": 125,
-        "z": "1b18cff5.bba51",
+        "x": 183,
+        "y": 115,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "7c6d0d29.a4e9cc"
+                "e046753f.a8811"
             ]
         ]
     },
     {
-        "id": "7c6d0d29.a4e9cc",
+        "id": "e046753f.a8811",
         "type": "method",
         "name": "method esr-thirdparty-sdnc-discovery",
         "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 149,
-        "y": 205,
-        "z": "1b18cff5.bba51",
+        "x": 203,
+        "y": 195,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "d5da3f05.d59de8"
+                "a7955eaa.8ebd"
             ]
         ]
     },
     {
-        "id": "d5da3f05.d59de8",
+        "id": "a7955eaa.8ebd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 396.5,
-        "y": 205,
-        "z": "1b18cff5.bba51",
+        "x": 450.5,
+        "y": 195,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "94fe0252.df11a8"
+                "cee74437.1c5038"
             ]
         ]
     },
     {
-        "id": "ed8abc6a.23da9",
+        "id": "6837c77a.4d245",
         "type": "for",
         "name": "for each Network",
         "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2609.500244140625,
-        "y": 214,
-        "z": "1b18cff5.bba51",
+        "x": 2663.500244140625,
+        "y": 204,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "9a721924.2f2028"
+                "d73b1be.693fde8"
             ]
         ]
     },
     {
-        "id": "9a721924.2f2028",
+        "id": "d73b1be.693fde8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2786.000244140625,
-        "y": 209,
-        "z": "1b18cff5.bba51",
+        "x": 2840.000244140625,
+        "y": 199,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "6726d129.2959a",
-                "896230f8.99ca6"
+                "1071ecfb.db6683",
+                "22040d8e.81ad3a"
             ]
         ]
     },
     {
-        "id": "6726d129.2959a",
+        "id": "1071ecfb.db6683",
         "type": "call",
         "name": "call update-network-to-aai",
         "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2965.000244140625,
-        "y": 229,
-        "z": "1b18cff5.bba51",
+        "x": 3019.000244140625,
+        "y": 219,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             []
         ]
     },
     {
-        "id": "896230f8.99ca6",
+        "id": "22040d8e.81ad3a",
         "type": "set",
         "name": "set network",
         "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
         "comments": "",
-        "x": 2920.000244140625,
-        "y": 189,
-        "z": "1b18cff5.bba51",
+        "x": 2974.000244140625,
+        "y": 179,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "95fadd6c.fb4588",
+        "id": "929ec7a5.9a46b8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1869.000244140625,
-        "y": 154,
-        "z": "1b18cff5.bba51",
+        "x": 1923.000244140625,
+        "y": 144,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             []
         ]
     },
     {
-        "id": "8fa7ac01.7e9068",
+        "id": "a95e321b.626b1",
         "type": "comment",
         "name": "Do Nothing",
         "info": "",
         "comments": "",
-        "x": 2039.000244140625,
-        "y": 194,
-        "z": "1b18cff5.bba51",
+        "x": 2093.000244140625,
+        "y": 184,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "4076575b.04c63",
+        "id": "30eb5834.80e7d",
         "type": "switchNode",
         "name": "switch type",
         "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 916,
-        "y": 290,
-        "z": "1b18cff5.bba51",
+        "x": 970,
+        "y": 280,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "e5bd5122.002238",
-                "6d8d65c8.0b06bc",
-                "b3287819.8ca7c",
-                "4433c168.8e0cb"
+                "bad9968b.bbaf5",
+                "826758bc.846648",
+                "f43baf3c.399558",
+                "6e19e1c4.aa4d28"
             ]
         ]
     },
     {
-        "id": "afc79595.03a058",
+        "id": "d7605eba.de53c8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 783,
-        "y": 290,
-        "z": "1b18cff5.bba51",
+        "x": 837,
+        "y": 280,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "4076575b.04c63"
+                "30eb5834.80e7d"
             ]
         ]
     },
     {
-        "id": "e5bd5122.002238",
+        "id": "bad9968b.bbaf5",
         "type": "other",
         "name": "SOTN",
         "xml": "<outcome value='SOTN'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1029,
-        "y": 201,
-        "z": "1b18cff5.bba51",
+        "x": 1083,
+        "y": 191,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "c970e0d9.988dc8"
+                "6a609919.dbddb"
             ]
         ]
     },
     {
-        "id": "6d8d65c8.0b06bc",
+        "id": "826758bc.846648",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1031.000087738037,
-        "y": 750.0001106262207,
-        "z": "1b18cff5.bba51",
+        "x": 1085.000087738037,
+        "y": 740.0001106262207,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "f76541c6.503d4"
+                "8d466c1d.2dbd88"
             ]
         ]
     },
     {
-        "id": "f76541c6.503d4",
+        "id": "8d466c1d.2dbd88",
         "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": 1181.0000610351562,
-        "y": 746.0000972747803,
-        "z": "1b18cff5.bba51",
+        "x": 1235.0000610351562,
+        "y": 736.0000972747803,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "b93333aa.1c0a7",
+        "id": "a8db8257.07cda8",
         "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": 1410.0001983642578,
-        "y": 82.00000953674316,
-        "z": "1b18cff5.bba51",
+        "x": 1464.0001983642578,
+        "y": 72.00000953674316,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             []
         ]
     },
     {
-        "id": "6bfd56ef.86aba8",
+        "id": "49ad06a0.4e0b98",
         "type": "switchNode",
         "name": "switch prop.sdncRestApi.token_id",
         "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1456.5001983642578,
-        "y": 202.00000953674316,
-        "z": "1b18cff5.bba51",
+        "x": 1510.5001983642578,
+        "y": 192.00000953674316,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "ec0b1f86.de86a8",
-                "d869f67b.6cbd68"
+                "8c8153ea.0d28b8",
+                "f01555ec.92788"
             ]
         ]
     },
     {
-        "id": "ec0b1f86.de86a8",
+        "id": "8c8153ea.0d28b8",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1749.000244140625,
-        "y": 194,
-        "z": "1b18cff5.bba51",
+        "x": 1803.000244140625,
+        "y": 184,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "36410877.b60b2"
+                "6e76fd4a.c154c4"
             ]
         ]
     },
     {
-        "id": "d869f67b.6cbd68",
+        "id": "f01555ec.92788",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1749.000244140625,
-        "y": 234,
-        "z": "1b18cff5.bba51",
+        "x": 1803.000244140625,
+        "y": 224,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "d863483.fe451b8"
+                "3afa5b8a.d8b45c"
             ]
         ]
     },
     {
-        "id": "36410877.b60b2",
+        "id": "6e76fd4a.c154c4",
         "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": 1970.500244140625,
-        "y": 194,
-        "z": "1b18cff5.bba51",
+        "x": 2024.500244140625,
+        "y": 184,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "10804f14.8fac71",
-                "27150b59.a15c7c"
+                "6e1598d4.05ae",
+                "fe4ed86b.9ca41"
             ]
         ]
     },
     {
-        "id": "9dd42ebd.c3ec58",
+        "id": "8b00173e.a90248",
         "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": 1453.0001983642578,
-        "y": 342.00000953674316,
-        "z": "1b18cff5.bba51",
+        "x": 1507.0001983642578,
+        "y": 332.00000953674316,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             []
         ]
     },
     {
-        "id": "29c878c8.6e2e3",
+        "id": "5d1f20b8.954bc8",
         "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": 1413.0001983642578,
-        "y": 302.00000953674316,
-        "z": "1b18cff5.bba51",
+        "x": 1467.0001983642578,
+        "y": 292.00000953674316,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "6c35f59f.31aaf4",
+        "id": "720c5fa5.cf9fc8",
         "type": "comment",
         "name": "Notification subscription",
         "info": "",
         "comments": "",
-        "x": 1418.000343322754,
-        "y": 259.00000858306885,
-        "z": "1b18cff5.bba51",
+        "x": 1472.000343322754,
+        "y": 249.00000858306885,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "94fe0252.df11a8",
+        "id": "cee74437.1c5038",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$prop.sdncRestApi.vendor == 'ZTE'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 103,
-        "y": 330,
-        "z": "1b18cff5.bba51",
+        "x": 157,
+        "y": 320,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "97112dfb.d25148",
-                "c86f88a8.e3654"
+                "68735a94.d40f5c",
+                "ab95c3e8.90657"
             ]
         ]
     },
     {
-        "id": "97112dfb.d25148",
+        "id": "68735a94.d40f5c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 290,
-        "y": 330,
-        "z": "1b18cff5.bba51",
+        "x": 344,
+        "y": 320,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "493ee223.06b5cc"
+                "78227710.8145c"
             ]
         ]
     },
     {
-        "id": "c86f88a8.e3654",
+        "id": "ab95c3e8.90657",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 291,
-        "y": 455,
-        "z": "1b18cff5.bba51",
+        "x": 345,
+        "y": 445,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "31c62e46.1b6bfa"
+                "9bf3753b.e16a38"
             ]
         ]
     },
     {
-        "id": "31c62e46.1b6bfa",
+        "id": "9bf3753b.e16a38",
         "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": 514,
-        "y": 455,
-        "z": "1b18cff5.bba51",
+        "x": 568,
+        "y": 445,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             []
         ]
     },
     {
-        "id": "b3287819.8ca7c",
+        "id": "f43baf3c.399558",
         "type": "other",
         "name": "TAPI",
         "xml": "<outcome value='TAPI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1107,
-        "y": 435,
-        "z": "1b18cff5.bba51",
+        "x": 1161,
+        "y": 425,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "a1b223fc.4bfc8"
+                "75540bd7.9ba5f4"
             ]
         ]
     },
     {
-        "id": "a1b223fc.4bfc8",
+        "id": "75540bd7.9ba5f4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1270,
-        "y": 434,
-        "z": "1b18cff5.bba51",
+        "x": 1324,
+        "y": 424,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "2ba90d0d.a5469a"
+                "a24deaa6.af3108"
             ]
         ]
     },
     {
-        "id": "2ba90d0d.a5469a",
+        "id": "a24deaa6.af3108",
         "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": 1431,
-        "y": 433,
-        "z": "1b18cff5.bba51",
+        "x": 1485,
+        "y": 423,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "e4e0c00a.96655",
-                "8857c3bd.cbf58"
+                "cdd2d534.962938",
+                "363290e2.c2512"
             ]
         ]
     },
     {
-        "id": "8857c3bd.cbf58",
+        "id": "363290e2.c2512",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1573,
-        "y": 509,
-        "z": "1b18cff5.bba51",
+        "x": 1627,
+        "y": 499,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "5009a48f.6c9144"
+                "91d6cda6.f47358"
             ]
         ]
     },
     {
-        "id": "e4e0c00a.96655",
+        "id": "cdd2d534.962938",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1607,
-        "y": 430,
-        "z": "1b18cff5.bba51",
+        "x": 1661,
+        "y": 420,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "3d3fabb0.3b7c64"
+                "78d89c1.df36ce4"
             ]
         ]
     },
     {
-        "id": "3d3fabb0.3b7c64",
+        "id": "78d89c1.df36ce4",
         "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": 1777,
-        "y": 429,
-        "z": "1b18cff5.bba51",
+        "x": 1831,
+        "y": 419,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "5009a48f.6c9144",
+        "id": "91d6cda6.f47358",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1734,
-        "y": 508,
-        "z": "1b18cff5.bba51",
+        "x": 1788,
+        "y": 498,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "7bccde97.6587f8"
+                "68a08572.6d4e94"
             ]
         ]
     },
     {
-        "id": "7bccde97.6587f8",
+        "id": "68a08572.6d4e94",
         "type": "for",
         "name": "for each topology",
         "xml": "<for index='tidx' start='0' end=\"`$topologies.topology_length`\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1913,
-        "y": 508,
-        "z": "1b18cff5.bba51",
+        "x": 1967,
+        "y": 498,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "b488f25e.063e58"
+                "e2491c10.3a12"
             ]
         ]
     },
     {
-        "id": "b488f25e.063e58",
+        "id": "e2491c10.3a12",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2080,
-        "y": 509,
-        "z": "1b18cff5.bba51",
+        "x": 2134,
+        "y": 499,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "5387bb7e.ccfa04",
-                "58ce3e1c.538878"
+                "b1c3c921.3c12a",
+                "b5a39927.d40208"
             ]
         ]
     },
     {
-        "id": "5387bb7e.ccfa04",
+        "id": "b1c3c921.3c12a",
         "type": "set",
         "name": "set topology",
         "xml": "<set>\n<parameter name='topology.' value='`$topologies.topology[$tidx].`' />\n",
         "comments": "",
-        "x": 2239,
-        "y": 510,
-        "z": "1b18cff5.bba51",
+        "x": 2293,
+        "y": 500,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "58ce3e1c.538878",
+        "id": "b5a39927.d40208",
         "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": 2230,
-        "y": 576,
-        "z": "1b18cff5.bba51",
+        "x": 2284,
+        "y": 566,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             []
         ]
     },
     {
-        "id": "4433c168.8e0cb",
+        "id": "6e19e1c4.aa4d28",
         "type": "outcome",
         "name": "MSA",
         "xml": "<outcome value='MSA'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1077.677324295044,
-        "y": 591.8993349075317,
-        "z": "1b18cff5.bba51",
+        "x": 1131.677324295044,
+        "y": 581.8993349075317,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "e65be9ee.c7b3b"
+                "4227a936.fe14d"
             ]
         ]
     },
     {
-        "id": "e65be9ee.c7b3b",
+        "id": "4227a936.fe14d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1239.6773872375488,
-        "y": 589.899335861206,
-        "z": "1b18cff5.bba51",
+        "x": 1293.6773872375488,
+        "y": 579.899335861206,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "35fd633c.bf4964"
+                "f20725de.f4794"
             ]
         ]
     },
     {
-        "id": "35fd633c.bf4964",
+        "id": "f20725de.f4794",
         "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": 1416.6771354675293,
-        "y": 581.8992919921875,
-        "z": "1b18cff5.bba51",
+        "x": 1470.6771354675293,
+        "y": 571.8992919921875,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "7a243e03.e07788",
-                "31b0685e.813ca8"
+                "49b0fd8b.249e2c",
+                "792d01db.8d11"
             ]
         ]
     },
     {
-        "id": "7a243e03.e07788",
+        "id": "49b0fd8b.249e2c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1569.6771354675293,
-        "y": 578.8992919921875,
-        "z": "1b18cff5.bba51",
+        "x": 1623.6771354675293,
+        "y": 568.8992919921875,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "a65ca6e4.09ef28"
+                "85d21e1a.a14be8"
             ]
         ]
     },
     {
-        "id": "a65ca6e4.09ef28",
+        "id": "85d21e1a.a14be8",
         "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": 1744.6771354675293,
-        "y": 577.8992919921875,
-        "z": "1b18cff5.bba51",
+        "x": 1798.6771354675293,
+        "y": 567.8992919921875,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "31b0685e.813ca8",
+        "id": "792d01db.8d11",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1575.6771354675293,
-        "y": 651.8992919921875,
-        "z": "1b18cff5.bba51",
+        "x": 1629.6771354675293,
+        "y": 641.8992919921875,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "777a7a58.789fc4"
+                "d5110405.aee948"
             ]
         ]
     },
     {
-        "id": "777a7a58.789fc4",
+        "id": "d5110405.aee948",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1759.6771354675293,
-        "y": 653.8992919921875,
-        "z": "1b18cff5.bba51",
+        "x": 1813.6771354675293,
+        "y": 643.8992919921875,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "7575649a.153f4c"
+                "68851b61.ef75e4"
             ]
         ]
     },
     {
-        "id": "7575649a.153f4c",
+        "id": "68851b61.ef75e4",
         "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": 2038.677001953125,
-        "y": 651.8992919921875,
-        "z": "1b18cff5.bba51",
+        "x": 2092.677001953125,
+        "y": 641.8992919921875,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             []
         ]
     },
     {
-        "id": "3075f0c3.b7397",
+        "id": "945331d0.def158",
         "type": "switchNode",
         "name": "switch network_length",
-        "xml": "<switch test='`$topology.networks.network_length`'>\n",
+        "xml": "<switch test='`$topology.networks.network_length >= 2`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2630,
-        "y": 320,
-        "z": "1b18cff5.bba51",
+        "x": 2684,
+        "y": 310,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "8524dca2.aeded8"
+                "901d4e1a.652118",
+                "11935c8a.a490ab"
             ]
         ]
     },
     {
-        "id": "8524dca2.aeded8",
+        "id": "9c61f388.1f0838",
         "type": "outcome",
         "name": "2 Topologies (1 Domain)",
         "xml": "<outcome value='2'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2904,
-        "y": 320,
-        "z": "1b18cff5.bba51",
+        "x": 2894,
+        "y": 611,
+        "z": "1620e9e3.f93e5e",
         "wires": [
-            [
-                "b33095ec.9e9e"
-            ]
+            []
         ]
     },
     {
-        "id": "b33095ec.9e9e",
+        "id": "326c6d24.4336b2",
         "type": "switchNode",
         "name": "switch network-types[0]",
         "xml": "<switch test='`$topology.networks.network[0].network-types`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3272,
-        "y": 305,
-        "z": "1b18cff5.bba51",
+        "x": 4603,
+        "y": 400,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "d9671ae7.1f2ac",
-                "8d2f7cad.ac7078"
+                "709f94a4.b34cf4",
+                "9cfb2d7f.448bd8"
             ]
         ]
     },
     {
-        "id": "d9671ae7.1f2ac",
+        "id": "709f94a4.b34cf4",
         "type": "outcome",
         "name": "ethernet-topology",
         "xml": "<outcome value='ethernet-topology'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3488,
-        "y": 305,
-        "z": "1b18cff5.bba51",
+        "x": 4819,
+        "y": 400,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "9105249.2609cd8"
+                "6ad78f52.8d683"
             ]
         ]
     },
     {
-        "id": "9105249.2609cd8",
+        "id": "6ad78f52.8d683",
         "type": "switchNode",
         "name": "switch network-types[1]",
         "xml": "<switch test='`$topology.networks.network[1].network-types`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3713,
-        "y": 305,
-        "z": "1b18cff5.bba51",
+        "x": 5044,
+        "y": 400,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "9ce7c86d.2eb2d8",
-                "36497843.e3494"
+                "4e12c36c.f82d3c",
+                "17b8d1f3.652706"
             ]
         ]
     },
     {
-        "id": "9ce7c86d.2eb2d8",
+        "id": "4e12c36c.f82d3c",
         "type": "outcome",
         "name": "otn-topology",
         "xml": "<outcome value='otn-topology'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3949,
-        "y": 258,
-        "z": "1b18cff5.bba51",
+        "x": 5280,
+        "y": 353,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "637acfae.0f124"
+                "cd9d2417.06096"
             ]
         ]
     },
     {
-        "id": "f3d25251.c6e91",
+        "id": "172a24d9.92ec93",
         "type": "call",
         "name": "call update-tp-ttp-relationship",
         "xml": "<call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4365,
-        "y": 246,
-        "z": "1b18cff5.bba51",
+        "x": 5696,
+        "y": 341,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             []
         ]
     },
     {
-        "id": "741e41f5.1da6",
+        "id": "61a560e1.35c54",
         "type": "set",
         "name": "set networks",
         "xml": "<set>\n<parameter name='network-eth.' value='`$topology.networks.network[0].`' />\n<parameter name='network-otn.' value='`$topology.networks.network[1].`' />\n",
         "comments": "",
-        "x": 4321,
-        "y": 155,
-        "z": "1b18cff5.bba51",
+        "x": 5541,
+        "y": 207,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "8d2f7cad.ac7078",
+        "id": "9cfb2d7f.448bd8",
         "type": "outcome",
         "name": "otn-topology",
         "xml": "<outcome value='otn-topology'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3493,
-        "y": 362,
-        "z": "1b18cff5.bba51",
+        "x": 4824,
+        "y": 457,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "a8d319cf.4bc79"
+                "f16b5928.2b534"
             ]
         ]
     },
     {
-        "id": "637acfae.0f124",
+        "id": "cd9d2417.06096",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4131,
-        "y": 232,
-        "z": "1b18cff5.bba51",
+        "x": 5462,
+        "y": 327,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "741e41f5.1da6",
-                "f3d25251.c6e91"
+                "61a560e1.35c54",
+                "172a24d9.92ec93"
             ]
         ]
     },
     {
-        "id": "a8d319cf.4bc79",
+        "id": "f16b5928.2b534",
         "type": "switchNode",
         "name": "switch network-types[1]",
         "xml": "<switch test='`$topology.networks.network[1].network-types`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3712,
-        "y": 364,
-        "z": "1b18cff5.bba51",
+        "x": 5043,
+        "y": 459,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "5531c9a0.612ad8",
-                "182315db.ba9502"
+                "b02955b9.ece2c",
+                "1f0d239a.a59004"
             ]
         ]
     },
     {
-        "id": "36497843.e3494",
+        "id": "17b8d1f3.652706",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3943,
-        "y": 317,
-        "z": "1b18cff5.bba51",
+        "x": 5274,
+        "y": 412,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "695f6a27.1421dc"
+                "d245d127.681cb"
             ]
         ]
     },
     {
-        "id": "695f6a27.1421dc",
+        "id": "d245d127.681cb",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4145,
-        "y": 315,
-        "z": "1b18cff5.bba51",
+        "x": 5476,
+        "y": 410,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "5531c9a0.612ad8",
+        "id": "b02955b9.ece2c",
         "type": "outcome",
         "name": "ethernet-topology",
         "xml": "<outcome value='ethernet-topology'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3935,
-        "y": 378,
-        "z": "1b18cff5.bba51",
+        "x": 5266,
+        "y": 473,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "842f72e1.b17048"
+                "a776716e.08be98"
             ]
         ]
     },
     {
-        "id": "3a98f05a.e5da8",
+        "id": "b2d9af5c.6d71e8",
         "type": "set",
         "name": "set networks",
         "xml": "<set>\n<parameter name='network.eth' value='`$topology.networks.network[1].`' />\n<parameter name='network.otn' value='`$topology.networks.network[0].`' />\n",
         "comments": "",
-        "x": 4351,
-        "y": 359,
-        "z": "1b18cff5.bba51",
+        "x": 5682,
+        "y": 454,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "182315db.ba9502",
+        "id": "1f0d239a.a59004",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3894,
-        "y": 439,
-        "z": "1b18cff5.bba51",
+        "x": 5225,
+        "y": 534,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "ac618cc1.491d7"
+                "7a25521e.b55894"
             ]
         ]
     },
     {
-        "id": "ac618cc1.491d7",
+        "id": "7a25521e.b55894",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4063,
-        "y": 446,
-        "z": "1b18cff5.bba51",
+        "x": 5370,
+        "y": 541,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "842f72e1.b17048",
+        "id": "a776716e.08be98",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4113,
-        "y": 374,
-        "z": "1b18cff5.bba51",
+        "x": 5444,
+        "y": 469,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "3a98f05a.e5da8",
-                "225dfddc.2a0cba"
+                "b2d9af5c.6d71e8",
+                "7141defd.d7f3a8"
             ]
         ]
     },
     {
-        "id": "5530fe3e.d46a6",
+        "id": "1a8710e5.1ad6b7",
         "type": "get-resource",
         "name": "get-resource network-resources",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resources\" \n        pfx='tmp.aai.network-resources' local-only='false' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2617,
-        "y": 510,
-        "z": "1b18cff5.bba51",
+        "x": 2504,
+        "y": 784,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "d9e48832.552bd8",
-                "59795789.351ce",
-                "61ad07cf.dca3e8"
+                "3a8bf069.f85ce",
+                "aebcabff.82acc",
+                "1f447726.4be529"
             ]
         ]
     },
     {
-        "id": "d9e48832.552bd8",
+        "id": "3a8bf069.f85ce",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2870,
-        "y": 428,
-        "z": "1b18cff5.bba51",
+        "x": 2757,
+        "y": 702,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "aa408c9d.56c38"
+                "e98ead73.d60f3"
             ]
         ]
     },
     {
-        "id": "59795789.351ce",
+        "id": "aebcabff.82acc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2873.490966796875,
-        "y": 475.57403564453125,
-        "z": "1b18cff5.bba51",
+        "x": 2760.490966796875,
+        "y": 749.5740356445312,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "c28a983a.0204"
+                "94257a05.fc968"
             ]
         ]
     },
     {
-        "id": "61ad07cf.dca3e8",
+        "id": "1f447726.4be529",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2861.823974609375,
-        "y": 519.9073486328125,
-        "z": "1b18cff5.bba51",
+        "x": 2748.823974609375,
+        "y": 793.9073486328125,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "781b901c.45ff08"
+                "fe4ab328.74eee"
             ]
         ]
     },
     {
-        "id": "225dfddc.2a0cba",
+        "id": "7141defd.d7f3a8",
         "type": "call",
         "name": "call update-tp-ttp-relationship",
         "xml": "<call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4386,
-        "y": 425,
-        "z": "1b18cff5.bba51",
+        "x": 5717,
+        "y": 520,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             []
         ]
     },
     {
-        "id": "11abef7e.ad2629",
+        "id": "db2f1670.e36278",
         "type": "call",
         "name": "call update-open-ended-links",
         "xml": "<call module='DataChange' rpc='update-open-ended-links' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3658,
-        "y": 683,
-        "z": "1b18cff5.bba51",
+        "x": 3712,
+        "y": 737,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             []
         ]
     },
     {
-        "id": "aa408c9d.56c38",
+        "id": "e98ead73.d60f3",
         "type": "switchNode",
         "name": "switch network-resources_length",
         "xml": "<switch test='tmp.aai.network-resources_length'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3085,
-        "y": 426,
-        "z": "1b18cff5.bba51",
+        "x": 2972,
+        "y": 700,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "13de82c2.31f6ad"
+                "c72d2527.4f27d8"
             ]
         ]
     },
     {
-        "id": "13de82c2.31f6ad",
+        "id": "c72d2527.4f27d8",
         "type": "outcome",
         "name": "4 Topologies (2 Domains)",
         "xml": "<outcome value='4'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3362,
-        "y": 425,
-        "z": "1b18cff5.bba51",
+        "x": 3233,
+        "y": 700,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "e4acb7eb.00534"
+                "3dcb11c5.a0564e"
             ]
         ]
     },
     {
-        "id": "c28a983a.0204",
+        "id": "94257a05.fc968",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3046,
-        "y": 476,
-        "z": "1b18cff5.bba51",
+        "x": 2933,
+        "y": 750,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "781b901c.45ff08",
+        "id": "fe4ab328.74eee",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3035,
-        "y": 522,
-        "z": "1b18cff5.bba51",
+        "x": 2922,
+        "y": 796,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "3daf0b35.8056dc",
+        "id": "6b9df565.677604",
         "type": "for",
         "name": "for each network-resource",
         "xml": "<for index='nridx' start='0' end='`$tmp.aai.network-resources.network-resource_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3677,
-        "y": 476,
-        "z": "1b18cff5.bba51",
+        "x": 3695,
+        "y": 664,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "a478abea.aef858"
+                "db1ad019.66229"
             ]
         ]
     },
     {
-        "id": "a478abea.aef858",
+        "id": "db1ad019.66229",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3836,
-        "y": 575,
-        "z": "1b18cff5.bba51",
+        "x": 3924,
+        "y": 690,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "672de2b7.6fadec",
-                "b7971e38.4fdc88"
+                "9c9a1adf.4a9568",
+                "df8384d1.95fc28"
             ]
         ]
     },
     {
-        "id": "672de2b7.6fadec",
+        "id": "9c9a1adf.4a9568",
         "type": "switchNode",
         "name": "switch network-types[nridx]",
         "xml": "<switch test='`$tmp.aai.network-resources.network-resource[$nridx].network-type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4043,
-        "y": 568,
-        "z": "1b18cff5.bba51",
+        "x": 4197,
+        "y": 715,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "8b03cc56.be0278"
+                "be613956.e7594"
             ]
         ]
     },
     {
-        "id": "8b03cc56.be0278",
+        "id": "be613956.e7594",
         "type": "outcome",
         "name": "otn-topology",
         "xml": "<outcome value='otn-topology'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4256,
-        "y": 562,
-        "z": "1b18cff5.bba51",
+        "x": 4410,
+        "y": 709,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "5b2aaa85.617b44"
+                "a82463e6.b9c248"
             ]
         ]
     },
     {
-        "id": "7c2a6199.8c29b",
+        "id": "369083d8.76a43c",
         "type": "set",
         "name": "set network-resource-otn[$otnidx]",
         "xml": "<set>\n<parameter name='network-resource-otn[$otnidx].' value='`$tmp.aai.network-resources.network-resource[$nridx].`' />\n",
         "comments": "",
-        "x": 4622,
-        "y": 555,
-        "z": "1b18cff5.bba51",
+        "x": 4776,
+        "y": 702,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "b7971e38.4fdc88",
+        "id": "df8384d1.95fc28",
         "type": "set",
         "name": "set otnidx",
         "xml": "<set>\n<parameter name='otnidx' value='0' />\n",
         "comments": "",
-        "x": 3988,
-        "y": 526,
-        "z": "1b18cff5.bba51",
+        "x": 4142,
+        "y": 673,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "ee5c6cf6.44a0c",
+        "id": "fd786916.269048",
         "type": "set",
         "name": "set otnidx",
         "xml": "<set>\n<parameter name='otnidx' value='`$otnidx + 1`' />\n",
         "comments": "",
-        "x": 4539,
-        "y": 607,
-        "z": "1b18cff5.bba51",
+        "x": 4693,
+        "y": 754,
+        "z": "1620e9e3.f93e5e",
         "wires": []
     },
     {
-        "id": "5b2aaa85.617b44",
+        "id": "a82463e6.b9c248",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4402,
-        "y": 575,
-        "z": "1b18cff5.bba51",
+        "x": 4556,
+        "y": 722,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "7c2a6199.8c29b",
-                "ee5c6cf6.44a0c"
+                "369083d8.76a43c",
+                "fd786916.269048"
             ]
         ]
     },
     {
-        "id": "e4acb7eb.00534",
+        "id": "3dcb11c5.a0564e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3456,
-        "y": 499,
-        "z": "1b18cff5.bba51",
+        "x": 3449,
+        "y": 695,
+        "z": "1620e9e3.f93e5e",
         "wires": [
             [
-                "3daf0b35.8056dc",
-                "11abef7e.ad2629"
+                "6b9df565.677604",
+                "db2f1670.e36278"
             ]
         ]
+    },
+    {
+        "id": "901d4e1a.652118",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2866,
+        "y": 311,
+        "z": "1620e9e3.f93e5e",
+        "wires": [
+            [
+                "2165924a.476cde"
+            ]
+        ]
+    },
+    {
+        "id": "11935c8a.a490ab",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2868,
+        "y": 358,
+        "z": "1620e9e3.f93e5e",
+        "wires": [
+            [
+                "94ef4628.95e6b8"
+            ]
+        ]
+    },
+    {
+        "id": "94ef4628.95e6b8",
+        "type": "record",
+        "name": "log file",
+        "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logSdncDiscovery.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"networks_length\" />\n    <parameter name=\"field3\" value=\"`$topology.networks.network_length`\" />\n    ",
+        "comments": "",
+        "outputs": 1,
+        "x": 2996,
+        "y": 360,
+        "z": "1620e9e3.f93e5e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2165924a.476cde",
+        "type": "for",
+        "name": "for each Network",
+        "xml": "<for index='netidx' start='0' end='`$topology.networks.network_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3039,
+        "y": 310,
+        "z": "1620e9e3.f93e5e",
+        "wires": [
+            [
+                "115276c4.acec21"
+            ]
+        ]
+    },
+    {
+        "id": "115276c4.acec21",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3209,
+        "y": 308,
+        "z": "1620e9e3.f93e5e",
+        "wires": [
+            [
+                "2a57d05e.a0dc88",
+                "dde988af.f0e1f",
+                "ccc4b2dc.03b6",
+                "9266c042.cf422",
+                "b4168243.614878"
+            ]
+        ]
+    },
+    {
+        "id": "2a57d05e.a0dc88",
+        "type": "set",
+        "name": "set network",
+        "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$netidx].`' />\n",
+        "comments": "",
+        "x": 3375,
+        "y": 276,
+        "z": "1620e9e3.f93e5e",
+        "wires": []
+    },
+    {
+        "id": "dde988af.f0e1f",
+        "type": "switchNode",
+        "name": "switch network-types with topologyId",
+        "xml": "<switch test='`$network.te-topology-id`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3420,
+        "y": 355,
+        "z": "1620e9e3.f93e5e",
+        "wires": [
+            [
+                "eaf6a3f8.6275b",
+                "92b40685.e87b6"
+            ]
+        ]
+    },
+    {
+        "id": "b3e974ed.02509",
+        "type": "record",
+        "name": "log file",
+        "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logSdncDiscovery.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"networks_length\" />\n    <parameter name=\"field3\" value=\"`$topology.networks.network_length`\" />\n    <parameter name=\"field4\" value=\"network-type-is\" />\n    <parameter name=\"field5\" value=\"OTN\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3904,
+        "y": 245,
+        "z": "1620e9e3.f93e5e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "eaf6a3f8.6275b",
+        "type": "outcome",
+        "name": "11",
+        "xml": "<outcome value='11'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3639,
+        "y": 309,
+        "z": "1620e9e3.f93e5e",
+        "wires": [
+            [
+                "7df875b.d3cf70c"
+            ]
+        ]
+    },
+    {
+        "id": "92b40685.e87b6",
+        "type": "outcome",
+        "name": "33",
+        "xml": "<outcome value='33'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3639,
+        "y": 370,
+        "z": "1620e9e3.f93e5e",
+        "wires": [
+            [
+                "16aa4525.8ff0c3"
+            ]
+        ]
+    },
+    {
+        "id": "d246fb34.c2a69",
+        "type": "record",
+        "name": "log file",
+        "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logSdncDiscovery.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"networks_length\" />\n    <parameter name=\"field3\" value=\"`$topology.networks.network_length`\" />\n    <parameter name=\"field4\" value=\"network-type-is\" />\n    <parameter name=\"field5\" value=\"ETH\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3898,
+        "y": 370,
+        "z": "1620e9e3.f93e5e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "50aa8e02.3ace68",
+        "type": "set",
+        "name": "set network-otn",
+        "xml": "<set>\n<parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />\n",
+        "comments": "",
+        "x": 3934,
+        "y": 315,
+        "z": "1620e9e3.f93e5e",
+        "wires": []
+    },
+    {
+        "id": "1ffaf146.64fab7",
+        "type": "set",
+        "name": "set networks",
+        "xml": "<set>\n<parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />\n",
+        "comments": "",
+        "x": 3916,
+        "y": 409,
+        "z": "1620e9e3.f93e5e",
+        "wires": []
+    },
+    {
+        "id": "ccc4b2dc.03b6",
+        "type": "set",
+        "name": "unset network",
+        "xml": "<set>\n<parameter name='network.' value='' />\n",
+        "comments": "",
+        "x": 3369,
+        "y": 222,
+        "z": "1620e9e3.f93e5e",
+        "wires": []
+    },
+    {
+        "id": "9266c042.cf422",
+        "type": "record",
+        "name": "log file",
+        "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logSdncDiscovery.txt\" />\n    <parameter name=\"field6\" value=\"network-otn-is\" />\n    <parameter name=\"field7\" value=\"`$network-otn.te-topology-id`\" />\n    <parameter name=\"field8\" value=\"network-eth-is\" />\n    <parameter name=\"field9\" value=\"`$network-eth.te-topology-id`\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3340,
+        "y": 480,
+        "z": "1620e9e3.f93e5e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7df875b.d3cf70c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3770,
+        "y": 314,
+        "z": "1620e9e3.f93e5e",
+        "wires": [
+            [
+                "b3e974ed.02509",
+                "50aa8e02.3ace68"
+            ]
+        ]
+    },
+    {
+        "id": "16aa4525.8ff0c3",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3775,
+        "y": 391,
+        "z": "1620e9e3.f93e5e",
+        "wires": [
+            [
+                "d246fb34.c2a69",
+                "1ffaf146.64fab7"
+            ]
+        ]
+    },
+    {
+        "id": "b4168243.614878",
+        "type": "call",
+        "name": "call update-tp-ttp-relationship",
+        "xml": "<call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3410,
+        "y": 531,
+        "z": "1620e9e3.f93e5e",
+        "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 9c07e5fb..fb4f302f 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,911 +1,1467 @@
-[
-  {
-    "id": "5858bb6c.1c5b2c",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 116,
-    "y": 67,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "350dfcb7.24e654"
-      ]
-    ]
-  },
-  {
-    "id": "350dfcb7.24e654",
-    "type": "service-logic",
-    "name": "DataChange ${project.version}",
-    "module": "DataChange",
-    "version": "${project.version}",
-    "comments": "",
-    "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>",
-    "outputs": 1,
-    "x": 173,
-    "y": 146.888916015625,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "92cd3521.3e4e6"
-      ]
-    ]
-  },
-  {
-    "id": "92cd3521.3e4e6",
-    "type": "method",
-    "name": "method update-network-links-to-aai",
-    "xml": "<method rpc='update-network-links-to-aai' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 187,
-    "y": 223.22222900390625,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "b665c6f2.69a4d"
-      ]
-    ]
-  },
-  {
-    "id": "b665c6f2.69a4d",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 198.33343505859375,
-    "y": 300.7779235839844,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "c59c9b79.9f8cc"
-      ]
-    ]
-  },
-  {
-    "id": "f41ff5d9.72c91",
-    "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": 1156.111083984375,
-    "y": 546.111083984375,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "c59c9b79.9f8cc",
-    "type": "for",
-    "name": "for each link",
-    "xml": "<for index='pidx' start='0' end='`$network.link_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 226.88885498046875,
-    "y": 394.33331298828125,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "6d5acc0f.b7df54",
-        "8fbc8f1e.fe24c8",
-        "954c1d48.971018",
-        "915555f.abb44a8"
-      ]
-    ]
-  },
-  {
-    "id": "6d5acc0f.b7df54",
-    "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": 572.111083984375,
-    "y": 62.22221374511719,
-    "z": "3cbec5d5.54ea02",
-    "wires": []
-  },
-  {
-    "id": "7a38f4d0.9f3e6c",
-    "type": "for",
-    "name": "for each label-restriction",
-    "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1535.4444580078125,
-    "y": 712.111083984375,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "556fc245.d19e3c",
-        "d6c13a1b.e798a",
-        "69e9f586.641064"
-      ]
-    ]
-  },
-  {
-    "id": "556fc245.d19e3c",
-    "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<parameter name='unique-lrId' value=\"`$unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
-    "comments": "",
-    "x": 1870.111328125,
-    "y": 635.0000610351562,
-    "z": "3cbec5d5.54ea02",
-    "wires": []
-  },
-  {
-    "id": "3398d2c0.69ae06",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2005.4998779296875,
-    "y": 679.74609375,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "abb716be.3fb59"
-      ]
-    ]
-  },
-  {
-    "id": "3d46f558.3e53f2",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2013.178466796875,
-    "y": 738.9604187011719,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "f0df0cf2.e46b6"
-      ]
-    ]
-  },
-  {
-    "id": "abb716be.3fb59",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2166,
-    "y": 679.0000305175781,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "9aed5c80.54f11",
-    "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": 2586.5001220703125,
-    "y": 2414.545135498047,
-    "z": "3cbec5d5.54ea02",
-    "wires": []
-  },
-  {
-    "id": "ce693523.2da318",
-    "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": 2620.0001220703125,
-    "y": 2454.545135498047,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "72343f4d.bac85",
-    "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": 2620.0001220703125,
-    "y": 2494.545135498047,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "f0df0cf2.e46b6",
-    "type": "update",
-    "name": "save label-restriction",
-    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2197,
-    "y": 739.0000305175781,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "d6c13a1b.e798a",
-    "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[$tidx].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[$tidx].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1892,
-    "y": 793,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "69e9f586.641064",
-    "type": "update",
-    "name": "save label-restriction",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1814.815185546875,
-    "y": 711.5556640625,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "3398d2c0.69ae06",
-        "3d46f558.3e53f2"
-      ]
-    ]
-  },
-  {
-    "id": "9c77d572.aa0dd",
-    "type": "switchNode",
-    "name": "switch te-link-attributes",
-    "xml": "<switch test='`$link.te.te-link-attributes.label-restriction`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1135,
-    "y": 668,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "acb46a14.faf1b8",
-        "fad2e2be.055cd8"
-      ]
-    ]
-  },
-  {
-    "id": "acb46a14.faf1b8",
-    "type": "outcome",
-    "name": "Null",
-    "xml": "<outcome value=''>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1324,
-    "y": 639,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "b663d811.06fad8"
-      ]
-    ]
-  },
-  {
-    "id": "b663d811.06fad8",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1484,
-    "y": 638,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "fad2e2be.055cd8",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1328,
-    "y": 712,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "7a38f4d0.9f3e6c"
-      ]
-    ]
-  },
-  {
-    "id": "8fbc8f1e.fe24c8",
-    "type": "switchNode",
-    "name": "switch link.destination",
-    "xml": "<switch test='`$link.destination`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 540,
-    "y": 158,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "44b39c00.9558ec",
-        "d8a931d0.793fd"
-      ]
-    ]
-  },
-  {
-    "id": "44b39c00.9558ec",
-    "type": "outcome",
-    "name": "Null",
-    "xml": "<outcome value=''>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 784,
-    "y": 129,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "dd848e51.9b8178"
-      ]
-    ]
-  },
-  {
-    "id": "d8a931d0.793fd",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 736,
-    "y": 190,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "bdffabea.a9f78"
-      ]
-    ]
-  },
-  {
-    "id": "bdffabea.a9f78",
-    "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": 965,
-    "y": 190,
-    "z": "3cbec5d5.54ea02",
-    "wires": []
-  },
-  {
-    "id": "d1d8b826.4d04f",
-    "type": "set",
-    "name": "set is-open-ended-link",
-    "xml": "<set>\n<parameter name='is-open-ended-link' value='true' />\n\n",
-    "comments": "",
-    "x": 1144,
-    "y": 94,
-    "z": "3cbec5d5.54ea02",
-    "wires": []
-  },
-  {
-    "id": "b17a800b.11d598",
-    "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": 1146,
-    "y": 150,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "698d4309.a506a4",
-        "c0b09280.fde57",
-        "b035740b.82c768"
-      ]
-    ]
-  },
-  {
-    "id": "698d4309.a506a4",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1389,
-    "y": 145,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "d4d599ee.a3913"
-      ]
-    ]
-  },
-  {
-    "id": "c0b09280.fde57",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1387,
-    "y": 234,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "d42c9066.3cdb28"
-      ]
-    ]
-  },
-  {
-    "id": "d4d599ee.a3913",
-    "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\n",
-    "comments": "",
-    "x": 1597,
-    "y": 147,
-    "z": "3cbec5d5.54ea02",
-    "wires": []
-  },
-  {
-    "id": "d42c9066.3cdb28",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-    "comments": "",
-    "x": 1556,
-    "y": 235,
-    "z": "3cbec5d5.54ea02",
-    "wires": []
-  },
-  {
-    "id": "f65cb67d.b3d368",
-    "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": 943,
-    "y": 355,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "48397109.a69d68",
-        "efa56bf.4c6db98"
-      ]
-    ]
-  },
-  {
-    "id": "b035740b.82c768",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1398.490966796875,
-    "y": 187.57403564453125,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "6959706d.7f87e8"
-      ]
-    ]
-  },
-  {
-    "id": "6959706d.7f87e8",
-    "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": 1552.0623779296875,
-    "y": 190.85977172851562,
-    "z": "3cbec5d5.54ea02",
-    "wires": []
-  },
-  {
-    "id": "954c1d48.971018",
-    "type": "switchNode",
-    "name": "switch is-open-ended-link",
-    "xml": "<switch test='`$is-open-ended-link`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 522,
-    "y": 394,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "4e6e74a5.e8af4c",
-        "53a87226.590744"
-      ]
-    ]
-  },
-  {
-    "id": "4e6e74a5.e8af4c",
-    "type": "outcomeFalse",
-    "name": "false",
-    "xml": "<outcome value='false'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 739,
-    "y": 416,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "2e08f3a1.53987c"
-      ]
-    ]
-  },
-  {
-    "id": "53a87226.590744",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 742,
-    "y": 356,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "f65cb67d.b3d368"
-      ]
-    ]
-  },
-  {
-    "id": "48397109.a69d68",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1140,
-    "y": 325,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "6b973.4170168dc"
-      ]
-    ]
-  },
-  {
-    "id": "efa56bf.4c6db98",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1143.490966796875,
-    "y": 365.57403564453125,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "ef51ee2a.cafb5"
-      ]
-    ]
-  },
-  {
-    "id": "842144b1.a1cb2",
-    "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\n\n\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1590,
-    "y": 368,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "2e08f3a1.53987c",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 917,
-    "y": 424,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "f41ff5d9.72c91",
-        "9c77d572.aa0dd",
-        "34901df.74cf7e2"
-      ]
-    ]
-  },
-  {
-    "id": "6b973.4170168dc",
-    "type": "save",
-    "name": "update dest TP by putting src TP of the current link",
-    "xml": "<update 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[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-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=\"`$src-tpId`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 1429,
-    "y": 321,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "34901df.74cf7e2",
-    "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": 1142,
-    "y": 601,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "dd848e51.9b8178",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 927,
-    "y": 126,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "d1d8b826.4d04f",
-        "b17a800b.11d598"
-      ]
-    ]
-  },
-  {
-    "id": "ef51ee2a.cafb5",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1314,
-    "y": 366,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "842144b1.a1cb2",
-        "9ab70c9.3d83df",
-        "dd8767a.3acd918"
-      ]
-    ]
-  },
-  {
-    "id": "9ab70c9.3d83df",
-    "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": 1527,
-    "y": 416,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "ec4710d1.a4614",
-    "type": "for",
-    "name": "for each label-restriction",
-    "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1933,
-    "y": 499,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "5f4e6661.8be42",
-        "bf1c8950.f6775",
-        "869edf38.84c148"
-      ]
-    ]
-  },
-  {
-    "id": "5f4e6661.8be42",
-    "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<parameter name='unique-lrId' value=\"`$alt-unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
-    "comments": "",
-    "x": 2267.6668701171875,
-    "y": 421.88897705078125,
-    "z": "3cbec5d5.54ea02",
-    "wires": []
-  },
-  {
-    "id": "7135b68.c08c3c8",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2403.055419921875,
-    "y": 466.635009765625,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "2043dae3.034356"
-      ]
-    ]
-  },
-  {
-    "id": "69007117.c84f9",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2410.7340087890625,
-    "y": 525.8493347167969,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "30f94010.a2f0b"
-      ]
-    ]
-  },
-  {
-    "id": "2043dae3.034356",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2563.5555419921875,
-    "y": 465.8889465332031,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "30f94010.a2f0b",
-    "type": "update",
-    "name": "save label-restriction",
-    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $alt-unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2594.5555419921875,
-    "y": 525.8889465332031,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "bf1c8950.f6775",
-    "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[$tidx].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[$tidx].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2289.5555419921875,
-    "y": 579.888916015625,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "869edf38.84c148",
-    "type": "update",
-    "name": "save label-restriction",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $alt-unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2212.3707275390625,
-    "y": 498.444580078125,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "7135b68.c08c3c8",
-        "69007117.c84f9"
-      ]
-    ]
-  },
-  {
-    "id": "dd8767a.3acd918",
-    "type": "switchNode",
-    "name": "switch te-link-attributes",
-    "xml": "<switch test='`$link.te.te-link-attributes.label-restriction`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1532.5555419921875,
-    "y": 454.888916015625,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "2ac06a2f.120e4e",
-        "45e6587f.a583a"
-      ]
-    ]
-  },
-  {
-    "id": "2ac06a2f.120e4e",
-    "type": "outcome",
-    "name": "Null",
-    "xml": "<outcome value=''>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1721.5555419921875,
-    "y": 425.888916015625,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "5884f4a0.224604"
-      ]
-    ]
-  },
-  {
-    "id": "5884f4a0.224604",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1881.5555419921875,
-    "y": 424.888916015625,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "45e6587f.a583a",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1725.5555419921875,
-    "y": 498.888916015625,
-    "z": "3cbec5d5.54ea02",
-    "wires": [
-      [
-        "ec4710d1.a4614"
-      ]
-    ]
-  },
-  {
-    "id": "915555f.abb44a8",
-    "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": 557,
-    "y": 102,
-    "z": "3cbec5d5.54ea02",
-    "wires": []
-  }
+[
+    {
+        "id": "5858bb6c.1c5b2c",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 116,
+        "y": 67,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "350dfcb7.24e654"
+            ]
+        ]
+    },
+    {
+        "id": "350dfcb7.24e654",
+        "type": "service-logic",
+        "name": "DataChange ${project.version}",
+        "module": "DataChange",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>",
+        "outputs": 1,
+        "x": 173,
+        "y": 146.888916015625,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "92cd3521.3e4e6"
+            ]
+        ]
+    },
+    {
+        "id": "92cd3521.3e4e6",
+        "type": "method",
+        "name": "method update-network-links-to-aai",
+        "xml": "<method rpc='update-network-links-to-aai' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 187,
+        "y": 223.22222900390625,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "b665c6f2.69a4d"
+            ]
+        ]
+    },
+    {
+        "id": "b665c6f2.69a4d",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 198.33343505859375,
+        "y": 300.7779235839844,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "c59c9b79.9f8cc"
+            ]
+        ]
+    },
+    {
+        "id": "f41ff5d9.72c91",
+        "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": 1159.111083984375,
+        "y": 694.111083984375,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c59c9b79.9f8cc",
+        "type": "for",
+        "name": "for each link",
+        "xml": "<for index='pidx' start='0' end='`$network.link_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 226.88885498046875,
+        "y": 394.33331298828125,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "6d5acc0f.b7df54",
+                "8fbc8f1e.fe24c8",
+                "915555f.abb44a8",
+                "b5320c88.aa407",
+                "589a9016.f198c"
+            ]
+        ]
+    },
+    {
+        "id": "6d5acc0f.b7df54",
+        "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": 559.111083984375,
+        "y": 99.22221374511719,
+        "z": "3cbec5d5.54ea02",
+        "wires": []
+    },
+    {
+        "id": "7a38f4d0.9f3e6c",
+        "type": "for",
+        "name": "for each label-restriction",
+        "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1532.4444580078125,
+        "y": 915.111083984375,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "556fc245.d19e3c",
+                "d6c13a1b.e798a",
+                "69e9f586.641064"
+            ]
+        ]
+    },
+    {
+        "id": "556fc245.d19e3c",
+        "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<parameter name='unique-lrId' value=\"`$unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
+        "comments": "",
+        "x": 1867.111328125,
+        "y": 838.0000610351562,
+        "z": "3cbec5d5.54ea02",
+        "wires": []
+    },
+    {
+        "id": "3398d2c0.69ae06",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2002.4998779296875,
+        "y": 882.74609375,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "abb716be.3fb59"
+            ]
+        ]
+    },
+    {
+        "id": "3d46f558.3e53f2",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2010.178466796875,
+        "y": 941.9604187011719,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "f0df0cf2.e46b6"
+            ]
+        ]
+    },
+    {
+        "id": "abb716be.3fb59",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2163,
+        "y": 882.0000305175781,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9aed5c80.54f11",
+        "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": 2586.5001220703125,
+        "y": 2414.545135498047,
+        "z": "3cbec5d5.54ea02",
+        "wires": []
+    },
+    {
+        "id": "ce693523.2da318",
+        "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": 2620.0001220703125,
+        "y": 2454.545135498047,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "72343f4d.bac85",
+        "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": 2620.0001220703125,
+        "y": 2494.545135498047,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f0df0cf2.e46b6",
+        "type": "update",
+        "name": "save label-restriction",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2194,
+        "y": 942.0000305175781,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d6c13a1b.e798a",
+        "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[$tidx].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[$tidx].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1914,
+        "y": 792,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "69e9f586.641064",
+        "type": "update",
+        "name": "save label-restriction",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1811.815185546875,
+        "y": 914.5556640625,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "3398d2c0.69ae06",
+                "3d46f558.3e53f2"
+            ]
+        ]
+    },
+    {
+        "id": "9c77d572.aa0dd",
+        "type": "switchNode",
+        "name": "switch te-link-attributes",
+        "xml": "<switch test='`$link.te.te-link-attributes.label-restriction`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1136,
+        "y": 870,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "acb46a14.faf1b8",
+                "fad2e2be.055cd8"
+            ]
+        ]
+    },
+    {
+        "id": "acb46a14.faf1b8",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1321,
+        "y": 868,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "b663d811.06fad8"
+            ]
+        ]
+    },
+    {
+        "id": "b663d811.06fad8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1476,
+        "y": 868,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fad2e2be.055cd8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1325,
+        "y": 915,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "7a38f4d0.9f3e6c"
+            ]
+        ]
+    },
+    {
+        "id": "8fbc8f1e.fe24c8",
+        "type": "switchNode",
+        "name": "switch link.destination",
+        "xml": "<switch test='`$link.destination.dest-node`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 535,
+        "y": 204,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "44b39c00.9558ec",
+                "d8a931d0.793fd"
+            ]
+        ]
+    },
+    {
+        "id": "44b39c00.9558ec",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 739,
+        "y": 165,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "dd848e51.9b8178"
+            ]
+        ]
+    },
+    {
+        "id": "d8a931d0.793fd",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 736,
+        "y": 227,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "bdffabea.a9f78"
+            ]
+        ]
+    },
+    {
+        "id": "bdffabea.a9f78",
+        "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": 965,
+        "y": 190,
+        "z": "3cbec5d5.54ea02",
+        "wires": []
+    },
+    {
+        "id": "d1d8b826.4d04f",
+        "type": "set",
+        "name": "set is-open-ended-link",
+        "xml": "<set>\n<parameter name='is-open-ended-link' value='true' />\n\n",
+        "comments": "",
+        "x": 1143,
+        "y": 65,
+        "z": "3cbec5d5.54ea02",
+        "wires": []
+    },
+    {
+        "id": "b17a800b.11d598",
+        "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": 1146,
+        "y": 150,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "698d4309.a506a4",
+                "c0b09280.fde57",
+                "b035740b.82c768"
+            ]
+        ]
+    },
+    {
+        "id": "698d4309.a506a4",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1389,
+        "y": 145,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "944bf6fb.a03838"
+            ]
+        ]
+    },
+    {
+        "id": "c0b09280.fde57",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1387,
+        "y": 234,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "d42c9066.3cdb28"
+            ]
+        ]
+    },
+    {
+        "id": "d4d599ee.a3913",
+        "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": 2062,
+        "y": 162,
+        "z": "3cbec5d5.54ea02",
+        "wires": []
+    },
+    {
+        "id": "d42c9066.3cdb28",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "comments": "",
+        "x": 1556,
+        "y": 235,
+        "z": "3cbec5d5.54ea02",
+        "wires": []
+    },
+    {
+        "id": "f65cb67d.b3d368",
+        "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": 854,
+        "y": 671,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "48397109.a69d68",
+                "efa56bf.4c6db98"
+            ]
+        ]
+    },
+    {
+        "id": "b035740b.82c768",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1398.490966796875,
+        "y": 187.57403564453125,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "6959706d.7f87e8"
+            ]
+        ]
+    },
+    {
+        "id": "6959706d.7f87e8",
+        "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": 1552.0623779296875,
+        "y": 190.85977172851562,
+        "z": "3cbec5d5.54ea02",
+        "wires": []
+    },
+    {
+        "id": "954c1d48.971018",
+        "type": "switchNode",
+        "name": "switch is-open-ended-link",
+        "xml": "<switch test='`$is-open-ended-link`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 433,
+        "y": 710,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "4e6e74a5.e8af4c",
+                "53a87226.590744"
+            ]
+        ]
+    },
+    {
+        "id": "4e6e74a5.e8af4c",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 650,
+        "y": 732,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "2e08f3a1.53987c"
+            ]
+        ]
+    },
+    {
+        "id": "53a87226.590744",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 653,
+        "y": 672,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "f65cb67d.b3d368"
+            ]
+        ]
+    },
+    {
+        "id": "48397109.a69d68",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1098,
+        "y": 341,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "b240875.e435ff8"
+            ]
+        ]
+    },
+    {
+        "id": "efa56bf.4c6db98",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1123.490966796875,
+        "y": 536.5740356445312,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "ef51ee2a.cafb5"
+            ]
+        ]
+    },
+    {
+        "id": "842144b1.a1cb2",
+        "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\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1595,
+        "y": 558,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2e08f3a1.53987c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 828,
+        "y": 740,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "f41ff5d9.72c91",
+                "9c77d572.aa0dd",
+                "dc4f90cd.605cd",
+                "a0d07820.dfe9c"
+            ]
+        ]
+    },
+    {
+        "id": "6b973.4170168dc",
+        "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": 2509,
+        "y": 387,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "46117ab.f8f0504",
+                "46594b42.a6ff04"
+            ]
+        ]
+    },
+    {
+        "id": "34901df.74cf7e2",
+        "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": 1119,
+        "y": 1068,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "dd848e51.9b8178",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 927,
+        "y": 126,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "d1d8b826.4d04f",
+                "b17a800b.11d598",
+                "9d4a7a95.ca2e88"
+            ]
+        ]
+    },
+    {
+        "id": "ef51ee2a.cafb5",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1312,
+        "y": 539,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "842144b1.a1cb2",
+                "9ab70c9.3d83df",
+                "dd8767a.3acd918"
+            ]
+        ]
+    },
+    {
+        "id": "9ab70c9.3d83df",
+        "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": 1524,
+        "y": 619,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ec4710d1.a4614",
+        "type": "for",
+        "name": "for each label-restriction",
+        "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1930,
+        "y": 702,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "5f4e6661.8be42",
+                "bf1c8950.f6775",
+                "869edf38.84c148"
+            ]
+        ]
+    },
+    {
+        "id": "5f4e6661.8be42",
+        "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<parameter name='unique-lrId' value=\"`$alt-unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
+        "comments": "",
+        "x": 2347.6669921875,
+        "y": 657.8889770507812,
+        "z": "3cbec5d5.54ea02",
+        "wires": []
+    },
+    {
+        "id": "7135b68.c08c3c8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2483.0555419921875,
+        "y": 702.635009765625,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "2043dae3.034356"
+            ]
+        ]
+    },
+    {
+        "id": "69007117.c84f9",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2490.734130859375,
+        "y": 761.8493347167969,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "30f94010.a2f0b"
+            ]
+        ]
+    },
+    {
+        "id": "2043dae3.034356",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2643.5556640625,
+        "y": 701.8889465332031,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "30f94010.a2f0b",
+        "type": "update",
+        "name": "save label-restriction",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $alt-unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2674.5556640625,
+        "y": 761.8889465332031,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "bf1c8950.f6775",
+        "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[$tidx].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[$tidx].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2369.5556640625,
+        "y": 815.888916015625,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "869edf38.84c148",
+        "type": "update",
+        "name": "save label-restriction",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $alt-unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2292.370849609375,
+        "y": 734.444580078125,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "7135b68.c08c3c8",
+                "69007117.c84f9"
+            ]
+        ]
+    },
+    {
+        "id": "dd8767a.3acd918",
+        "type": "switchNode",
+        "name": "switch te-link-attributes",
+        "xml": "<switch test='`$link.te.te-link-attributes.label-restriction`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1529.5555419921875,
+        "y": 657.888916015625,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "2ac06a2f.120e4e",
+                "45e6587f.a583a"
+            ]
+        ]
+    },
+    {
+        "id": "2ac06a2f.120e4e",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1718.5555419921875,
+        "y": 628.888916015625,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "5884f4a0.224604"
+            ]
+        ]
+    },
+    {
+        "id": "5884f4a0.224604",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1878.5555419921875,
+        "y": 627.888916015625,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "45e6587f.a583a",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1722.5555419921875,
+        "y": 701.888916015625,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "ec4710d1.a4614"
+            ]
+        ]
+    },
+    {
+        "id": "915555f.abb44a8",
+        "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": 536,
+        "y": 149,
+        "z": "3cbec5d5.54ea02",
+        "wires": []
+    },
+    {
+        "id": "e4a47b8d.470f98",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1478,
+        "y": 62,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "944bf6fb.a03838",
+        "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": 1628,
+        "y": 142,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "757c7b80.d77ff4",
+                "a7e52125.cd95a"
+            ]
+        ]
+    },
+    {
+        "id": "757c7b80.d77ff4",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1858,
+        "y": 89,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "ed9b2776.e3f"
+            ]
+        ]
+    },
+    {
+        "id": "a7e52125.cd95a",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1862,
+        "y": 162,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "d4d599ee.a3913"
+            ]
+        ]
+    },
+    {
+        "id": "ed9b2776.e3f",
+        "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": 2046,
+        "y": 85,
+        "z": "3cbec5d5.54ea02",
+        "wires": []
+    },
+    {
+        "id": "952d829a.9e04c8",
+        "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": 2027,
+        "y": 34,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b5320c88.aa407",
+        "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": 564,
+        "y": 41,
+        "z": "3cbec5d5.54ea02",
+        "wires": []
+    },
+    {
+        "id": "1c31f66.0ec5b8a",
+        "type": "switchNode",
+        "name": "switch is-invalid-open-ended-link",
+        "xml": "<switch test='`$is-invalid-open-ended-link`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 715,
+        "y": 1046,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "59b5f613.5fe9d8",
+                "a603a990.7bb358"
+            ]
+        ]
+    },
+    {
+        "id": "a603a990.7bb358",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 922,
+        "y": 1014,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "9ab8714a.2092f"
+            ]
+        ]
+    },
+    {
+        "id": "59b5f613.5fe9d8",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 919,
+        "y": 1074,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "34901df.74cf7e2"
+            ]
+        ]
+    },
+    {
+        "id": "9ab8714a.2092f",
+        "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": 1102,
+        "y": 1013,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5352bd62.ccf79c",
+        "type": "switchNode",
+        "name": "switch relationship-list_length",
+        "xml": "<switch test='`$tmp.aai.logical-link.relationship-list_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1370,
+        "y": 314,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "eff4d21d.288088",
+                "37404956.35d1ce",
+                "8c968f09.e16c4"
+            ]
+        ]
+    },
+    {
+        "id": "2c9276d9.9299c2",
+        "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": 1821,
+        "y": 328,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "267a2f8f.07cbd"
+            ]
+        ]
+    },
+    {
+        "id": "eff4d21d.288088",
+        "type": "outcome",
+        "name": "0",
+        "xml": "<outcome value='0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1588,
+        "y": 273,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "984dee72.e9354"
+            ]
+        ]
+    },
+    {
+        "id": "37404956.35d1ce",
+        "type": "outcome",
+        "name": "1",
+        "xml": "<outcome value='1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1585,
+        "y": 310,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "2c9276d9.9299c2"
+            ]
+        ]
+    },
+    {
+        "id": "8c968f09.e16c4",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1595,
+        "y": 384,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "978f2fad.844c4"
+            ]
+        ]
+    },
+    {
+        "id": "978f2fad.844c4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1732,
+        "y": 385,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "a65b0566.f99d28"
+            ]
+        ]
+    },
+    {
+        "id": "984dee72.e9354",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1730,
+        "y": 281,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "3177c841.0c8"
+            ]
+        ]
+    },
+    {
+        "id": "589a9016.f198c",
+        "type": "switchNode",
+        "name": "switch is-invalid-open-ended-link",
+        "xml": "<switch test='`$is-invalid-open-ended-link`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 431,
+        "y": 538,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "68d44b36.10ebc4",
+                "b635b7a2.550c68"
+            ]
+        ]
+    },
+    {
+        "id": "b635b7a2.550c68",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 638,
+        "y": 506,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "a2f767e6.1afe7"
+            ]
+        ]
+    },
+    {
+        "id": "68d44b36.10ebc4",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 635,
+        "y": 566,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "954c1d48.971018"
+            ]
+        ]
+    },
+    {
+        "id": "a2f767e6.1afe7",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 789,
+        "y": 506,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "dc4f90cd.605cd",
+        "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": 1129,
+        "y": 791,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "267a2f8f.07cbd",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2068,
+        "y": 319,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a0d07820.dfe9c",
+        "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": 1074,
+        "y": 739,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9d4a7a95.ca2e88",
+        "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": 1144,
+        "y": 103,
+        "z": "3cbec5d5.54ea02",
+        "wires": []
+    },
+    {
+        "id": "6cbb9c56.a1a2b4",
+        "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": 2384,
+        "y": 291,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b240875.e435ff8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2060,
+        "y": 536,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "6cbb9c56.a1a2b4",
+                "6b973.4170168dc"
+            ]
+        ]
+    },
+    {
+        "id": "46117ab.f8f0504",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2798,
+        "y": 357,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "f6743dce.4b9b98"
+            ]
+        ]
+    },
+    {
+        "id": "46594b42.a6ff04",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2805.6785888671875,
+        "y": 416.2143249511719,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "fa1c4b7d.8445b"
+            ]
+        ]
+    },
+    {
+        "id": "f6743dce.4b9b98",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2946,
+        "y": 352,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "1261d503.e1a3cb"
+            ]
+        ]
+    },
+    {
+        "id": "1261d503.e1a3cb",
+        "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": 3091,
+        "y": 352,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fa1c4b7d.8445b",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2953,
+        "y": 414,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            [
+                "8f51aa8d.73ba38"
+            ]
+        ]
+    },
+    {
+        "id": "3177c841.0c8",
+        "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": 1866,
+        "y": 279,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a65b0566.f99d28",
+        "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": 1877,
+        "y": 394,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8f51aa8d.73ba38",
+        "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": 3098,
+        "y": 414,
+        "z": "3cbec5d5.54ea02",
+        "wires": [
+            []
+        ]
+    }
 ]
\ No newline at end of file
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 382a4c98..786fef55 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,654 +1,753 @@
-[
-  {
-    "id": "ef88be3f.517f78",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 105,
-    "y": 67,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "74a7a837.229be"
-      ]
-    ]
-  },
-  {
-    "id": "74a7a837.229be",
-    "type": "service-logic",
-    "name": "DataChange ${project.version}",
-    "module": "DataChange",
-    "version": "${project.version}",
-    "comments": "",
-    "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>",
-    "outputs": 1,
-    "x": 194.00003051757812,
-    "y": 157.88891220092773,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "284dae72.737532"
-      ]
-    ]
-  },
-  {
-    "id": "284dae72.737532",
-    "type": "method",
-    "name": "update-network-to-aai",
-    "xml": "<method rpc='update-network-to-aai' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 230.1112518310547,
-    "y": 228.22223663330078,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "da05320e.186d48"
-      ]
-    ]
-  },
-  {
-    "id": "da05320e.186d48",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 455.33343505859375,
-    "y": 227.77792358398438,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "8c187a81.9e4d28",
-        "75113293.98ea0c",
-        "9937b93d.ff5938",
-        "55dde830.cc61b8"
-      ]
-    ]
-  },
-  {
-    "id": "75113293.98ea0c",
-    "type": "save",
-    "name": "save network-resource",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'  \n     key='network-resource.network-id = $tmp.network-id' >\n<parameter name='network-id' value='`$tmp.network-id`' />\n<parameter name='client-id' value='`$network.client-id`' />\n<parameter name='te-topo-id' value='`$network.te-topology-id`' />\n<parameter name='provider-id' value='`$network.provider-id`' />\n\n<parameter name='network-type' value='`$network.network-types`' />\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 685.333251953125,
-    "y": 133.00001525878906,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "74f65e67.75c658",
-    "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": 897.1111450195312,
-    "y": 223.111083984375,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "9937b93d.ff5938",
-    "type": "for",
-    "name": "for each node",
-    "xml": "<for index='pidx' start='0' end='`$network.node_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 668.8888549804688,
-    "y": 203.33331298828125,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "74f65e67.75c658",
-        "60e29b35.16fbd4",
-        "b27f201.393186",
-        "e83884ed.3fb2d8",
-        "7257c53.4f087bc",
-        "395bef40.08498",
-        "1392eb55.76adbd",
-        "e55192de.2cc998"
-      ]
-    ]
-  },
-  {
-    "id": "60e29b35.16fbd4",
-    "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": 902.111083984375,
-    "y": 119.22221374511719,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": []
-  },
-  {
-    "id": "e83884ed.3fb2d8",
-    "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": 993.7779541015625,
-    "y": 398.44447803497314,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "9c15e41a.6cfbc8",
-    "type": "for",
-    "name": "for each termination point",
-    "xml": "<for index='tidx' start='0' end='`$node.termination-point_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1279.4444580078125,
-    "y": 574.111083984375,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "3c657cae.66477c",
-        "2e1dc2b9.f23686",
-        "8c144095.b1eaf8"
-      ]
-    ]
-  },
-  {
-    "id": "3c657cae.66477c",
-    "type": "set",
-    "name": "set termination point",
-    "xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tidx].`' />\n",
-    "comments": "",
-    "x": 1550.111328125,
-    "y": 536.0000457763672,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": []
-  },
-  {
-    "id": "8c144095.b1eaf8",
-    "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\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1533.815185546875,
-    "y": 628.5556030273438,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "3fc33363.5b82ec",
-        "34c813e4.f5477c"
-      ]
-    ]
-  },
-  {
-    "id": "f6e5129a.8bd048",
-    "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": 1610.703857421875,
-    "y": 784.3333740234375,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "2e1dc2b9.f23686",
-    "type": "set",
-    "name": "set unique-ltpId",
-    "xml": "<set>\n<parameter name='unique-ltpId' value=\"`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`\" />\n",
-    "comments": "",
-    "x": 1534.000244140625,
-    "y": 570.1111145019531,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": []
-  },
-  {
-    "id": "8c187a81.9e4d28",
-    "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.network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",
-    "comments": "",
-    "outputs": 1,
-    "x": 640.9935302734375,
-    "y": 83.99349975585938,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "b27f201.393186",
-    "type": "save",
-    "name": "save pnf relation with esr-thirdparty-sdnc",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $node.node-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$node.node-id`\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 975,
-    "y": 434.9934997558594,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "3fc33363.5b82ec",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1705.499885559082,
-    "y": 615.7460784912109,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "a873419b.bc81c"
-      ]
-    ]
-  },
-  {
-    "id": "34c813e4.f5477c",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1699.1784744262695,
-    "y": 667.9603900909424,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "66113f50.7819f8"
-      ]
-    ]
-  },
-  {
-    "id": "a873419b.bc81c",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1856.0000457763672,
-    "y": 615.0000095367432,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "66113f50.7819f8",
-    "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`' />",
-    "comments": "",
-    "outputs": 1,
-    "x": 1885,
-    "y": 669,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "c8e5472a.d10408",
-    "type": "save",
-    "name": "save tunnel-termination-point",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n      key='pnf.pnf-name = $unique-nodeId\n      AND 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`' />\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": 1678,
-    "y": 331,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "11cb3cf8.02c3eb",
-        "1a336806.ba4bc8"
-      ]
-    ]
-  },
-  {
-    "id": "8b0a557c.b35cd",
-    "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": 1341,
-    "y": 319,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "58c4d943.63d2f",
-        "e7e93cd.8f563c",
-        "c8e5472a.d10408",
-        "7c00c858.c87ab8"
-      ]
-    ]
-  },
-  {
-    "id": "58c4d943.63d2f",
-    "type": "set",
-    "name": "set tunnel termination point",
-    "xml": "<set>\n<parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />\n",
-    "comments": "",
-    "x": 1676,
-    "y": 239,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": []
-  },
-  {
-    "id": "e7e93cd.8f563c",
-    "type": "set",
-    "name": "set unique-ttpId",
-    "xml": "<set>\n<parameter name='unique-ttpId' value=\"`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`\" />\n",
-    "comments": "",
-    "x": 1634.888916015625,
-    "y": 277.111083984375,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": []
-  },
-  {
-    "id": "11cb3cf8.02c3eb",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1944,
-    "y": 317,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "9ad375c8.fab3e8"
-      ]
-    ]
-  },
-  {
-    "id": "1a336806.ba4bc8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1937.6785888671875,
-    "y": 369.21431159973145,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "842e7e75.fc0558"
-      ]
-    ]
-  },
-  {
-    "id": "9ad375c8.fab3e8",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2094.500160217285,
-    "y": 316.2539310455322,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "842e7e75.fc0558",
-    "type": "update",
-    "name": "update tunnel-termination-point",
-    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n      key='pnf.pnf-name = $unique-nodeId\n      AND 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`' />\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": 2175,
-    "y": 371,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "7257c53.4f087bc",
-    "type": "set",
-    "name": "set local variables",
-    "xml": "<set>\n<parameter name='unique-nodeId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`\" />\n",
-    "comments": "",
-    "x": 927,
-    "y": 166,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": []
-  },
-  {
-    "id": "55dde830.cc61b8",
-    "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": 611,
-    "y": 329,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "b86a9ee9.558c2",
-    "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": 1617,
-    "y": 728,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "7c00c858.c87ab8",
-    "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[$ttidx].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[$ttidx].relationship-data[0].relationship-key\" value=\"tunnel-termination-point.ttp-id\" />\n<parameter name=\"relationship-list.relationship[$ttidx].relationship-data[0].relationship-value\" value=\"`$unique-ttpId`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 1749,
-    "y": 423,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "395bef40.08498",
-    "type": "switchNode",
-    "name": "switch node ttp",
-    "xml": "<switch test='`$node.te.tunnel-termination-point_length`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 913,
-    "y": 295,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "84bf875e.b8d51",
-        "cc6df2e.2398e9",
-        "f2d2c388.1aa578"
-      ]
-    ]
-  },
-  {
-    "id": "5889c4ed.3fc544",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1261,
-    "y": 247,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "f2d2c388.1aa578",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1103,
-    "y": 318,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "8b0a557c.b35cd"
-      ]
-    ]
-  },
-  {
-    "id": "1392eb55.76adbd",
-    "type": "switchNode",
-    "name": "switch node tp",
-    "xml": "<switch test='`$node.termination-point_length`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 893,
-    "y": 550,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "c5e649ab.cfe2e8",
-        "d7a3de29.b44a1",
-        "a21fbfb7.b6608"
-      ]
-    ]
-  },
-  {
-    "id": "c5e649ab.cfe2e8",
-    "type": "other",
-    "name": "Null",
-    "xml": "<outcome value=''>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1072,
-    "y": 502,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "3d51c59d.7acffa"
-      ]
-    ]
-  },
-  {
-    "id": "d7a3de29.b44a1",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1071,
-    "y": 604,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "9c15e41a.6cfbc8"
-      ]
-    ]
-  },
-  {
-    "id": "3d51c59d.7acffa",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1227,
-    "y": 502,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "e55192de.2cc998",
-    "type": "record",
-    "name": "log file",
-    "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/hesamlogx.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"sucess executing Hesam 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": 891,
-    "y": 339,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "84bf875e.b8d51",
-    "type": "other",
-    "name": "Null",
-    "xml": "<outcome value=''>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1101,
-    "y": 181,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "5889c4ed.3fc544"
-      ]
-    ]
-  },
-  {
-    "id": "cc6df2e.2398e9",
-    "type": "outcome",
-    "name": "length 0",
-    "xml": "<outcome value='0'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1106,
-    "y": 256,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "5889c4ed.3fc544"
-      ]
-    ]
-  },
-  {
-    "id": "a21fbfb7.b6608",
-    "type": "outcome",
-    "name": "length 0",
-    "xml": "<outcome value='0'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1082,
-    "y": 550,
-    "z": "6d6b8a1f.be1cb4",
-    "wires": [
-      [
-        "3d51c59d.7acffa"
-      ]
-    ]
-  }
+[
+    {
+        "id": "ef88be3f.517f78",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 105,
+        "y": 67,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "74a7a837.229be"
+            ]
+        ]
+    },
+    {
+        "id": "74a7a837.229be",
+        "type": "service-logic",
+        "name": "DataChange ${project.version}",
+        "module": "DataChange",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>",
+        "outputs": 1,
+        "x": 194.00003051757812,
+        "y": 157.88891220092773,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "284dae72.737532"
+            ]
+        ]
+    },
+    {
+        "id": "284dae72.737532",
+        "type": "method",
+        "name": "update-network-to-aai",
+        "xml": "<method rpc='update-network-to-aai' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 230.1112518310547,
+        "y": 228.22223663330078,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "da05320e.186d48"
+            ]
+        ]
+    },
+    {
+        "id": "da05320e.186d48",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 455.33343505859375,
+        "y": 227.77792358398438,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "8c187a81.9e4d28",
+                "75113293.98ea0c",
+                "9937b93d.ff5938",
+                "55dde830.cc61b8"
+            ]
+        ]
+    },
+    {
+        "id": "75113293.98ea0c",
+        "type": "save",
+        "name": "save network-resource",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'  \n     key='network-resource.network-id = $tmp.network-id' >\n<parameter name='network-id' value='`$tmp.network-id`' />\n<parameter name='client-id' value='`$network.client-id`' />\n<parameter name='te-topo-id' value='`$network.te-topology-id`' />\n<parameter name='provider-id' value='`$network.provider-id`' />\n\n<parameter name='network-type' value='`$network.network-types`' />\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 685.333251953125,
+        "y": 133.00001525878906,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "74f65e67.75c658",
+        "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": 897.1111450195312,
+        "y": 223.111083984375,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9937b93d.ff5938",
+        "type": "for",
+        "name": "for each node",
+        "xml": "<for index='pidx' start='0' end='`$network.node_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 668.8888549804688,
+        "y": 203.33331298828125,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "74f65e67.75c658",
+                "60e29b35.16fbd4",
+                "b27f201.393186",
+                "e83884ed.3fb2d8",
+                "7257c53.4f087bc",
+                "395bef40.08498",
+                "1392eb55.76adbd",
+                "e55192de.2cc998",
+                "a1ffb2f2.4b50b8"
+            ]
+        ]
+    },
+    {
+        "id": "60e29b35.16fbd4",
+        "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": 902.111083984375,
+        "y": 119.22221374511719,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": []
+    },
+    {
+        "id": "e83884ed.3fb2d8",
+        "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": 993.7779541015625,
+        "y": 398.44447803497314,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9c15e41a.6cfbc8",
+        "type": "for",
+        "name": "for each termination point",
+        "xml": "<for index='tidx' start='0' end='`$node.termination-point_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1279.4444580078125,
+        "y": 574.111083984375,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "3c657cae.66477c",
+                "2e1dc2b9.f23686",
+                "8c144095.b1eaf8",
+                "9abbad80.6c0f7"
+            ]
+        ]
+    },
+    {
+        "id": "3c657cae.66477c",
+        "type": "set",
+        "name": "set termination point",
+        "xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tidx].`' />\n",
+        "comments": "",
+        "x": 1550.111328125,
+        "y": 536.0000457763672,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": []
+    },
+    {
+        "id": "8c144095.b1eaf8",
+        "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\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1533.815185546875,
+        "y": 628.5556030273438,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "3fc33363.5b82ec",
+                "34c813e4.f5477c"
+            ]
+        ]
+    },
+    {
+        "id": "f6e5129a.8bd048",
+        "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": 1367.703857421875,
+        "y": 779.3333740234375,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2e1dc2b9.f23686",
+        "type": "set",
+        "name": "set unique-ltpId",
+        "xml": "<set>\n<parameter name='unique-ltpId' value=\"`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`\" />\n",
+        "comments": "",
+        "x": 1534.000244140625,
+        "y": 570.1111145019531,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": []
+    },
+    {
+        "id": "8c187a81.9e4d28",
+        "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.network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",
+        "comments": "",
+        "outputs": 1,
+        "x": 640.9935302734375,
+        "y": 83.99349975585938,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b27f201.393186",
+        "type": "save",
+        "name": "save pnf relation with esr-thirdparty-sdnc",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $node.node-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$node.node-id`\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 975,
+        "y": 434.9934997558594,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3fc33363.5b82ec",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1705.499885559082,
+        "y": 615.7460784912109,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "a873419b.bc81c"
+            ]
+        ]
+    },
+    {
+        "id": "34c813e4.f5477c",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1699.1784744262695,
+        "y": 667.9603900909424,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "66113f50.7819f8"
+            ]
+        ]
+    },
+    {
+        "id": "a873419b.bc81c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1856.0000457763672,
+        "y": 615.0000095367432,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "66113f50.7819f8",
+        "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`' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1885,
+        "y": 669,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c8e5472a.d10408",
+        "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`' />\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": 1678,
+        "y": 331,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "11cb3cf8.02c3eb",
+                "1a336806.ba4bc8"
+            ]
+        ]
+    },
+    {
+        "id": "8b0a557c.b35cd",
+        "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": 1341,
+        "y": 319,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "58c4d943.63d2f",
+                "e7e93cd.8f563c",
+                "c8e5472a.d10408",
+                "7c00c858.c87ab8",
+                "1bd07bf.99e9784"
+            ]
+        ]
+    },
+    {
+        "id": "58c4d943.63d2f",
+        "type": "set",
+        "name": "set tunnel termination point",
+        "xml": "<set>\n<parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />\n",
+        "comments": "",
+        "x": 1676,
+        "y": 239,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": []
+    },
+    {
+        "id": "e7e93cd.8f563c",
+        "type": "set",
+        "name": "set unique-ttpId",
+        "xml": "<set>\n<parameter name='unique-ttpId' value=\"`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`\" />\n",
+        "comments": "",
+        "x": 1634.888916015625,
+        "y": 277.111083984375,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": []
+    },
+    {
+        "id": "11cb3cf8.02c3eb",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1944,
+        "y": 317,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "9ad375c8.fab3e8"
+            ]
+        ]
+    },
+    {
+        "id": "1a336806.ba4bc8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1937.6785888671875,
+        "y": 369.21431159973145,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "842e7e75.fc0558"
+            ]
+        ]
+    },
+    {
+        "id": "9ad375c8.fab3e8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2094.500160217285,
+        "y": 316.2539310455322,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "842e7e75.fc0558",
+        "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`' />\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": 2175,
+        "y": 371,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7257c53.4f087bc",
+        "type": "set",
+        "name": "set local variables",
+        "xml": "<set>\n<parameter name='unique-nodeId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`\" />\n",
+        "comments": "",
+        "x": 927,
+        "y": 166,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": []
+    },
+    {
+        "id": "55dde830.cc61b8",
+        "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": 611,
+        "y": 329,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b86a9ee9.558c2",
+        "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": 1617,
+        "y": 728,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7c00c858.c87ab8",
+        "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[$ttidx].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[$ttidx].related-link`\" value=\"`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`\" />\n<parameter name=\"`relationship-list.relationship[$ttidx].relationship-data[0].relationship-key`\" value=\"tunnel-termination-point.ttp-id\" />\n<parameter name=\"`relationship-list.relationship[$ttidx].relationship-data[0].relationship-value`\" value=\"`$unique-ttpId`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1749,
+        "y": 423,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "5d32d079.32cfb8",
+                "5c2d8774.9a9178"
+            ]
+        ]
+    },
+    {
+        "id": "395bef40.08498",
+        "type": "switchNode",
+        "name": "switch node ttp",
+        "xml": "<switch test='`$node.te.tunnel-termination-point_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 913,
+        "y": 295,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "84bf875e.b8d51",
+                "cc6df2e.2398e9",
+                "f2d2c388.1aa578"
+            ]
+        ]
+    },
+    {
+        "id": "5889c4ed.3fc544",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1261,
+        "y": 247,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f2d2c388.1aa578",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1103,
+        "y": 318,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "8b0a557c.b35cd"
+            ]
+        ]
+    },
+    {
+        "id": "1392eb55.76adbd",
+        "type": "switchNode",
+        "name": "switch node tp",
+        "xml": "<switch test='`$node.termination-point_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 893,
+        "y": 550,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "c5e649ab.cfe2e8",
+                "d7a3de29.b44a1",
+                "a21fbfb7.b6608"
+            ]
+        ]
+    },
+    {
+        "id": "c5e649ab.cfe2e8",
+        "type": "other",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1072,
+        "y": 502,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "3d51c59d.7acffa"
+            ]
+        ]
+    },
+    {
+        "id": "d7a3de29.b44a1",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1071,
+        "y": 604,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "9c15e41a.6cfbc8"
+            ]
+        ]
+    },
+    {
+        "id": "3d51c59d.7acffa",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1227,
+        "y": 502,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e55192de.2cc998",
+        "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": 891,
+        "y": 339,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "84bf875e.b8d51",
+        "type": "other",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1101,
+        "y": 181,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "5889c4ed.3fc544"
+            ]
+        ]
+    },
+    {
+        "id": "cc6df2e.2398e9",
+        "type": "outcome",
+        "name": "length 0",
+        "xml": "<outcome value='0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1106,
+        "y": 256,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "5889c4ed.3fc544"
+            ]
+        ]
+    },
+    {
+        "id": "a21fbfb7.b6608",
+        "type": "outcome",
+        "name": "length 0",
+        "xml": "<outcome value='0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1082,
+        "y": 550,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "3d51c59d.7acffa"
+            ]
+        ]
+    },
+    {
+        "id": "a1ffb2f2.4b50b8",
+        "type": "set",
+        "name": "unset node",
+        "xml": "<set>\n<parameter name='node.' value='' />\n\n",
+        "comments": "",
+        "x": 899,
+        "y": 68,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": []
+    },
+    {
+        "id": "9abbad80.6c0f7",
+        "type": "set",
+        "name": "unset termination point",
+        "xml": "<set>\n<parameter name='tp.' value='' />\n",
+        "comments": "",
+        "x": 1549,
+        "y": 491,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": []
+    },
+    {
+        "id": "1bd07bf.99e9784",
+        "type": "set",
+        "name": "unset tunnel termination point",
+        "xml": "<set>\n<parameter name='ttp.' value='' />\n",
+        "comments": "",
+        "x": 1676,
+        "y": 191,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": []
+    },
+    {
+        "id": "5d32d079.32cfb8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2081,
+        "y": 426,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "42b15971.2191b8"
+            ]
+        ]
+    },
+    {
+        "id": "5c2d8774.9a9178",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2078,
+        "y": 474,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "ad595c83.2160d"
+            ]
+        ]
+    },
+    {
+        "id": "42b15971.2191b8",
+        "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": 2236,
+        "y": 427,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ad595c83.2160d",
+        "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": 2237,
+        "y": 475,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    }
 ]
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json b/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json
index bf63e730..cec126c3 100644
--- a/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json
@@ -1,327 +1,351 @@
-[
-  {
-    "id": "c069a9f3.34d638",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 168,
-    "y": 75,
-    "z": "d37ca473.74b47",
-    "wires": [
-      [
-        "2f4d91cf.36cc46"
-      ]
-    ]
-  },
-  {
-    "id": "2f4d91cf.36cc46",
-    "type": "service-logic",
-    "name": "DataChange ${project.version}",
-    "module": "DataChange",
-    "version": "${project.version}",
-    "comments": "",
-    "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>",
-    "outputs": 1,
-    "x": 257.0000305175781,
-    "y": 165.88891220092773,
-    "z": "d37ca473.74b47",
-    "wires": [
-      [
-        "550913a5.d552a4"
-      ]
-    ]
-  },
-  {
-    "id": "550913a5.d552a4",
-    "type": "method",
-    "name": "method update-tp-ttp-relationship",
-    "xml": "<method rpc='update-tp-ttp-relationship' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 293.1112518310547,
-    "y": 236.22223663330078,
-    "z": "d37ca473.74b47",
-    "wires": [
-      [
-        "1261384d.98d348"
-      ]
-    ]
-  },
-  {
-    "id": "1261384d.98d348",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 518.3334350585938,
-    "y": 235.77792358398438,
-    "z": "d37ca473.74b47",
-    "wires": [
-      [
-        "f631c21f.80e608",
-        "d6f41ba6.e863f8",
-        "9c740eae.9ff66"
-      ]
-    ]
-  },
-  {
-    "id": "d6f41ba6.e863f8",
-    "type": "for",
-    "name": "for each node in network-eth",
-    "xml": "<for index='pethidx' start='0' end='`$network-eth.node_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 750.8888549804688,
-    "y": 190.33331298828125,
-    "z": "d37ca473.74b47",
-    "wires": [
-      [
-        "9889f298.ed1fc8",
-        "5c75717d.de39a",
-        "f952b49d.52fa6"
-      ]
-    ]
-  },
-  {
-    "id": "9889f298.ed1fc8",
-    "type": "set",
-    "name": "set node-eth",
-    "xml": "<set>\n<parameter name='node-eth.' value='`$network-eth.node[$pethidx].`' />",
-    "comments": "",
-    "x": 1034.111083984375,
-    "y": 97.22221374511719,
-    "z": "d37ca473.74b47",
-    "wires": []
-  },
-  {
-    "id": "5c75717d.de39a",
-    "type": "for",
-    "name": "for each termination point",
-    "xml": "<for index='tidx' start='0' end='`$node-eth.termination-point_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 983.4444580078125,
-    "y": 353.111083984375,
-    "z": "d37ca473.74b47",
-    "wires": [
-      [
-        "c60cccd6.642dd",
-        "4b686a78.0dbfdc",
-        "634edb60.ca9b44",
-        "d61d1f77.90dba"
-      ]
-    ]
-  },
-  {
-    "id": "c60cccd6.642dd",
-    "type": "set",
-    "name": "set termination point tp-eth",
-    "xml": "<set>\n<parameter name='tp-eth.' value='`$node-eth.termination-point[$tidx].`' />\n",
-    "comments": "",
-    "x": 1255.111328125,
-    "y": 224.00006103515625,
-    "z": "d37ca473.74b47",
-    "wires": []
-  },
-  {
-    "id": "4b686a78.0dbfdc",
-    "type": "set",
-    "name": "set unique-ltpethId",
-    "xml": "<set>\n<parameter name='unique-ltpethId' value=\"`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`\" />\n",
-    "comments": "",
-    "x": 1233.000244140625,
-    "y": 261.111083984375,
-    "z": "d37ca473.74b47",
-    "wires": []
-  },
-  {
-    "id": "f631c21f.80e608",
-    "type": "execute",
-    "name": "execute set tmp.network-eth.network-id",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$network-eth.network-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.network-eth.network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",
-    "comments": "",
-    "outputs": 1,
-    "x": 708.9935302734375,
-    "y": 54.993499755859375,
-    "z": "d37ca473.74b47",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "f952b49d.52fa6",
-    "type": "set",
-    "name": "set local variables",
-    "xml": "<set>\n<parameter name='unique-network-ethId' value='`$tmp.network-eth.network-id`' />\n<parameter name='unique-node-ethId' value=\"`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`\" />\n",
-    "comments": "",
-    "x": 1033,
-    "y": 145,
-    "z": "d37ca473.74b47",
-    "wires": []
-  },
-  {
-    "id": "9c740eae.9ff66",
-    "type": "execute",
-    "name": "execute set tmp.network-otn.network-id",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$network-otn.network-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.network-otn.network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",
-    "comments": "",
-    "outputs": 1,
-    "x": 706,
-    "y": 94,
-    "z": "d37ca473.74b47",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "75e07276.34af4c",
-    "type": "for",
-    "name": "for each tunnel termination point in otn",
-    "xml": "<for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1609,
-    "y": 408,
-    "z": "d37ca473.74b47",
-    "wires": [
-      [
-        "74200ec3.9b2e88",
-        "b86a8b99.9fa22",
-        "f5f85bac.6cdcb",
-        "45e7bcc7.d12924"
-      ]
-    ]
-  },
-  {
-    "id": "74200ec3.9b2e88",
-    "type": "set",
-    "name": "set tunnel termination point",
-    "xml": "<set>\n<parameter name='ttp.' value='`$node-otn.te.tunnel-termination-point[$ttidx].`' />\n",
-    "comments": "",
-    "x": 1985,
-    "y": 333,
-    "z": "d37ca473.74b47",
-    "wires": []
-  },
-  {
-    "id": "b86a8b99.9fa22",
-    "type": "set",
-    "name": "set unique-ttpId",
-    "xml": "<set>\n<parameter name='unique-ttpId' value=\"`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`\" />\n",
-    "comments": "",
-    "x": 1962.888916015625,
-    "y": 400.111083984375,
-    "z": "d37ca473.74b47",
-    "wires": []
-  },
-  {
-    "id": "634edb60.ca9b44",
-    "type": "set",
-    "name": "set tp-inter-layer-lock-id",
-    "xml": "<set>\n<parameter name='tp-inter-layer-lock-id' value='`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`' />\n",
-    "comments": "",
-    "x": 1273,
-    "y": 301,
-    "z": "d37ca473.74b47",
-    "wires": []
-  },
-  {
-    "id": "d61d1f77.90dba",
-    "type": "for",
-    "name": "for each node in network-otn",
-    "xml": "<for index='potnidx' start='0' end='`$network-otn.node_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1291,
-    "y": 350,
-    "z": "d37ca473.74b47",
-    "wires": [
-      [
-        "75e07276.34af4c",
-        "81ad0d1b.593018",
-        "65d2d272.734f34"
-      ]
-    ]
-  },
-  {
-    "id": "81ad0d1b.593018",
-    "type": "set",
-    "name": "set node-otn",
-    "xml": "<set>\n<parameter name='node-otn.' value='`$network-otn.node[$potnidx].`' />",
-    "comments": "",
-    "x": 1585,
-    "y": 320,
-    "z": "d37ca473.74b47",
-    "wires": []
-  },
-  {
-    "id": "65d2d272.734f34",
-    "type": "set",
-    "name": "set local variables",
-    "xml": "<set>\n<parameter name='unique-network-otnId' value='`$tmp.network-otn.network-id`' />\n<parameter name='unique-node-otnId' value=\"`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`\" />\n",
-    "comments": "",
-    "x": 1583.888916015625,
-    "y": 367.7777862548828,
-    "z": "d37ca473.74b47",
-    "wires": []
-  },
-  {
-    "id": "f5f85bac.6cdcb",
-    "type": "set",
-    "name": "set ttp-inter-layer-lock-id",
-    "xml": "<set>\n<parameter name='ttp-inter-layer-lock-id' value='`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id`' />\n",
-    "comments": "",
-    "x": 1984,
-    "y": 451,
-    "z": "d37ca473.74b47",
-    "wires": []
-  },
-  {
-    "id": "45e7bcc7.d12924",
-    "type": "switchNode",
-    "name": "switch tp-inter-layer-lock-id",
-    "xml": "<switch test='tp-inter-layer-lock-id'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1927,
-    "y": 506,
-    "z": "d37ca473.74b47",
-    "wires": [
-      [
-        "7b1ad64c.6662d"
-      ]
-    ]
-  },
-  {
-    "id": "7b1ad64c.6662d",
-    "type": "outcome",
-    "name": "ttp-inter-layer-lock-id",
-    "xml": "<outcome value='ttp-inter-layer-lock-id'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2036,
-    "y": 603,
-    "z": "d37ca473.74b47",
-    "wires": [
-      [
-        "d7c8dbff.d22ff"
-      ]
-    ]
-  },
-  {
-    "id": "d7c8dbff.d22ff",
-    "type": "save",
-    "name": "save p-interface relationship to ttp in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' \n      key='p-interface.interface-name = $unique-ltpethId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"tunnel-termination-point\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"tunnel-termination-point.tunnel-tp-id\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$unique-ttpId`\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2354,
-    "y": 603,
-    "z": "d37ca473.74b47",
-    "wires": [
-      []
-    ]
-  }
+[
+    {
+        "id": "f3ed8bda.981eb",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 126,
+        "y": 86.00650024414062,
+        "z": "8966128c.40fc9",
+        "wires": [
+            [
+                "1edaf826.be0fa"
+            ]
+        ]
+    },
+    {
+        "id": "1edaf826.be0fa",
+        "type": "service-logic",
+        "name": "DataChange ${project.version}",
+        "module": "DataChange",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>",
+        "outputs": 1,
+        "x": 215.00003051757812,
+        "y": 176.89541244506836,
+        "z": "8966128c.40fc9",
+        "wires": [
+            [
+                "3d56f688.012602"
+            ]
+        ]
+    },
+    {
+        "id": "3d56f688.012602",
+        "type": "method",
+        "name": "method update-tp-ttp-relationship",
+        "xml": "<method rpc='update-tp-ttp-relationship' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 251.1112518310547,
+        "y": 247.2287368774414,
+        "z": "8966128c.40fc9",
+        "wires": [
+            [
+                "91a7d40.f3c79b"
+            ]
+        ]
+    },
+    {
+        "id": "91a7d40.f3c79b",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 476.33343505859375,
+        "y": 246.784423828125,
+        "z": "8966128c.40fc9",
+        "wires": [
+            [
+                "44cf69ab.02fc28",
+                "6f71423b.e63cac",
+                "8b1ad0d7.d3282"
+            ]
+        ]
+    },
+    {
+        "id": "6f71423b.e63cac",
+        "type": "for",
+        "name": "for each node in network-eth",
+        "xml": "<for index='pethidx' start='0' end='`$network-eth.node_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 708.8888549804688,
+        "y": 201.33981323242188,
+        "z": "8966128c.40fc9",
+        "wires": [
+            [
+                "c451c605.7ae0a",
+                "70ab1d73.78dfa4",
+                "7bcb2ba2.9953f4"
+            ]
+        ]
+    },
+    {
+        "id": "c451c605.7ae0a",
+        "type": "set",
+        "name": "set node-eth",
+        "xml": "<set>\n<parameter name='node-eth.' value='`$network-eth.node[$pethidx].`' />",
+        "comments": "",
+        "x": 992.111083984375,
+        "y": 108.22871398925781,
+        "z": "8966128c.40fc9",
+        "wires": []
+    },
+    {
+        "id": "70ab1d73.78dfa4",
+        "type": "for",
+        "name": "for each termination point",
+        "xml": "<for index='tidx' start='0' end='`$node-eth.termination-point_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 941.4444580078125,
+        "y": 364.1175842285156,
+        "z": "8966128c.40fc9",
+        "wires": [
+            [
+                "ae76cdd8.d0a408",
+                "f5cb00b6.301068",
+                "a58125ba.f3ece",
+                "6948417f.bffae",
+                "eb8eee0c.443eb8"
+            ]
+        ]
+    },
+    {
+        "id": "ae76cdd8.d0a408",
+        "type": "set",
+        "name": "set termination point tp-eth",
+        "xml": "<set>\n<parameter name='tp-eth.' value='`$node-eth.termination-point[$tidx].`' />\n",
+        "comments": "",
+        "x": 1213.111328125,
+        "y": 235.00656127929688,
+        "z": "8966128c.40fc9",
+        "wires": []
+    },
+    {
+        "id": "f5cb00b6.301068",
+        "type": "set",
+        "name": "set unique-ltpethId",
+        "xml": "<set>\n<parameter name='unique-ltpethId' value=\"`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`\" />\n",
+        "comments": "",
+        "x": 1191.000244140625,
+        "y": 272.1175842285156,
+        "z": "8966128c.40fc9",
+        "wires": []
+    },
+    {
+        "id": "44cf69ab.02fc28",
+        "type": "execute",
+        "name": "execute set tmp.network-eth.network-id",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$network-eth.network-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.network-eth.network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",
+        "comments": "",
+        "outputs": 1,
+        "x": 666.9935302734375,
+        "y": 66,
+        "z": "8966128c.40fc9",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7bcb2ba2.9953f4",
+        "type": "set",
+        "name": "set local variables",
+        "xml": "<set>\n<parameter name='unique-network-ethId' value='`$tmp.network-eth.network-id`' />\n<parameter name='unique-node-ethId' value=\"`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`\" />\n",
+        "comments": "",
+        "x": 991,
+        "y": 156.00650024414062,
+        "z": "8966128c.40fc9",
+        "wires": []
+    },
+    {
+        "id": "8b1ad0d7.d3282",
+        "type": "execute",
+        "name": "execute set tmp.network-otn.network-id",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$network-otn.network-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.network-otn.network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",
+        "comments": "",
+        "outputs": 1,
+        "x": 664,
+        "y": 105.00650024414062,
+        "z": "8966128c.40fc9",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3e8d4c9d.81492c",
+        "type": "for",
+        "name": "for each tunnel termination point in otn",
+        "xml": "<for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1567,
+        "y": 419.0065002441406,
+        "z": "8966128c.40fc9",
+        "wires": [
+            [
+                "c8d54563.247c18",
+                "5e04ba3c.b57a04",
+                "f0519db1.196698",
+                "86fe0338.dea2e8",
+                "14bac025.125a4"
+            ]
+        ]
+    },
+    {
+        "id": "c8d54563.247c18",
+        "type": "set",
+        "name": "set tunnel termination point",
+        "xml": "<set>\n<parameter name='ttp.' value='`$node-otn.te.tunnel-termination-point[$ttidx].`' />\n",
+        "comments": "",
+        "x": 1943,
+        "y": 344.0065002441406,
+        "z": "8966128c.40fc9",
+        "wires": []
+    },
+    {
+        "id": "5e04ba3c.b57a04",
+        "type": "set",
+        "name": "set unique-ttpId",
+        "xml": "<set>\n<parameter name='unique-ttpId' value=\"`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`\" />\n",
+        "comments": "",
+        "x": 1920.888916015625,
+        "y": 411.1175842285156,
+        "z": "8966128c.40fc9",
+        "wires": []
+    },
+    {
+        "id": "a58125ba.f3ece",
+        "type": "set",
+        "name": "set tp-inter-layer-lock-id",
+        "xml": "<set>\n<parameter name='tp-inter-layer-lock-id' value='`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`' />\n",
+        "comments": "",
+        "x": 1231,
+        "y": 312.0065002441406,
+        "z": "8966128c.40fc9",
+        "wires": []
+    },
+    {
+        "id": "6948417f.bffae",
+        "type": "for",
+        "name": "for each node in network-otn",
+        "xml": "<for index='potnidx' start='0' end='`$network-otn.node_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1249,
+        "y": 361.0065002441406,
+        "z": "8966128c.40fc9",
+        "wires": [
+            [
+                "3e8d4c9d.81492c",
+                "a37094cf.0ec268",
+                "f9e7891b.a33b9"
+            ]
+        ]
+    },
+    {
+        "id": "a37094cf.0ec268",
+        "type": "set",
+        "name": "set node-otn",
+        "xml": "<set>\n<parameter name='node-otn.' value='`$network-otn.node[$potnidx].`' />",
+        "comments": "",
+        "x": 1543,
+        "y": 331.0065002441406,
+        "z": "8966128c.40fc9",
+        "wires": []
+    },
+    {
+        "id": "f9e7891b.a33b9",
+        "type": "set",
+        "name": "set local variables",
+        "xml": "<set>\n<parameter name='unique-network-otnId' value='`$tmp.network-otn.network-id`' />\n<parameter name='unique-node-otnId' value=\"`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`\" />\n",
+        "comments": "",
+        "x": 1541.888916015625,
+        "y": 378.78428649902344,
+        "z": "8966128c.40fc9",
+        "wires": []
+    },
+    {
+        "id": "f0519db1.196698",
+        "type": "set",
+        "name": "set ttp-inter-layer-lock-id",
+        "xml": "<set>\n<parameter name='ttp-inter-layer-lock-id' value='`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id`' />\n",
+        "comments": "",
+        "x": 1942,
+        "y": 462.0065002441406,
+        "z": "8966128c.40fc9",
+        "wires": []
+    },
+    {
+        "id": "86fe0338.dea2e8",
+        "type": "switchNode",
+        "name": "switch tp-inter-layer-lock-id",
+        "xml": "<switch test='tp-inter-layer-lock-id'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1885,
+        "y": 517.0065002441406,
+        "z": "8966128c.40fc9",
+        "wires": [
+            [
+                "bece73d9.c8717"
+            ]
+        ]
+    },
+    {
+        "id": "bece73d9.c8717",
+        "type": "outcome",
+        "name": "ttp-inter-layer-lock-id",
+        "xml": "<outcome value='ttp-inter-layer-lock-id'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1994,
+        "y": 614.0065002441406,
+        "z": "8966128c.40fc9",
+        "wires": [
+            [
+                "377503ca.868e7c"
+            ]
+        ]
+    },
+    {
+        "id": "377503ca.868e7c",
+        "type": "save",
+        "name": "save p-interface relationship to ttp in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' \n      key='p-interface.interface-name = $unique-ltpethId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"tunnel-termination-point\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"tunnel-termination-point.tunnel-tp-id\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$unique-ttpId`\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2312,
+        "y": 614.0065002441406,
+        "z": "8966128c.40fc9",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "eb8eee0c.443eb8",
+        "type": "set",
+        "name": "unset termination point tp-eth",
+        "xml": "<set>\n<parameter name='tp-eth.' value='' />\n",
+        "comments": "",
+        "x": 1208,
+        "y": 198,
+        "z": "8966128c.40fc9",
+        "wires": []
+    },
+    {
+        "id": "14bac025.125a4",
+        "type": "set",
+        "name": "unset tunnel termination point",
+        "xml": "<set>\n<parameter name='ttp.' value='' />\n",
+        "comments": "",
+        "x": 1933,
+        "y": 305,
+        "z": "8966128c.40fc9",
+        "wires": []
+    }
 ]
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
index a80f8710..81e8bd20 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
@@ -1,6 +1,6 @@
 <service-logic
-        xmlns='http://www.onap.org/sdnc/svclogic'
-        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>
     <method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>
         <block atomic="true">
             <switch test="`$prop.sdncRestApi.vendor == 'ZTE'`">
@@ -64,94 +64,68 @@
                                                                         <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>
                                                                     </block>
                                                                 </for>
-                                                                <switch test='`$topology.networks.network_length`'>
-                                                                    <outcome value='2'>
-                                                                        <switch test='`$topology.networks.network[0].network-types`'>
-                                                                            <outcome value='ethernet-topology'>
-                                                                                <switch test='`$topology.networks.network[1].network-types`'>
-                                                                                    <outcome value='otn-topology'>
+                                                                <switch test='`$topology.networks.network_length >= 2`'>
+                                                                    <outcome value='true'>
+                                                                        <for index='netidx' start='0' end='`$topology.networks.network_length`' >
+                                                                            <block>
+                                                                                <set>
+                                                                                    <parameter name='network.' value='' />
+                                                                                </set>
+                                                                                <set>
+                                                                                    <parameter name='network.' value='`$topology.networks.network[$netidx].`' />
+                                                                                </set>
+                                                                                <switch test='`$network.te-topology-id`'>
+                                                                                    <outcome value='11'>
                                                                                         <block>
+                                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                                                <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
+                                                                                                <parameter name="field1" value="__TIMESTAMP__" />
+                                                                                                <parameter name="field2" value="networks_length" />
+                                                                                                <parameter name="field3" value="`$topology.networks.network_length`" />
+                                                                                                <parameter name="field4" value="network-type-is" />
+                                                                                                <parameter name="field5" value="OTN" />
+                                                                                            </record>
                                                                                             <set>
-                                                                                                <parameter name='network-eth.' value='`$topology.networks.network[0].`' />
-                                                                                                <parameter name='network-otn.' value='`$topology.networks.network[1].`' />
+                                                                                                <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />
                                                                                             </set>
-                                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
                                                                                         </block>
                                                                                     </outcome>
-                                                                                    <outcome value='Other'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='error-code' value='' />
-                                                                                            <parameter name='error-message' value='' />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                </switch>
-                                                                            </outcome>
-                                                                            <outcome value='otn-topology'>
-                                                                                <switch test='`$topology.networks.network[1].network-types`'>
-                                                                                    <outcome value='ethernet-topology'>
+                                                                                    <outcome value='33'>
                                                                                         <block>
+                                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                                                <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
+                                                                                                <parameter name="field1" value="__TIMESTAMP__" />
+                                                                                                <parameter name="field2" value="networks_length" />
+                                                                                                <parameter name="field3" value="`$topology.networks.network_length`" />
+                                                                                                <parameter name="field4" value="network-type-is" />
+                                                                                                <parameter name="field5" value="ETH" />
+                                                                                            </record>
                                                                                             <set>
-                                                                                                <parameter name='network.eth' value='`$topology.networks.network[1].`' />
-                                                                                                <parameter name='network.otn' value='`$topology.networks.network[0].`' />
+                                                                                                <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />
                                                                                             </set>
-                                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
                                                                                         </block>
                                                                                     </outcome>
-                                                                                    <outcome value='Other'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='error-code' value='' />
-                                                                                            <parameter name='error-message' value='' />
-                                                                                        </return>
-                                                                                    </outcome>
                                                                                 </switch>
-                                                                            </outcome>
-                                                                        </switch>
+                                                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                                    <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
+                                                                                    <parameter name="field6" value="network-otn-is" />
+                                                                                    <parameter name="field7" value="`$network-otn.te-topology-id`" />
+                                                                                    <parameter name="field8" value="network-eth-is" />
+                                                                                    <parameter name="field9" value="`$network-eth.te-topology-id`" />
+                                                                                </record>
+                                                                                <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
+                                                                            </block>
+                                                                        </for>
                                                                     </outcome>
-                                                                </switch>
-                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                              resource="network-resources"
-                                                                              pfx='tmp.aai.network-resources' local-only='false' >
-                                                                    <outcome value='success'>
-                                                                        <switch test='tmp.aai.network-resources_length'>
-                                                                            <outcome value='4'>
-                                                                                <block atomic='true'>
-                                                                                    <for index='nridx' start='0' end='`$tmp.aai.network-resources.network-resource_length`' >
-                                                                                        <block>
-                                                                                            <set>
-                                                                                                <parameter name='otnidx' value='0' />
-                                                                                            </set>
-                                                                                            <switch test='`$tmp.aai.network-resources.network-resource[$nridx].network-type`'>
-                                                                                                <outcome value='otn-topology'>
-                                                                                                    <block>
-                                                                                                        <set>
-                                                                                                            <parameter name='network-resource-otn[$otnidx].' value='`$tmp.aai.network-resources.network-resource[$nridx].`' />
-                                                                                                        </set>
-                                                                                                        <set>
-                                                                                                            <parameter name='otnidx' value='`$otnidx + 1`' />
-                                                                                                        </set>
-                                                                                                    </block>
-                                                                                                </outcome>
-                                                                                            </switch>
-                                                                                        </block>
-                                                                                    </for>
-                                                                                    <call module='DataChange' rpc='update-open-ended-links' mode='sync' ></call>
-                                                                                </block>
-                                                                            </outcome>
-                                                                        </switch>
-                                                                    </outcome>
-                                                                    <outcome value='not-found'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='error-code' value='' />
-                                                                            <parameter name='error-message' value='' />
-                                                                        </return>
+                                                                    <outcome value='false'>
+                                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                            <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
+                                                                            <parameter name="field1" value="__TIMESTAMP__" />
+                                                                            <parameter name="field2" value="networks_length" />
+                                                                            <parameter name="field3" value="`$topology.networks.network_length`" />
+                                                                        </record>
                                                                     </outcome>
-                                                                    <outcome value='Other'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='error-code' value='' />
-                                                                            <parameter name='error-message' value='' />
-                                                                        </return>
-                                                                    </outcome>
-                                                                </get-resource>
+                                                                </switch>
                                                             </block>
                                                         </outcome>
                                                     </execute>
@@ -186,94 +160,68 @@
                                                                         <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>
                                                                     </block>
                                                                 </for>
-                                                                <switch test='`$topology.networks.network_length`'>
-                                                                    <outcome value='2'>
-                                                                        <switch test='`$topology.networks.network[0].network-types`'>
-                                                                            <outcome value='ethernet-topology'>
-                                                                                <switch test='`$topology.networks.network[1].network-types`'>
-                                                                                    <outcome value='otn-topology'>
+                                                                <switch test='`$topology.networks.network_length >= 2`'>
+                                                                    <outcome value='true'>
+                                                                        <for index='netidx' start='0' end='`$topology.networks.network_length`' >
+                                                                            <block>
+                                                                                <set>
+                                                                                    <parameter name='network.' value='' />
+                                                                                </set>
+                                                                                <set>
+                                                                                    <parameter name='network.' value='`$topology.networks.network[$netidx].`' />
+                                                                                </set>
+                                                                                <switch test='`$network.te-topology-id`'>
+                                                                                    <outcome value='11'>
                                                                                         <block>
+                                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                                                <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
+                                                                                                <parameter name="field1" value="__TIMESTAMP__" />
+                                                                                                <parameter name="field2" value="networks_length" />
+                                                                                                <parameter name="field3" value="`$topology.networks.network_length`" />
+                                                                                                <parameter name="field4" value="network-type-is" />
+                                                                                                <parameter name="field5" value="OTN" />
+                                                                                            </record>
                                                                                             <set>
-                                                                                                <parameter name='network-eth.' value='`$topology.networks.network[0].`' />
-                                                                                                <parameter name='network-otn.' value='`$topology.networks.network[1].`' />
+                                                                                                <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />
                                                                                             </set>
-                                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
                                                                                         </block>
                                                                                     </outcome>
-                                                                                    <outcome value='Other'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='error-code' value='' />
-                                                                                            <parameter name='error-message' value='' />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                </switch>
-                                                                            </outcome>
-                                                                            <outcome value='otn-topology'>
-                                                                                <switch test='`$topology.networks.network[1].network-types`'>
-                                                                                    <outcome value='ethernet-topology'>
+                                                                                    <outcome value='33'>
                                                                                         <block>
+                                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                                                <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
+                                                                                                <parameter name="field1" value="__TIMESTAMP__" />
+                                                                                                <parameter name="field2" value="networks_length" />
+                                                                                                <parameter name="field3" value="`$topology.networks.network_length`" />
+                                                                                                <parameter name="field4" value="network-type-is" />
+                                                                                                <parameter name="field5" value="ETH" />
+                                                                                            </record>
                                                                                             <set>
-                                                                                                <parameter name='network.eth' value='`$topology.networks.network[1].`' />
-                                                                                                <parameter name='network.otn' value='`$topology.networks.network[0].`' />
+                                                                                                <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />
                                                                                             </set>
-                                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
                                                                                         </block>
                                                                                     </outcome>
-                                                                                    <outcome value='Other'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='error-code' value='' />
-                                                                                            <parameter name='error-message' value='' />
-                                                                                        </return>
-                                                                                    </outcome>
                                                                                 </switch>
-                                                                            </outcome>
-                                                                        </switch>
+                                                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                                    <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
+                                                                                    <parameter name="field6" value="network-otn-is" />
+                                                                                    <parameter name="field7" value="`$network-otn.te-topology-id`" />
+                                                                                    <parameter name="field8" value="network-eth-is" />
+                                                                                    <parameter name="field9" value="`$network-eth.te-topology-id`" />
+                                                                                </record>
+                                                                                <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
+                                                                            </block>
+                                                                        </for>
                                                                     </outcome>
-                                                                </switch>
-                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                              resource="network-resources"
-                                                                              pfx='tmp.aai.network-resources' local-only='false' >
-                                                                    <outcome value='success'>
-                                                                        <switch test='tmp.aai.network-resources_length'>
-                                                                            <outcome value='4'>
-                                                                                <block atomic='true'>
-                                                                                    <for index='nridx' start='0' end='`$tmp.aai.network-resources.network-resource_length`' >
-                                                                                        <block>
-                                                                                            <set>
-                                                                                                <parameter name='otnidx' value='0' />
-                                                                                            </set>
-                                                                                            <switch test='`$tmp.aai.network-resources.network-resource[$nridx].network-type`'>
-                                                                                                <outcome value='otn-topology'>
-                                                                                                    <block>
-                                                                                                        <set>
-                                                                                                            <parameter name='network-resource-otn[$otnidx].' value='`$tmp.aai.network-resources.network-resource[$nridx].`' />
-                                                                                                        </set>
-                                                                                                        <set>
-                                                                                                            <parameter name='otnidx' value='`$otnidx + 1`' />
-                                                                                                        </set>
-                                                                                                    </block>
-                                                                                                </outcome>
-                                                                                            </switch>
-                                                                                        </block>
-                                                                                    </for>
-                                                                                    <call module='DataChange' rpc='update-open-ended-links' mode='sync' ></call>
-                                                                                </block>
-                                                                            </outcome>
-                                                                        </switch>
-                                                                    </outcome>
-                                                                    <outcome value='not-found'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='error-code' value='' />
-                                                                            <parameter name='error-message' value='' />
-                                                                        </return>
+                                                                    <outcome value='false'>
+                                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                            <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
+                                                                            <parameter name="field1" value="__TIMESTAMP__" />
+                                                                            <parameter name="field2" value="networks_length" />
+                                                                            <parameter name="field3" value="`$topology.networks.network_length`" />
+                                                                        </record>
                                                                     </outcome>
-                                                                    <outcome value='Other'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='error-code' value='' />
-                                                                            <parameter name='error-message' value='' />
-                                                                        </return>
-                                                                    </outcome>
-                                                                </get-resource>
+                                                                </switch>
                                                             </block>
                                                         </outcome>
                                                     </execute>
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 8777891a..b867b56a 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml
@@ -1,193 +1,290 @@
-<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">
-    <method rpc="update-network-links-to-aai" mode="sync">
-        <block atomic="true">
-            <for index="pidx" start="0" end="`$network.link_length`">
-                <set>
-                    <parameter name="link." value="`$network.link[$pidx].`"/>
-                    <parameter name="unique-networkId" value="`$tmp.network-id`"/>
-                </set>
-                <set>
-                    <parameter name="unique-linkId" value="`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`"/>
-                    <parameter name="src-tpId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`"/>
-                    <parameter name="unique-src-node-Id" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node`"/>
-                </set>
-                <switch test="`$link.destination`">
-                    <outcome value="">
-                        <block>
-                            <set>
-                                <parameter name="is-open-ended-link" value="true"/>
-                            </set>
-                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-src-node-Id and p-interface.interface-name = $src-tpId" local-only="false" pfx="tmp.aai.p-interface">
-                                <outcome value="success">
-                                    <set>
-                                        <parameter name="alt-unique-linkId" value="`$tmp.aai.p-interface.inter-domain-plug-id`"/>
-                                    </set>
-                                </outcome>
-                                <outcome value="not-found">
-                                    <return status="failure">
-                                        <parameter name="ack-final" value="Y"/>
-                                        <parameter name="error-code" value="500"/>
-                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`"/>
-                                    </return>
-                                </outcome>
-                                <outcome value="failure">
-                                    <return status="failure">
-                                        <parameter name="error-code" value=""/>
-                                        <parameter name="error-message" value=""/>
-                                    </return>
-                                </outcome>
-                            </get-resource>
-                        </block>
-                    </outcome>
-                    <outcome value="Other">
-                        <set>
-                            <parameter name="dst-tpId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`"/>
-                            <parameter name="unique-dst-node-Id" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node`"/>
-                            <parameter name="is-open-ended-link" value="false"/>
-                        </set>
-                    </outcome>
-                </switch>
-                <switch test="`$is-open-ended-link`">
-                    <outcome value="true">
-                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $alt-unique-linkId" local-only="false" pfx="tmp.aai.logical-link">
-                            <outcome value="success">
-                                <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $alt-unique-linkId" force="true" pfx="tmp.AnAI-data">
-                                    <!--
-                                    <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
-                                    -->
-                                    <!--
-                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />
-                                    -->
-                                    <!--
-                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
-                                    -->
-                                    <!--
-                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`" />
-                                    -->
-                                    <parameter name="relationship-list.relationship[1].related-to" value="p-interface"/>
-                                    <parameter name="relationship-list.relationship[1].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>
-                                    <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name"/>
-                                    <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$src-tpId`"/>
-                                </update>
-                            </outcome>
-                            <outcome value="not-found">
-                                <block atomic="true">
-                                    <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $alt-unique-linkId">
-                                        <parameter name="link-name" value="`$alt-unique-linkId`"/>
-                                        <parameter name="link-id" value="`$link.link-id`"/>
-                                        <parameter name="link-type" value="`$link.te.te-link-attributes.access-type`"/>
-                                    </save>
-                                    <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $unique-linkId" force="true" pfx="tmp.AnAI-data">
-                                        <parameter name="relationship-list.relationship[0].related-to" value="p-interface"/>
-                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>
-                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name"/>
-                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`"/>
-                                    </save>
-                                    <switch test="`$link.te.te-link-attributes.label-restriction`">
-                                        <outcome value="">
-                                            <block/>
-                                        </outcome>
-                                        <outcome value="Other">
-                                            <for index="tidx" start="0" end="`$link.te.te-link-attributes.label-restriction_length`">
-                                                <set>
-                                                    <parameter name="label-restriction." value="`$link.te.te-link-attributes.label-restriction[$tidx].`"/>
-                                                    <parameter name="unique-lrId" value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`"/>
-                                                </set>
-                                                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $alt-unique-linkId AND label-restriction.id = $unique-lrId">
-                                                    <parameter name="id" value="`$unique-lrId`"/>
-                                                    <parameter name="label-start" value="`$label-restriction.label-start`"/>
-                                                    <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`"/>
-                                                    <outcome value="success">
-                                                        <block/>
-                                                    </outcome>
-                                                    <outcome value="failure">
-                                                        <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $alt-unique-linkId AND label-restriction.id = $unique-lrId">
-                                                            <parameter name="id" value="`$unique-lrId`"/>
-                                                            <parameter name="label-start" value="`$label-restriction.label-start`"/>
-                                                            <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`"/>
-                                                        </update>
-                                                    </outcome>
-                                                </save>
-                                                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $alt-unique-linkId" force="true" pfx="tmp.AnAI-data">
-                                                    <parameter name="relationship-list.relationship[$tidx].related-to" value="label-restriction"/>
-                                                    <parameter name="relationship-list.relationship[$tidx].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`"/>
-                                                    <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-key" value="label-restriction.id"/>
-                                                    <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-value" value="`$unique-lrId`"/>
-                                                </save>
-                                            </for>
-                                        </outcome>
-                                    </switch>
-                                </block>
-                            </outcome>
-                        </get-resource>
-                    </outcome>
-                    <outcome value="false">
-                        <block atomic="true">
-                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $unique-linkId">
-                                <parameter name="link-name" value="`$unique-linkId`"/>
-                                <parameter name="link-id" value="`$link.link-id`"/>
-                                <parameter name="link-type" value="`$link.te.te-link-attributes.access-type`"/>
-                            </save>
-                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $unique-linkId" force="true" pfx="tmp.AnAI-data">
-                                <parameter name="relationship-list.relationship[0].related-to" value="p-interface"/>
-                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>
-                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name"/>
-                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`"/>
-                                <parameter name="relationship-list.relationship[1].related-to" value="p-interface"/>
-                                <parameter name="relationship-list.relationship[1].related-link" value="`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`"/>
-                                <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name"/>
-                                <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$dst-tpId`"/>
-                            </save>
-                            <switch test="`$link.te.te-link-attributes.label-restriction`">
-                                <outcome value="">
-                                    <block/>
-                                </outcome>
-                                <outcome value="Other">
-                                    <for index="tidx" start="0" end="`$link.te.te-link-attributes.label-restriction_length`">
-                                        <set>
-                                            <parameter name="label-restriction." value="`$link.te.te-link-attributes.label-restriction[$tidx].`"/>
-                                            <parameter name="unique-lrId" value="`$unique-linkId + '-lrId-' + $label-restriction.index`"/>
-                                        </set>
-                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $unique-linkId AND label-restriction.id = $unique-lrId">
-                                            <parameter name="id" value="`$unique-lrId`"/>
-                                            <parameter name="label-start" value="`$label-restriction.label-start`"/>
-                                            <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`"/>
-                                            <outcome value="success">
-                                                <block/>
-                                            </outcome>
-                                            <outcome value="failure">
-                                                <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $unique-linkId AND label-restriction.id = $unique-lrId">
-                                                    <parameter name="id" value="`$unique-lrId`"/>
-                                                    <parameter name="label-start" value="`$label-restriction.label-start`"/>
-                                                    <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`"/>
-                                                </update>
-                                            </outcome>
-                                        </save>
-                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $unique-linkId" force="true" pfx="tmp.AnAI-data">
-                                            <parameter name="relationship-list.relationship[$tidx].related-to" value="label-restriction"/>
-                                            <parameter name="relationship-list.relationship[$tidx].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`"/>
-                                            <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-key" value="label-restriction.id"/>
-                                            <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-value" value="`$unique-lrId`"/>
-                                        </save>
-                                    </for>
-                                </outcome>
-                            </switch>
-                        </block>
-                    </outcome>
-                </switch>
-            </for>
-        </block>
-    </method>
+<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}'>
+    <method rpc='update-network-links-to-aai' mode='sync'>
+        <block atomic="true">
+            <for index='pidx' start='0' end='`$network.link_length`' >
+                <set>
+                    <parameter name='link.' value='' />
+                    <parameter name='dst-tpId' value='' />
+                    <parameter name='unique-dst-node-Id' value='' />
+                    <parameter name='is-open-ended-link' value='false' />
+                    <parameter name='is-invalid-open-ended-link' value='false' />
+                </set>
+                <set>
+                    <parameter name='link.' value='`$network.link[$pidx].`' />
+                    <parameter name='unique-networkId' value='`$tmp.network-id`' />
+                </set>
+                <set>
+                    <parameter name='unique-linkId' value="`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`" />
+                    <parameter name='src-tpId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`" />
+                    <parameter name='unique-src-node-Id' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node`" />
+                </set>
+                <switch test='`$link.destination.dest-node`'>
+                    <outcome value=''>
+                        <block>
+                            <set>
+                                <parameter name='is-open-ended-link' value='true' />
+                            </set>
+                            <set>
+                                <parameter name='tmp.aai.p-interface' value='' />
+                                <parameter name='tmp.aai.p-interface.inter-domain-plug-id' value='' />
+                            </set>
+                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+	resource="p-interface"
+	    key="pnf.pnf-name = $unique-src-node-Id
+	        and p-interface.interface-name = $src-tpId"
+		local-only="false" 
+		pfx="tmp.aai.p-interface" >
+                                <outcome value='success'>
+                                    <switch test='`$tmp.aai.p-interface.inter-domain-plug-id`'>
+                                        <outcome value=''>
+                                            <set>
+                                                <parameter name='is-open-ended-link' value='false' />
+                                                <parameter name='is-invalid-open-ended-link' value='true' />
+                                            </set>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <set>
+                                                <parameter name='alt-unique-linkId' value="`$tmp.aai.p-interface.inter-domain-plug-id`" />
+                                                <!--<parameter name='alt-unique-linkId' value="`'networkId-' + $unique-networkId + '-linkId-' + $tmp.aai.p-interface.inter-domain-plug-id`" />-->
+                                            </set>
+                                        </outcome>
+                                    </switch>
+                                </outcome>
+                                <outcome value='not-found'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                    </return>
+                                </outcome>
+                                <outcome value='failure'>
+                                    <return status='failure'>
+                                        <parameter name='error-code' value='' />
+                                        <parameter name='error-message' value='' />
+                                    </return>
+                                </outcome>
+                            </get-resource>
+                        </block>
+                    </outcome>
+                    <outcome value='Other'>
+                        <set>
+                            <parameter name='dst-tpId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`" />
+                            <parameter name='unique-dst-node-Id' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node`" />
+                            <parameter name='is-open-ended-link' value='false' />
+                        </set>
+                    </outcome>
+                </switch>
+                <switch test='`$is-invalid-open-ended-link`'>
+                    <outcome value='true'>
+                        <block></block>
+                    </outcome>
+                    <outcome value='false'>
+                        <switch test='`$is-open-ended-link`'>
+                            <outcome value='true'>
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+	resource="logical-link"
+	    key="logical-link.link-name = $alt-unique-linkId"
+		local-only="false" 
+		pfx="tmp.aai.logical-link" >
+                                    <outcome value='success'>
+                                        <block>
+                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                <parameter name="file" value="/opt/onap/logMerge.txt" />
+                                                <parameter name="field1" value="__TIMESTAMP__" />
+                                                <parameter name="field2" value="altUniqueLinkId" />
+                                                <parameter name="field3" value="`$alt-unique-linkId`" />
+                                                <parameter name="field4" value="srcTpId" />
+                                                <parameter name="field5" value="`$src-tpId`" />
+                                                <parameter name="field6" value="relationship-value" />
+                                                <parameter name="field7" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />
+                                            </record>
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' 
+      key='logical-link.link-name = $alt-unique-linkId' force="true" pfx="tmp.AnAI-data">
+                                                <!--<parameter name="relationship-list.relationship[0].related-to" value="p-interface" />-->
+                                                <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />-->
+                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />-->
+                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`" />-->
+                                                <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
+                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />
+                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
+                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`" />
+                                                <outcome value='success'>
+                                                    <block>
+                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                            <parameter name="file" value="/opt/onap/logMergeSuccess.txt" />
+                                                            <parameter name="field1" value="__TIMESTAMP__" />
+                                                            <parameter name="field2" value="altUniqueLinkId" />
+                                                            <parameter name="field3" value="`$alt-unique-linkId`" />
+                                                            <parameter name="field4" value="srcTpId" />
+                                                            <parameter name="field5" value="`$src-tpId`" />
+                                                            <parameter name="field6" value="relationship-value" />
+                                                            <parameter name="field7" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />
+                                                        </record>
+                                                    </block>
+                                                </outcome>
+                                                <outcome value='failure'>
+                                                    <block>
+                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                            <parameter name="file" value="/opt/onap/logMergeFailure.txt" />
+                                                            <parameter name="field1" value="__TIMESTAMP__" />
+                                                            <parameter name="field2" value="altUniqueLinkId" />
+                                                            <parameter name="field3" value="`$alt-unique-linkId`" />
+                                                            <parameter name="field4" value="srcTpId" />
+                                                            <parameter name="field5" value="`$src-tpId`" />
+                                                            <parameter name="field6" value="relationship-value" />
+                                                            <parameter name="field7" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />
+                                                        </record>
+                                                    </block>
+                                                </outcome>
+                                            </save>
+                                        </block>
+                                    </outcome>
+                                    <outcome value='not-found'>
+                                        <block atomic='true'>
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' 
+      key='logical-link.link-name = $alt-unique-linkId' >
+                                                <parameter name='link-name' value='`$alt-unique-linkId`' />
+                                                <parameter name='link-id' value='`$link.link-id`' />
+                                                <parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />
+                                            </save>
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' 
+      key='logical-link.link-name = $alt-unique-linkId' force="true" pfx="tmp.AnAI-data">
+                                                <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
+                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />
+                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
+                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`" />
+                                            </save>
+                                            <switch test='`$link.te.te-link-attributes.label-restriction`'>
+                                                <outcome value=''>
+                                                    <block></block>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >
+                                                        <set>
+                                                            <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />
+                                                            <parameter name='unique-lrId' value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`" />
+                                                        </set>
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' 
+      key='logical-link.link-name = $alt-unique-linkId
+      AND label-restriction.id = $unique-lrId' >
+                                                            <parameter name='id' value='`$unique-lrId`' />
+                                                            <parameter name='label-start' value='`$label-restriction.label-start`' />
+                                                            <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`' />
+                                                            <outcome value='success'>
+                                                                <block></block>
+                                                            </outcome>
+                                                            <outcome value='failure'>
+                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' 
+      key='logical-link.link-name = $alt-unique-linkId
+      AND label-restriction.id = $unique-lrId' >
+                                                                    <parameter name='id' value='`$unique-lrId`' />
+                                                                    <parameter name='label-start' value='`$label-restriction.label-start`' />
+                                                                    <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`' />
+                                                                </update>
+                                                            </outcome>
+                                                        </save>
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' 
+      key='logical-link.link-name = $alt-unique-linkId' force="true" pfx="tmp.AnAI-data">
+                                                            <parameter name="relationship-list.relationship[$tidx].related-to" value="label-restriction" />
+                                                            <parameter name="relationship-list.relationship[$tidx].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />
+                                                            <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-key" value="label-restriction.id" />
+                                                            <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-value" value="`$unique-lrId`" />
+                                                        </save>
+                                                    </for>
+                                                </outcome>
+                                            </switch>
+                                        </block>
+                                    </outcome>
+                                </get-resource>
+                            </outcome>
+                            <outcome value='false'>
+                                <block atomic='true'>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' 
+      key='logical-link.link-name = $unique-linkId' >
+                                        <parameter name='link-name' value='`$unique-linkId`' />
+                                        <parameter name='link-id' value='`$link.link-id`' />
+                                        <parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />
+                                    </save>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />
+                                        <parameter name="field1" value="__TIMESTAMP__" />
+                                        <parameter name="field2" value="uniqueLinkId" />
+                                        <parameter name="field3" value="`$unique-linkId`" />
+                                        <parameter name="field4" value="srcTpId" />
+                                        <parameter name="field5" value="`$src-tpId`" />
+                                        <parameter name="field6" value="dstTpId" />
+                                        <parameter name="field7" value="`$dst-tpId`" />
+                                    </record>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' 
+      key='logical-link.link-name = $unique-linkId' force="true" pfx="tmp.AnAI-data">
+                                        <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
+                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`" />
+                                        <parameter name="relationship-list.relationship[1].related-to" value="p-interface" />
+                                        <parameter name="relationship-list.relationship[1].related-link" value="`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`" />
+                                        <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name" />
+                                        <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$dst-tpId`" />
+                                    </save>
+                                    <switch test='`$link.te.te-link-attributes.label-restriction`'>
+                                        <outcome value=''>
+                                            <block></block>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >
+                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' 
+      key='logical-link.link-name = $unique-linkId' force="true" pfx="tmp.AnAI-data">
+                                                    <parameter name="relationship-list.relationship[$tidx].related-to" value="label-restriction" />
+                                                    <parameter name="relationship-list.relationship[$tidx].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />
+                                                    <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-key" value="label-restriction.id" />
+                                                    <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-value" value="`$unique-lrId`" />
+                                                </save>
+                                                <set>
+                                                    <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />
+                                                    <parameter name='unique-lrId' value="`$unique-linkId + '-lrId-' + $label-restriction.index`" />
+                                                </set>
+                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' 
+      key='logical-link.link-name = $unique-linkId
+      AND label-restriction.id = $unique-lrId' >
+                                                    <parameter name='id' value='`$unique-lrId`' />
+                                                    <parameter name='label-start' value='`$label-restriction.label-start`' />
+                                                    <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`' />
+                                                    <outcome value='success'>
+                                                        <block></block>
+                                                    </outcome>
+                                                    <outcome value='failure'>
+                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' 
+      key='logical-link.link-name = $unique-linkId
+      AND label-restriction.id = $unique-lrId' >
+                                                            <parameter name='id' value='`$unique-lrId`' />
+                                                            <parameter name='label-start' value='`$label-restriction.label-start`' />
+                                                            <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`' />
+                                                        </update>
+                                                    </outcome>
+                                                </save>
+                                            </for>
+                                        </outcome>
+                                    </switch>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </outcome>
+                </switch>
+            </for>
+        </block>
+    </method>
 </service-logic>
\ No newline at end of file
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 17be19ec..f9b7d997 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
@@ -1,141 +1,187 @@
-<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">
-    <method rpc="update-network-to-aai" mode="sync">
+<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}'>
+    <method rpc='update-network-to-aai' mode='sync'>
         <block atomic="true">
-            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
                 <parameter name="source" value="`$network.network-id`"/>
                 <parameter name="outputPath" value="tmp.network-id"/>
                 <parameter name="target" value="/"/>
                 <parameter name="replacement" value="-"/>
             </execute>
-            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource" key="network-resource.network-id = $tmp.network-id">
-                <parameter name="network-id" value="`$tmp.network-id`"/>
-                <parameter name="client-id" value="`$network.client-id`"/>
-                <parameter name="te-topo-id" value="`$network.te-topology-id`"/>
-                <parameter name="provider-id" value="`$network.provider-id`"/>
-                <parameter name="network-type" value="`$network.network-types`"/>
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'  
+     key='network-resource.network-id = $tmp.network-id' >
+                <parameter name='network-id' value='`$tmp.network-id`' />
+                <parameter name='client-id' value='`$network.client-id`' />
+                <parameter name='te-topo-id' value='`$network.te-topology-id`' />
+                <parameter name='provider-id' value='`$network.provider-id`' />
+                <parameter name='network-type' value='`$network.network-types`' />
             </save>
-            <for index="pidx" start="0" end="`$network.node_length`">
+            <for index='pidx' start='0' end='`$network.node_length`' >
                 <set>
-                    <parameter name="node." value="`$network.node[$pidx].`"/>
-                    <parameter name="unique-networkId" value="`$tmp.network-id`"/>
+                    <parameter name='node.' value='' />
                 </set>
                 <set>
-                    <parameter name="unique-nodeId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`"/>
+                    <parameter name='node.' value='`$network.node[$pidx].`' />
+                    <parameter name='unique-networkId' value='`$tmp.network-id`' />
                 </set>
-                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $unique-nodeId">
-                    <parameter name="pnf-name" value="`$unique-nodeId`"/>
-                    <parameter name="pnf-id" value="`$node.node-id`"/>
-                    <parameter name="operational-status" value="`$node.te.oper-status`"/>
-                    <parameter name="admin-status" value="`$node.te.te-node-attributes.admin-status`"/>
-                    <parameter name="in-maint" value="true"/>
+                <set>
+                    <parameter name='unique-nodeId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`" />
+                </set>
+                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' 
+      key='pnf.pnf-name = $unique-nodeId' >
+                    <parameter name='pnf-name' value='`$unique-nodeId`' />
+                    <parameter name='pnf-id' value='`$node.node-id`' />
+                    <parameter name='operational-status' value='`$node.te.oper-status`' />
+                    <parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />
+                    <parameter name='in-maint' value='true' />
                 </save>
-                <switch test="`$node.te.tunnel-termination-point_length`">
-                    <outcome value="">
-                        <block/>
+                <switch test='`$node.te.tunnel-termination-point_length`'>
+                    <outcome value=''>
+                        <block></block>
                     </outcome>
-                    <outcome value="0">
-                        <block/>
+                    <outcome value='0'>
+                        <block></block>
                     </outcome>
-                    <outcome value="Other">
-                        <for index="ttidx" start="0" end="`$node.te.tunnel-termination-point_length`">
+                    <outcome value='Other'>
+                        <for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >
+                            <set>
+                                <parameter name='ttp.' value='' />
+                            </set>
                             <set>
-                                <parameter name="ttp." value="`$node.te.tunnel-termination-point[$ttidx].`"/>
+                                <parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />
                             </set>
                             <set>
-                                <parameter name="unique-ttpId" value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`"/>
+                                <parameter name='unique-ttpId' value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`" />
                             </set>
-                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="pnf.pnf-name = $unique-nodeId AND tunnel-termination-point.ttp-id = $unique-ttpId">
-                                <parameter name="ttp-id" value="`$unique-ttpId`"/>
-                                <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>
-                                <parameter name="name" value="`$ttp.name`"/>
-                                <parameter name="admin-status" value="`$ttp.admin-status`"/>
-                                <parameter name="oper-status" value="`$ttp.oper-status`"/>
-                                <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id`"/>
-                                <parameter name="switching-capability" value="`$ttp.switching-capability`"/>
-                                <parameter name="protection-type" value="`$ttp.protection-type`"/>
-                                <parameter name="encoding" value="`$ttp.encoding`"/>
-                                <outcome value="success">
-                                    <block/>
+                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' 
+      key='tunnel-termination-point.ttp-id = $unique-ttpId' >
+                                <parameter name='ttp-id' value='`$unique-ttpId`' />
+                                <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />
+                                <parameter name='name' value='`$ttp.name`' />
+                                <parameter name='admin-status' value='`$ttp.admin-status`' />
+                                <parameter name='oper-status' value='`$ttp.oper-status`' />
+                                <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />
+                                <parameter name='switching-capability' value='`$ttp.switching-capability`' />
+                                <parameter name='protection-type' value='`$ttp.protection-type`' />
+                                <parameter name='encoding' value='`$ttp.encoding`' />
+                                <outcome value='success'>
+                                    <block></block>
                                 </outcome>
-                                <outcome value="failure">
-                                    <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="pnf.pnf-name = $unique-nodeId AND tunnel-termination-point.ttp-id = $unique-ttpId">
-                                        <parameter name="ttp-id" value="`$unique-ttpId`"/>
-                                        <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>
-                                        <parameter name="name" value="`$ttp.name`"/>
-                                        <parameter name="admin-status" value="`$ttp.admin-status`"/>
-                                        <parameter name="oper-status" value="`$ttp.oper-status`"/>
-                                        <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id`"/>
-                                        <parameter name="switching-capability" value="`$ttp.switching-capability`"/>
-                                        <parameter name="protection-type" value="`$ttp.protection-type`"/>
-                                        <parameter name="encoding" value="`$ttp.encoding`"/>
+                                <outcome value='failure'>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' 
+      key='tunnel-termination-point.ttp-id = $unique-ttpId' >
+                                        <parameter name='ttp-id' value='`$unique-ttpId`' />
+                                        <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />
+                                        <parameter name='name' value='`$ttp.name`' />
+                                        <parameter name='admin-status' value='`$ttp.admin-status`' />
+                                        <parameter name='oper-status' value='`$ttp.oper-status`' />
+                                        <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />
+                                        <parameter name='switching-capability' value='`$ttp.switching-capability`' />
+                                        <parameter name='protection-type' value='`$ttp.protection-type`' />
+                                        <parameter name='encoding' value='`$ttp.encoding`' />
                                     </update>
                                 </outcome>
                             </save>
-                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf:relationship-list" key="pnf.pnf-name = $unique-nodeId" force="true" pfx="tmp.AnAI-data">
-                                <parameter name="relationship-list.relationship[$ttidx].related-to" value="tunnel-termination-point"/>
-                                <parameter name="relationship-list.relationship[$ttidx].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`"/>
-                                <parameter name="relationship-list.relationship[$ttidx].relationship-data[0].relationship-key" value="tunnel-termination-point.ttp-id"/>
-                                <parameter name="relationship-list.relationship[$ttidx].relationship-data[0].relationship-value" value="`$unique-ttpId`"/>
+                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' 
+      key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">
+                                <parameter name="`relationship-list.relationship[$ttidx].related-to`" value="tunnel-termination-point" />
+                                <!--<parameter name="relationship-list.relationship[$ttidx].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />-->
+                                <parameter name="`relationship-list.relationship[$ttidx].related-link`" value="`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />
+                                <parameter name="`relationship-list.relationship[$ttidx].relationship-data[0].relationship-key`" value="tunnel-termination-point.ttp-id" />
+                                <parameter name="`relationship-list.relationship[$ttidx].relationship-data[0].relationship-value`" value="`$unique-ttpId`" />
+                                <outcome value='success'>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />
+                                        <parameter name="field1" value="__TIMESTAMP__" />
+                                        <parameter name="field2" value="sucess executing Hesam log file" />
+                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />
+                                        <parameter name="field4" value="`$node.termination-point_length`" />
+                                        <parameter name="field5" value="sucessfully saved ttp" />
+                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`" />
+                                    </record>
+                                </outcome>
+                                <outcome value='failure'>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />
+                                        <parameter name="field1" value="__TIMESTAMP__" />
+                                        <parameter name="field2" value="sucess executing Hesam log file" />
+                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />
+                                        <parameter name="field4" value="`$node.termination-point_length`" />
+                                        <parameter name="field5" value="failuire on saving ttp" />
+                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`" />
+                                    </record>
+                                </outcome>
                             </save>
                         </for>
                     </outcome>
                 </switch>
                 <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                    <parameter name="file" value="/opt/onap/hesamlogx.txt"/>
-                    <parameter name="field1" value="__TIMESTAMP__"/>
-                    <parameter name="field2" value="sucess executing Hesam hesam log file"/>
-                    <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>
-                    <parameter name="field4" value="`$node.termination-point_length`"/>
+                    <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />
+                    <parameter name="field1" value="__TIMESTAMP__" />
+                    <parameter name="field2" value="sucess executing Hesam log file" />
+                    <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />
+                    <parameter name="field4" value="`$node.termination-point_length`" />
                 </record>
-                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf:relationship-list" key="pnf.pnf-name = $unique-nodeId" force="true" pfx="tmp.AnAI-data">
-                    <parameter name="relationship-list.relationship[0].related-to" value="network-resource"/>
-                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id`"/>
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id"/>
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`"/>
+                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' 
+      key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">
+                    <parameter name="relationship-list.relationship[0].related-to" value="network-resource" />
+                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id`" />
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id" />
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`" />
                 </save>
-                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc:relationship-list" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id" force="true" pfx="tmp.AnAI-data">
-                    <parameter name="relationship-list.relationship[0].related-to" value="pnf"/>
-                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`"/>
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name"/>
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`"/>
+                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' 
+      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' 
+      force="true" pfx="tmp.AnAI-data">
+                    <parameter name="relationship-list.relationship[0].related-to" value="pnf" />
+                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`" />
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`" />
                 </save>
-                <switch test="`$node.termination-point_length`">
-                    <outcome value="">
-                        <block/>
+                <switch test='`$node.termination-point_length`'>
+                    <outcome value=''>
+                        <block></block>
                     </outcome>
-                    <outcome value="0">
-                        <block/>
+                    <outcome value='0'>
+                        <block></block>
                     </outcome>
-                    <outcome value="Other">
-                        <for index="tidx" start="0" end="`$node.termination-point_length`">
+                    <outcome value='Other'>
+                        <for index='tidx' start='0' end='`$node.termination-point_length`' >
+                            <set>
+                                <parameter name='tp.' value='' />
+                            </set>
                             <set>
-                                <parameter name="tp." value="`$node.termination-point[$tidx].`"/>
+                                <parameter name='tp.' value='`$node.termination-point[$tidx].`' />
                             </set>
                             <set>
-                                <parameter name="unique-ltpId" value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`"/>
+                                <parameter name='unique-ltpId' value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`" />
                             </set>
-                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-nodeId AND p-interface.interface-name = $unique-ltpId">
-                                <parameter name="interface-name" value="`$unique-ltpId`"/>
-                                <parameter name="network-ref" value="`$tp.supporting-termination-point[0].network-ref`"/>
-                                <parameter name="transparent" value="`$tp.svc.supported-classification.transparent`"/>
-                                <parameter name="speed-value" value="`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`"/>
-                                <parameter name="operational-status" value="`$tp.te.oper-status`"/>
-                                <parameter name="in-maint" value="true"/>
-                                <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>
-                                <parameter name="inter-domain-plug-id" value="`$tp.te.inter-domain-plug-id`"/>
-                                <outcome value="success">
-                                    <block/>
+                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' 
+      key='pnf.pnf-name = $unique-nodeId
+      AND p-interface.interface-name = $unique-ltpId' >
+                                <parameter name='interface-name' value='`$unique-ltpId`' />
+                                <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />
+                                <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />
+                                <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />
+                                <parameter name='operational-status' value='`$tp.te.oper-status`' />
+                                <parameter name='in-maint' value="true" />
+                                <parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />
+                                <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />
+                                <outcome value='success'>
+                                    <block></block>
                                 </outcome>
-                                <outcome value="failure">
-                                    <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-nodeId AND p-interface.interface-name = $unique-ltpId">
-                                        <parameter name="interface-name" value="`$unique-ltpId`"/>
-                                        <parameter name="network-ref" value="`$tp.supporting-termination-point[0].network-ref`"/>
-                                        <parameter name="transparent" value="`$tp.svc.supported-classification.transparent`"/>
-                                        <parameter name="speed-value" value="`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`"/>
-                                        <parameter name="operational-status" value="`$tp.te.oper-status`"/>
-                                        <parameter name="in-maint" value="true"/>
-                                        <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>
-                                        <parameter name="inter-domain-plug-id" value="`$tp.te.inter-domain-plug-id`"/>
+                                <outcome value='failure'>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' 
+      key='pnf.pnf-name = $unique-nodeId
+      AND p-interface.interface-name = $unique-ltpId' >
+                                        <parameter name='interface-name' value='`$unique-ltpId`' />
+                                        <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />
+                                        <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />
+                                        <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />
+                                        <parameter name='operational-status' value='`$tp.te.oper-status`' />
+                                        <parameter name='in-maint' value="true" />
+                                        <parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />
+                                        <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />
                                     </update>
                                 </outcome>
                             </save>
@@ -143,7 +189,7 @@
                     </outcome>
                 </switch>
             </for>
-            <call module="DataChange" rpc="update-network-links-to-aai" mode="sync"/>
+            <call module='DataChange' rpc='update-network-links-to-aai' mode='sync' ></call>
         </block>
     </method>
 </service-logic>
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml b/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml
index 786265b8..f009a801 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml
@@ -1,71 +1,77 @@
-<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}'>
-    <method rpc='update-tp-ttp-relationship' mode='sync'>
-        <block atomic="true">
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$network-eth.network-id`"/>
-                <parameter name="outputPath" value="tmp.network-eth.network-id"/>
-                <parameter name="target" value="/"/>
-                <parameter name="replacement" value="-"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$network-otn.network-id`"/>
-                <parameter name="outputPath" value="tmp.network-otn.network-id"/>
-                <parameter name="target" value="/"/>
-                <parameter name="replacement" value="-"/>
-            </execute>
-            <for index='pethidx' start='0' end='`$network-eth.node_length`' >
-                <set>
-                    <parameter name='node-eth.' value='`$network-eth.node[$pethidx].`' />
-                </set>
-                <set>
-                    <parameter name='unique-network-ethId' value='`$tmp.network-eth.network-id`' />
-                    <parameter name='unique-node-ethId' value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`" />
-                </set>
-                <for index='tidx' start='0' end='`$node-eth.termination-point_length`' >
-                    <set>
-                        <parameter name='tp-eth.' value='`$node-eth.termination-point[$tidx].`' />
-                    </set>
-                    <set>
-                        <parameter name='unique-ltpethId' value="`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`" />
-                    </set>
-                    <set>
-                        <parameter name='tp-inter-layer-lock-id' value='`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`' />
-                    </set>
-                    <for index='potnidx' start='0' end='`$network-otn.node_length`' >
-                        <set>
-                            <parameter name='node-otn.' value='`$network-otn.node[$potnidx].`' />
-                        </set>
-                        <set>
-                            <parameter name='unique-network-otnId' value='`$tmp.network-otn.network-id`' />
-                            <parameter name='unique-node-otnId' value="`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`" />
-                        </set>
-                        <for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >
-                            <set>
-                                <parameter name='ttp.' value='`$node-otn.te.tunnel-termination-point[$ttidx].`' />
-                            </set>
-                            <set>
-                                <parameter name='unique-ttpId' value="`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`" />
-                            </set>
-                            <set>
-                                <parameter name='ttp-inter-layer-lock-id' value='`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id`' />
-                            </set>
-                            <switch test='tp-inter-layer-lock-id'>
-                                <outcome value='ttp-inter-layer-lock-id'>
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list'
-                                          key='p-interface.interface-name = $unique-ltpethId' force="true" pfx="tmp.AnAI-data">
-                                        <parameter name="relationship-list.relationship[1].related-to" value="tunnel-termination-point" />
-                                        <parameter name="relationship-list.relationship[1].related-link" value="/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`" />
-                                        <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="tunnel-termination-point.tunnel-tp-id" />
-                                        <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$unique-ttpId`" />
-                                    </save>
-                                </outcome>
-                            </switch>
-                        </for>
-                    </for>
-                </for>
-            </for>
-        </block>
-    </method>
+<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}'>
+    <method rpc='update-tp-ttp-relationship' mode='sync'>
+        <block atomic="true">
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$network-eth.network-id`"/>
+                <parameter name="outputPath" value="tmp.network-eth.network-id"/>
+                <parameter name="target" value="/"/>
+                <parameter name="replacement" value="-"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$network-otn.network-id`"/>
+                <parameter name="outputPath" value="tmp.network-otn.network-id"/>
+                <parameter name="target" value="/"/>
+                <parameter name="replacement" value="-"/>
+            </execute>
+            <for index='pethidx' start='0' end='`$network-eth.node_length`' >
+                <set>
+                    <parameter name='node-eth.' value='`$network-eth.node[$pethidx].`' />
+                </set>
+                <set>
+                    <parameter name='unique-network-ethId' value='`$tmp.network-eth.network-id`' />
+                    <parameter name='unique-node-ethId' value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`" />
+                </set>
+                <for index='tidx' start='0' end='`$node-eth.termination-point_length`' >
+                    <set>
+                        <parameter name='tp-eth.' value='' />
+                    </set>
+                    <set>
+                        <parameter name='tp-eth.' value='`$node-eth.termination-point[$tidx].`' />
+                    </set>
+                    <set>
+                        <parameter name='unique-ltpethId' value="`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`" />
+                    </set>
+                    <set>
+                        <parameter name='tp-inter-layer-lock-id' value='`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`' />
+                    </set>
+                    <for index='potnidx' start='0' end='`$network-otn.node_length`' >
+                        <set>
+                            <parameter name='node-otn.' value='`$network-otn.node[$potnidx].`' />
+                        </set>
+                        <set>
+                            <parameter name='unique-network-otnId' value='`$tmp.network-otn.network-id`' />
+                            <parameter name='unique-node-otnId' value="`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`" />
+                        </set>
+                        <for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >
+                            <set>
+                                <parameter name='ttp.' value='' />
+                            </set>
+                            <set>
+                                <parameter name='ttp.' value='`$node-otn.te.tunnel-termination-point[$ttidx].`' />
+                            </set>
+                            <set>
+                                <parameter name='unique-ttpId' value="`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`" />
+                            </set>
+                            <set>
+                                <parameter name='ttp-inter-layer-lock-id' value='`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id`' />
+                            </set>
+                            <switch test='tp-inter-layer-lock-id'>
+                                <outcome value='ttp-inter-layer-lock-id'>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' 
+      key='p-interface.interface-name = $unique-ltpethId' force="true" pfx="tmp.AnAI-data">
+                                        <parameter name="relationship-list.relationship[1].related-to" value="tunnel-termination-point" />
+                                        <parameter name="relationship-list.relationship[1].related-link" value="/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`" />
+                                        <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="tunnel-termination-point.tunnel-tp-id" />
+                                        <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$unique-ttpId`" />
+                                    </save>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </for>
+                </for>
+            </for>
+        </block>
+    </method>
 </service-logic>
\ No newline at end of file
-- 
cgit 1.2.3-korg