From ccf839a4815dc7e26deaf36627d04c0a4587780b Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Thu, 7 May 2020 18:16:58 +0000
Subject: NNI-based Service creation DG bug fixes (uni, l2vpn, and underlay
 resources).

- This is needed for F release

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

Former-commit-id: f515a8831e0036414d69d73030e871dec88180f8
---
 .../DataChange_update-network-links-to-aai.json    | 1246 ++++++++++----------
 .../json/DataChange_update-network-to-aai.json     |  480 ++++----
 .../DataChange_update-tp-ttp-relationship.json     |  404 ++++---
 3 files changed, 1083 insertions(+), 1047 deletions(-)

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

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 236bc6a3..0d6a2784 100644
--- a/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "eb6ce69b.3f957",
+        "id": "ebe56983.0d3a9",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 248,
-        "y": 67,
-        "z": "42ade40f.4fa29c",
+        "x": 134,
+        "y": 65,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "dc110d5e.a3e278"
+                "13e5c84a.55bf3"
             ]
         ]
     },
     {
-        "id": "dc110d5e.a3e278",
+        "id": "13e5c84a.55bf3",
         "type": "service-logic",
         "name": "DataChange ${project.version}",
         "module": "DataChange",
@@ -22,1885 +22,1885 @@
         "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": 305,
-        "y": 146.888916015625,
-        "z": "42ade40f.4fa29c",
+        "x": 191,
+        "y": 144.888916015625,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "5f52c1a1.066a8"
+                "66a22ecb.fd2f58"
             ]
         ]
     },
     {
-        "id": "5f52c1a1.066a8",
+        "id": "66a22ecb.fd2f58",
         "type": "method",
         "name": "method update-network-links-to-aai",
         "xml": "<method rpc='update-network-links-to-aai' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 319,
-        "y": 223.22222900390625,
-        "z": "42ade40f.4fa29c",
+        "x": 205,
+        "y": 221.22222900390625,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "d4e648b5.a39fa8"
+                "6e3553b1.ce5dcc"
             ]
         ]
     },
     {
-        "id": "d4e648b5.a39fa8",
+        "id": "6e3553b1.ce5dcc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 330.33343505859375,
-        "y": 300.7779235839844,
-        "z": "42ade40f.4fa29c",
+        "x": 216.33343505859375,
+        "y": 298.7779235839844,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "e5c5d545.9d86e8"
+                "ce48b85e.94f938"
             ]
         ]
     },
     {
-        "id": "367c2dd.186e752",
+        "id": "a43a6e87.7bb85",
         "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": 1205.111083984375,
-        "y": 725.111083984375,
-        "z": "42ade40f.4fa29c",
+        "x": 1091.111083984375,
+        "y": 723.111083984375,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "e5c5d545.9d86e8",
+        "id": "ce48b85e.94f938",
         "type": "for",
         "name": "for each link",
         "xml": "<for index='pidx' start='0' end='`$network.link_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 358.88885498046875,
-        "y": 394.33331298828125,
-        "z": "42ade40f.4fa29c",
+        "x": 244.88885498046875,
+        "y": 392.33331298828125,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "c535a196.07d77",
-                "2b697423.656f74",
-                "23c74055.452fd8",
-                "357884ff.889364",
-                "5d91edd1.3c2f24"
+                "dec42fbf.1e3dc8",
+                "faf4c2c8.a313e8",
+                "6624aa74.606e14",
+                "dbc86076.1de4f",
+                "4c4fa03a.a50f2"
             ]
         ]
     },
     {
-        "id": "c535a196.07d77",
+        "id": "dec42fbf.1e3dc8",
         "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": 691.111083984375,
-        "y": 99.22221374511719,
-        "z": "42ade40f.4fa29c",
+        "x": 577.111083984375,
+        "y": 97.22221374511719,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "3a0f4814.b217",
+        "id": "9f28786b.9755c",
         "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": 1731.4444580078125,
-        "y": 945.111083984375,
-        "z": "42ade40f.4fa29c",
+        "x": 1617.4444580078125,
+        "y": 943.111083984375,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "2cea987d.04721",
-                "76b35791.18f63",
-                "2f963aac.304aa6",
-                "a173e4f5.f5a478",
-                "c921d18d.970b48",
-                "15c10484.c4629b"
+                "a10e9de3.90e708",
+                "9f6f811c.bccf8",
+                "7166bef0.82e4a",
+                "c6ea0cbf.fb7cd",
+                "441a859d.1c08ec",
+                "e1339bff.8f7f98"
             ]
         ]
     },
     {
-        "id": "2cea987d.04721",
+        "id": "a10e9de3.90e708",
         "type": "set",
         "name": "set label-restriction's local variables",
         "xml": "<set>\n<parameter name='unique-lrId' value=\"`$unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
         "comments": "",
-        "x": 2036.111328125,
-        "y": 910.0000610351562,
-        "z": "42ade40f.4fa29c",
+        "x": 1922.111328125,
+        "y": 908.0000610351562,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "a53b765.67e4408",
+        "id": "481ae7ff.84ac9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2149.4998779296875,
-        "y": 952.74609375,
-        "z": "42ade40f.4fa29c",
+        "x": 2035.4998779296875,
+        "y": 950.74609375,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "bcb47eec.4c95d8"
+                "4b5e8d4c.a2cfc4"
             ]
         ]
     },
     {
-        "id": "987d5f9c.60006",
+        "id": "958898b9.8616a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2157.178466796875,
-        "y": 1011.9604187011719,
-        "z": "42ade40f.4fa29c",
+        "x": 2043.178466796875,
+        "y": 1009.9604187011719,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "e46f36b.2789648"
+                "76714a99.5b6304"
             ]
         ]
     },
     {
-        "id": "bcb47eec.4c95d8",
+        "id": "4b5e8d4c.a2cfc4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2310,
-        "y": 952.0000305175781,
-        "z": "42ade40f.4fa29c",
+        "x": 2196,
+        "y": 950.0000305175781,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "df8ec894.2ce188",
+        "id": "1494b149.c9a337",
         "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": 2718.5001220703125,
-        "y": 2414.545135498047,
-        "z": "42ade40f.4fa29c",
+        "x": 2604.5001220703125,
+        "y": 2412.545135498047,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "ed966c58.9421a",
+        "id": "ed0f5687.170a7",
         "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": 2752.0001220703125,
-        "y": 2454.545135498047,
-        "z": "42ade40f.4fa29c",
+        "x": 2638.0001220703125,
+        "y": 2452.545135498047,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "c79cef0b.98c06",
+        "id": "c964af3.a8439d",
         "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": 2752.0001220703125,
-        "y": 2494.545135498047,
-        "z": "42ade40f.4fa29c",
+        "x": 2638.0001220703125,
+        "y": 2492.545135498047,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "e46f36b.2789648",
+        "id": "76714a99.5b6304",
         "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": 2341,
-        "y": 1012.0000305175781,
-        "z": "42ade40f.4fa29c",
+        "x": 2227,
+        "y": 1010.0000305175781,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "cce10880.3add5",
+        "id": "df8f6a30.0e19f",
         "type": "save",
         "name": "save link relationship to label-restriction in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2052,
-        "y": 1208,
-        "z": "42ade40f.4fa29c",
+        "x": 1938,
+        "y": 1206,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "76b35791.18f63",
+        "id": "9f6f811c.bccf8",
         "type": "update",
         "name": "save label-restriction",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1990.815185546875,
-        "y": 984.5556640625,
-        "z": "42ade40f.4fa29c",
+        "x": 1876.815185546875,
+        "y": 982.5556640625,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "a53b765.67e4408",
-                "987d5f9c.60006"
+                "481ae7ff.84ac9",
+                "958898b9.8616a"
             ]
         ]
     },
     {
-        "id": "6bd86154.f4552",
+        "id": "e7971b0b.c3d0c",
         "type": "switchNode",
         "name": "switch te-link-attributes label-restriction_length",
         "xml": "<switch test='`$link.te.te-link-attributes.label-restriction_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1250,
-        "y": 945,
-        "z": "42ade40f.4fa29c",
+        "x": 1136,
+        "y": 943,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "6ededdc5.cf6c8c",
-                "ecaf5041.3bee8",
-                "5dbfa8d0.65ebe"
+                "d0a27e5d.161cf",
+                "c301ff98.2e6928",
+                "4d75dbb8.4d6b04"
             ]
         ]
     },
     {
-        "id": "2b697423.656f74",
+        "id": "faf4c2c8.a313e8",
         "type": "switchNode",
         "name": "switch link.destination",
         "xml": "<switch test='`$link.destination.dest-node`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 667,
-        "y": 204,
-        "z": "42ade40f.4fa29c",
+        "x": 553,
+        "y": 202,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "6a7d179d.85fe8",
-                "e3266b7a.5033d8"
+                "998d07b5.34538",
+                "4877c101.9ce65"
             ]
         ]
     },
     {
-        "id": "6a7d179d.85fe8",
+        "id": "998d07b5.34538",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 871,
-        "y": 165,
-        "z": "42ade40f.4fa29c",
+        "x": 757,
+        "y": 163,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "ea7811a5.6557e"
+                "c3ced1a5.7034b"
             ]
         ]
     },
     {
-        "id": "e3266b7a.5033d8",
+        "id": "4877c101.9ce65",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 868,
-        "y": 227,
-        "z": "42ade40f.4fa29c",
+        "x": 754,
+        "y": 225,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "68cf703d.fdacb8"
+                "d4197495.299218"
             ]
         ]
     },
     {
-        "id": "68cf703d.fdacb8",
+        "id": "d4197495.299218",
         "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": 1097,
-        "y": 190,
-        "z": "42ade40f.4fa29c",
+        "x": 983,
+        "y": 188,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "d8b9afa9.8c7938",
+        "id": "c382f34.d97691",
         "type": "set",
         "name": "set is-open-ended-link",
         "xml": "<set>\n<parameter name='is-open-ended-link' value='true' />\n\n",
         "comments": "",
-        "x": 1275,
-        "y": 65,
-        "z": "42ade40f.4fa29c",
+        "x": 1161,
+        "y": 63,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "4445364b.3ff31",
+        "id": "ff450949.dbf658",
         "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": 1278,
-        "y": 150,
-        "z": "42ade40f.4fa29c",
+        "x": 1164,
+        "y": 148,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "1fabb633.34a7e2",
-                "30ce6e4c.0b0d22",
-                "78ec6cbb.d8199c"
+                "5da3043a.2acbac",
+                "1bf53d3.d439ac3",
+                "8f4faa5b.7a92c"
             ]
         ]
     },
     {
-        "id": "1fabb633.34a7e2",
+        "id": "5da3043a.2acbac",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1521,
-        "y": 145,
-        "z": "42ade40f.4fa29c",
+        "x": 1407,
+        "y": 143,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "f6b85f73.a6bb"
+                "ce061615.442fb"
             ]
         ]
     },
     {
-        "id": "30ce6e4c.0b0d22",
+        "id": "1bf53d3.d439ac3",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1519,
-        "y": 234,
-        "z": "42ade40f.4fa29c",
+        "x": 1405,
+        "y": 232,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "112ae233.6a9666"
+                "8dce7fe6.cbf1f"
             ]
         ]
     },
     {
-        "id": "2d37b161.c87e5e",
+        "id": "863e663a.20d8f8",
         "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": 2194,
-        "y": 162,
-        "z": "42ade40f.4fa29c",
+        "x": 2080,
+        "y": 160,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "112ae233.6a9666",
+        "id": "8dce7fe6.cbf1f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1688,
-        "y": 235,
-        "z": "42ade40f.4fa29c",
+        "x": 1574,
+        "y": 233,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "b25a39cd.f52a6",
+        "id": "2b1dcd15.312222",
         "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": 986,
-        "y": 671,
-        "z": "42ade40f.4fa29c",
+        "x": 872,
+        "y": 669,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "2eac00b.0ddcd8",
-                "cef26741.44e878"
+                "ec693039.84dc28",
+                "3de532fd.f494f6"
             ]
         ]
     },
     {
-        "id": "78ec6cbb.d8199c",
+        "id": "8f4faa5b.7a92c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1530.490966796875,
-        "y": 187.57403564453125,
-        "z": "42ade40f.4fa29c",
+        "x": 1416.490966796875,
+        "y": 185.57403564453125,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "cc3c7aa7.507dd8"
+                "788cf8a5.93c298"
             ]
         ]
     },
     {
-        "id": "cc3c7aa7.507dd8",
+        "id": "788cf8a5.93c298",
         "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": 1684.0623779296875,
-        "y": 190.85977172851562,
-        "z": "42ade40f.4fa29c",
+        "x": 1570.0623779296875,
+        "y": 188.85977172851562,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "339fe7b3.ae4e",
+        "id": "98f67a1e.d79eb",
         "type": "switchNode",
         "name": "switch is-open-ended-link",
         "xml": "<switch test='`$is-open-ended-link`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 565,
-        "y": 710,
-        "z": "42ade40f.4fa29c",
+        "x": 451,
+        "y": 708,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "7bffce42.060d68",
-                "601fa3d8.aedcac"
+                "6cd18165.d49da8",
+                "a4b87205.849aa"
             ]
         ]
     },
     {
-        "id": "7bffce42.060d68",
+        "id": "6cd18165.d49da8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 782,
-        "y": 732,
-        "z": "42ade40f.4fa29c",
+        "x": 668,
+        "y": 730,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "d9f05462.4a8968"
+                "6eb10efe.79be58"
             ]
         ]
     },
     {
-        "id": "601fa3d8.aedcac",
+        "id": "a4b87205.849aa",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 785,
-        "y": 672,
-        "z": "42ade40f.4fa29c",
+        "x": 671,
+        "y": 670,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "b25a39cd.f52a6"
+                "2b1dcd15.312222"
             ]
         ]
     },
     {
-        "id": "2eac00b.0ddcd8",
+        "id": "ec693039.84dc28",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1230,
-        "y": 341,
-        "z": "42ade40f.4fa29c",
+        "x": 1116,
+        "y": 339,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "d26336.070c9cc8"
+                "7e014e1e.a8dd8"
             ]
         ]
     },
     {
-        "id": "cef26741.44e878",
+        "id": "3de532fd.f494f6",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1255.490966796875,
-        "y": 536.5740356445312,
-        "z": "42ade40f.4fa29c",
+        "x": 1141.490966796875,
+        "y": 534.5740356445312,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "1417b1e7.adccae"
+                "308dc22b.73a67e"
             ]
         ]
     },
     {
-        "id": "c9f57eec.3fa43",
+        "id": "2e5d2820.63e8c",
         "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",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \n      key='logical-link.link-name = $alt-unique-linkId' >\n<parameter name='link-name' value='`$alt-unique-linkId`' />\n<parameter name='link-id' value='`$link.link-id`' />\n<parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />\n<parameter name='link-role' value='cross-domain' />\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1727,
-        "y": 558,
-        "z": "42ade40f.4fa29c",
+        "x": 1613,
+        "y": 556,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "d9f05462.4a8968",
+        "id": "6eb10efe.79be58",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 960,
-        "y": 740,
-        "z": "42ade40f.4fa29c",
+        "x": 846,
+        "y": 738,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "367c2dd.186e752",
-                "6bd86154.f4552",
-                "8c3bc53e.020c3",
-                "3b98d33.38a2bac",
-                "9f4e28fe.9e925"
+                "a43a6e87.7bb85",
+                "e7971b0b.c3d0c",
+                "a6b6ae44.7eb2a8",
+                "370b414a.4eba76",
+                "4aadddbd.521a8c"
             ]
         ]
     },
     {
-        "id": "882e1409.701ce8",
+        "id": "521f891d.91cfc8",
         "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": 2641,
-        "y": 387,
-        "z": "42ade40f.4fa29c",
+        "x": 2527,
+        "y": 385,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "a1bfa8c8.032428",
-                "4552885e.7227f8"
+                "27e614a8.33d2f4",
+                "5b692078.dcecc"
             ]
         ]
     },
     {
-        "id": "7c1006a1.c0bf28",
+        "id": "6468635a.9e6d94",
         "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": 1190,
-        "y": 1179,
-        "z": "42ade40f.4fa29c",
+        "x": 1076,
+        "y": 1177,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "ea7811a5.6557e",
+        "id": "c3ced1a5.7034b",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1059,
-        "y": 126,
-        "z": "42ade40f.4fa29c",
+        "x": 945,
+        "y": 124,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "d8b9afa9.8c7938",
-                "4445364b.3ff31",
-                "78b9c95f.ae17e8"
+                "c382f34.d97691",
+                "ff450949.dbf658",
+                "b85c23da.8517d"
             ]
         ]
     },
     {
-        "id": "1417b1e7.adccae",
+        "id": "308dc22b.73a67e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1444,
-        "y": 539,
-        "z": "42ade40f.4fa29c",
+        "x": 1330,
+        "y": 537,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "c9f57eec.3fa43",
-                "fe6e139a.88d838",
-                "1e861048.9f807",
-                "fc9bbbc9.76dd6"
+                "2e5d2820.63e8c",
+                "3996c800.afa0a8",
+                "d3a8ab71.fccb7",
+                "6c137df8.722b8c"
             ]
         ]
     },
     {
-        "id": "fe6e139a.88d838",
+        "id": "3996c800.afa0a8",
         "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": 1656,
-        "y": 619,
-        "z": "42ade40f.4fa29c",
+        "x": 1542,
+        "y": 617,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "ed1851cd.c2d2d",
+        "id": "51ef22a.000c3dc",
         "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": 2183,
-        "y": 745,
-        "z": "42ade40f.4fa29c",
+        "x": 2069,
+        "y": 743,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "bf2a36f0.0411c",
-                "1a178b14.9ad4dd",
-                "13838be4.d07ac4",
-                "ec158e78.eb2b58",
-                "a3570d8f.6b641",
-                "1375d0c1.e8bf07"
+                "cb31166c.2edd2",
+                "db1f7d98.2def68",
+                "c4dd69cd.d872b",
+                "f581a4e4.841408",
+                "f2fac409.beeaf8",
+                "ea1f1d76.87207"
             ]
         ]
     },
     {
-        "id": "bf2a36f0.0411c",
+        "id": "cb31166c.2edd2",
         "type": "set",
         "name": "set label-restriction's local variables",
         "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n",
         "comments": "",
-        "x": 2473.6669921875,
-        "y": 623.8889770507812,
-        "z": "42ade40f.4fa29c",
+        "x": 2359.6669921875,
+        "y": 621.8889770507812,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "eb573572.449a5",
+        "id": "1dcb5e38.622da2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2615.0555419921875,
-        "y": 702.635009765625,
-        "z": "42ade40f.4fa29c",
+        "x": 2501.0555419921875,
+        "y": 700.635009765625,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "80720656.40f1f8"
+                "2526017c.1c252e"
             ]
         ]
     },
     {
-        "id": "e5ad824b.fd1c3",
+        "id": "19906550.30ac83",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2622.734130859375,
-        "y": 761.8493347167969,
-        "z": "42ade40f.4fa29c",
+        "x": 2508.734130859375,
+        "y": 759.8493347167969,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "75cc9002.94bbf8"
+                "52d0ed95.142f34"
             ]
         ]
     },
     {
-        "id": "80720656.40f1f8",
+        "id": "2526017c.1c252e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2775.5556640625,
-        "y": 701.8889465332031,
-        "z": "42ade40f.4fa29c",
+        "x": 2661.5556640625,
+        "y": 699.8889465332031,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "75cc9002.94bbf8",
+        "id": "52d0ed95.142f34",
         "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": 2806.5556640625,
-        "y": 761.8889465332031,
-        "z": "42ade40f.4fa29c",
+        "x": 2692.5556640625,
+        "y": 759.8889465332031,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "cb668db0.48c4b",
+        "id": "e7979ea6.dbce4",
         "type": "save",
         "name": "save link relationship to label-restriction in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $alt-unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2482.5556640625,
-        "y": 894.888916015625,
-        "z": "42ade40f.4fa29c",
+        "x": 2368.5556640625,
+        "y": 892.888916015625,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "1a178b14.9ad4dd",
+        "id": "db1f7d98.2def68",
         "type": "update",
         "name": "save label-restriction",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2424.370849609375,
-        "y": 734.444580078125,
-        "z": "42ade40f.4fa29c",
+        "x": 2310.370849609375,
+        "y": 732.444580078125,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "eb573572.449a5",
-                "e5ad824b.fd1c3"
+                "1dcb5e38.622da2",
+                "19906550.30ac83"
             ]
         ]
     },
     {
-        "id": "23c74055.452fd8",
+        "id": "6624aa74.606e14",
         "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": 668,
-        "y": 149,
-        "z": "42ade40f.4fa29c",
+        "x": 554,
+        "y": 147,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "93546ba2.1bedb8",
+        "id": "6e337c6f.cd362c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1610,
-        "y": 62,
-        "z": "42ade40f.4fa29c",
+        "x": 1496,
+        "y": 60,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "f6b85f73.a6bb",
+        "id": "ce061615.442fb",
         "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": 1760,
-        "y": 142,
-        "z": "42ade40f.4fa29c",
+        "x": 1646,
+        "y": 140,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "905e14d2.8e13d",
-                "56d86a80.47b554"
+                "a445a8a1.87665",
+                "7abf5d27.d789e4"
             ]
         ]
     },
     {
-        "id": "905e14d2.8e13d",
+        "id": "a445a8a1.87665",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1990,
-        "y": 89,
-        "z": "42ade40f.4fa29c",
+        "x": 1876,
+        "y": 87,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "39191ee3.a2421a"
+                "85dfc9e9.b205a8"
             ]
         ]
     },
     {
-        "id": "56d86a80.47b554",
+        "id": "7abf5d27.d789e4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1994,
-        "y": 162,
-        "z": "42ade40f.4fa29c",
+        "x": 1880,
+        "y": 160,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "2d37b161.c87e5e"
+                "863e663a.20d8f8"
             ]
         ]
     },
     {
-        "id": "39191ee3.a2421a",
+        "id": "85dfc9e9.b205a8",
         "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": 2178,
-        "y": 85,
-        "z": "42ade40f.4fa29c",
+        "x": 2064,
+        "y": 83,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "1ecef5c2.0f02ca",
+        "id": "5df859b8.6bf788",
         "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": 2159,
-        "y": 34,
-        "z": "42ade40f.4fa29c",
+        "x": 2045,
+        "y": 32,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "357884ff.889364",
+        "id": "dbc86076.1de4f",
         "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": 696,
-        "y": 41,
-        "z": "42ade40f.4fa29c",
+        "x": 582,
+        "y": 39,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "37660aa6.c865c6",
+        "id": "5be7d94e.325bd",
         "type": "switchNode",
         "name": "switch is-invalid-open-ended-link",
         "xml": "<switch test='`$is-invalid-open-ended-link`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 786,
-        "y": 1157,
-        "z": "42ade40f.4fa29c",
+        "x": 672,
+        "y": 1155,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "f54e3efd.634a38",
-                "8022555f.169df8"
+                "3a021903.aa35de",
+                "bd6a87fb.60cad"
             ]
         ]
     },
     {
-        "id": "8022555f.169df8",
+        "id": "bd6a87fb.60cad",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 993,
-        "y": 1125,
-        "z": "42ade40f.4fa29c",
+        "x": 879,
+        "y": 1123,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "e44bc7ce.ed35b8"
+                "7d536275.1f7f6c"
             ]
         ]
     },
     {
-        "id": "f54e3efd.634a38",
+        "id": "3a021903.aa35de",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 990,
-        "y": 1185,
-        "z": "42ade40f.4fa29c",
+        "x": 876,
+        "y": 1183,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "7c1006a1.c0bf28"
+                "6468635a.9e6d94"
             ]
         ]
     },
     {
-        "id": "e44bc7ce.ed35b8",
+        "id": "7d536275.1f7f6c",
         "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": 1173,
-        "y": 1124,
-        "z": "42ade40f.4fa29c",
+        "x": 1059,
+        "y": 1122,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "6e0155a0.4236dc",
+        "id": "c290c25a.9cb058",
         "type": "switchNode",
         "name": "switch relationship-list_length",
         "xml": "<switch test='`$tmp.aai.logical-link.relationship-list_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1502,
-        "y": 314,
-        "z": "42ade40f.4fa29c",
+        "x": 1388,
+        "y": 312,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "c6d7c8ac.8edfe",
-                "e1f14b0f.6d7378",
-                "863a7ad.fb20188"
+                "8171cd76.e9b4d",
+                "9c1be6a.eb1c998",
+                "be2751bf.fc2318"
             ]
         ]
     },
     {
-        "id": "64886b03.3e43e4",
+        "id": "8ea0dfd0.e04d5",
         "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": 1953,
-        "y": 328,
-        "z": "42ade40f.4fa29c",
+        "x": 1839,
+        "y": 326,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "b3998350.44919"
+                "f6fe2af1.32bcd"
             ]
         ]
     },
     {
-        "id": "c6d7c8ac.8edfe",
+        "id": "8171cd76.e9b4d",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1720,
-        "y": 273,
-        "z": "42ade40f.4fa29c",
+        "x": 1606,
+        "y": 271,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "ae0ebd2c.ab0408"
+                "6d799180.26117"
             ]
         ]
     },
     {
-        "id": "e1f14b0f.6d7378",
+        "id": "9c1be6a.eb1c998",
         "type": "outcome",
         "name": "1",
         "xml": "<outcome value='1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1717,
-        "y": 310,
-        "z": "42ade40f.4fa29c",
+        "x": 1603,
+        "y": 308,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "64886b03.3e43e4"
+                "8ea0dfd0.e04d5"
             ]
         ]
     },
     {
-        "id": "863a7ad.fb20188",
+        "id": "be2751bf.fc2318",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1727,
-        "y": 384,
-        "z": "42ade40f.4fa29c",
+        "x": 1613,
+        "y": 382,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "8fdcd683.3660b"
+                "a1d91cb.fcaede"
             ]
         ]
     },
     {
-        "id": "8fdcd683.3660b",
+        "id": "a1d91cb.fcaede",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1864,
-        "y": 385,
-        "z": "42ade40f.4fa29c",
+        "x": 1750,
+        "y": 383,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "ec1a3a53.fa7ff8"
+                "9a538487.c08aa"
             ]
         ]
     },
     {
-        "id": "ae0ebd2c.ab0408",
+        "id": "6d799180.26117",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1862,
-        "y": 281,
-        "z": "42ade40f.4fa29c",
+        "x": 1748,
+        "y": 279,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "c29cb556.f4deb8"
+                "92abbd48.ac3ab"
             ]
         ]
     },
     {
-        "id": "5d91edd1.3c2f24",
+        "id": "4c4fa03a.a50f2",
         "type": "switchNode",
         "name": "switch is-invalid-open-ended-link",
         "xml": "<switch test='`$is-invalid-open-ended-link`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 563,
-        "y": 538,
-        "z": "42ade40f.4fa29c",
+        "x": 449,
+        "y": 536,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "62e07412.96bbe4",
-                "db9d2b02.3f6e5"
+                "7a803037.7fbd88",
+                "a043c19c.e11a18"
             ]
         ]
     },
     {
-        "id": "db9d2b02.3f6e5",
+        "id": "a043c19c.e11a18",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 770,
-        "y": 506,
-        "z": "42ade40f.4fa29c",
+        "x": 656,
+        "y": 504,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "7150962.0cacbe8"
+                "2aea0930.46cd5e"
             ]
         ]
     },
     {
-        "id": "62e07412.96bbe4",
+        "id": "7a803037.7fbd88",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 767,
-        "y": 566,
-        "z": "42ade40f.4fa29c",
+        "x": 653,
+        "y": 564,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "339fe7b3.ae4e"
+                "98f67a1e.d79eb"
             ]
         ]
     },
     {
-        "id": "7150962.0cacbe8",
+        "id": "2aea0930.46cd5e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 921,
-        "y": 506,
-        "z": "42ade40f.4fa29c",
+        "x": 807,
+        "y": 504,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "8c3bc53e.020c3",
+        "id": "a6b6ae44.7eb2a8",
         "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": 1188,
-        "y": 828,
-        "z": "42ade40f.4fa29c",
+        "x": 1074,
+        "y": 826,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "b3998350.44919",
+        "id": "f6fe2af1.32bcd",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2200,
-        "y": 319,
-        "z": "42ade40f.4fa29c",
+        "x": 2086,
+        "y": 317,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "3b98d33.38a2bac",
+        "id": "370b414a.4eba76",
         "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": 1133,
-        "y": 773,
-        "z": "42ade40f.4fa29c",
+        "x": 1019,
+        "y": 771,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "78b9c95f.ae17e8",
+        "id": "b85c23da.8517d",
         "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": 1276,
-        "y": 103,
-        "z": "42ade40f.4fa29c",
+        "x": 1162,
+        "y": 101,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "c7f9432f.fc4c28",
+        "id": "e0d728fb.03e448",
         "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": 2516,
-        "y": 291,
-        "z": "42ade40f.4fa29c",
+        "x": 2402,
+        "y": 289,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "d26336.070c9cc8",
+        "id": "7e014e1e.a8dd8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2192,
-        "y": 536,
-        "z": "42ade40f.4fa29c",
+        "x": 2078,
+        "y": 534,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "c7f9432f.fc4c28",
-                "882e1409.701ce8",
-                "6e4bc51.b0c9dbc",
-                "7a9fabbe.629c44"
+                "e0d728fb.03e448",
+                "521f891d.91cfc8",
+                "cedaeaf5.78fef8",
+                "740002f8.4aedac"
             ]
         ]
     },
     {
-        "id": "a1bfa8c8.032428",
+        "id": "27e614a8.33d2f4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2930,
-        "y": 357,
-        "z": "42ade40f.4fa29c",
+        "x": 2816,
+        "y": 355,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "c9e17582.5ea8"
+                "c5f6a36b.0845d8"
             ]
         ]
     },
     {
-        "id": "4552885e.7227f8",
+        "id": "5b692078.dcecc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2937.6785888671875,
-        "y": 416.2143249511719,
-        "z": "42ade40f.4fa29c",
+        "x": 2823.6785888671875,
+        "y": 414.2143249511719,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "de1c7c10.d4de68"
+                "b2044c9b.8096a"
             ]
         ]
     },
     {
-        "id": "c9e17582.5ea8",
+        "id": "c5f6a36b.0845d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3078,
-        "y": 352,
-        "z": "42ade40f.4fa29c",
+        "x": 2964,
+        "y": 350,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "747beccb.60a274"
+                "ad2b40a6.ff37f8"
             ]
         ]
     },
     {
-        "id": "747beccb.60a274",
+        "id": "ad2b40a6.ff37f8",
         "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": 3223,
-        "y": 352,
-        "z": "42ade40f.4fa29c",
+        "x": 3109,
+        "y": 350,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "de1c7c10.d4de68",
+        "id": "b2044c9b.8096a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3085,
-        "y": 414,
-        "z": "42ade40f.4fa29c",
+        "x": 2971,
+        "y": 412,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "81d2a002.7c0388"
+                "a8dbf2db.72f548"
             ]
         ]
     },
     {
-        "id": "c29cb556.f4deb8",
+        "id": "92abbd48.ac3ab",
         "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": 1998,
-        "y": 279,
-        "z": "42ade40f.4fa29c",
+        "x": 1884,
+        "y": 277,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "ec1a3a53.fa7ff8",
+        "id": "9a538487.c08aa",
         "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": 2009,
-        "y": 394,
-        "z": "42ade40f.4fa29c",
+        "x": 1895,
+        "y": 392,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "81d2a002.7c0388",
+        "id": "a8dbf2db.72f548",
         "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": 3230,
-        "y": 414,
-        "z": "42ade40f.4fa29c",
+        "x": 3116,
+        "y": 412,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "6ededdc5.cf6c8c",
+        "id": "d0a27e5d.161cf",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1544,
-        "y": 843,
-        "z": "42ade40f.4fa29c",
+        "x": 1430,
+        "y": 841,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "13eb321c.419dee"
+                "53c3433b.ea3fa4"
             ]
         ]
     },
     {
-        "id": "ecaf5041.3bee8",
+        "id": "c301ff98.2e6928",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1546,
-        "y": 891,
-        "z": "42ade40f.4fa29c",
+        "x": 1432,
+        "y": 889,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "13eb321c.419dee"
+                "53c3433b.ea3fa4"
             ]
         ]
     },
     {
-        "id": "5dbfa8d0.65ebe",
+        "id": "4d75dbb8.4d6b04",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1543,
-        "y": 945,
-        "z": "42ade40f.4fa29c",
+        "x": 1429,
+        "y": 943,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "3a0f4814.b217"
+                "9f28786b.9755c"
             ]
         ]
     },
     {
-        "id": "13eb321c.419dee",
+        "id": "53c3433b.ea3fa4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1699,
-        "y": 843,
-        "z": "42ade40f.4fa29c",
+        "x": 1585,
+        "y": 841,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "1e861048.9f807",
+        "id": "d3a8ab71.fccb7",
         "type": "switchNode",
         "name": "switch te-link-attributes label-restriction_length",
         "xml": "<switch test='`$link.te.te-link-attributes.label-restriction_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1725,
-        "y": 736,
-        "z": "42ade40f.4fa29c",
+        "x": 1611,
+        "y": 734,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "f4fbab89.9ba908",
-                "7dc7ac6a.dc9714",
-                "4d8c04cc.f4e3d4"
+                "d2a47af.0c53388",
+                "6ac8d49a.12d694",
+                "7da4e2ad.ccfb34"
             ]
         ]
     },
     {
-        "id": "f4fbab89.9ba908",
+        "id": "d2a47af.0c53388",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1997,
-        "y": 646,
-        "z": "42ade40f.4fa29c",
+        "x": 1883,
+        "y": 644,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "bc7188dd.cc9d18"
+                "70211305.a9bd74"
             ]
         ]
     },
     {
-        "id": "bc7188dd.cc9d18",
+        "id": "70211305.a9bd74",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2152,
-        "y": 646,
-        "z": "42ade40f.4fa29c",
+        "x": 2038,
+        "y": 644,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "7dc7ac6a.dc9714",
+        "id": "6ac8d49a.12d694",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1999,
-        "y": 694,
-        "z": "42ade40f.4fa29c",
+        "x": 1885,
+        "y": 692,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "bc7188dd.cc9d18"
+                "70211305.a9bd74"
             ]
         ]
     },
     {
-        "id": "4d8c04cc.f4e3d4",
+        "id": "7da4e2ad.ccfb34",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1998,
-        "y": 745,
-        "z": "42ade40f.4fa29c",
+        "x": 1884,
+        "y": 743,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "ed1851cd.c2d2d"
+                "51ef22a.000c3dc"
             ]
         ]
     },
     {
-        "id": "13838be4.d07ac4",
+        "id": "c4dd69cd.d872b",
         "type": "set",
         "name": "unset label-restriction's local variables",
         "xml": "<set>\n<parameter name='label-restriction.' value='' />\n<parameter name='unique-lrId' value=\"\" />\n",
         "comments": "",
-        "x": 2479,
-        "y": 572,
-        "z": "42ade40f.4fa29c",
+        "x": 2365,
+        "y": 570,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "2f963aac.304aa6",
+        "id": "7166bef0.82e4a",
         "type": "set",
         "name": "unset label-restriction's local variables",
         "xml": "<set>\n<parameter name='label-restriction.' value='' />\n<parameter name='unique-lrId' value=\"\" />\n",
         "comments": "",
-        "x": 2033,
-        "y": 799,
-        "z": "42ade40f.4fa29c",
+        "x": 1919,
+        "y": 797,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "6e4bc51.b0c9dbc",
+        "id": "cedaeaf5.78fef8",
         "type": "switchNode",
         "name": "switch te-link-attributes label-restriction_length",
         "xml": "<switch test='`$link.te.te-link-attributes.label-restriction_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2817,
-        "y": 523,
-        "z": "42ade40f.4fa29c",
+        "x": 2703,
+        "y": 521,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "30a1d0ca.e887a",
-                "92fd4ff1.3a409",
-                "389e55ce.061fe2"
+                "e2267c99.350348",
+                "3e0a9900.cec47e",
+                "ab55b067.791f5"
             ]
         ]
     },
     {
-        "id": "30a1d0ca.e887a",
+        "id": "e2267c99.350348",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3087,
-        "y": 485,
-        "z": "42ade40f.4fa29c",
+        "x": 2973,
+        "y": 483,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "5dda79fd.751e4"
+                "8e66b008.2f7c48"
             ]
         ]
     },
     {
-        "id": "5dda79fd.751e4",
+        "id": "8e66b008.2f7c48",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3242,
-        "y": 485,
-        "z": "42ade40f.4fa29c",
+        "x": 3128,
+        "y": 483,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "92fd4ff1.3a409",
+        "id": "3e0a9900.cec47e",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3089,
-        "y": 533,
-        "z": "42ade40f.4fa29c",
+        "x": 2975,
+        "y": 531,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "5dda79fd.751e4"
+                "8e66b008.2f7c48"
             ]
         ]
     },
     {
-        "id": "389e55ce.061fe2",
+        "id": "ab55b067.791f5",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3088,
-        "y": 584,
-        "z": "42ade40f.4fa29c",
+        "x": 2974,
+        "y": 582,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "bc1a2664.a26998"
+                "ef26b767.51cb"
             ]
         ]
     },
     {
-        "id": "bc1a2664.a26998",
+        "id": "ef26b767.51cb",
         "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": 3273,
-        "y": 584,
-        "z": "42ade40f.4fa29c",
+        "x": 3159,
+        "y": 582,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "bc3590a8.aace38",
-                "c370620b.230e48",
-                "a5a0665d.651de8",
-                "1ab3f9a3.2d2bce",
-                "fed3d208.8682f8",
-                "864febfd.65faf"
+                "1e98f683.1aa1c9",
+                "fb05e52d.520ed8",
+                "d6c4c7a0.0d9e8",
+                "c76088aa.f470c8",
+                "4bfdac8d.42ab7c",
+                "fab9bbde.d7c01"
             ]
         ]
     },
     {
-        "id": "a5a0665d.651de8",
+        "id": "d6c4c7a0.0d9e8",
         "type": "set",
         "name": "unset label-restriction's local variables",
         "xml": "<set>\n<parameter name='label-restriction.' value='' />\n<parameter name='unique-lrId' value=\"\" />\n",
         "comments": "",
-        "x": 3571,
-        "y": 399,
-        "z": "42ade40f.4fa29c",
+        "x": 3457,
+        "y": 397,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "bc3590a8.aace38",
+        "id": "1e98f683.1aa1c9",
         "type": "set",
         "name": "set label-restriction's local variables",
         "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n",
         "comments": "",
-        "x": 3560.6669921875,
-        "y": 445.88897705078125,
-        "z": "42ade40f.4fa29c",
+        "x": 3446.6669921875,
+        "y": 443.88897705078125,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "c370620b.230e48",
+        "id": "fb05e52d.520ed8",
         "type": "update",
         "name": "save label-restriction",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3514.370849609375,
-        "y": 573.444580078125,
-        "z": "42ade40f.4fa29c",
+        "x": 3400.370849609375,
+        "y": 571.444580078125,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "fa7d62b3.003ef",
-                "8c2cda96.78942"
+                "d9005ccd.b320e8",
+                "c6b7c3e3.521e98"
             ]
         ]
     },
     {
-        "id": "bad7ff54.e113a8",
+        "id": "9c6aaa8e.65077",
         "type": "save",
         "name": "save link relationship to label-restriction in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $alt-unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3588.5556640625,
-        "y": 757.888916015625,
-        "z": "42ade40f.4fa29c",
+        "x": 3474.5556640625,
+        "y": 755.888916015625,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "fa7d62b3.003ef",
+        "id": "d9005ccd.b320e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3705.0555419921875,
-        "y": 541.635009765625,
-        "z": "42ade40f.4fa29c",
+        "x": 3591.0555419921875,
+        "y": 539.635009765625,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "ee15e7b0.52d0f8"
+                "85dd0f0d.ac434"
             ]
         ]
     },
     {
-        "id": "8c2cda96.78942",
+        "id": "c6b7c3e3.521e98",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3712.734130859375,
-        "y": 600.8493347167969,
-        "z": "42ade40f.4fa29c",
+        "x": 3598.734130859375,
+        "y": 598.8493347167969,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             [
-                "ed52377e.4eb4a"
+                "d138a600.db5b8"
             ]
         ]
     },
     {
-        "id": "ee15e7b0.52d0f8",
+        "id": "85dd0f0d.ac434",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3865.5556640625,
-        "y": 540.8889465332031,
-        "z": "42ade40f.4fa29c",
+        "x": 3751.5556640625,
+        "y": 538.8889465332031,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "ed52377e.4eb4a",
+        "id": "d138a600.db5b8",
         "type": "update",
         "name": "save label-restriction",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3896.5556640625,
-        "y": 600.8889465332031,
-        "z": "42ade40f.4fa29c",
+        "x": 3782.5556640625,
+        "y": 598.8889465332031,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "1ab3f9a3.2d2bce",
+        "id": "c76088aa.f470c8",
         "type": "set",
         "name": "set label-restriction's local variables",
         "xml": "<set>\n<parameter name='unique-lrId' value=\"`$alt-unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
         "comments": "",
-        "x": 3561,
-        "y": 495,
-        "z": "42ade40f.4fa29c",
+        "x": 3447,
+        "y": 493,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "ec158e78.eb2b58",
+        "id": "f581a4e4.841408",
         "type": "set",
         "name": "set label-restriction's local variables",
         "xml": "<set>\n<parameter name='unique-lrId' value=\"`$alt-unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
         "comments": "",
-        "x": 2475,
-        "y": 664,
-        "z": "42ade40f.4fa29c",
+        "x": 2361,
+        "y": 662,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "a173e4f5.f5a478",
+        "id": "c6ea0cbf.fb7cd",
         "type": "set",
         "name": "set label-restriction's local variables",
         "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n",
         "comments": "",
-        "x": 2030,
-        "y": 851,
-        "z": "42ade40f.4fa29c",
+        "x": 1916,
+        "y": 849,
+        "z": "3cbec5d5.54ea02",
         "wires": []
     },
     {
-        "id": "9f4e28fe.9e925",
+        "id": "4aadddbd.521a8c",
         "type": "update",
         "name": "save te-link-attribute",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' >      \n<parameter name='id' value='`$link.te.te-link-attributes.name`' />\n<parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1171,
-        "y": 873,
-        "z": "42ade40f.4fa29c",
+        "x": 1057,
+        "y": 871,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "15c10484.c4629b",
+        "id": "e1339bff.8f7f98",
         "type": "save",
         "name": "save te-link-attribute relationship to label-restriction",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2062,
-        "y": 1142,
-        "z": "42ade40f.4fa29c",
+        "x": 1948,
+        "y": 1140,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "c921d18d.970b48",
+        "id": "441a859d.1c08ec",
         "type": "save",
         "name": "save te-link-attribute relationship to logical-link in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"logical-link\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/logical-links/logical-link/' + $unique-linkId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"logical-link.link-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-linkId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2071,
-        "y": 1082,
-        "z": "42ade40f.4fa29c",
+        "x": 1957,
+        "y": 1080,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "fc9bbbc9.76dd6",
+        "id": "6c137df8.722b8c",
         "type": "update",
         "name": "save te-link-attribute",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' >      \n<parameter name='id' value='`$link.te.te-link-attributes.name`' />\n<parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1662,
-        "y": 671,
-        "z": "42ade40f.4fa29c",
+        "x": 1548,
+        "y": 669,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "7a9fabbe.629c44",
+        "id": "740002f8.4aedac",
         "type": "update",
         "name": "update te-link-attribute",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' >      \n<parameter name='id' value='`$link.te.te-link-attributes.name`' />\n<parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2542,
-        "y": 456,
-        "z": "42ade40f.4fa29c",
+        "x": 2428,
+        "y": 454,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "a3570d8f.6b641",
+        "id": "f2fac409.beeaf8",
         "type": "save",
         "name": "save te-link-attribute relationship to logical-link in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"logical-link\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/logical-links/logical-link/' + $alt-unique-linkId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"logical-link.link-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$alt-unique-linkId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2507,
-        "y": 802,
-        "z": "42ade40f.4fa29c",
+        "x": 2393,
+        "y": 800,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "1375d0c1.e8bf07",
+        "id": "ea1f1d76.87207",
         "type": "save",
         "name": "save te-link-attribute relationship to label-restriction",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2500,
-        "y": 848,
-        "z": "42ade40f.4fa29c",
+        "x": 2386,
+        "y": 846,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "864febfd.65faf",
+        "id": "fab9bbde.d7c01",
         "type": "save",
         "name": "save te-link-attribute relationship to label-restriction",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3597,
-        "y": 700,
-        "z": "42ade40f.4fa29c",
+        "x": 3483,
+        "y": 698,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
     },
     {
-        "id": "fed3d208.8682f8",
+        "id": "4bfdac8d.42ab7c",
         "type": "save",
         "name": "save te-link-attribute relationship to logical-link in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"logical-link\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/logical-links/logical-link/' + $alt-unique-linkId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"logical-link.link-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$alt-unique-linkId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3604,
-        "y": 654,
-        "z": "42ade40f.4fa29c",
+        "x": 3490,
+        "y": 652,
+        "z": "3cbec5d5.54ea02",
         "wires": [
             []
         ]
diff --git a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
index 7b6731cb..d87fd490 100644
--- a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "ef88be3f.517f78",
+        "id": "b9fcda31.4ec79",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 105,
-        "y": 67,
+        "x": 113,
+        "y": 65.00650024414062,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "74a7a837.229be"
+                "3760ce9c.1bf2e2"
             ]
         ]
     },
     {
-        "id": "74a7a837.229be",
+        "id": "3760ce9c.1bf2e2",
         "type": "service-logic",
         "name": "DataChange ${project.version}",
         "module": "DataChange",
@@ -22,879 +22,879 @@
         "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,
+        "x": 202.00003051757812,
+        "y": 155.89541244506836,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "284dae72.737532"
+                "de74005b.f44ce8"
             ]
         ]
     },
     {
-        "id": "284dae72.737532",
+        "id": "de74005b.f44ce8",
         "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,
+        "x": 238.1112518310547,
+        "y": 226.2287368774414,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "da05320e.186d48"
+                "1541ad9c.69aa8a"
             ]
         ]
     },
     {
-        "id": "da05320e.186d48",
+        "id": "1541ad9c.69aa8a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 455.33343505859375,
-        "y": 227.77792358398438,
+        "x": 463.33343505859375,
+        "y": 225.784423828125,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "8c187a81.9e4d28",
-                "75113293.98ea0c",
-                "9937b93d.ff5938",
-                "55dde830.cc61b8",
-                "f7667eb6.ec8938"
+                "dbbcebe5.6f422",
+                "e66d9ed0.3d3d8",
+                "f1256a59.e632c",
+                "1dca15d7.0a7a3a",
+                "1c1d34a0.adaa8b"
             ]
         ]
     },
     {
-        "id": "75113293.98ea0c",
+        "id": "e66d9ed0.3d3d8",
         "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,
+        "x": 693.333251953125,
+        "y": 131.0065155029297,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
         ]
     },
     {
-        "id": "74f65e67.75c658",
+        "id": "40545c4b.9221f4",
         "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,
+        "x": 905.1111450195312,
+        "y": 221.11758422851562,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
         ]
     },
     {
-        "id": "9937b93d.ff5938",
+        "id": "f1256a59.e632c",
         "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,
+        "x": 676.8888549804688,
+        "y": 201.33981323242188,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "74f65e67.75c658",
-                "60e29b35.16fbd4",
-                "b27f201.393186",
-                "e83884ed.3fb2d8",
-                "7257c53.4f087bc",
-                "395bef40.08498",
-                "1392eb55.76adbd",
-                "e55192de.2cc998",
-                "a1ffb2f2.4b50b8"
+                "40545c4b.9221f4",
+                "eba2ef35.33c428",
+                "4817116d.5f593",
+                "466a40bd.9d277",
+                "1acdca56.b6e67e",
+                "3e1f14bc.ee90c4",
+                "6de7541f.0e2a24",
+                "8794be9f.289a08",
+                "1b6896a8.e62c19"
             ]
         ]
     },
     {
-        "id": "60e29b35.16fbd4",
+        "id": "eba2ef35.33c428",
         "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,
+        "x": 910.111083984375,
+        "y": 117.22871398925781,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
     {
-        "id": "e83884ed.3fb2d8",
+        "id": "466a40bd.9d277",
         "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,
+        "x": 1001.7779541015625,
+        "y": 396.45097827911377,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
         ]
     },
     {
-        "id": "9c15e41a.6cfbc8",
+        "id": "3d4b777c.0e42f",
         "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,
+        "x": 1287.4444580078125,
+        "y": 572.1175842285156,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "3c657cae.66477c",
-                "2e1dc2b9.f23686",
-                "8c144095.b1eaf8",
-                "9abbad80.6c0f7",
-                "ef702ba5.ac71e"
+                "95dfcdd1.046e6",
+                "1ac320c7.c54f67",
+                "aa2f70cf.6e112",
+                "64896027.57fb78",
+                "fe275075.949f1"
             ]
         ]
     },
     {
-        "id": "3c657cae.66477c",
+        "id": "95dfcdd1.046e6",
         "type": "set",
         "name": "set termination point",
         "xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tidx].`' />\n",
         "comments": "",
-        "x": 1549.111328125,
-        "y": 557.0000610351562,
+        "x": 1557.111328125,
+        "y": 555.0065612792969,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
     {
-        "id": "8c144095.b1eaf8",
+        "id": "aa2f70cf.6e112",
         "type": "save",
         "name": "save p-interface",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $unique-nodeId\n      AND p-interface.interface-name = $unique-ltpId' >      \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n<parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\n<!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->\n<parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1543.815185546875,
-        "y": 744.5556030273438,
+        "x": 1551.815185546875,
+        "y": 742.5621032714844,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "3fc33363.5b82ec",
-                "34c813e4.f5477c"
+                "673078d4.a5cb68",
+                "5651def0.2c85b8"
             ]
         ]
     },
     {
-        "id": "f6e5129a.8bd048",
+        "id": "6cce4024.476ad",
         "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": 1626.703857421875,
-        "y": 901.3333740234375,
+        "x": 1634.703857421875,
+        "y": 899.3398742675781,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
         ]
     },
     {
-        "id": "2e1dc2b9.f23686",
+        "id": "1ac320c7.c54f67",
         "type": "set",
         "name": "set unique-ltpId",
         "xml": "<set>\n<parameter name='unique-ltpId' value=\"`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`\" />\n",
         "comments": "",
-        "x": 1533.000244140625,
-        "y": 614.111083984375,
+        "x": 1541.000244140625,
+        "y": 612.1175842285156,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
     {
-        "id": "8c187a81.9e4d28",
+        "id": "dbbcebe5.6f422",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$network.network-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.original-network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 641.9935302734375,
-        "y": 41.993499755859375,
+        "x": 649.9935302734375,
+        "y": 40,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
         ]
     },
     {
-        "id": "b27f201.393186",
+        "id": "4817116d.5f593",
         "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,
+        "x": 983,
+        "y": 433,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
         ]
     },
     {
-        "id": "3fc33363.5b82ec",
+        "id": "673078d4.a5cb68",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1715.499885559082,
-        "y": 731.7460784912109,
+        "x": 1723.499885559082,
+        "y": 729.7525787353516,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "a873419b.bc81c"
+                "72e23ce3.0ceb8c"
             ]
         ]
     },
     {
-        "id": "34c813e4.f5477c",
+        "id": "5651def0.2c85b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1709.1784744262695,
-        "y": 783.9603900909424,
+        "x": 1717.1784744262695,
+        "y": 781.966890335083,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "66113f50.7819f8"
+                "936d0942.79b6"
             ]
         ]
     },
     {
-        "id": "a873419b.bc81c",
+        "id": "72e23ce3.0ceb8c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1866.0000457763672,
-        "y": 731.0000095367432,
+        "x": 1874.0000457763672,
+        "y": 729.0065097808838,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
         ]
     },
     {
-        "id": "66113f50.7819f8",
+        "id": "936d0942.79b6",
         "type": "update",
         "name": "update p-interface",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $unique-nodeId\n      AND p-interface.interface-name = $unique-ltpId' >      \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n<parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\n<!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->\n<parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />",
         "comments": "",
         "outputs": 1,
-        "x": 1895,
-        "y": 785,
+        "x": 1903,
+        "y": 783.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
         ]
     },
     {
-        "id": "c8e5472a.d10408",
+        "id": "7077dcc4.1aa314",
         "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,
+        "x": 1686,
+        "y": 329.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "11cb3cf8.02c3eb",
-                "1a336806.ba4bc8"
+                "ee093e46.66c7d8",
+                "e9c7ad6a.1577f"
             ]
         ]
     },
     {
-        "id": "8b0a557c.b35cd",
+        "id": "3a45511d.adcf26",
         "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,
+        "x": 1349,
+        "y": 317.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "58c4d943.63d2f",
-                "e7e93cd.8f563c",
-                "c8e5472a.d10408",
-                "7c00c858.c87ab8",
-                "1bd07bf.99e9784"
+                "2ea4deaf.40bdfa",
+                "458ce581.77bfe4",
+                "7077dcc4.1aa314",
+                "dad1a90d.61b018",
+                "7da29c03.1dbdf4"
             ]
         ]
     },
     {
-        "id": "58c4d943.63d2f",
+        "id": "2ea4deaf.40bdfa",
         "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,
+        "x": 1684,
+        "y": 237.00650024414062,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
     {
-        "id": "e7e93cd.8f563c",
+        "id": "458ce581.77bfe4",
         "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,
+        "x": 1642.888916015625,
+        "y": 275.1175842285156,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
     {
-        "id": "11cb3cf8.02c3eb",
+        "id": "ee093e46.66c7d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1944,
-        "y": 317,
+        "x": 1952,
+        "y": 315.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "9ad375c8.fab3e8"
+                "1b7d5a60.835d5e"
             ]
         ]
     },
     {
-        "id": "1a336806.ba4bc8",
+        "id": "e9c7ad6a.1577f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1937.6785888671875,
-        "y": 369.21431159973145,
+        "x": 1945.6785888671875,
+        "y": 367.22081184387207,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "842e7e75.fc0558"
+                "652a4eb1.3c9f7"
             ]
         ]
     },
     {
-        "id": "9ad375c8.fab3e8",
+        "id": "1b7d5a60.835d5e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2094.500160217285,
-        "y": 316.2539310455322,
+        "x": 2102.500160217285,
+        "y": 314.26043128967285,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
         ]
     },
     {
-        "id": "842e7e75.fc0558",
+        "id": "652a4eb1.3c9f7",
         "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,
+        "x": 2183,
+        "y": 369.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
         ]
     },
     {
-        "id": "7257c53.4f087bc",
+        "id": "1acdca56.b6e67e",
         "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,
+        "x": 935,
+        "y": 164.00650024414062,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
     {
-        "id": "55dde830.cc61b8",
+        "id": "1dca15d7.0a7a3a",
         "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,
+        "x": 619,
+        "y": 327.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
         ]
     },
     {
-        "id": "b86a9ee9.558c2",
+        "id": "c87f71c.204801",
         "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": 1627,
-        "y": 844,
+        "x": 1635,
+        "y": 842.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
         ]
     },
     {
-        "id": "7c00c858.c87ab8",
+        "id": "dad1a90d.61b018",
         "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`\" />",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $unique-nodeId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"tunnel-termination-point\" />\n<!--<parameter name=\"relationship-list.relationship[$ttidx].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`\" />-->\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"tunnel-termination-point.ttp-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ttpId`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1749,
-        "y": 423,
+        "x": 1757,
+        "y": 421.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "5d32d079.32cfb8",
-                "5c2d8774.9a9178"
+                "486bef2.804149",
+                "8297f8e3.32f2f"
             ]
         ]
     },
     {
-        "id": "395bef40.08498",
+        "id": "3e1f14bc.ee90c4",
         "type": "switchNode",
         "name": "switch node ttp",
         "xml": "<switch test='`$node.te.tunnel-termination-point_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 913,
-        "y": 295,
+        "x": 921,
+        "y": 293.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "84bf875e.b8d51",
-                "cc6df2e.2398e9",
-                "f2d2c388.1aa578"
+                "3564e5a8.68c49a",
+                "fd68b5a4.a3a878",
+                "f36d0950.312798"
             ]
         ]
     },
     {
-        "id": "5889c4ed.3fc544",
+        "id": "d6240165.9d9a1",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1261,
-        "y": 247,
+        "x": 1269,
+        "y": 245.00650024414062,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
         ]
     },
     {
-        "id": "f2d2c388.1aa578",
+        "id": "f36d0950.312798",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1103,
-        "y": 318,
+        "x": 1111,
+        "y": 316.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "8b0a557c.b35cd"
+                "3a45511d.adcf26"
             ]
         ]
     },
     {
-        "id": "1392eb55.76adbd",
+        "id": "6de7541f.0e2a24",
         "type": "switchNode",
         "name": "switch node tp",
         "xml": "<switch test='`$node.termination-point_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 893,
-        "y": 550,
+        "x": 901,
+        "y": 548.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "c5e649ab.cfe2e8",
-                "d7a3de29.b44a1",
-                "a21fbfb7.b6608"
+                "d28496d2.5ae628",
+                "74698dba.4a5d9c",
+                "f51e137e.4b4cd"
             ]
         ]
     },
     {
-        "id": "c5e649ab.cfe2e8",
+        "id": "d28496d2.5ae628",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1072,
-        "y": 502,
+        "x": 1080,
+        "y": 500.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "3d51c59d.7acffa"
+                "1912a08f.2e751f"
             ]
         ]
     },
     {
-        "id": "d7a3de29.b44a1",
+        "id": "74698dba.4a5d9c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1071,
-        "y": 604,
+        "x": 1079,
+        "y": 602.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "9c15e41a.6cfbc8"
+                "3d4b777c.0e42f"
             ]
         ]
     },
     {
-        "id": "3d51c59d.7acffa",
+        "id": "1912a08f.2e751f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1227,
-        "y": 502,
+        "x": 1235,
+        "y": 500.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
         ]
     },
     {
-        "id": "e55192de.2cc998",
+        "id": "8794be9f.289a08",
         "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,
+        "x": 899,
+        "y": 337.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
         ]
     },
     {
-        "id": "84bf875e.b8d51",
+        "id": "3564e5a8.68c49a",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1101,
-        "y": 181,
+        "x": 1109,
+        "y": 179.00650024414062,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "5889c4ed.3fc544"
+                "d6240165.9d9a1"
             ]
         ]
     },
     {
-        "id": "cc6df2e.2398e9",
+        "id": "fd68b5a4.a3a878",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1106,
-        "y": 256,
+        "x": 1114,
+        "y": 254.00650024414062,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "5889c4ed.3fc544"
+                "d6240165.9d9a1"
             ]
         ]
     },
     {
-        "id": "a21fbfb7.b6608",
+        "id": "f51e137e.4b4cd",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1082,
-        "y": 550,
+        "x": 1090,
+        "y": 548.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "3d51c59d.7acffa"
+                "1912a08f.2e751f"
             ]
         ]
     },
     {
-        "id": "a1ffb2f2.4b50b8",
+        "id": "1b6896a8.e62c19",
         "type": "set",
         "name": "unset node",
         "xml": "<set>\n<parameter name='node.' value='' />\n\n",
         "comments": "",
-        "x": 899,
-        "y": 68,
+        "x": 907,
+        "y": 66.00650024414062,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
     {
-        "id": "9abbad80.6c0f7",
+        "id": "64896027.57fb78",
         "type": "set",
         "name": "unset termination point",
         "xml": "<set>\n<parameter name='tp.' value='' />\n",
         "comments": "",
-        "x": 1561,
-        "y": 500,
+        "x": 1569,
+        "y": 498.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
     {
-        "id": "1bd07bf.99e9784",
+        "id": "7da29c03.1dbdf4",
         "type": "set",
         "name": "unset tunnel termination point",
         "xml": "<set>\n<parameter name='ttp.' value='' />\n",
         "comments": "",
-        "x": 1676,
-        "y": 191,
+        "x": 1684,
+        "y": 189.00650024414062,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
     {
-        "id": "5d32d079.32cfb8",
+        "id": "486bef2.804149",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2081,
-        "y": 426,
+        "x": 2089,
+        "y": 424.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "42b15971.2191b8"
+                "f859267c.20dd3"
             ]
         ]
     },
     {
-        "id": "5c2d8774.9a9178",
+        "id": "8297f8e3.32f2f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2078,
-        "y": 474,
+        "x": 2086,
+        "y": 472.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "ad595c83.2160d"
+                "19a686f.52c17f9"
             ]
         ]
     },
     {
-        "id": "42b15971.2191b8",
+        "id": "f859267c.20dd3",
         "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,
+        "x": 2244,
+        "y": 425.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
         ]
     },
     {
-        "id": "ad595c83.2160d",
+        "id": "19a686f.52c17f9",
         "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,
+        "x": 2245,
+        "y": 473.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
         ]
     },
     {
-        "id": "b9a378e9.3ee13",
+        "id": "c991cb25.a4c41",
         "type": "execute",
         "name": "execute Base64 Converter",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='base64DecodingAlgo' >\n    <parameter name=\"encodedValue\" value='`$tp.te.inter-domain-plug-id`'/>\n    <parameter name=\"decodedValue\" value=\"tmp.decoded-plug-id\"/>\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 2027,
-        "y": 669,
+        "x": 2035,
+        "y": 667.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "1cdf8713.954a51",
-                "3754d4b.0357eac"
+                "dcbfdbac.4106e8",
+                "25f66573.5f2caa"
             ]
         ]
     },
     {
-        "id": "ef702ba5.ac71e",
+        "id": "fe275075.949f1",
         "type": "switchNode",
         "name": "switch inter-domain-plug-id empty?",
         "xml": "<switch test='`length($tp.te.inter-domain-plug-id) == 0`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1597,
-        "y": 670,
+        "x": 1605,
+        "y": 668.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "95523b36.e61fe",
-                "a2f27028.9e578"
+                "2202ef19.0cb66",
+                "a44d5e08.8645a8"
             ]
         ]
     },
     {
-        "id": "a2f27028.9e578",
+        "id": "a44d5e08.8645a8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1824,
-        "y": 623,
+        "x": 1832,
+        "y": 621.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "ce508a28.fe217"
+                "77ac957f.8f7e64"
             ]
         ]
     },
     {
-        "id": "95523b36.e61fe",
+        "id": "2202ef19.0cb66",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1825,
-        "y": 669,
+        "x": 1833,
+        "y": 667.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "b9a378e9.3ee13"
+                "c991cb25.a4c41"
             ]
         ]
     },
     {
-        "id": "ce508a28.fe217",
+        "id": "77ac957f.8f7e64",
         "type": "set",
         "name": "unset tmp.decoded-plug-id",
         "xml": "<set>\n<parameter name='tmp.decoded-plug-id' value='' />\n",
         "comments": "",
-        "x": 2028,
-        "y": 623,
+        "x": 2036,
+        "y": 621.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
     {
-        "id": "1cdf8713.954a51",
+        "id": "dcbfdbac.4106e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2232,
-        "y": 646,
+        "x": 2240,
+        "y": 644.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "611d993d.82c5c"
+                "21836a86.63b72e"
             ]
         ]
     },
     {
-        "id": "3754d4b.0357eac",
+        "id": "25f66573.5f2caa",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2225.6785888671875,
-        "y": 698.2143115997314,
+        "x": 2233.6785888671875,
+        "y": 696.2208118438721,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
-                "495bfe4.4b1a"
+                "8297f536.6bb4a"
             ]
         ]
     },
     {
-        "id": "611d993d.82c5c",
+        "id": "21836a86.63b72e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2373,
-        "y": 646,
+        "x": 2381,
+        "y": 644.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
         ]
     },
     {
-        "id": "495bfe4.4b1a",
+        "id": "8297f536.6bb4a",
         "type": "set",
         "name": "unset tmp.decoded-plug-id",
         "xml": "<set>\n<parameter name='tmp.decoded-plug-id' value='`$tp.te.inter-domain-plug-id`' />\n",
         "comments": "",
-        "x": 2432,
-        "y": 698,
+        "x": 2440,
+        "y": 696.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
     {
-        "id": "f7667eb6.ec8938",
+        "id": "1c1d34a0.adaa8b",
         "type": "set",
         "name": "set tmp.network-if",
         "xml": "<set>\n<parameter name='tmp.network-id' value=\"`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`\" />\n\n",
         "comments": "",
-        "x": 667,
-        "y": 83,
+        "x": 675,
+        "y": 81.00650024414062,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     }
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 1ef85f5b..a47bab0b 100644
--- a/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "db76d876.619d4",
+        "id": "f3e0b928.e8c7e",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 107,
-        "y": 76,
-        "z": "ffd702ea.3cd72",
+        "x": 128,
+        "y": 83,
+        "z": "8966128c.40fc9",
         "wires": [
             [
-                "ac7d0d8e.d68168"
+                "2b8024f5.a0b3e4"
             ]
         ]
     },
     {
-        "id": "ac7d0d8e.d68168",
+        "id": "2b8024f5.a0b3e4",
         "type": "service-logic",
         "name": "DataChange ${project.version}",
         "module": "DataChange",
@@ -22,504 +22,540 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>",
         "outputs": 1,
-        "x": 196.00003051757812,
-        "y": 166.88891220092773,
-        "z": "ffd702ea.3cd72",
+        "x": 217.00003051757812,
+        "y": 173.88891220092773,
+        "z": "8966128c.40fc9",
         "wires": [
             [
-                "15add1ed.67bb06"
+                "e0b4218d.2d604"
             ]
         ]
     },
     {
-        "id": "15add1ed.67bb06",
+        "id": "e0b4218d.2d604",
         "type": "method",
         "name": "method update-tp-ttp-relationship",
         "xml": "<method rpc='update-tp-ttp-relationship' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 232.1112518310547,
-        "y": 237.22223663330078,
-        "z": "ffd702ea.3cd72",
+        "x": 253.1112518310547,
+        "y": 244.22223663330078,
+        "z": "8966128c.40fc9",
         "wires": [
             [
-                "2ef3d64c.d8633a"
+                "36afdba8.70bb5c"
             ]
         ]
     },
     {
-        "id": "2ef3d64c.d8633a",
+        "id": "36afdba8.70bb5c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 457.33343505859375,
-        "y": 236.77792358398438,
-        "z": "ffd702ea.3cd72",
+        "x": 478.33343505859375,
+        "y": 243.77792358398438,
+        "z": "8966128c.40fc9",
         "wires": [
             [
-                "929780.1985e88",
-                "25858afe.2b9bce",
-                "e912429a.04b788"
+                "63bd9611.390fd8",
+                "1ed8c21a.583ede",
+                "232a5f0a.159568",
+                "e63ab049.15d1f"
             ]
         ]
     },
     {
-        "id": "25858afe.2b9bce",
+        "id": "1ed8c21a.583ede",
         "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": 689.8888549804688,
-        "y": 191.33331298828125,
-        "z": "ffd702ea.3cd72",
+        "x": 710.8888549804688,
+        "y": 198.33331298828125,
+        "z": "8966128c.40fc9",
         "wires": [
             [
-                "9ceedf0.da974a",
-                "2a93e407.ae18bc",
-                "e6e033d7.96653"
+                "d25c4b67.5fdd7",
+                "7e336092.2a08",
+                "d912c615.382f4",
+                "e1c780a1.bce018"
             ]
         ]
     },
     {
-        "id": "9ceedf0.da974a",
+        "id": "d25c4b67.5fdd7",
         "type": "set",
         "name": "set node-eth",
         "xml": "<set>\n<parameter name='node-eth.' value='`$network-eth.node[$pethidx].`' />",
         "comments": "",
         "x": 973.111083984375,
-        "y": 98.22221374511719,
-        "z": "ffd702ea.3cd72",
+        "y": 42.22221374511719,
+        "z": "8966128c.40fc9",
         "wires": []
     },
     {
-        "id": "79b02bc6.8ef74c",
+        "id": "68049.3760dfb7c",
         "type": "set",
         "name": "set termination point tp-eth",
         "xml": "<set>\n<parameter name='tp-eth.' value='`$node-eth.termination-point[$tidx].`' />\n",
         "comments": "",
-        "x": 1194.111328125,
-        "y": 225.00006103515625,
-        "z": "ffd702ea.3cd72",
+        "x": 1215.111328125,
+        "y": 232.00006103515625,
+        "z": "8966128c.40fc9",
         "wires": []
     },
     {
-        "id": "53e75306.b60214",
+        "id": "78ae2560.1cea4c",
         "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": 1172.000244140625,
-        "y": 262.111083984375,
-        "z": "ffd702ea.3cd72",
+        "x": 1193.000244140625,
+        "y": 269.111083984375,
+        "z": "8966128c.40fc9",
         "wires": []
     },
     {
-        "id": "929780.1985e88",
+        "id": "63bd9611.390fd8",
         "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    ",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$network-eth.network-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.original-network-eth.network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 647.9935302734375,
-        "y": 55.993499755859375,
-        "z": "ffd702ea.3cd72",
+        "x": 668.9935302734375,
+        "y": 62.993499755859375,
+        "z": "8966128c.40fc9",
         "wires": [
             []
         ]
     },
     {
-        "id": "2a93e407.ae18bc",
+        "id": "7e336092.2a08",
         "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",
+        "xml": "<set>\n<parameter name='unique-network-ethId' value='`$tmp.network-eth.network-id`' />\n",
         "comments": "",
-        "x": 972,
-        "y": 146,
-        "z": "ffd702ea.3cd72",
+        "x": 987,
+        "y": 97,
+        "z": "8966128c.40fc9",
         "wires": []
     },
     {
-        "id": "e912429a.04b788",
+        "id": "232a5f0a.159568",
         "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    ",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$network-otn.network-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.original-network-otn.network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 645,
-        "y": 95,
-        "z": "ffd702ea.3cd72",
+        "x": 666,
+        "y": 102,
+        "z": "8966128c.40fc9",
         "wires": [
             []
         ]
     },
     {
-        "id": "8be3e429.ccb7d",
+        "id": "5ced7489.3fd33c",
         "type": "for",
         "name": "for each tunnel termination point in otn",
         "xml": "<for index='ttidx' start='0' end='`$node-otn.te.tunnel-termination-point_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1549,
-        "y": 622,
-        "z": "ffd702ea.3cd72",
+        "x": 1570,
+        "y": 629,
+        "z": "8966128c.40fc9",
         "wires": [
             [
-                "f3d35e68.c9d718",
-                "3ad809f1.06ba16",
-                "4db37c69.2430a4",
-                "ec80108a.70e1d",
-                "6c3aac2e.471db4"
+                "c149dbcd.dbc5b",
+                "a007e2e5.f8d76",
+                "1e876a82.9683f5",
+                "a5938665.3779c8",
+                "a06a50c9.82a2f"
             ]
         ]
     },
     {
-        "id": "f3d35e68.c9d718",
+        "id": "c149dbcd.dbc5b",
         "type": "set",
         "name": "set tunnel termination point",
         "xml": "<set>\n<parameter name='ttp.' value='`$node-otn.te.tunnel-termination-point[$ttidx].`' />\n",
         "comments": "",
-        "x": 1918,
-        "y": 334,
-        "z": "ffd702ea.3cd72",
+        "x": 1939,
+        "y": 341,
+        "z": "8966128c.40fc9",
         "wires": []
     },
     {
-        "id": "3ad809f1.06ba16",
+        "id": "a007e2e5.f8d76",
         "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": 1885.888916015625,
-        "y": 398.111083984375,
-        "z": "ffd702ea.3cd72",
+        "x": 1906.888916015625,
+        "y": 405.111083984375,
+        "z": "8966128c.40fc9",
         "wires": []
     },
     {
-        "id": "7c6c9bf4.1268f4",
+        "id": "b56a229e.94c8d8",
         "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": 1212,
-        "y": 302,
-        "z": "ffd702ea.3cd72",
+        "x": 1233,
+        "y": 309,
+        "z": "8966128c.40fc9",
         "wires": []
     },
     {
-        "id": "38915841.38d1e",
+        "id": "91b08f38.b7b1f",
         "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": 1230,
-        "y": 351,
-        "z": "ffd702ea.3cd72",
+        "x": 1251,
+        "y": 358,
+        "z": "8966128c.40fc9",
         "wires": [
             [
-                "b1b6d531.8e8428",
-                "591e31d0.de7628",
-                "e2cb35d4.99da",
-                "32e4e342.a9f04c"
+                "2a04c22a.d38706",
+                "747557f8.e08f6",
+                "23d7e732.31c878",
+                "7fec5669.9d797",
+                "5525a122.db022"
             ]
         ]
     },
     {
-        "id": "b1b6d531.8e8428",
+        "id": "2a04c22a.d38706",
         "type": "set",
         "name": "set node-otn",
         "xml": "<set>\n<parameter name='node-otn.' value='`$network-otn.node[$potnidx].`' />",
         "comments": "",
-        "x": 1524,
-        "y": 321,
-        "z": "ffd702ea.3cd72",
+        "x": 1545,
+        "y": 328,
+        "z": "8966128c.40fc9",
         "wires": []
     },
     {
-        "id": "591e31d0.de7628",
+        "id": "747557f8.e08f6",
         "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",
+        "xml": "<set>\n<parameter name='unique-network-otnId' value='`$tmp.network-otn.network-id`' />\n",
         "comments": "",
-        "x": 1522.888916015625,
-        "y": 368.7777862548828,
-        "z": "ffd702ea.3cd72",
+        "x": 1543.888916015625,
+        "y": 375.7777862548828,
+        "z": "8966128c.40fc9",
         "wires": []
     },
     {
-        "id": "4db37c69.2430a4",
+        "id": "1e876a82.9683f5",
         "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": 1910,
-        "y": 452,
-        "z": "ffd702ea.3cd72",
+        "x": 1931,
+        "y": 459,
+        "z": "8966128c.40fc9",
         "wires": []
     },
     {
-        "id": "ec80108a.70e1d",
+        "id": "a5938665.3779c8",
         "type": "switchNode",
         "name": "switch tp-inter-layer-lock-id",
         "xml": "<switch test='`$tp-inter-layer-lock-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1917,
-        "y": 508,
-        "z": "ffd702ea.3cd72",
+        "x": 1938,
+        "y": 515,
+        "z": "8966128c.40fc9",
         "wires": [
             [
-                "cf4f4a72.7d5168"
+                "48b284bc.31f88c"
             ]
         ]
     },
     {
-        "id": "cf4f4a72.7d5168",
+        "id": "48b284bc.31f88c",
         "type": "outcome",
         "name": "ttp-inter-layer-lock-id",
         "xml": "<outcome value='`$ttp-inter-layer-lock-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1975,
-        "y": 604,
-        "z": "ffd702ea.3cd72",
+        "x": 1996,
+        "y": 611,
+        "z": "8966128c.40fc9",
         "wires": [
             [
-                "3d7797fd.32b9a8"
+                "d5168225.118b5"
             ]
         ]
     },
     {
-        "id": "3d7797fd.32b9a8",
+        "id": "d5168225.118b5",
         "type": "save",
         "name": "save p-interface relationship to ttp in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' \n      key='p-interface.interface-name = $unique-ltpethId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"tunnel-termination-point\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"tunnel-termination-point.tunnel-tp-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ttpId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2293,
-        "y": 604,
-        "z": "ffd702ea.3cd72",
+        "x": 2314,
+        "y": 611,
+        "z": "8966128c.40fc9",
         "wires": [
             []
         ]
     },
     {
-        "id": "b8fd2648.6f854",
+        "id": "679b8e41.9ed698",
         "type": "set",
         "name": "unset termination point tp-eth",
         "xml": "<set>\n<parameter name='tp-eth.' value='' />\n",
         "comments": "",
-        "x": 1189,
-        "y": 187.99349975585938,
-        "z": "ffd702ea.3cd72",
+        "x": 1210,
+        "y": 194.99349975585938,
+        "z": "8966128c.40fc9",
         "wires": []
     },
     {
-        "id": "6c3aac2e.471db4",
+        "id": "a06a50c9.82a2f",
         "type": "set",
         "name": "unset tunnel termination point",
         "xml": "<set>\n<parameter name='ttp.' value='' />\n",
         "comments": "",
-        "x": 1926,
-        "y": 280.9934997558594,
-        "z": "ffd702ea.3cd72",
+        "x": 1947,
+        "y": 287.9934997558594,
+        "z": "8966128c.40fc9",
         "wires": []
     },
     {
-        "id": "e6e033d7.96653",
+        "id": "d912c615.382f4",
         "type": "switchNode",
         "name": "switch node-eth tp",
         "xml": "<switch test='`$node-eth.termination-point_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 556,
-        "y": 370,
-        "z": "ffd702ea.3cd72",
+        "x": 577,
+        "y": 377,
+        "z": "8966128c.40fc9",
         "wires": [
             [
-                "80e4765d.fcdaa8",
-                "a8cca188.f375d",
-                "b96aa4a5.384fe8"
+                "a5220607.a1fd88",
+                "ed33421.4d77fc",
+                "60e52ea8.adce88"
             ]
         ]
     },
     {
-        "id": "80e4765d.fcdaa8",
+        "id": "a5220607.a1fd88",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 735,
-        "y": 322,
-        "z": "ffd702ea.3cd72",
+        "x": 756,
+        "y": 329,
+        "z": "8966128c.40fc9",
         "wires": [
             [
-                "adea3129.2af79"
+                "f8847f3a.3586c"
             ]
         ]
     },
     {
-        "id": "adea3129.2af79",
+        "id": "f8847f3a.3586c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 890,
-        "y": 322,
-        "z": "ffd702ea.3cd72",
+        "x": 911,
+        "y": 329,
+        "z": "8966128c.40fc9",
         "wires": [
             []
         ]
     },
     {
-        "id": "b96aa4a5.384fe8",
+        "id": "60e52ea8.adce88",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 745,
-        "y": 370,
-        "z": "ffd702ea.3cd72",
+        "x": 766,
+        "y": 377,
+        "z": "8966128c.40fc9",
         "wires": [
             [
-                "adea3129.2af79"
+                "f8847f3a.3586c"
             ]
         ]
     },
     {
-        "id": "a8cca188.f375d",
+        "id": "ed33421.4d77fc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 734,
-        "y": 424,
-        "z": "ffd702ea.3cd72",
+        "x": 755,
+        "y": 431,
+        "z": "8966128c.40fc9",
         "wires": [
             [
-                "2c29c804.a15ee"
+                "4137593c.5397c"
             ]
         ]
     },
     {
-        "id": "2c29c804.a15ee",
+        "id": "4137593c.5397c",
         "type": "for",
         "name": "for each termination point",
         "xml": "<for index='tidx' start='0' end='`$node-eth.termination-point_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 942.4444580078125,
-        "y": 394.111083984375,
-        "z": "ffd702ea.3cd72",
+        "x": 963.4444580078125,
+        "y": 401.111083984375,
+        "z": "8966128c.40fc9",
         "wires": [
             [
-                "b8fd2648.6f854",
-                "79b02bc6.8ef74c",
-                "53e75306.b60214",
-                "7c6c9bf4.1268f4",
-                "38915841.38d1e"
+                "679b8e41.9ed698",
+                "68049.3760dfb7c",
+                "78ae2560.1cea4c",
+                "b56a229e.94c8d8",
+                "91b08f38.b7b1f"
             ]
         ]
     },
     {
-        "id": "e2cb35d4.99da",
+        "id": "23d7e732.31c878",
         "type": "set",
         "name": "unset node-otn",
         "xml": "<set>\n<parameter name='node-otn.' value='' />\n<parameter name='unique-network-otnId' value='' />\n<parameter name='unique-node-otnId' value=\"\" />\n",
         "comments": "",
-        "x": 1525,
-        "y": 270,
-        "z": "ffd702ea.3cd72",
+        "x": 1546,
+        "y": 277,
+        "z": "8966128c.40fc9",
         "wires": []
     },
     {
-        "id": "32e4e342.a9f04c",
+        "id": "7fec5669.9d797",
         "type": "switchNode",
         "name": "switch node-otn ttp",
         "xml": "<switch test='`$node-otn.te.tunnel-termination-point_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1122,
-        "y": 601,
-        "z": "ffd702ea.3cd72",
+        "x": 1143,
+        "y": 608,
+        "z": "8966128c.40fc9",
         "wires": [
             [
-                "571c7e22.88577",
-                "c4c843ca.dc868",
-                "dcc7ee12.1af12"
+                "c2495d37.4f1a88",
+                "4a7d6e3.4a2c99",
+                "e5a8fd10.f52c58"
             ]
         ]
     },
     {
-        "id": "571c7e22.88577",
+        "id": "c2495d37.4f1a88",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1310,
-        "y": 487,
-        "z": "ffd702ea.3cd72",
+        "x": 1331,
+        "y": 494,
+        "z": "8966128c.40fc9",
         "wires": [
             [
-                "3d4d0383.b594e4"
+                "50aa44cc.08445c"
             ]
         ]
     },
     {
-        "id": "c4c843ca.dc868",
+        "id": "4a7d6e3.4a2c99",
         "type": "outcome",
         "name": "length 0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1315,
-        "y": 562,
-        "z": "ffd702ea.3cd72",
+        "x": 1336,
+        "y": 569,
+        "z": "8966128c.40fc9",
         "wires": [
             [
-                "3d4d0383.b594e4"
+                "50aa44cc.08445c"
             ]
         ]
     },
     {
-        "id": "dcc7ee12.1af12",
+        "id": "e5a8fd10.f52c58",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1312,
-        "y": 624,
-        "z": "ffd702ea.3cd72",
+        "x": 1333,
+        "y": 631,
+        "z": "8966128c.40fc9",
         "wires": [
             [
-                "8be3e429.ccb7d"
+                "5ced7489.3fd33c"
             ]
         ]
     },
     {
-        "id": "3d4d0383.b594e4",
+        "id": "50aa44cc.08445c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1470,
-        "y": 553,
-        "z": "ffd702ea.3cd72",
+        "x": 1491,
+        "y": 560,
+        "z": "8966128c.40fc9",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "e1c780a1.bce018",
+        "type": "set",
+        "name": "set local variables",
+        "xml": "<set>\n<parameter name='unique-node-ethId' value=\"`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`\" />\n",
+        "comments": "",
+        "x": 989,
+        "y": 153,
+        "z": "8966128c.40fc9",
+        "wires": []
+    },
+    {
+        "id": "e63ab049.15d1f",
+        "type": "set",
+        "name": "set local variables",
+        "xml": "<set>\n<parameter name='tmp.network-eth.network-id' value=\"`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-eth.network-id`\" />\n<parameter name='tmp.network-otn.network-id' value=\"`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-otn.network-id`\" />\n\n",
+        "comments": "",
+        "x": 658,
+        "y": 144,
+        "z": "8966128c.40fc9",
+        "wires": []
+    },
+    {
+        "id": "5525a122.db022",
+        "type": "set",
+        "name": "set local variables",
+        "xml": "<set>\n<parameter name='unique-node-otnId' value=\"`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`\" />\n",
+        "comments": "",
+        "x": 1544,
+        "y": 425,
+        "z": "8966128c.40fc9",
+        "wires": []
     }
 ]
\ No newline at end of file
-- 
cgit 1.2.3-korg