X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=blobdiff_plain;f=platform-logic%2Fdatachange%2Fsrc%2Fmain%2Fjson%2FDataChange_update-network-links-to-aai.json;h=0d6a2784d8413e989ed6801abec571487b0820d0;hp=236bc6a38144b92d1963f1e30190f1bb76f38d0f;hb=f515a8831e0036414d69d73030e871dec88180f8;hpb=1df36cd2a20f26dfa1c80bc5c3baaa03140f1987

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": [
             []
         ]