From 7231f26f523c65f8fa12d0ddc36c7988dacda8a2 Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Thu, 28 Apr 2022 10:15:34 -0400
Subject: [PATCH] - Removing model-invariant-id, model-customization-id, and
 model-version-id from the payload when creating connectivity and vpn-binding
 in AAI. - Adding an explicit depth=0 in the selflink URL when fetching all
 pnfs.

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

Former-commit-id: 6061a6ba857412c00d6f62e5a4c5777ba5ece19c
---
 ...nf-topology-operation-trans-slice-allocate.json | 3368 ++++++++---------
 ...-vnf-topology-operation-trans-slice-modify.json | 3808 ++++++++++----------
 ...vnf-topology-operation-trans-slice-allocate.xml |   28 +-
 ...i-vnf-topology-operation-trans-slice-modify.xml |   28 +-
 4 files changed, 3616 insertions(+), 3616 deletions(-)

diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
index 0ec5d2ec..9904f4df 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "b3b9455c.251fb8",
+        "id": "6fd18371.ab4fc4",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 107,
-        "y": 110,
-        "z": "cd8c161.e76ffe8",
+        "x": 138.56666564941406,
+        "y": 144.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "5661f4c7.6e8104"
+                "f71dc579.359058"
             ]
         ]
     },
     {
-        "id": "5661f4c7.6e8104",
+        "id": "f71dc579.359058",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,4963 +22,4963 @@
         "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='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 391.2856903076172,
-        "y": 171.23810863494873,
-        "z": "cd8c161.e76ffe8",
+        "x": 422.85235595703125,
+        "y": 205.8047742843628,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "47f23ec8.713ca"
+                "c0146243.1b894"
             ]
         ]
     },
     {
-        "id": "47f23ec8.713ca",
+        "id": "c0146243.1b894",
         "type": "method",
         "name": "method tsli-vnf-topology-operation-trans-slice-allocate",
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-allocate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 397.42860412597656,
-        "y": 256.0000305175781,
-        "z": "cd8c161.e76ffe8",
+        "x": 428.9952697753906,
+        "y": 290.5666961669922,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "909d5d01.2efc9"
+                "8f2a1d48.4d5c1"
             ]
         ]
     },
     {
-        "id": "909d5d01.2efc9",
+        "id": "8f2a1d48.4d5c1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 767.238037109375,
-        "y": 280.66668701171875,
-        "z": "cd8c161.e76ffe8",
+        "x": 798.8047027587891,
+        "y": 315.2333526611328,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c5df95a2.6c697",
-                "a851f151.681188",
-                "4430b278.87d9ac"
+                "aba9a33d.b56118",
+                "b34cfae3.a993d8",
+                "195092e3.943c55"
             ]
         ]
     },
     {
-        "id": "c5df95a2.6c697",
+        "id": "aba9a33d.b56118",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 1068.571533203125,
-        "y": 551.5969848632812,
-        "z": "cd8c161.e76ffe8",
+        "x": 1100.138198852539,
+        "y": 586.1636505126953,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "a851f151.681188",
+        "id": "b34cfae3.a993d8",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",
         "comments": "",
         "outputs": 1,
-        "x": 1090,
-        "y": 254,
-        "z": "cd8c161.e76ffe8",
+        "x": 1121.566665649414,
+        "y": 288.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "bee2d1fb.fc819",
-                "706fc8bb.926d88",
-                "b5dbfca1.6b8958"
+                "689fbe64.b269",
+                "60b4e331.4ab1b4",
+                "69c448c.334a3b8"
             ]
         ]
     },
     {
-        "id": "bee2d1fb.fc819",
+        "id": "689fbe64.b269",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1315,
-        "y": 112,
-        "z": "cd8c161.e76ffe8",
+        "x": 1346.566665649414,
+        "y": 146.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e14cb882.1a5158"
+                "fead0819.21d2e8"
             ]
         ]
     },
     {
-        "id": "706fc8bb.926d88",
+        "id": "60b4e331.4ab1b4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1310.490966796875,
-        "y": 181.57403564453125,
-        "z": "cd8c161.e76ffe8",
+        "x": 1342.057632446289,
+        "y": 216.1407012939453,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "5cbb540f.81c364"
+                "ad666133.38332"
             ]
         ]
     },
     {
-        "id": "b5dbfca1.6b8958",
+        "id": "69c448c.334a3b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1299,
-        "y": 228,
-        "z": "cd8c161.e76ffe8",
+        "x": 1330.566665649414,
+        "y": 262.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "bd99daf8.5c5508"
+                "be5632ce.888008"
             ]
         ]
     },
     {
-        "id": "e14cb882.1a5158",
+        "id": "fead0819.21d2e8",
         "type": "switchNode",
         "name": "switch allotted-resources_length != 0",
         "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1554,
-        "y": 109,
-        "z": "cd8c161.e76ffe8",
+        "x": 1585.566665649414,
+        "y": 143.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "6386b942.401658",
-                "736cbc7f.84dcc4"
+                "79e1f5a9.abc0fc",
+                "628b0c00.38066c"
             ]
         ]
     },
     {
-        "id": "5cbb540f.81c364",
+        "id": "ad666133.38332",
         "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": 1464.0623779296875,
-        "y": 184.85977172851562,
-        "z": "cd8c161.e76ffe8",
+        "x": 1495.6290435791016,
+        "y": 219.4264373779297,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "bd99daf8.5c5508",
+        "id": "be5632ce.888008",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1468,
-        "y": 229,
-        "z": "cd8c161.e76ffe8",
+        "x": 1499.566665649414,
+        "y": 263.56666564941406,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "6386b942.401658",
+        "id": "79e1f5a9.abc0fc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1767,
-        "y": 133,
-        "z": "cd8c161.e76ffe8",
+        "x": 1798.566665649414,
+        "y": 167.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "bdbad755.d12dc8"
+                "affa73a3.ee8208"
             ]
         ]
     },
     {
-        "id": "736cbc7f.84dcc4",
+        "id": "628b0c00.38066c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1769,
-        "y": 73,
-        "z": "cd8c161.e76ffe8",
+        "x": 1800.566665649414,
+        "y": 107.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "73516434.8b694c",
+        "id": "13f096c3.155339",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 1069,
-        "y": 142,
-        "z": "cd8c161.e76ffe8",
+        "x": 1100.566665649414,
+        "y": 176.56666564941406,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "bdbad755.d12dc8",
+        "id": "affa73a3.ee8208",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1752,
-        "y": 221,
-        "z": "cd8c161.e76ffe8",
+        "x": 1783.566665649414,
+        "y": 255.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "3b75dc28.79bec4",
-                "5d2f9da2.d38694",
-                "48979781.1681f8",
-                "93c183ce.0a9ed8",
-                "5d8a5506.b8ac8c",
-                "a26db7da.175a4"
+                "48ff46b8.d3629",
+                "782b021e.0fd0fc",
+                "bb7c148d.8dd4d8",
+                "6e431d76.be632c",
+                "29e9cbd2.ce75c4",
+                "d12bfd13.8bf75"
             ]
         ]
     },
     {
-        "id": "31cf85b5.906fca",
+        "id": "bc7152e2.d9d418",
         "type": "set",
         "name": "set network-route-A",
         "xml": "<set>\n<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-name`\" />\n<!--<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-id`\" />-->\n\n\n",
         "comments": "",
-        "x": 2615,
-        "y": 821,
-        "z": "cd8c161.e76ffe8",
+        "x": 2646.566665649414,
+        "y": 855.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "db907b5a.2ae538",
+        "id": "c38cb4ff.6bd5e",
         "type": "set",
         "name": "set network-route-B",
         "xml": "<set>\n<parameter name='network-route-B' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
         "comments": "",
-        "x": 2616,
-        "y": 876,
-        "z": "cd8c161.e76ffe8",
+        "x": 2647.566665649414,
+        "y": 910.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "fea2a65.c94cf58",
+        "id": "91e3d9ca.33dbb",
         "type": "save",
         "name": "get allotted-resource from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2238,
-        "y": 272,
-        "z": "cd8c161.e76ffe8",
+        "x": 2269.566665649414,
+        "y": 306.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "87df4589.584858",
-                "635af784.3cb32",
-                "22a4a39b.dd73ec"
+                "5160a5be.66b9fc",
+                "bc755c97.0130a8",
+                "8c53c9d8.1845d8"
             ]
         ]
     },
     {
-        "id": "87df4589.584858",
+        "id": "5160a5be.66b9fc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2454,
-        "y": 339,
-        "z": "cd8c161.e76ffe8",
+        "x": 2485.566665649414,
+        "y": 373.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "8e0be879.699538"
+                "d72f2b29.b29698"
             ]
         ]
     },
     {
-        "id": "635af784.3cb32",
+        "id": "bc755c97.0130a8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2454.490966796875,
-        "y": 238.573974609375,
-        "z": "cd8c161.e76ffe8",
+        "x": 2486.057632446289,
+        "y": 273.14064025878906,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "84ac682e.b78a08"
+                "9c5f6654.ebe11"
             ]
         ]
     },
     {
-        "id": "22a4a39b.dd73ec",
+        "id": "8c53c9d8.1845d8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2450,
-        "y": 288,
-        "z": "cd8c161.e76ffe8",
+        "x": 2481.566665649414,
+        "y": 322.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "b2061dbc.0548c8"
+                "3ae07ef4.fec912"
             ]
         ]
     },
     {
-        "id": "84ac682e.b78a08",
+        "id": "9c5f6654.ebe11",
         "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": 2632.0625,
-        "y": 238.8597412109375,
-        "z": "cd8c161.e76ffe8",
+        "x": 2663.629165649414,
+        "y": 273.42640686035156,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "b2061dbc.0548c8",
+        "id": "3ae07ef4.fec912",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2632,
-        "y": 288,
-        "z": "cd8c161.e76ffe8",
+        "x": 2663.566665649414,
+        "y": 322.56666564941406,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "358e179e.99b9f",
+        "id": "cb7d8033.d10ca8",
         "type": "save",
         "name": "get logical-link from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
         "comments": "",
         "outputs": 1,
-        "x": 1973,
-        "y": 761,
-        "z": "cd8c161.e76ffe8",
+        "x": 2004.566665649414,
+        "y": 795.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e260aa07.d4c01",
-                "9ec9d813.5ed0f",
-                "46b462c7.130bb4"
+                "2b85dd7e.f02352",
+                "1b3631c4.5fdf36",
+                "233346f1.01fed2"
             ]
         ]
     },
     {
-        "id": "e260aa07.d4c01",
+        "id": "2b85dd7e.f02352",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2264.490966796875,
-        "y": 739.573974609375,
-        "z": "cd8c161.e76ffe8",
+        "x": 2296.057632446289,
+        "y": 774.1406402587891,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c2b6bbd8.3d5eb8"
+                "2de91143.9e84c6"
             ]
         ]
     },
     {
-        "id": "9ec9d813.5ed0f",
+        "id": "1b3631c4.5fdf36",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2253,
-        "y": 784,
-        "z": "cd8c161.e76ffe8",
+        "x": 2284.566665649414,
+        "y": 818.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "1e57c51f.2af7db"
+                "f3744c4d.35627"
             ]
         ]
     },
     {
-        "id": "c2b6bbd8.3d5eb8",
+        "id": "2de91143.9e84c6",
         "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": 2413.0625,
-        "y": 739.8597412109375,
-        "z": "cd8c161.e76ffe8",
+        "x": 2444.629165649414,
+        "y": 774.4264068603516,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "1e57c51f.2af7db",
+        "id": "f3744c4d.35627",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2412,
-        "y": 784,
-        "z": "cd8c161.e76ffe8",
+        "x": 2443.566665649414,
+        "y": 818.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "46b462c7.130bb4",
+        "id": "233346f1.01fed2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2260,
-        "y": 863,
-        "z": "cd8c161.e76ffe8",
+        "x": 2291.566665649414,
+        "y": 897.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "9b6c334b.ffcfb8"
+                "14e4e24b.240d3e"
             ]
         ]
     },
     {
-        "id": "9b6c334b.ffcfb8",
+        "id": "14e4e24b.240d3e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2399,
-        "y": 863,
-        "z": "cd8c161.e76ffe8",
+        "x": 2430.566665649414,
+        "y": 897.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "31cf85b5.906fca",
-                "db907b5a.2ae538",
-                "b99c062f.cc8e2",
-                "f8919e28.817698",
-                "63c0978f.6d4218",
-                "256b3f1a.6b05f8",
-                "72dba682.c63c9",
-                "1b6d1c66.bc0bb4",
-                "d6aa9ec.33fa46",
-                "6c32ab13.072304",
-                "35f98555.2ceed2",
-                "63cf541.20dacac",
-                "eb9a9d75.279478"
+                "bc7152e2.d9d418",
+                "c38cb4ff.6bd5e",
+                "6b90e6dc.1a4938",
+                "f826c02e.b2d98",
+                "d4510409.d18f8",
+                "f73397ef.aaf4c",
+                "f8f7fd3.b9ae18",
+                "eb24a93a.96e538",
+                "5ea4cfd5.51261",
+                "e11f1e73.f567a8",
+                "9c7b5506.97a75",
+                "3add3536.bf190a",
+                "33633691.1ec92a"
             ]
         ]
     },
     {
-        "id": "b99c062f.cc8e2",
+        "id": "6b90e6dc.1a4938",
         "type": "save",
         "name": "get network-route-A from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-A'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-A\">",
         "comments": "",
         "outputs": 1,
-        "x": 2628,
-        "y": 944,
-        "z": "cd8c161.e76ffe8",
+        "x": 2659.566665649414,
+        "y": 978.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "177d33ef.653acc",
-                "b808d106.b2a7e8",
-                "99bf3e88.29ecb8"
+                "1d7d57d5.4b528",
+                "d18df8cc.ecc03",
+                "cbd2b797.9f07e8"
             ]
         ]
     },
     {
-        "id": "f8919e28.817698",
+        "id": "f826c02e.b2d98",
         "type": "save",
         "name": "get network-route-B from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-B'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-B\">",
         "comments": "",
         "outputs": 1,
-        "x": 2607,
-        "y": 1545.9998779296875,
-        "z": "cd8c161.e76ffe8",
+        "x": 2638.566665649414,
+        "y": 1580.5665435791016,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e551771e.c49a78",
-                "c096bcbd.1a977",
-                "cd719142.8f5fd8"
+                "6cc847e1.0c4c8",
+                "9bc40e0b.3e66b8",
+                "4130e8fa.6dc708"
             ]
         ]
     },
     {
-        "id": "177d33ef.653acc",
+        "id": "1d7d57d5.4b528",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2829,
-        "y": 828,
-        "z": "cd8c161.e76ffe8",
+        "x": 2860.566665649414,
+        "y": 862.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "60c8d868.cb0f38"
+                "9adb7053.6193c"
             ]
         ]
     },
     {
-        "id": "b808d106.b2a7e8",
+        "id": "d18df8cc.ecc03",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2824.509033203125,
-        "y": 877.426025390625,
-        "z": "cd8c161.e76ffe8",
+        "x": 2856.075698852539,
+        "y": 911.9926910400391,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "8912eaa6.91a52"
+                "bc31bdd5.70d25"
             ]
         ]
     },
     {
-        "id": "99bf3e88.29ecb8",
+        "id": "cbd2b797.9f07e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2828.509033203125,
-        "y": 928.426025390625,
-        "z": "cd8c161.e76ffe8",
+        "x": 2860.075698852539,
+        "y": 962.9926910400391,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "f8cee9a2.f0a618"
+                "fa5d0125.b00d78"
             ]
         ]
     },
     {
-        "id": "60c8d868.cb0f38",
+        "id": "9adb7053.6193c",
         "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": 2977.571533203125,
-        "y": 827.2857666015625,
-        "z": "cd8c161.e76ffe8",
+        "x": 3009.138198852539,
+        "y": 861.8524322509766,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "8912eaa6.91a52",
+        "id": "bc31bdd5.70d25",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2967.509033203125,
-        "y": 877.426025390625,
-        "z": "cd8c161.e76ffe8",
+        "x": 2999.075698852539,
+        "y": 911.9926910400391,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "e551771e.c49a78",
+        "id": "6cc847e1.0c4c8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2830,
-        "y": 1515.9998779296875,
-        "z": "cd8c161.e76ffe8",
+        "x": 2861.566665649414,
+        "y": 1550.5665435791016,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "ae022a7b.5f0fc"
+                "9ebfd12f.98fe08"
             ]
         ]
     },
     {
-        "id": "c096bcbd.1a977",
+        "id": "9bc40e0b.3e66b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2825.509033203125,
-        "y": 1565.4259033203125,
-        "z": "cd8c161.e76ffe8",
+        "x": 2857.075698852539,
+        "y": 1599.9925689697266,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "2c76b27.1b72ace"
+                "e2a53907.ab9ce8"
             ]
         ]
     },
     {
-        "id": "cd719142.8f5fd8",
+        "id": "4130e8fa.6dc708",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2829.509033203125,
-        "y": 1616.4259033203125,
-        "z": "cd8c161.e76ffe8",
+        "x": 2861.075698852539,
+        "y": 1650.9925689697266,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e3f74bb4.409b5"
+                "dd04bd6b.572858"
             ]
         ]
     },
     {
-        "id": "ae022a7b.5f0fc",
+        "id": "9ebfd12f.98fe08",
         "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": 2978.571533203125,
-        "y": 1515.28564453125,
-        "z": "cd8c161.e76ffe8",
+        "x": 3010.138198852539,
+        "y": 1549.852310180664,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "2c76b27.1b72ace",
+        "id": "e2a53907.ab9ce8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2968.509033203125,
-        "y": 1565.4259033203125,
-        "z": "cd8c161.e76ffe8",
+        "x": 3000.075698852539,
+        "y": 1599.9925689697266,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "194cc348.04e4bd",
+        "id": "eabcf699.92546",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3642.66650390625,
-        "y": 972,
-        "z": "cd8c161.e76ffe8",
+        "x": 3674.233169555664,
+        "y": 1006.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e0f54a30.b97458",
-                "6e8fe0e8.771d7",
-                "2d7aee5e.4b3492",
-                "d2697672.e5142",
-                "c6965465.aeb14"
+                "ff0400bb.e98958",
+                "2638e2e.143761e",
+                "1c74c2ea.33d395",
+                "3078ca2b.4c72c6",
+                "81305781.090ed8"
             ]
         ]
     },
     {
-        "id": "c1db8d6e.967fa8",
+        "id": "89cd3be0.fed2e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3470,
-        "y": 973,
-        "z": "cd8c161.e76ffe8",
+        "x": 3501.566665649414,
+        "y": 1007.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "194cc348.04e4bd"
+                "eabcf699.92546"
             ]
         ]
     },
     {
-        "id": "ea169f9.1e78f6",
+        "id": "6ce22fa5.148738",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3479.490966796875,
-        "y": 1015.5740356445312,
-        "z": "cd8c161.e76ffe8",
+        "x": 3511.057632446289,
+        "y": 1050.1407012939453,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "9dbcf7c3.d03228"
+                "6f858024.73295"
             ]
         ]
     },
     {
-        "id": "b37256ee.6a59a",
+        "id": "316c237c.fde964",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3468,
-        "y": 1062,
-        "z": "cd8c161.e76ffe8",
+        "x": 3499.566665649414,
+        "y": 1096.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "78909f5b.c256b8"
+                "7e23353f.01fac4"
             ]
         ]
     },
     {
-        "id": "9dbcf7c3.d03228",
+        "id": "6f858024.73295",
         "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": 3633.0623779296875,
-        "y": 1018.8597717285156,
-        "z": "cd8c161.e76ffe8",
+        "x": 3664.6290435791016,
+        "y": 1053.4264373779297,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "78909f5b.c256b8",
+        "id": "7e23353f.01fac4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3637,
-        "y": 1063,
-        "z": "cd8c161.e76ffe8",
+        "x": 3668.566665649414,
+        "y": 1097.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "f8cee9a2.f0a618",
+        "id": "fa5d0125.b00d78",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2990,
-        "y": 930,
-        "z": "cd8c161.e76ffe8",
+        "x": 3021.566665649414,
+        "y": 964.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "bd63f21f.6d97a",
-                "bcdc8dc3.72d61"
+                "670222f1.9217fc",
+                "82e83a40.d9e3c"
             ]
         ]
     },
     {
-        "id": "e3f74bb4.409b5",
+        "id": "dd04bd6b.572858",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2980,
-        "y": 1617.9998779296875,
-        "z": "cd8c161.e76ffe8",
+        "x": 3011.566665649414,
+        "y": 1652.5665435791016,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "d9529ce2.4ca64",
-                "68b3ff1a.0849f"
+                "b42a18a6.f5c9c",
+                "ccfa8314.375c3"
             ]
         ]
     },
     {
-        "id": "1bc4a1b0.e8f4e6",
+        "id": "9231955e.3e12f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3610.66650390625,
-        "y": 1808,
-        "z": "cd8c161.e76ffe8",
+        "x": 3642.233169555664,
+        "y": 1842.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "6b02eeb7.bc53e8",
-                "aa3dffa0.a80a58",
-                "ce63ac06.8bd44",
-                "c950727d.3e1368",
-                "83539382.7676b8"
+                "834482bc.da8c9",
+                "713b2333.204aec",
+                "359ab66.2c0144a",
+                "2cc88657.e87afa",
+                "5952bd35.50a834"
             ]
         ]
     },
     {
-        "id": "206889a2.ad62d6",
+        "id": "e0e6a71d.ebb61",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3438,
-        "y": 1809,
-        "z": "cd8c161.e76ffe8",
+        "x": 3469.566665649414,
+        "y": 1843.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "1bc4a1b0.e8f4e6"
+                "9231955e.3e12f8"
             ]
         ]
     },
     {
-        "id": "eceddf53.8343c8",
+        "id": "20818b75.1274cc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3447.490966796875,
-        "y": 1851.5740356445312,
-        "z": "cd8c161.e76ffe8",
+        "x": 3479.057632446289,
+        "y": 1886.1407012939453,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "89316d2b.d76a7"
+                "729c480a.b2455"
             ]
         ]
     },
     {
-        "id": "9f6e2dae.f13bd8",
+        "id": "ef5e9023.0ffb1",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3436,
-        "y": 1898,
-        "z": "cd8c161.e76ffe8",
+        "x": 3467.566665649414,
+        "y": 1932.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "ff7b6926.fc1f5"
+                "76e8a026.d94a18"
             ]
         ]
     },
     {
-        "id": "89316d2b.d76a7",
+        "id": "729c480a.b2455",
         "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": 3601.0623779296875,
-        "y": 1854.8597717285156,
-        "z": "cd8c161.e76ffe8",
+        "x": 3632.6290435791016,
+        "y": 1889.4264373779297,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "ff7b6926.fc1f5",
+        "id": "76e8a026.d94a18",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3605,
-        "y": 1899,
-        "z": "cd8c161.e76ffe8",
+        "x": 3636.566665649414,
+        "y": 1933.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "e0f54a30.b97458",
+        "id": "ff0400bb.e98958",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3907,
-        "y": 956,
-        "z": "cd8c161.e76ffe8",
+        "x": 3938.566665649414,
+        "y": 990.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "8a48ffc4.99708",
-                "9768c48e.e91b5"
+                "1b7a2eba.962ee9",
+                "7716f28b.4501a4"
             ]
         ]
     },
     {
-        "id": "9768c48e.e91b5",
+        "id": "7716f28b.4501a4",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4130,
-        "y": 911,
-        "z": "cd8c161.e76ffe8",
+        "x": 4161.566665649414,
+        "y": 945.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "704965d2.1b9644"
+                "22cc4911.ba723e"
             ]
         ]
     },
     {
-        "id": "8a48ffc4.99708",
+        "id": "1b7a2eba.962ee9",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4132,
-        "y": 975,
-        "z": "cd8c161.e76ffe8",
+        "x": 4163.566665649414,
+        "y": 1009.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "5140e6b9.7a9158"
+                "b1d0addd.f89fe8"
             ]
         ]
     },
     {
-        "id": "b8a9d793.4e0ca",
+        "id": "690a2492.cfb0bc",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
         "comments": "",
-        "x": 4465,
-        "y": 866,
-        "z": "cd8c161.e76ffe8",
+        "x": 4496.566665649414,
+        "y": 900.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "5140e6b9.7a9158",
+        "id": "b1d0addd.f89fe8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 4294,
-        "y": 971,
-        "z": "cd8c161.e76ffe8",
+        "x": 4325.566665649414,
+        "y": 1005.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "704965d2.1b9644",
+        "id": "22cc4911.ba723e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4295,
-        "y": 908,
-        "z": "cd8c161.e76ffe8",
+        "x": 4326.566665649414,
+        "y": 942.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c30e1911.559b98",
-                "b8a9d793.4e0ca"
+                "86327d08.aa9fb8",
+                "690a2492.cfb0bc"
             ]
         ]
     },
     {
-        "id": "c30e1911.559b98",
+        "id": "86327d08.aa9fb8",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",
         "comments": "",
-        "x": 4466,
-        "y": 974,
-        "z": "cd8c161.e76ffe8",
+        "x": 4497.566665649414,
+        "y": 1008.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "6b71df66.ebc0e",
+        "id": "cde2aa0c.c7d71",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 4467,
-        "y": 923,
-        "z": "cd8c161.e76ffe8",
+        "x": 4498.566665649414,
+        "y": 957.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "2d7aee5e.4b3492",
+        "id": "1c74c2ea.33d395",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3909,
-        "y": 1115,
-        "z": "cd8c161.e76ffe8",
+        "x": 3940.566665649414,
+        "y": 1149.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "6e8fe0e8.771d7",
+        "id": "2638e2e.143761e",
         "type": "execute",
         "name": "execute UUID generator for connectivity domainA",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3954,
-        "y": 1025,
-        "z": "cd8c161.e76ffe8",
+        "x": 3985.566665649414,
+        "y": 1059.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "703a6ba5.55da1c",
+        "id": "5d159096.a0e35",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",
         "comments": "",
-        "x": 3843,
-        "y": 1066,
-        "z": "cd8c161.e76ffe8",
+        "x": 3874.566665649414,
+        "y": 1100.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "6b02eeb7.bc53e8",
+        "id": "834482bc.da8c9",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3897,
-        "y": 1812.0001220703125,
-        "z": "cd8c161.e76ffe8",
+        "x": 3928.566665649414,
+        "y": 1846.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "866b6a8.23d5e98",
-                "cb5f1ada.6b67f"
+                "78906c54.263be4",
+                "da17cabc.510218"
             ]
         ]
     },
     {
-        "id": "cb5f1ada.6b67f",
+        "id": "da17cabc.510218",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4120,
-        "y": 1767.0001220703125,
-        "z": "cd8c161.e76ffe8",
+        "x": 4151.566665649414,
+        "y": 1801.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e1a14a86.388a08"
+                "4c8e2849.b6ab18"
             ]
         ]
     },
     {
-        "id": "866b6a8.23d5e98",
+        "id": "78906c54.263be4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4122,
-        "y": 1831.0001220703125,
-        "z": "cd8c161.e76ffe8",
+        "x": 4153.566665649414,
+        "y": 1865.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e3367ed2.f52b78"
+                "dfe47f7c.d37a1"
             ]
         ]
     },
     {
-        "id": "c05c0482.6a0aa8",
+        "id": "7e4bfbaf.bbef8c",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
         "comments": "",
-        "x": 4455,
-        "y": 1725.0001220703125,
-        "z": "cd8c161.e76ffe8",
+        "x": 4486.566665649414,
+        "y": 1759.5667877197266,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "e3367ed2.f52b78",
+        "id": "dfe47f7c.d37a1",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 4281,
-        "y": 1850.0001220703125,
-        "z": "cd8c161.e76ffe8",
+        "x": 4312.566665649414,
+        "y": 1884.5667877197266,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "e1a14a86.388a08",
+        "id": "4c8e2849.b6ab18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4285,
-        "y": 1764.0001220703125,
-        "z": "cd8c161.e76ffe8",
+        "x": 4316.566665649414,
+        "y": 1798.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c05c0482.6a0aa8",
-                "6625860d.59cf58"
+                "7e4bfbaf.bbef8c",
+                "26579dba.f3fbba"
             ]
         ]
     },
     {
-        "id": "6625860d.59cf58",
+        "id": "26579dba.f3fbba",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
         "comments": "",
-        "x": 4456,
-        "y": 1830.0001220703125,
-        "z": "cd8c161.e76ffe8",
+        "x": 4487.566665649414,
+        "y": 1864.5667877197266,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "3d78f64a.35443a",
+        "id": "8836114.dcb937",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 4451,
-        "y": 1779.0001220703125,
-        "z": "cd8c161.e76ffe8",
+        "x": 4482.566665649414,
+        "y": 1813.5667877197266,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "ce63ac06.8bd44",
+        "id": "359ab66.2c0144a",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3899,
-        "y": 1971.0001220703125,
-        "z": "cd8c161.e76ffe8",
+        "x": 3930.566665649414,
+        "y": 2005.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "aa3dffa0.a80a58",
+        "id": "713b2333.204aec",
         "type": "execute",
         "name": "execute UUID generator for connectivity domainB",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3944,
-        "y": 1881.0001220703125,
-        "z": "cd8c161.e76ffe8",
+        "x": 3975.566665649414,
+        "y": 1915.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "de57e045.5d324",
+        "id": "9f1fac8a.3f574",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",
         "comments": "",
-        "x": 3833,
-        "y": 1919.0001220703125,
-        "z": "cd8c161.e76ffe8",
+        "x": 3864.566665649414,
+        "y": 1953.5667877197266,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "63c0978f.6d4218",
+        "id": "d4510409.d18f8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2829,
-        "y": 2315,
-        "z": "cd8c161.e76ffe8",
+        "x": 2860.566665649414,
+        "y": 2349.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "256b3f1a.6b05f8",
+        "id": "f73397ef.aaf4c",
         "type": "set",
         "name": "set attachment_param",
         "xml": "<set>\n<parameter name='prop.connection-attachment.access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='prop.connection-attachment.access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='prop.connection-attachment.access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='prop.connection-attachment.access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='prop.connection-attachment.access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n\n<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='prop.remote.connection-attachment.access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='prop.remote.connection-attachment.access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n\n<!--<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />-->\n",
         "comments": "",
-        "x": 2627,
-        "y": 2194,
-        "z": "cd8c161.e76ffe8",
+        "x": 2658.566665649414,
+        "y": 2228.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "8870d8f4.24b26",
+        "id": "200f044c.0142e4",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "put proper values for src topology-id, node-id, ltp-id, etc (in domain A)\nand dst topology-id, node-id, ltp-id, etc (in domain B)",
         "comments": "",
-        "x": 2593,
-        "y": 2128,
-        "z": "cd8c161.e76ffe8",
+        "x": 2624.566665649414,
+        "y": 2162.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "d2697672.e5142",
+        "id": "3078ca2b.4c72c6",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 4037,
-        "y": 1163,
-        "z": "cd8c161.e76ffe8",
+        "x": 4068.566665649414,
+        "y": 1197.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "c950727d.3e1368",
+        "id": "2cc88657.e87afa",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 4026,
-        "y": 2036.0001220703125,
-        "z": "cd8c161.e76ffe8",
+        "x": 4057.566665649414,
+        "y": 2070.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "2cb22463.a9a10c",
+        "id": "117cb756.a2a2d9",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5081,
-        "y": 683,
-        "z": "cd8c161.e76ffe8",
+        "x": 5112.566665649414,
+        "y": 717.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "4afa0297.0e92ec",
-                "f0a2c2cf.76f7c",
-                "78f72703.090dd8"
+                "3866efd7.2177",
+                "72d35790.07a0a8",
+                "261ed4c9.21b32c"
             ]
         ]
     },
     {
-        "id": "8e0be879.699538",
+        "id": "d72f2b29.b29698",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2634,
-        "y": 339,
-        "z": "cd8c161.e76ffe8",
+        "x": 2665.566665649414,
+        "y": 373.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c6b29f32.96c43"
+                "a21b0826.040f68"
             ]
         ]
     },
     {
-        "id": "926dbaa7.515a7",
+        "id": "ba7cd715.7b1848",
         "type": "outcome",
         "name": "logical-link",
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1564.0001220703125,
-        "y": 756.0001220703125,
-        "z": "cd8c161.e76ffe8",
+        "x": 1595.5667877197266,
+        "y": 790.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "aa0dd611.39e8d8"
+                "5a4e861b.fe333"
             ]
         ]
     },
     {
-        "id": "3fd9bf5c.04e708",
+        "id": "7935e728.7a6cd8",
         "type": "switchNode",
         "name": "switch allotted-resource.relationship-list not empty",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2302,
-        "y": 462,
-        "z": "cd8c161.e76ffe8",
+        "x": 2333.566665649414,
+        "y": 496.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "2b043a11.143596",
-                "d91f0f1e.b29778"
+                "c03e1705.5e117",
+                "443647ac.996ce8"
             ]
         ]
     },
     {
-        "id": "d91f0f1e.b29778",
+        "id": "443647ac.996ce8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2612,
-        "y": 469,
-        "z": "cd8c161.e76ffe8",
+        "x": 2643.566665649414,
+        "y": 503.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "2b043a11.143596",
+        "id": "c03e1705.5e117",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2611,
-        "y": 523,
-        "z": "cd8c161.e76ffe8",
+        "x": 2642.566665649414,
+        "y": 557.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "53404fc0.a38be"
+                "f30f322a.ce56f8"
             ]
         ]
     },
     {
-        "id": "dd4dd108.7ed66",
+        "id": "a7413863.fffc18",
         "type": "set",
         "name": "set the current logical-link-name",
         "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
-        "x": 1984,
-        "y": 706,
-        "z": "cd8c161.e76ffe8",
+        "x": 2015.566665649414,
+        "y": 740.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "aa0dd611.39e8d8",
+        "id": "5a4e861b.fe333",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1741,
-        "y": 749,
-        "z": "cd8c161.e76ffe8",
+        "x": 1772.566665649414,
+        "y": 783.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "dd4dd108.7ed66",
-                "358e179e.99b9f"
+                "a7413863.fffc18",
+                "cb7d8033.d10ca8"
             ]
         ]
     },
     {
-        "id": "50481ed8.b97c38",
+        "id": "ef7f5983.624538",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3170,
-        "y": 935,
-        "z": "cd8c161.e76ffe8",
+        "x": 3201.566665649414,
+        "y": 969.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "bd63f21f.6d97a",
+        "id": "670222f1.9217fc",
         "type": "save",
         "name": "get p-interface-src from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<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 = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3213,
-        "y": 1000,
-        "z": "cd8c161.e76ffe8",
+        "x": 3244.566665649414,
+        "y": 1034.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c1db8d6e.967fa8",
-                "ea169f9.1e78f6",
-                "b37256ee.6a59a"
+                "89cd3be0.fed2e8",
+                "6ce22fa5.148738",
+                "316c237c.fde964"
             ]
         ]
     },
     {
-        "id": "d9529ce2.4ca64",
+        "id": "b42a18a6.f5c9c",
         "type": "save",
         "name": "get p-interface-dst from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<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 = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3210,
-        "y": 1844,
-        "z": "cd8c161.e76ffe8",
+        "x": 3241.566665649414,
+        "y": 1878.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "206889a2.ad62d6",
-                "eceddf53.8343c8",
-                "9f6e2dae.f13bd8"
+                "e0e6a71d.ebb61",
+                "20818b75.1274cc",
+                "ef5e9023.0ffb1"
             ]
         ]
     },
     {
-        "id": "2cacaea3.bdcdca",
+        "id": "c8a39fd5.26e7b",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3171,
-        "y": 1788,
-        "z": "cd8c161.e76ffe8",
+        "x": 3202.566665649414,
+        "y": 1822.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "c6b29f32.96c43",
+        "id": "a21b0826.040f68",
         "type": "save",
         "name": "get allotted-resource relationship from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2927,
-        "y": 286,
-        "z": "cd8c161.e76ffe8",
+        "x": 2958.566665649414,
+        "y": 320.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "9de6915b.b19d38",
-                "e8ebc1b6.d4d34",
-                "e6a28fa6.880708"
+                "4aea984e.525588",
+                "b162701f.2122e",
+                "62d5ee30.6cb7d8"
             ]
         ]
     },
     {
-        "id": "e8ebc1b6.d4d34",
+        "id": "b162701f.2122e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3200.490966796875,
-        "y": 178.573974609375,
-        "z": "cd8c161.e76ffe8",
+        "x": 3232.057632446289,
+        "y": 213.14064025878906,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "b49d6ada.3dcaf8"
+                "1f5782e1.732415"
             ]
         ]
     },
     {
-        "id": "b49d6ada.3dcaf8",
+        "id": "1f5782e1.732415",
         "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": 3378.0625,
-        "y": 178.8597412109375,
-        "z": "cd8c161.e76ffe8",
+        "x": 3409.629165649414,
+        "y": 213.42640686035156,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "e6a28fa6.880708",
+        "id": "62d5ee30.6cb7d8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3196,
-        "y": 228,
-        "z": "cd8c161.e76ffe8",
+        "x": 3227.566665649414,
+        "y": 262.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "d8c17b5e.5b6d48"
+                "95458c8d.84809"
             ]
         ]
     },
     {
-        "id": "d8c17b5e.5b6d48",
+        "id": "95458c8d.84809",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3378,
-        "y": 228,
-        "z": "cd8c161.e76ffe8",
+        "x": 3409.566665649414,
+        "y": 262.56666564941406,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "9de6915b.b19d38",
+        "id": "4aea984e.525588",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3200,
-        "y": 279,
-        "z": "cd8c161.e76ffe8",
+        "x": 3231.566665649414,
+        "y": 313.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "54518182.0b0878"
+                "f1c741f5.f9107"
             ]
         ]
     },
     {
-        "id": "54518182.0b0878",
+        "id": "f1c741f5.f9107",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3380,
-        "y": 279,
-        "z": "cd8c161.e76ffe8",
+        "x": 3411.566665649414,
+        "y": 313.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "3fd9bf5c.04e708"
+                "7935e728.7a6cd8"
             ]
         ]
     },
     {
-        "id": "62e6aba8.2c101c",
+        "id": "c6653aca.b9464",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2871,
-        "y": 503,
-        "z": "cd8c161.e76ffe8",
+        "x": 2902.566665649414,
+        "y": 537.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "ce3eb436.d43a6"
+                "f3ed889.142a978"
             ]
         ]
     },
     {
-        "id": "ce3eb436.d43a6",
+        "id": "f3ed889.142a978",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3151,
-        "y": 503,
-        "z": "cd8c161.e76ffe8",
+        "x": 3182.566665649414,
+        "y": 537.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "926dbaa7.515a7"
+                "ba7cd715.7b1848"
             ]
         ]
     },
     {
-        "id": "7737916f.9448f",
+        "id": "dba40877.5798e",
         "type": "outcome",
         "name": "network-policy",
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3356,
-        "y": 477,
-        "z": "cd8c161.e76ffe8",
+        "x": 3387.566665649414,
+        "y": 511.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "9c3216ab.adc2a8"
+                "196e356.b3ce64b"
             ]
         ]
     },
     {
-        "id": "9c3216ab.adc2a8",
+        "id": "196e356.b3ce64b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3532.9998779296875,
-        "y": 469.9998779296875,
-        "z": "cd8c161.e76ffe8",
+        "x": 3564.5665435791016,
+        "y": 504.56654357910156,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "6ca4307d.28f77",
-                "15dd1089.866707"
+                "e3e6b765.4d9878",
+                "b8269eb.7fee5e"
             ]
         ]
     },
     {
-        "id": "6ca4307d.28f77",
+        "id": "e3e6b765.4d9878",
         "type": "set",
         "name": "set the 1st network-policy-id",
         "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
-        "x": 3775.9998779296875,
-        "y": 426.9998779296875,
-        "z": "cd8c161.e76ffe8",
+        "x": 3807.5665435791016,
+        "y": 461.56654357910156,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "15dd1089.866707",
+        "id": "b8269eb.7fee5e",
         "type": "save",
         "name": "get network-policy from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",
         "comments": "",
         "outputs": 1,
-        "x": 3764.9998779296875,
-        "y": 481.9998779296875,
-        "z": "cd8c161.e76ffe8",
+        "x": 3796.5665435791016,
+        "y": 516.5665435791016,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "af36166d.ada238",
-                "d07a4cd5.ac3678",
-                "65922e69.a77b18"
+                "52707298.644854",
+                "73e07a10.53585c",
+                "cc16ab53.2ad86"
             ]
         ]
     },
     {
-        "id": "65922e69.a77b18",
+        "id": "cc16ab53.2ad86",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4018,
-        "y": 368,
-        "z": "cd8c161.e76ffe8",
+        "x": 4049.566665649414,
+        "y": 402.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "1424d407.3a5b34"
+                "a488a64d.fae9f"
             ]
         ]
     },
     {
-        "id": "1424d407.3a5b34",
+        "id": "a488a64d.fae9f",
         "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": 4166.571533203125,
-        "y": 368.2857666015625,
-        "z": "cd8c161.e76ffe8",
+        "x": 4198.138198852539,
+        "y": 402.85243225097656,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "e640c3b9.1f16d",
+        "id": "3e172036.3dfe9",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4165.509033203125,
-        "y": 412.426025390625,
-        "z": "cd8c161.e76ffe8",
+        "x": 4197.075698852539,
+        "y": 446.99269104003906,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "d07a4cd5.ac3678",
+        "id": "73e07a10.53585c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4006.509033203125,
-        "y": 412.426025390625,
-        "z": "cd8c161.e76ffe8",
+        "x": 4038.075698852539,
+        "y": 446.99269104003906,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e640c3b9.1f16d"
+                "3e172036.3dfe9"
             ]
         ]
     },
     {
-        "id": "af36166d.ada238",
+        "id": "52707298.644854",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4013.509033203125,
-        "y": 491.426025390625,
-        "z": "cd8c161.e76ffe8",
+        "x": 4045.075698852539,
+        "y": 525.9926910400391,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "3b605de0.ec3a52"
+                "f6f5e0ef.37ff18"
             ]
         ]
     },
     {
-        "id": "3b605de0.ec3a52",
+        "id": "f6f5e0ef.37ff18",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4152.509033203125,
-        "y": 491.426025390625,
-        "z": "cd8c161.e76ffe8",
+        "x": 4184.075698852539,
+        "y": 525.9926910400391,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e719047d.96b1f",
-                "36ea936c.0d2d9c"
+                "f1f16ad9.ab6c1",
+                "43bfbebe.764f5"
             ]
         ]
     },
     {
-        "id": "e719047d.96b1f",
+        "id": "f1f16ad9.ab6c1",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
-        "x": 4358,
-        "y": 489,
-        "z": "cd8c161.e76ffe8",
+        "x": 4389.566665649414,
+        "y": 523.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "bcdc8dc3.72d61",
+        "id": "82e83a40.d9e3c",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3214,
-        "y": 670,
-        "z": "cd8c161.e76ffe8",
+        "x": 3245.566665649414,
+        "y": 704.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "88359d7a.204d2",
-                "184f5811.e1748"
+                "bc26e44c.af9fc",
+                "1d377ef3.0119d9"
             ]
         ]
     },
     {
-        "id": "184f5811.e1748",
+        "id": "1d377ef3.0119d9",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3437,
-        "y": 656,
-        "z": "cd8c161.e76ffe8",
+        "x": 3468.566665649414,
+        "y": 690.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "65b8cca9.2ac444"
+                "2e20e3ac.843a84"
             ]
         ]
     },
     {
-        "id": "88359d7a.204d2",
+        "id": "bc26e44c.af9fc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3439,
-        "y": 689,
-        "z": "cd8c161.e76ffe8",
+        "x": 3470.566665649414,
+        "y": 723.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "776eb0a5.2fd87"
+                "26e72470.d1e50c"
             ]
         ]
     },
     {
-        "id": "776eb0a5.2fd87",
+        "id": "26e72470.d1e50c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 3582,
-        "y": 686,
-        "z": "cd8c161.e76ffe8",
+        "x": 3613.566665649414,
+        "y": 720.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "65b8cca9.2ac444",
+        "id": "2e20e3ac.843a84",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3585,
-        "y": 649,
-        "z": "cd8c161.e76ffe8",
+        "x": 3616.566665649414,
+        "y": 683.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "2397aa3a.45e876",
-                "c5b3bcfd.d10508"
+                "d1ca7e66.d6d25",
+                "8b886e18.72a2f"
             ]
         ]
     },
     {
-        "id": "2397aa3a.45e876",
+        "id": "d1ca7e66.d6d25",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 3747,
-        "y": 644,
-        "z": "cd8c161.e76ffe8",
+        "x": 3778.566665649414,
+        "y": 678.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "68b3ff1a.0849f",
+        "id": "ccfa8314.375c3",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3228,
-        "y": 1506.9998779296875,
-        "z": "cd8c161.e76ffe8",
+        "x": 3259.566665649414,
+        "y": 1541.5665435791016,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "6fc92ae0.49bd04",
-                "59f072e2.0b71ec"
+                "fb9d05a4.702cb",
+                "2e323a70.856296"
             ]
         ]
     },
     {
-        "id": "59f072e2.0b71ec",
+        "id": "2e323a70.856296",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3451,
-        "y": 1492.9998779296875,
-        "z": "cd8c161.e76ffe8",
+        "x": 3482.566665649414,
+        "y": 1527.5665435791016,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "a6cfeb0c.ecbd1"
+                "ac71b291.7c3e"
             ]
         ]
     },
     {
-        "id": "6fc92ae0.49bd04",
+        "id": "fb9d05a4.702cb",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3453,
-        "y": 1525.9998779296875,
-        "z": "cd8c161.e76ffe8",
+        "x": 3484.566665649414,
+        "y": 1560.5665435791016,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "862c14a1.8553d8"
+                "96d94f89.40a6f8"
             ]
         ]
     },
     {
-        "id": "862c14a1.8553d8",
+        "id": "96d94f89.40a6f8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 3596,
-        "y": 1522.9998779296875,
-        "z": "cd8c161.e76ffe8",
+        "x": 3627.566665649414,
+        "y": 1557.5665435791016,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "a6cfeb0c.ecbd1",
+        "id": "ac71b291.7c3e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3599,
-        "y": 1485.9998779296875,
-        "z": "cd8c161.e76ffe8",
+        "x": 3630.566665649414,
+        "y": 1520.5665435791016,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "9265a5e9.075d5",
-                "3387bb2a.b4fa7c"
+                "eab11739.c2283",
+                "dc956cf0.69a068"
             ]
         ]
     },
     {
-        "id": "9265a5e9.075d5",
+        "id": "eab11739.c2283",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 3793,
-        "y": 1489,
-        "z": "cd8c161.e76ffe8",
+        "x": 3824.566665649414,
+        "y": 1523.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "4430b278.87d9ac",
+        "id": "195092e3.943c55",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 1057,
-        "y": 194,
-        "z": "cd8c161.e76ffe8",
+        "x": 1088.566665649414,
+        "y": 228.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "c6965465.aeb14",
+        "id": "81305781.090ed8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3861,
-        "y": 1240,
-        "z": "cd8c161.e76ffe8",
+        "x": 3892.566665649414,
+        "y": 1274.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "d7da00cb.9e6198"
+                "f76721b5.8461d"
             ]
         ]
     },
     {
-        "id": "d7da00cb.9e6198",
+        "id": "f76721b5.8461d",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4067,
-        "y": 1240,
-        "z": "cd8c161.e76ffe8",
+        "x": 4098.566665649414,
+        "y": 1274.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "3e41f9e9.7f65b6"
+                "b969fa1c.797cc8"
             ]
         ]
     },
     {
-        "id": "3e41f9e9.7f65b6",
+        "id": "b969fa1c.797cc8",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4282.28564453125,
-        "y": 1239.82177734375,
-        "z": "cd8c161.e76ffe8",
+        "x": 4313.852310180664,
+        "y": 1274.388442993164,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "8a860c24.fed68"
+                "53dab03f.fc20f"
             ]
         ]
     },
     {
-        "id": "8a860c24.fed68",
+        "id": "53dab03f.fc20f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4489.1171875,
-        "y": 1240.34033203125,
-        "z": "cd8c161.e76ffe8",
+        "x": 4520.683853149414,
+        "y": 1274.906997680664,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "377e7af0.ac592e",
-                "9af75c5e.34aa1",
-                "ad2bdd99.5817d"
+                "c8f50b30.1a1a",
+                "5524147a.4f670c",
+                "e21dfbfb.d70ee"
             ]
         ]
     },
     {
-        "id": "377e7af0.ac592e",
+        "id": "c8f50b30.1a1a",
         "type": "set",
         "name": "set source ttp-id",
         "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4704.1171875,
-        "y": 1202.34033203125,
-        "z": "cd8c161.e76ffe8",
+        "x": 4735.683853149414,
+        "y": 1236.906997680664,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "9af75c5e.34aa1",
+        "id": "5524147a.4f670c",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4701.1171875,
-        "y": 1241.34033203125,
-        "z": "cd8c161.e76ffe8",
+        "x": 4732.683853149414,
+        "y": 1275.906997680664,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "817cb438.99e4a8"
+                "468c57ff.e87bd"
             ]
         ]
     },
     {
-        "id": "ad2bdd99.5817d",
+        "id": "e21dfbfb.d70ee",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4656.6171875,
-        "y": 1283.34033203125,
-        "z": "cd8c161.e76ffe8",
+        "x": 4688.183853149414,
+        "y": 1317.906997680664,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "817cb438.99e4a8",
+        "id": "468c57ff.e87bd",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4881.6171875,
-        "y": 1240.34033203125,
-        "z": "cd8c161.e76ffe8",
+        "x": 4913.183853149414,
+        "y": 1274.906997680664,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "4eac437.160bcbc"
+                "674f9840.48c03"
             ]
         ]
     },
     {
-        "id": "4eac437.160bcbc",
+        "id": "674f9840.48c03",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5039.6171875,
-        "y": 1240.34033203125,
-        "z": "cd8c161.e76ffe8",
+        "x": 5071.183853149414,
+        "y": 1274.906997680664,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "602a09ac.ab98b8"
+                "202acc61.848adc"
             ]
         ]
     },
     {
-        "id": "602a09ac.ab98b8",
+        "id": "202acc61.848adc",
         "type": "set",
         "name": "set source tunnel tp ip",
         "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 5246.6171875,
-        "y": 1240.34033203125,
-        "z": "cd8c161.e76ffe8",
+        "x": 5278.183853149414,
+        "y": 1274.906997680664,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "83539382.7676b8",
+        "id": "5952bd35.50a834",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3858,
-        "y": 2109.0001220703125,
-        "z": "cd8c161.e76ffe8",
+        "x": 3889.566665649414,
+        "y": 2143.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "5579dfc7.be27d"
+                "6a89a776.9e1148"
             ]
         ]
     },
     {
-        "id": "5579dfc7.be27d",
+        "id": "6a89a776.9e1148",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4064,
-        "y": 2109.0001220703125,
-        "z": "cd8c161.e76ffe8",
+        "x": 4095.566665649414,
+        "y": 2143.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "901fbdc2.3ee4d"
+                "c422bc84.9ff58"
             ]
         ]
     },
     {
-        "id": "901fbdc2.3ee4d",
+        "id": "c422bc84.9ff58",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4279.28564453125,
-        "y": 2108.8218994140625,
-        "z": "cd8c161.e76ffe8",
+        "x": 4310.852310180664,
+        "y": 2143.3885650634766,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "2e4b86b2.9caae2"
+                "35ec76d0.e92ad2"
             ]
         ]
     },
     {
-        "id": "2e4b86b2.9caae2",
+        "id": "35ec76d0.e92ad2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4486.1171875,
-        "y": 2109.3404541015625,
-        "z": "cd8c161.e76ffe8",
+        "x": 4517.683853149414,
+        "y": 2143.9071197509766,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "bc60382f.b0361",
-                "b3a5cd52.d83f2",
-                "ee9aa3b3.89ca4"
+                "2da8c0eb.ef8a5",
+                "ed9d3d70.991958",
+                "4afbd03e.c78838"
             ]
         ]
     },
     {
-        "id": "bc60382f.b0361",
+        "id": "2da8c0eb.ef8a5",
         "type": "set",
         "name": "set destination ttp-id",
         "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4701.1171875,
-        "y": 2071.3404541015625,
-        "z": "cd8c161.e76ffe8",
+        "x": 4732.683853149414,
+        "y": 2105.9071197509766,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "b3a5cd52.d83f2",
+        "id": "ed9d3d70.991958",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4698.1171875,
-        "y": 2110.3404541015625,
-        "z": "cd8c161.e76ffe8",
+        "x": 4729.683853149414,
+        "y": 2144.9071197509766,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "93e41626.124d78"
+                "12a67fc9.3eabd"
             ]
         ]
     },
     {
-        "id": "ee9aa3b3.89ca4",
+        "id": "4afbd03e.c78838",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4653.6171875,
-        "y": 2152.3404541015625,
-        "z": "cd8c161.e76ffe8",
+        "x": 4685.183853149414,
+        "y": 2186.9071197509766,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "93e41626.124d78",
+        "id": "12a67fc9.3eabd",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4878.6171875,
-        "y": 2109.3404541015625,
-        "z": "cd8c161.e76ffe8",
+        "x": 4910.183853149414,
+        "y": 2143.9071197509766,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "6ea99290.2aa4d4"
+                "e5260f19.3624e"
             ]
         ]
     },
     {
-        "id": "6ea99290.2aa4d4",
+        "id": "e5260f19.3624e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5036.6171875,
-        "y": 2109.3404541015625,
-        "z": "cd8c161.e76ffe8",
+        "x": 5068.183853149414,
+        "y": 2143.9071197509766,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "a95428e7.14cad"
+                "fea1a0aa.e8456"
             ]
         ]
     },
     {
-        "id": "a95428e7.14cad",
+        "id": "fea1a0aa.e8456",
         "type": "set",
         "name": "set destination tunnel tp ip",
         "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 5243.6171875,
-        "y": 2109.3404541015625,
-        "z": "cd8c161.e76ffe8",
+        "x": 5275.183853149414,
+        "y": 2143.9071197509766,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "c5b3bcfd.d10508",
+        "id": "8b886e18.72a2f",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3774,
-        "y": 716,
-        "z": "cd8c161.e76ffe8",
+        "x": 3805.566665649414,
+        "y": 750.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "8e60f4cf.82fba",
-                "2cad2896.c9df4",
-                "335dceb2.9bab72"
+                "230a01ea.26a66e",
+                "548c580d.50378",
+                "266b6d86.22640a"
             ]
         ]
     },
     {
-        "id": "8e60f4cf.82fba",
+        "id": "230a01ea.26a66e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3969.5001220703125,
-        "y": 668,
-        "z": "cd8c161.e76ffe8",
+        "x": 4001.0667877197266,
+        "y": 702.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "7a06334d.9731e4"
+                "8a1e2c2.231ae5"
             ]
         ]
     },
     {
-        "id": "2cad2896.c9df4",
+        "id": "548c580d.50378",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3961.5001220703125,
-        "y": 723,
-        "z": "cd8c161.e76ffe8",
+        "x": 3993.0667877197266,
+        "y": 757.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "17051d0f.c52e53"
+                "f0a74837.6bf648"
             ]
         ]
     },
     {
-        "id": "335dceb2.9bab72",
+        "id": "266b6d86.22640a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3966.5001220703125,
-        "y": 780,
-        "z": "cd8c161.e76ffe8",
+        "x": 3998.0667877197266,
+        "y": 814.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "328eeb2e.ff715c"
+                "c89ea643.5fb658"
             ]
         ]
     },
     {
-        "id": "328eeb2e.ff715c",
+        "id": "c89ea643.5fb658",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4118.5001220703125,
-        "y": 781,
-        "z": "cd8c161.e76ffe8",
+        "x": 4150.066787719727,
+        "y": 815.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "17051d0f.c52e53",
+        "id": "f0a74837.6bf648",
         "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.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4129.5001220703125,
-        "y": 726,
-        "z": "cd8c161.e76ffe8",
+        "x": 4161.066787719727,
+        "y": 760.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "7a06334d.9731e4",
+        "id": "8a1e2c2.231ae5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4113.8824462890625,
-        "y": 665.6556701660156,
-        "z": "cd8c161.e76ffe8",
+        "x": 4145.449111938477,
+        "y": 700.2223358154297,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "89e57d02.e9996"
+                "5c25cba9.41b2b4"
             ]
         ]
     },
     {
-        "id": "c9d4f321.66364",
+        "id": "f1310713.19e1c",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4696,
-        "y": 684,
-        "z": "cd8c161.e76ffe8",
+        "x": 4727.566665649414,
+        "y": 718.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "f8e16adc.55ac68"
+                "cbcc3226.5de568"
             ]
         ]
     },
     {
-        "id": "f8e16adc.55ac68",
+        "id": "cbcc3226.5de568",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4873,
-        "y": 676,
-        "z": "cd8c161.e76ffe8",
+        "x": 4904.566665649414,
+        "y": 710.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "f8c4bbbd.612dc",
-                "2cb22463.a9a10c"
+                "9672ea99.0655d",
+                "117cb756.a2a2d9"
             ]
         ]
     },
     {
-        "id": "89e57d02.e9996",
+        "id": "5c25cba9.41b2b4",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4298,
-        "y": 680,
-        "z": "cd8c161.e76ffe8",
+        "x": 4329.566665649414,
+        "y": 714.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "ffc907a3.634c3"
+                "c4bf834f.523618"
             ]
         ]
     },
     {
-        "id": "ffc907a3.634c3",
+        "id": "c4bf834f.523618",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4493,
-        "y": 680,
-        "z": "cd8c161.e76ffe8",
+        "x": 4524.566665649414,
+        "y": 714.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c9d4f321.66364",
-                "d8e84e3d.259878"
+                "f1310713.19e1c",
+                "88191017.73b938"
             ]
         ]
     },
     {
-        "id": "f8c4bbbd.612dc",
+        "id": "9672ea99.0655d",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainA id",
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5111,
-        "y": 631,
-        "z": "cd8c161.e76ffe8",
+        "x": 5142.566665649414,
+        "y": 665.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "4afa0297.0e92ec",
+        "id": "3866efd7.2177",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5291,
-        "y": 674,
-        "z": "cd8c161.e76ffe8",
+        "x": 5322.566665649414,
+        "y": 708.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "ba53a591.c08868"
+                "fe38d110.6015b8"
             ]
         ]
     },
     {
-        "id": "f0a2c2cf.76f7c",
+        "id": "72d35790.07a0a8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5283,
-        "y": 729,
-        "z": "cd8c161.e76ffe8",
+        "x": 5314.566665649414,
+        "y": 763.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "3a442fd2.17b8b8"
+                "7783383e.51854"
             ]
         ]
     },
     {
-        "id": "78f72703.090dd8",
+        "id": "261ed4c9.21b32c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5288,
-        "y": 786,
-        "z": "cd8c161.e76ffe8",
+        "x": 5319.566665649414,
+        "y": 820.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "3131a765.52f598"
+                "fa12b901.242fd8"
             ]
         ]
     },
     {
-        "id": "3131a765.52f598",
+        "id": "fa12b901.242fd8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5440,
-        "y": 787,
-        "z": "cd8c161.e76ffe8",
+        "x": 5471.566665649414,
+        "y": 821.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "3a442fd2.17b8b8",
+        "id": "7783383e.51854",
         "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.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5451,
-        "y": 732,
-        "z": "cd8c161.e76ffe8",
+        "x": 5482.566665649414,
+        "y": 766.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "ba53a591.c08868",
+        "id": "fe38d110.6015b8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5435.38232421875,
-        "y": 671.6556701660156,
-        "z": "cd8c161.e76ffe8",
+        "x": 5466.948989868164,
+        "y": 706.2223358154297,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "280c0a87.0e105e"
+                "60bc3d89.a08324"
             ]
         ]
     },
     {
-        "id": "280c0a87.0e105e",
+        "id": "60bc3d89.a08324",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5650,
-        "y": 668,
-        "z": "cd8c161.e76ffe8",
+        "x": 5681.566665649414,
+        "y": 702.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "3387bb2a.b4fa7c",
+        "id": "dc956cf0.69a068",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3815,
-        "y": 1557,
-        "z": "cd8c161.e76ffe8",
+        "x": 3846.566665649414,
+        "y": 1591.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "4d61cd16.0abdfc",
-                "83252466.aa101",
-                "a13a024e.f66fb"
+                "bf4fb85e.9c3948",
+                "6a7367e2.bb2c9",
+                "ddd9af1d.15854"
             ]
         ]
     },
     {
-        "id": "4d61cd16.0abdfc",
+        "id": "bf4fb85e.9c3948",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4010.5001220703125,
-        "y": 1509,
-        "z": "cd8c161.e76ffe8",
+        "x": 4042.0667877197266,
+        "y": 1543.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "45754d39.0b500c"
+                "350a8536.22a84a"
             ]
         ]
     },
     {
-        "id": "83252466.aa101",
+        "id": "6a7367e2.bb2c9",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4002.5001220703125,
-        "y": 1564,
-        "z": "cd8c161.e76ffe8",
+        "x": 4034.0667877197266,
+        "y": 1598.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "7042d1e3.edb1d"
+                "145991d9.a47ef6"
             ]
         ]
     },
     {
-        "id": "a13a024e.f66fb",
+        "id": "ddd9af1d.15854",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4007.5001220703125,
-        "y": 1621,
-        "z": "cd8c161.e76ffe8",
+        "x": 4039.0667877197266,
+        "y": 1655.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "67ddb18b.39ea7"
+                "820f34bd.964968"
             ]
         ]
     },
     {
-        "id": "67ddb18b.39ea7",
+        "id": "820f34bd.964968",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4159.5001220703125,
-        "y": 1622,
-        "z": "cd8c161.e76ffe8",
+        "x": 4191.066787719727,
+        "y": 1656.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "7042d1e3.edb1d",
+        "id": "145991d9.a47ef6",
         "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.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4170.5001220703125,
-        "y": 1567,
-        "z": "cd8c161.e76ffe8",
+        "x": 4202.066787719727,
+        "y": 1601.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "45754d39.0b500c",
+        "id": "350a8536.22a84a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4154.8824462890625,
-        "y": 1506.6556701660156,
-        "z": "cd8c161.e76ffe8",
+        "x": 4186.449111938477,
+        "y": 1541.2223358154297,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "f1a969ab.50fa7"
+                "6f232f80.17fde"
             ]
         ]
     },
     {
-        "id": "e2a984cd.aa357",
+        "id": "df02e92.6642a98",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4737,
-        "y": 1525,
-        "z": "cd8c161.e76ffe8",
+        "x": 4768.566665649414,
+        "y": 1559.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "3a9f2f8b.e28ed"
+                "360786c5.7cab22"
             ]
         ]
     },
     {
-        "id": "3a9f2f8b.e28ed",
+        "id": "360786c5.7cab22",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4914,
-        "y": 1517,
-        "z": "cd8c161.e76ffe8",
+        "x": 4945.566665649414,
+        "y": 1551.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "53b7b7ea.79ccb8",
-                "abc0256.22d4b58"
+                "41cd01ea.c63f78",
+                "aaeef3c0.eb5678"
             ]
         ]
     },
     {
-        "id": "f1a969ab.50fa7",
+        "id": "6f232f80.17fde",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4339,
-        "y": 1521,
-        "z": "cd8c161.e76ffe8",
+        "x": 4370.566665649414,
+        "y": 1555.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "f0d37653.530e5"
+                "d99ab523.6da018"
             ]
         ]
     },
     {
-        "id": "f0d37653.530e5",
+        "id": "d99ab523.6da018",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4534,
-        "y": 1521,
-        "z": "cd8c161.e76ffe8",
+        "x": 4565.566665649414,
+        "y": 1555.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e2a984cd.aa357",
-                "19b04051.d11648"
+                "df02e92.6642a98",
+                "c50f0505.bf6c28"
             ]
         ]
     },
     {
-        "id": "abc0256.22d4b58",
+        "id": "aaeef3c0.eb5678",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5122,
-        "y": 1524,
-        "z": "cd8c161.e76ffe8",
+        "x": 5153.566665649414,
+        "y": 1558.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "ee461c39.fc6a98",
-                "85f503dc.f3ae58",
-                "2cdb4338.f53074"
+                "3618e547.e0a40a",
+                "eed6fd7.fbf15",
+                "3313cec2.2b8cca"
             ]
         ]
     },
     {
-        "id": "53b7b7ea.79ccb8",
+        "id": "41cd01ea.c63f78",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainB id",
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5152,
-        "y": 1472,
-        "z": "cd8c161.e76ffe8",
+        "x": 5183.566665649414,
+        "y": 1506.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "ee461c39.fc6a98",
+        "id": "3618e547.e0a40a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5332,
-        "y": 1515,
-        "z": "cd8c161.e76ffe8",
+        "x": 5363.566665649414,
+        "y": 1549.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "bc865963.b711a"
+                "b22ebd12.40a81"
             ]
         ]
     },
     {
-        "id": "85f503dc.f3ae58",
+        "id": "eed6fd7.fbf15",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5324,
-        "y": 1570,
-        "z": "cd8c161.e76ffe8",
+        "x": 5355.566665649414,
+        "y": 1604.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "f79338ab.92167"
+                "7d8acc36.091ccc"
             ]
         ]
     },
     {
-        "id": "2cdb4338.f53074",
+        "id": "3313cec2.2b8cca",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5329,
-        "y": 1627,
-        "z": "cd8c161.e76ffe8",
+        "x": 5360.566665649414,
+        "y": 1661.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "bfc5b714.cbe288"
+                "112ac18e.80256e"
             ]
         ]
     },
     {
-        "id": "bfc5b714.cbe288",
+        "id": "112ac18e.80256e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5481,
-        "y": 1628,
-        "z": "cd8c161.e76ffe8",
+        "x": 5512.566665649414,
+        "y": 1662.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "f79338ab.92167",
+        "id": "7d8acc36.091ccc",
         "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.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5492,
-        "y": 1573,
-        "z": "cd8c161.e76ffe8",
+        "x": 5523.566665649414,
+        "y": 1607.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "bc865963.b711a",
+        "id": "b22ebd12.40a81",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5476.38232421875,
-        "y": 1512.6556701660156,
-        "z": "cd8c161.e76ffe8",
+        "x": 5507.948989868164,
+        "y": 1547.2223358154297,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "6cd4d323.819c7c"
+                "1c9d9642.f84cba"
             ]
         ]
     },
     {
-        "id": "6cd4d323.819c7c",
+        "id": "1c9d9642.f84cba",
         "type": "set",
         "name": "set controller domainB data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5691,
-        "y": 1509,
-        "z": "cd8c161.e76ffe8",
+        "x": 5722.566665649414,
+        "y": 1543.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "53404fc0.a38be",
+        "id": "f30f322a.ce56f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2775,
-        "y": 449,
-        "z": "cd8c161.e76ffe8",
+        "x": 2806.566665649414,
+        "y": 483.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "62e6aba8.2c101c",
-                "9754a6dd.67f03"
+                "c6653aca.b9464",
+                "b73a30ff.3793c"
             ]
         ]
     },
     {
-        "id": "9754a6dd.67f03",
+        "id": "b73a30ff.3793c",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3056,
-        "y": 405,
-        "z": "cd8c161.e76ffe8",
+        "x": 3087.566665649414,
+        "y": 439.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "a377e213.201cf8"
+                "be2994c5.6111e8"
             ]
         ]
     },
     {
-        "id": "a377e213.201cf8",
+        "id": "be2994c5.6111e8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3318,
-        "y": 405,
-        "z": "cd8c161.e76ffe8",
+        "x": 3349.566665649414,
+        "y": 439.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "7737916f.9448f"
+                "dba40877.5798e"
             ]
         ]
     },
     {
-        "id": "d8e84e3d.259878",
+        "id": "88191017.73b938",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4699,
-        "y": 758,
-        "z": "cd8c161.e76ffe8",
+        "x": 4730.566665649414,
+        "y": 792.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "3db61f55.c940b"
+                "65c2e1c9.1b56d8"
             ]
         ]
     },
     {
-        "id": "3db61f55.c940b",
+        "id": "65c2e1c9.1b56d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4876,
-        "y": 750,
-        "z": "cd8c161.e76ffe8",
+        "x": 4907.566665649414,
+        "y": 784.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c68e6afb.37cad8"
+                "e785d4f0.4913e8"
             ]
         ]
     },
     {
-        "id": "c68e6afb.37cad8",
+        "id": "e785d4f0.4913e8",
         "type": "set",
         "name": "set domainA ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5111,
-        "y": 874,
-        "z": "cd8c161.e76ffe8",
+        "x": 5142.566665649414,
+        "y": 908.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "70ffeb00.3c6c1c",
+        "id": "5f8b1fbc.6dcf18",
         "type": "set",
         "name": "set domainB ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5151,
-        "y": 1714,
-        "z": "cd8c161.e76ffe8",
+        "x": 5182.566665649414,
+        "y": 1748.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "ce30230.018a56",
+        "id": "1932705.17f659",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4916,
-        "y": 1590,
-        "z": "cd8c161.e76ffe8",
+        "x": 4947.566665649414,
+        "y": 1624.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "70ffeb00.3c6c1c"
+                "5f8b1fbc.6dcf18"
             ]
         ]
     },
     {
-        "id": "19b04051.d11648",
+        "id": "c50f0505.bf6c28",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4739,
-        "y": 1598,
-        "z": "cd8c161.e76ffe8",
+        "x": 4770.566665649414,
+        "y": 1632.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "ce30230.018a56"
+                "1932705.17f659"
             ]
         ]
     },
     {
-        "id": "36ea936c.0d2d9c",
+        "id": "43bfbebe.764f5",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
-        "x": 4357,
-        "y": 535,
-        "z": "cd8c161.e76ffe8",
+        "x": 4388.566665649414,
+        "y": 569.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "39c2d67.9f1a22a",
+        "id": "3a026a1.c8b1f96",
         "type": "execute",
         "name": "execute UUID generator for ethernet-service-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2713,
-        "y": 669,
-        "z": "cd8c161.e76ffe8",
+        "x": 2744.566665649414,
+        "y": 703.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "d6aa9ec.33fa46",
+        "id": "5ea4cfd5.51261",
         "type": "execute",
         "name": "execute UUID generator for otn-tunnel-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2694,
-        "y": 719,
-        "z": "cd8c161.e76ffe8",
+        "x": 2725.566665649414,
+        "y": 753.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "3b75dc28.79bec4",
+        "id": "48ff46b8.d3629",
         "type": "for",
         "name": "for each allotted-resource",
         "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1955,
-        "y": 253,
-        "z": "cd8c161.e76ffe8",
+        "x": 1986.566665649414,
+        "y": 287.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "42ce53ea.f9d9f4",
-                "fea2a65.c94cf58"
+                "84ff5346.d202e8",
+                "91e3d9ca.33dbb"
             ]
         ]
     },
     {
-        "id": "42ce53ea.f9d9f4",
+        "id": "84ff5346.d202e8",
         "type": "set",
         "name": "set the current allotted-resource-id",
         "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",
         "comments": "",
-        "x": 2235,
-        "y": 191,
-        "z": "cd8c161.e76ffe8",
+        "x": 2266.566665649414,
+        "y": 225.56666564941406,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "72dba682.c63c9",
+        "id": "f8f7fd3.b9ae18",
         "type": "set",
         "name": "set query_param",
         "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",
         "comments": "",
-        "x": 2608,
-        "y": 2247,
-        "z": "cd8c161.e76ffe8",
+        "x": 2639.566665649414,
+        "y": 2281.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "1b6d1c66.bc0bb4",
+        "id": "eb24a93a.96e538",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value='' />\n<parameter name='domain-A.node-id' value='' />\n<parameter name='domain-A.network-id' value=\"\" />\n<parameter name='domain-A.provider-id' value=\"\" />\n<parameter name='domain-A.client-id' value=\"\" />\n<parameter name='domain-A.te-topo-id' value=\"\" />\n<parameter name='domain-A.network-type' value=\"\" />\n<parameter name='domain-A.ltpId' value=\"\" />\n<parameter name='tmp.domain-A.network-id' value=\"\" />\n<parameter name='tmp.domain-A.ttp-id' value=\"\" />\n<parameter name='network-route-A' value=\"\" />\n<!--<parameter name='domain-A.' value=\"\" />-->\n\n<parameter name='request-id' value='' />\n<parameter name='otn-source-node' value='' />\n<parameter name='otn-dest-node' value='' />\n<parameter name='bw-odu' value=\"\" />\n<parameter name='src-ttp-id' value='' />\n<parameter name='dst-ttp-id' value='' />\n\n<parameter name='domain-B.tunnel-tp-id' value='' />\n<parameter name='domain-B.node-id' value='' />\n<parameter name='domain-B.network-id' value=\"\" />\n<parameter name='domain-B.provider-id' value=\"\" />\n<parameter name='domain-B.client-id' value=\"\" />\n<parameter name='domain-B.te-topo-id' value=\"\" />\n<parameter name='domain-B.network-type' value=\"\" />\n<parameter name='domain-B.ltpId' value=\"\" />\n<parameter name='tmp.domain-B.network-id' value=\"\" />\n<parameter name='tmp.domain-B.ttp-id' value=\"\" />\n<parameter name='network-route-B' value=\"\" />\n<!--<parameter name='domain-B.' value=\"\" />-->\n\n\n\n\n\n",
         "comments": "",
-        "x": 2594,
-        "y": 3927,
-        "z": "cd8c161.e76ffe8",
+        "x": 2625.566665649414,
+        "y": 3961.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "6c32ab13.072304",
+        "id": "e11f1e73.f567a8",
         "type": "set",
         "name": "set new ethernet-service-name",
         "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
         "comments": "",
-        "x": 2651,
-        "y": 764,
-        "z": "cd8c161.e76ffe8",
+        "x": 2682.566665649414,
+        "y": 798.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "35f98555.2ceed2",
+        "id": "9c7b5506.97a75",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 2639,
-        "y": 2494,
-        "z": "cd8c161.e76ffe8",
+        "x": 2670.566665649414,
+        "y": 2528.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "5f7bc0b4.b38de8"
+                "9ffd0093.8105f8"
             ]
         ]
     },
     {
-        "id": "3340e53d.b2b492",
+        "id": "85036bc9.25f0a",
         "type": "save",
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3768,
-        "y": 2916,
-        "z": "cd8c161.e76ffe8",
+        "x": 3799.566665649414,
+        "y": 2950.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "b711db38.ba184"
+                "bd2b4caa.40f07"
             ]
         ]
     },
     {
-        "id": "4bdc0f0f.14fc9",
+        "id": "4d0fe394.a0f5c4",
         "type": "save",
         "name": "save connectivity-A relationship to vpn-binding-A, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4340.5,
-        "y": 3020,
-        "z": "cd8c161.e76ffe8",
+        "x": 4372.066665649414,
+        "y": 3054.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "b711db38.ba184",
+        "id": "bd2b4caa.40f07",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4074,
-        "y": 2915,
-        "z": "cd8c161.e76ffe8",
+        "x": 4105.566665649414,
+        "y": 2949.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "b22521de.818118"
+                "28d033b7.b1a7b4"
             ]
         ]
     },
     {
-        "id": "b22521de.818118",
+        "id": "28d033b7.b1a7b4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4283.5,
-        "y": 2915.25390625,
-        "z": "cd8c161.e76ffe8",
+        "x": 4315.066665649414,
+        "y": 2949.820571899414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "585cd143.7d2b8",
+        "id": "da384da9.50fad",
         "type": "execute",
         "name": "execute UUID generator for vpn-binding $otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3801,
-        "y": 2395,
-        "z": "cd8c161.e76ffe8",
+        "x": 3832.566665649414,
+        "y": 2429.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "f49c0fd7.2e7c08",
+        "id": "458c9236.fc09c4",
         "type": "switchNode",
         "name": "switch otnidx == 0",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3677,
-        "y": 3033,
-        "z": "cd8c161.e76ffe8",
+        "x": 3708.566665649414,
+        "y": 3067.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "fed6bc26.f071a8",
-                "1d37d7ca.3763f"
+                "20b3c9fb.2f7a1e",
+                "2b2bcdf.9a75432"
             ]
         ]
     },
     {
-        "id": "fed6bc26.f071a8",
+        "id": "20b3c9fb.2f7a1e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3860,
-        "y": 3033,
-        "z": "cd8c161.e76ffe8",
+        "x": 3891.566665649414,
+        "y": 3067.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "73494a81.45e24c"
+                "85853f45.184448"
             ]
         ]
     },
     {
-        "id": "1d37d7ca.3763f",
+        "id": "2b2bcdf.9a75432",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3685,
-        "y": 3180,
-        "z": "cd8c161.e76ffe8",
+        "x": 3716.566665649414,
+        "y": 3214.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "d3242d0f.9401e"
+                "69e93af2.71c7f4"
             ]
         ]
     },
     {
-        "id": "e99682a.c4f64",
+        "id": "dec16147.315f48",
         "type": "switchNode",
         "name": "switch otnidx == last",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4026,
-        "y": 3261,
-        "z": "cd8c161.e76ffe8",
+        "x": 4057.566665649414,
+        "y": 3295.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "eb362179.9d3068",
-                "72ad90f5.140788"
+                "6e1ea31a.8dc254",
+                "3327fa99.59aede"
             ]
         ]
     },
     {
-        "id": "eb362179.9d3068",
+        "id": "6e1ea31a.8dc254",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4211,
-        "y": 3262,
-        "z": "cd8c161.e76ffe8",
+        "x": 4242.566665649414,
+        "y": 3296.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "9791b470.15bff8"
+                "35e519f9.462626"
             ]
         ]
     },
     {
-        "id": "72ad90f5.140788",
+        "id": "3327fa99.59aede",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4230,
-        "y": 3528,
-        "z": "cd8c161.e76ffe8",
+        "x": 4261.566665649414,
+        "y": 3562.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "aff1f53d.8faa"
+                "234eca18.b570de"
             ]
         ]
     },
     {
-        "id": "c78f87c4.9bed48",
+        "id": "3a9f4476.809074",
         "type": "save",
         "name": "save connectivity-B relationship to vpn-binding-B, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4641,
-        "y": 3263,
-        "z": "cd8c161.e76ffe8",
+        "x": 4672.566665649414,
+        "y": 3297.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "d7d2c7f0.8e25f8",
+        "id": "4efd8bac.69de6c",
         "type": "execute",
         "name": "execute UUID generator for connectivity domain otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4715,
-        "y": 3561,
-        "z": "cd8c161.e76ffe8",
+        "x": 4746.566665649414,
+        "y": 3595.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "1d6b059f.4c3bfa",
+        "id": "401e45e3.6933bc",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4651,
-        "y": 3612,
-        "z": "cd8c161.e76ffe8",
+        "x": 4682.566665649414,
+        "y": 3646.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "3d6ca865.871a5",
+        "id": "9a88afee.ea2358",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 4780,
-        "y": 3662,
-        "z": "cd8c161.e76ffe8",
+        "x": 4811.566665649414,
+        "y": 3696.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "cd227f8a.a8638",
+        "id": "303e66ea.a0468a",
         "type": "comment",
         "name": "connectivity has not been created for middle domains, so we have to create one",
         "info": "",
         "comments": "",
-        "x": 4790,
-        "y": 3505,
-        "z": "cd8c161.e76ffe8",
+        "x": 4821.566665649414,
+        "y": 3539.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "bfa230df.6f6f98",
+        "id": "bd97ab87.4b8898",
         "type": "save",
         "name": "save connectivity-otnidx relationship to vpn-binding-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4748,
-        "y": 3721,
-        "z": "cd8c161.e76ffe8",
+        "x": 4779.566665649414,
+        "y": 3755.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "aff1f53d.8faa",
+        "id": "234eca18.b570de",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4387,
-        "y": 3529,
-        "z": "cd8c161.e76ffe8",
+        "x": 4418.566665649414,
+        "y": 3563.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "d7d2c7f0.8e25f8",
-                "1d6b059f.4c3bfa",
-                "3d6ca865.871a5",
-                "bfa230df.6f6f98",
-                "12522f2b.6fc8b1"
+                "4efd8bac.69de6c",
+                "401e45e3.6933bc",
+                "9a88afee.ea2358",
+                "bd97ab87.4b8898",
+                "2cb520a2.c67d5"
             ]
         ]
     },
     {
-        "id": "5f7bc0b4.b38de8",
+        "id": "9ffd0093.8105f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2908,
-        "y": 2494,
-        "z": "cd8c161.e76ffe8",
+        "x": 2939.566665649414,
+        "y": 2528.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "585cd143.7d2b8",
-                "3340e53d.b2b492",
-                "f49c0fd7.2e7c08",
-                "f42a2589.31a0b",
-                "cc8174a8.50b7f",
-                "90db4521.56089",
-                "7bd1d477.e03354"
+                "da384da9.50fad",
+                "85036bc9.25f0a",
+                "458c9236.fc09c4",
+                "afb7d963.d1d2e",
+                "b5c03e87.4a3d2",
+                "5fbd4527.08216c",
+                "580438cc.a39858"
             ]
         ]
     },
     {
-        "id": "4e1b8da0.7824b4",
+        "id": "7371bc78.68f23c",
         "type": "set",
         "name": "set attachment_param domain A",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n\n",
         "comments": "",
-        "x": 4265,
-        "y": 3077,
-        "z": "cd8c161.e76ffe8",
+        "x": 4296.566665649414,
+        "y": 3111.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "5449eb52.31f6ec",
+        "id": "9da935b4.011d78",
         "type": "execute",
         "name": "execute RestApiCallNode domainA UNI Coloring",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4318,
-        "y": 3121,
-        "z": "cd8c161.e76ffe8",
+        "x": 4349.566665649414,
+        "y": 3155.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "1830f22c.565b16",
-                "d371e563.9b53a"
+                "a38d117f.617d1",
+                "64ad5e9f.cde688"
             ]
         ]
     },
     {
-        "id": "d371e563.9b53a",
+        "id": "64ad5e9f.cde688",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4589,
-        "y": 3106,
-        "z": "cd8c161.e76ffe8",
+        "x": 4620.566665649414,
+        "y": 3140.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e029f2f6.ad875"
+                "ae1e714f.21e89"
             ]
         ]
     },
     {
-        "id": "1830f22c.565b16",
+        "id": "a38d117f.617d1",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4587.000213623047,
-        "y": 3163.99990940094,
-        "z": "cd8c161.e76ffe8",
+        "x": 4618.566879272461,
+        "y": 3198.566575050354,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "adfa6667.8c9cb"
+                "cc46ab1d.b8d358"
             ]
         ]
     },
     {
-        "id": "e029f2f6.ad875",
+        "id": "ae1e714f.21e89",
         "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=\"Error executing UNI Coloring for domain A\" />\n",
         "comments": "",
-        "x": 4729.000247955322,
-        "y": 3106.0000009536743,
-        "z": "cd8c161.e76ffe8",
+        "x": 4760.566913604736,
+        "y": 3140.5666666030884,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "adfa6667.8c9cb",
+        "id": "cc46ab1d.b8d358",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4735.02725982666,
-        "y": 3154.745394706726,
-        "z": "cd8c161.e76ffe8",
+        "x": 4766.593925476074,
+        "y": 3189.31206035614,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "73494a81.45e24c",
+        "id": "85853f45.184448",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4001,
-        "y": 3023,
-        "z": "cd8c161.e76ffe8",
+        "x": 4032.566665649414,
+        "y": 3057.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "4bdc0f0f.14fc9",
-                "5449eb52.31f6ec",
-                "4e1b8da0.7824b4"
+                "4d0fe394.a0f5c4",
+                "9da935b4.011d78",
+                "7371bc78.68f23c"
             ]
         ]
     },
     {
-        "id": "9791b470.15bff8",
+        "id": "35e519f9.462626",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4345,
-        "y": 3263,
-        "z": "cd8c161.e76ffe8",
+        "x": 4376.566665649414,
+        "y": 3297.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c78f87c4.9bed48",
-                "96e361f0.0cb568",
-                "e43c5196.95971"
+                "3a9f4476.809074",
+                "6085ae42.a24518",
+                "92ddf8d8.c0a7e"
             ]
         ]
     },
     {
-        "id": "e43c5196.95971",
+        "id": "92ddf8d8.c0a7e",
         "type": "set",
         "name": "set attachment_param domain B",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n",
         "comments": "",
-        "x": 4565,
-        "y": 3307,
-        "z": "cd8c161.e76ffe8",
+        "x": 4596.566665649414,
+        "y": 3341.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "96e361f0.0cb568",
+        "id": "6085ae42.a24518",
         "type": "execute",
         "name": "execute RestApiCallNode domainB UNI Coloring",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4616,
-        "y": 3351,
-        "z": "cd8c161.e76ffe8",
+        "x": 4647.566665649414,
+        "y": 3385.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "d02e29cf.263e8",
-                "ecba049c.afd758"
+                "e3b13fd7.7163e8",
+                "22b24822.5449d"
             ]
         ]
     },
     {
-        "id": "ecba049c.afd758",
+        "id": "22b24822.5449d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4879,
-        "y": 3331,
-        "z": "cd8c161.e76ffe8",
+        "x": 4910.566665649414,
+        "y": 3365.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "335f23f9.119f0c"
+                "f1d0e9c2.a4fe58"
             ]
         ]
     },
     {
-        "id": "d02e29cf.263e8",
+        "id": "e3b13fd7.7163e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4880.000213623047,
-        "y": 3381.99990940094,
-        "z": "cd8c161.e76ffe8",
+        "x": 4911.566879272461,
+        "y": 3416.566575050354,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "49ab66fd.a6d9f8"
+                "117ef1f.6c1660e"
             ]
         ]
     },
     {
-        "id": "335f23f9.119f0c",
+        "id": "f1d0e9c2.a4fe58",
         "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=\"Error executing UNI coloring for domain B\" />\n",
         "comments": "",
-        "x": 5019.000247955322,
-        "y": 3331.0000009536743,
-        "z": "cd8c161.e76ffe8",
+        "x": 5050.566913604736,
+        "y": 3365.5666666030884,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "49ab66fd.a6d9f8",
+        "id": "117ef1f.6c1660e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5025.02725982666,
-        "y": 3379.745394706726,
-        "z": "cd8c161.e76ffe8",
+        "x": 5056.593925476074,
+        "y": 3414.31206035614,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "12522f2b.6fc8b1",
+        "id": "2cb520a2.c67d5",
         "type": "set",
         "name": "set attachment_param domain otnidx",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
         "comments": "",
-        "x": 4662,
-        "y": 3781,
-        "z": "cd8c161.e76ffe8",
+        "x": 4693.566665649414,
+        "y": 3815.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "48979781.1681f8",
+        "id": "bb7c148d.8dd4d8",
         "type": "save",
         "name": "get all-vpn-bindings from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1981,
-        "y": 4128,
-        "z": "cd8c161.e76ffe8",
+        "x": 2012.566665649414,
+        "y": 4162.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c2f0d7a5.dddd68",
-                "39032723.2690f8",
-                "52e0bd76.c6817c"
+                "bfb40bbb.94779",
+                "3cbbde56.b4a31a",
+                "1a8f636f.24e13d"
             ]
         ]
     },
     {
-        "id": "c2f0d7a5.dddd68",
+        "id": "bfb40bbb.94779",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2169,
-        "y": 4141,
-        "z": "cd8c161.e76ffe8",
+        "x": 2200.566665649414,
+        "y": 4175.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "ab5cddb1.22da4"
+                "eaca1bd7.371c7"
             ]
         ]
     },
     {
-        "id": "39032723.2690f8",
+        "id": "3cbbde56.b4a31a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2169.490966796875,
-        "y": 4186.574035644531,
-        "z": "cd8c161.e76ffe8",
+        "x": 2201.057632446289,
+        "y": 4221.140701293945,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "14fe4895.b40197"
+                "38f81285.85b9a6"
             ]
         ]
     },
     {
-        "id": "52e0bd76.c6817c",
+        "id": "1a8f636f.24e13d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2167,
-        "y": 4230,
-        "z": "cd8c161.e76ffe8",
+        "x": 2198.566665649414,
+        "y": 4264.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "b5248481.e522a"
+                "f0bf5dd6.fd17a"
             ]
         ]
     },
     {
-        "id": "ab5cddb1.22da4",
+        "id": "eaca1bd7.371c7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2342,
-        "y": 4139,
-        "z": "cd8c161.e76ffe8",
+        "x": 2373.566665649414,
+        "y": 4173.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "4470cae1.fbd614"
+                "8ebcdd79.0a28b"
             ]
         ]
     },
     {
-        "id": "14fe4895.b40197",
+        "id": "38f81285.85b9a6",
         "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": 2332.0623779296875,
-        "y": 4186.859771728516,
-        "z": "cd8c161.e76ffe8",
+        "x": 2363.6290435791016,
+        "y": 4221.42643737793,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "b5248481.e522a",
+        "id": "f0bf5dd6.fd17a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2334,
-        "y": 4229,
-        "z": "cd8c161.e76ffe8",
+        "x": 2365.566665649414,
+        "y": 4263.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "5d2f9da2.d38694",
+        "id": "782b021e.0fd0fc",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='dmnsidx' start='0' end='`$otn-tunnel-slice_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1970,
-        "y": 4319,
-        "z": "cd8c161.e76ffe8",
+        "x": 2001.566665649414,
+        "y": 4353.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "8dfa636a.7429d"
+                "80466868.45553"
             ]
         ]
     },
     {
-        "id": "e79af240.ca6e5",
+        "id": "6f32f968.2f76b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2780,
-        "y": 4319,
-        "z": "cd8c161.e76ffe8",
+        "x": 2811.566665649414,
+        "y": 4353.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "6c6212ef.f90554"
+                "5534fc3.85d0104"
             ]
         ]
     },
     {
-        "id": "da3d1785.252e3",
+        "id": "be092ed.4a93b5",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='stunidx' start='0' end='`$otn-tunnel-slice[$dmnsidx].list_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2552,
-        "y": 4319,
-        "z": "cd8c161.e76ffe8",
+        "x": 2583.566665649414,
+        "y": 4353.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e79af240.ca6e5"
+                "6f32f968.2f76b8"
             ]
         ]
     },
     {
-        "id": "14ccf193.a7ba36",
+        "id": "114fcf9e.f212a8",
         "type": "set",
         "name": "set providerValue",
         "xml": "<set>\n<parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />\n<parameter name='found' value='false' />\n\n\n",
         "comments": "",
-        "x": 3672,
-        "y": 4086,
-        "z": "cd8c161.e76ffe8",
+        "x": 3703.566665649414,
+        "y": 4120.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "3ba4980a.a7808",
+        "id": "aaeb5226.81f7d",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='testingvalue' value='$tmp.otninfo_length -1' />\n",
         "comments": "",
-        "x": 3974,
-        "y": 3212,
-        "z": "cd8c161.e76ffe8",
+        "x": 4005.566665649414,
+        "y": 3246.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "d3242d0f.9401e",
+        "id": "69e93af2.71c7f4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3809,
-        "y": 3187,
-        "z": "cd8c161.e76ffe8",
+        "x": 3840.566665649414,
+        "y": 3221.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "3ba4980a.a7808",
-                "e99682a.c4f64"
+                "aaeb5226.81f7d",
+                "dec16147.315f48"
             ]
         ]
     },
     {
-        "id": "a26db7da.175a4",
+        "id": "d12bfd13.8bf75",
         "type": "set",
         "name": "set tmp.arr",
         "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",
         "comments": "",
-        "x": 1929,
-        "y": 203,
-        "z": "cd8c161.e76ffe8",
+        "x": 1960.566665649414,
+        "y": 237.56666564941406,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "4470cae1.fbd614",
+        "id": "8ebcdd79.0a28b",
         "type": "for",
         "name": "for vpnidx in all-vpn-bindings",
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2571,
-        "y": 4140,
-        "z": "cd8c161.e76ffe8",
+        "x": 2602.566665649414,
+        "y": 4174.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "af51805a.3f6e48"
+                "3567bff3.8ebcd8"
             ]
         ]
     },
     {
-        "id": "af51805a.3f6e48",
+        "id": "3567bff3.8ebcd8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2786,
-        "y": 4141,
-        "z": "cd8c161.e76ffe8",
+        "x": 2817.566665649414,
+        "y": 4175.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "b29ba493.8896c8"
+                "473c1519.d01eb4"
             ]
         ]
     },
     {
-        "id": "de53bb83.199eb",
+        "id": "809d3147.ec0f3",
         "type": "for",
         "name": "for arridx in tmp.arr",
         "xml": "<for index='arridx' start='0' end='`$tmp.arr_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4239,
-        "y": 4061,
-        "z": "cd8c161.e76ffe8",
+        "x": 4270.566665649414,
+        "y": 4095.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "204c9a7d.7d28b6"
+                "aa9ab401.5fa778"
             ]
         ]
     },
     {
-        "id": "4aa9ee27.313a08",
+        "id": "5596317e.9b3628",
         "type": "switchNode",
         "name": "switch $tmp.arr_length != 0",
         "xml": "<switch test='`$tmp.arr_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3705,
-        "y": 4141,
-        "z": "cd8c161.e76ffe8",
+        "x": 3736.566665649414,
+        "y": 4175.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "2d961aee.1b3a76",
-                "3325a435.f57dbc"
+                "a957484e.5a6ff",
+                "94a2b6d3.766e58"
             ]
         ]
     },
     {
-        "id": "2d961aee.1b3a76",
+        "id": "a957484e.5a6ff",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3901,
-        "y": 4111,
-        "z": "cd8c161.e76ffe8",
+        "x": 3932.566665649414,
+        "y": 4145.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "78c69440.64f1a4"
+                "b3c10703.b98f2"
             ]
         ]
     },
     {
-        "id": "3325a435.f57dbc",
+        "id": "94a2b6d3.766e58",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3902,
-        "y": 4182,
-        "z": "cd8c161.e76ffe8",
+        "x": 3933.566665649414,
+        "y": 4216.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "fefe3e36.023678"
+                "60df48e3.d4564"
             ]
         ]
     },
     {
-        "id": "78c69440.64f1a4",
+        "id": "b3c10703.b98f2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4052,
-        "y": 4109,
-        "z": "cd8c161.e76ffe8",
+        "x": 4083.566665649414,
+        "y": 4143.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "de53bb83.199eb",
-                "8df94468.3b3aa8"
+                "809d3147.ec0f3",
+                "5065f5c6.173234"
             ]
         ]
     },
     {
-        "id": "204c9a7d.7d28b6",
+        "id": "aa9ab401.5fa778",
         "type": "switchNode",
         "name": "switch tmp.arr[$arridx] == $providerValue",
         "xml": "<switch test='`$tmp.arr[$arridx] == $providerValue`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4530,
-        "y": 4061,
-        "z": "cd8c161.e76ffe8",
+        "x": 4561.566665649414,
+        "y": 4095.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c41481ab.88bea8",
-                "e1b07d6e.872148"
+                "6d737171.e1452",
+                "b5a839dc.7835"
             ]
         ]
     },
     {
-        "id": "c41481ab.88bea8",
+        "id": "6d737171.e1452",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4805,
-        "y": 4030,
-        "z": "cd8c161.e76ffe8",
+        "x": 4836.566665649414,
+        "y": 4064.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "f1ff9d18.303e98"
+                "397594e.7aa86ec"
             ]
         ]
     },
     {
-        "id": "e1b07d6e.872148",
+        "id": "b5a839dc.7835",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4806,
-        "y": 4101,
-        "z": "cd8c161.e76ffe8",
+        "x": 4837.566665649414,
+        "y": 4135.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "14131c89.49f9f3"
+                "49c3abd.61fa054"
             ]
         ]
     },
     {
-        "id": "f1ff9d18.303e98",
+        "id": "397594e.7aa86ec",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4956,
-        "y": 4028,
-        "z": "cd8c161.e76ffe8",
+        "x": 4987.566665649414,
+        "y": 4062.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "40d1e81e.6cc88",
-                "dbbf7f90.5aa4c8",
-                "83374978.c1c35",
-                "d7033d3e.83e278",
-                "8b158b61.9a9f58"
+                "412bffc9.1c0e28",
+                "1704d5ec.8e1b6a",
+                "12f4e6d8.82a019",
+                "d12115f5.e77c3",
+                "eb231f11.de562"
             ]
         ]
     },
     {
-        "id": "40d1e81e.6cc88",
+        "id": "412bffc9.1c0e28",
         "type": "set",
         "name": "set found to true",
         "xml": "<set>\n<parameter name='found' value='true' />\n\n\n",
         "comments": "",
-        "x": 5144,
-        "y": 3988,
-        "z": "cd8c161.e76ffe8",
+        "x": 5175.566665649414,
+        "y": 4022.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "dbbf7f90.5aa4c8",
+        "id": "1704d5ec.8e1b6a",
         "type": "save",
         "name": "store $arridx somewhere in vpn-binding",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx`' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5216,
-        "y": 4033,
-        "z": "cd8c161.e76ffe8",
+        "x": 5247.566665649414,
+        "y": 4067.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "8b158b61.9a9f58",
+        "id": "eb231f11.de562",
         "type": "set",
         "name": "set twoD arr",
         "xml": "<set>\n\n<!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->\n<!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->\n<parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />\n\n",
         "comments": "",
-        "x": 5131,
-        "y": 4160,
-        "z": "cd8c161.e76ffe8",
+        "x": 5162.566665649414,
+        "y": 4194.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "d7033d3e.83e278",
+        "id": "d12115f5.e77c3",
         "type": "set",
         "name": "set sizeOfSliceList",
         "xml": "<set>\n<parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />\n\n\n",
         "comments": "",
-        "x": 5152,
-        "y": 4096,
-        "z": "cd8c161.e76ffe8",
+        "x": 5183.566665649414,
+        "y": 4130.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "fefe3e36.023678",
+        "id": "60df48e3.d4564",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4054,
-        "y": 4182,
-        "z": "cd8c161.e76ffe8",
+        "x": 4085.566665649414,
+        "y": 4216.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "8b5a5937.7b14e8",
-                "738e0247.d8b784"
+                "974dbcc3.cf34c8",
+                "ca9f0d65.bbf04"
             ]
         ]
     },
     {
-        "id": "8b5a5937.7b14e8",
+        "id": "974dbcc3.cf34c8",
         "type": "save",
         "name": "store $arridx somewhere in vpn-binding",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='0' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4309,
-        "y": 4175,
-        "z": "cd8c161.e76ffe8",
+        "x": 4340.566665649414,
+        "y": 4209.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "738e0247.d8b784",
+        "id": "ca9f0d65.bbf04",
         "type": "set",
         "name": "set twoD array",
         "xml": "<set>\n<parameter name='tmp.arr[0]' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='1' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='1' />\n<parameter name='otn-tunnel-slice[0].list_length' value='1' />\n\n",
         "comments": "",
-        "x": 4237,
-        "y": 4222,
-        "z": "cd8c161.e76ffe8",
+        "x": 4268.566665649414,
+        "y": 4256.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "8df94468.3b3aa8",
+        "id": "5065f5c6.173234",
         "type": "switchNode",
         "name": "switch found?",
         "xml": "<switch test='`$found`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4230,
-        "y": 4106,
-        "z": "cd8c161.e76ffe8",
+        "x": 4261.566665649414,
+        "y": 4140.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "df11cc3e.1263f",
-                "1fe91094.d80647"
+                "f595c5ce.d138f8",
+                "a27215c.554f2e8"
             ]
         ]
     },
     {
-        "id": "df11cc3e.1263f",
+        "id": "f595c5ce.d138f8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4390,
-        "y": 4098,
-        "z": "cd8c161.e76ffe8",
+        "x": 4421.566665649414,
+        "y": 4132.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "6014caa7.dd1974"
+                "3c70617c.e2885e"
             ]
         ]
     },
     {
-        "id": "1fe91094.d80647",
+        "id": "a27215c.554f2e8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4388,
-        "y": 4135,
-        "z": "cd8c161.e76ffe8",
+        "x": 4419.566665649414,
+        "y": 4169.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "4b7b9538.9e1144"
+                "27b0e714.f2ecf8"
             ]
         ]
     },
     {
-        "id": "6014caa7.dd1974",
+        "id": "3c70617c.e2885e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4515,
-        "y": 4098,
-        "z": "cd8c161.e76ffe8",
+        "x": 4546.566665649414,
+        "y": 4132.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "f4cf80fc.6110b8",
+        "id": "a0581441.562ff8",
         "type": "save",
         "name": "store $arridx+1 somewhere in vpn-binding",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx + 1`' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4822,
-        "y": 4156,
-        "z": "cd8c161.e76ffe8",
+        "x": 4853.566665649414,
+        "y": 4190.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "4b7b9538.9e1144",
+        "id": "27b0e714.f2ecf8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4548,
-        "y": 4143,
-        "z": "cd8c161.e76ffe8",
+        "x": 4579.566665649414,
+        "y": 4177.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "f4cf80fc.6110b8",
-                "cb01b96d.902da8"
+                "a0581441.562ff8",
+                "a72a86e5.09979"
             ]
         ]
     },
     {
-        "id": "cb01b96d.902da8",
+        "id": "a72a86e5.09979",
         "type": "set",
         "name": "set twoD array",
         "xml": "<set>\n<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />\n\n",
         "comments": "",
-        "x": 4739,
-        "y": 4202,
-        "z": "cd8c161.e76ffe8",
+        "x": 4770.566665649414,
+        "y": 4236.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "14131c89.49f9f3",
+        "id": "49c3abd.61fa054",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4939,
-        "y": 4100,
-        "z": "cd8c161.e76ffe8",
+        "x": 4970.566665649414,
+        "y": 4134.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "83374978.c1c35",
+        "id": "12f4e6d8.82a019",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5110,
-        "y": 4227,
-        "z": "cd8c161.e76ffe8",
+        "x": 5141.566665649414,
+        "y": 4261.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "f42a2589.31a0b",
+        "id": "afb7d963.d1d2e",
         "type": "switchNode",
         "name": "switch dstPort == NULL",
         "xml": "<switch test=\"`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3515,
-        "y": 2485,
-        "z": "cd8c161.e76ffe8",
+        "x": 3546.566665649414,
+        "y": 2519.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "ac6a7600.1391a8",
-                "6c99c1a3.b2c848"
+                "2a68f8d8.e1dda",
+                "4b46d94e.68d61"
             ]
         ]
     },
     {
-        "id": "ac6a7600.1391a8",
+        "id": "2a68f8d8.e1dda",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3881,
-        "y": 2446,
-        "z": "cd8c161.e76ffe8",
+        "x": 3912.566665649414,
+        "y": 2480.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c094d1a4.3a348"
+                "9cc98ff4.caf3c"
             ]
         ]
     },
     {
-        "id": "6c99c1a3.b2c848",
+        "id": "4b46d94e.68d61",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3882,
-        "y": 2492,
-        "z": "cd8c161.e76ffe8",
+        "x": 3913.566665649414,
+        "y": 2526.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "11e69cf.d047563"
+                "a85d4c51.ca6c38"
             ]
         ]
     },
     {
-        "id": "c094d1a4.3a348",
+        "id": "9cc98ff4.caf3c",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n",
         "comments": "",
-        "x": 4095,
-        "y": 2445,
-        "z": "cd8c161.e76ffe8",
+        "x": 4126.566665649414,
+        "y": 2479.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "11e69cf.d047563",
+        "id": "a85d4c51.ca6c38",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\n",
         "comments": "",
-        "x": 4093,
-        "y": 2490,
-        "z": "cd8c161.e76ffe8",
+        "x": 4124.566665649414,
+        "y": 2524.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "6c6212ef.f90554",
+        "id": "5534fc3.85d0104",
         "type": "set",
         "name": "set attachment_param sliceG",
         "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].request-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].request-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].bw-odu`' value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].bw-odu`\" />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].src-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].src-ttp-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].dst-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].dst-ttp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='otn-tunnel-sliceG-list_length' value='`$stunidx + 1`' />\n\n\n<parameter name=\"tmp.domainG.restapiUrl\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainurl`\" />\n<parameter name=\"tmp.domainG.restapiUser\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainuser`\" />\n<parameter name=\"tmp.domainG.restapiPassword\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainpassword`\" />",
         "comments": "",
-        "x": 3033,
-        "y": 4317,
-        "z": "cd8c161.e76ffe8",
+        "x": 3064.566665649414,
+        "y": 4351.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "a54ce659.29b108",
+        "id": "42aa6078.f937c",
         "type": "execute",
         "name": "execute RestApiCallNode sliceG creation domainG",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceG-list-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$tmp.domainG.restapiUrl + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$tmp.domainG.restapiUser`\" />\n<parameter name=\"restapiPassword\" value=\"`tmp.domainG.restapiPassword`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2618,
-        "y": 4425,
-        "z": "cd8c161.e76ffe8",
+        "x": 2649.566665649414,
+        "y": 4459.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "3fa26ce7.7e0224",
-                "b2b0e72c.a11478"
+                "51d7fa89.689264",
+                "5ac90edf.1e939"
             ]
         ]
     },
     {
-        "id": "b2b0e72c.a11478",
+        "id": "5ac90edf.1e939",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2901,
-        "y": 4405,
-        "z": "cd8c161.e76ffe8",
+        "x": 2932.566665649414,
+        "y": 4439.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "fa1f56ce.f832c8"
+                "86bbe7aa.1bf2"
             ]
         ]
     },
     {
-        "id": "3fa26ce7.7e0224",
+        "id": "51d7fa89.689264",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2902.000213623047,
-        "y": 4455.99990940094,
-        "z": "cd8c161.e76ffe8",
+        "x": 2933.566879272461,
+        "y": 4490.566575050354,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "50896aad.7e40ec"
+                "f017812e.0e0548"
             ]
         ]
     },
     {
-        "id": "fa1f56ce.f832c8",
+        "id": "86bbe7aa.1bf2",
         "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=\"Error executing slice creation api for domain A\" />\n",
         "comments": "",
-        "x": 3041.0002479553223,
-        "y": 4405.000000953674,
-        "z": "cd8c161.e76ffe8",
+        "x": 3072.5669136047363,
+        "y": 4439.566666603088,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "50896aad.7e40ec",
+        "id": "f017812e.0e0548",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3047.02725982666,
-        "y": 4453.745394706726,
-        "z": "cd8c161.e76ffe8",
+        "x": 3078.593925476074,
+        "y": 4488.31206035614,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "cc8174a8.50b7f",
+        "id": "b5c03e87.4a3d2",
         "type": "set",
         "name": "set srcdstpnf-name",
         "xml": "<set>\n<parameter name='tmp.srcdstpnf-name' value=\"`'networkId-providerId-' + \n                                             $tmp.access-provider-id + '-clientId-' +\n                                             $tmp.access-client-id + '-topologyId-' + \n                                             $tmp.access-topology-id + '-nodeId-' + \n                                             $tmp.srcdstpnf-id`\" />\n\n",
         "comments": "",
-        "x": 3691,
-        "y": 2559,
-        "z": "cd8c161.e76ffe8",
+        "x": 3722.566665649414,
+        "y": 2593.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "90db4521.56089",
+        "id": "5fbd4527.08216c",
         "type": "get-resource",
         "name": "get-resource tmp.srcdstpnf-name",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.srcdstpnf-name\"\n        pfx='tmp.aai.srcdst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3735,
-        "y": 2607,
-        "z": "cd8c161.e76ffe8",
+        "x": 3766.566665649414,
+        "y": 2641.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "3240cb0e.b7a8d4",
-                "f04379f7.8df68",
-                "3ab1dbdc.5ba7f4"
+                "1efdee28.f91a52",
+                "64406c95.e8d00c",
+                "d9f7dd8f.9ba66"
             ]
         ]
     },
     {
-        "id": "3240cb0e.b7a8d4",
+        "id": "1efdee28.f91a52",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3947.5,
-        "y": 2554,
-        "z": "cd8c161.e76ffe8",
+        "x": 3979.066665649414,
+        "y": 2588.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e8a8f72b.6c9a08"
+                "2ed8b0a7.4efac8"
             ]
         ]
     },
     {
-        "id": "f04379f7.8df68",
+        "id": "64406c95.e8d00c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3959.5,
-        "y": 2604,
-        "z": "cd8c161.e76ffe8",
+        "x": 3991.066665649414,
+        "y": 2638.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "b12e923.fc82e7"
+                "51fd5363.368514"
             ]
         ]
     },
     {
-        "id": "3ab1dbdc.5ba7f4",
+        "id": "d9f7dd8f.9ba66",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3950.5,
-        "y": 2659,
-        "z": "cd8c161.e76ffe8",
+        "x": 3982.066665649414,
+        "y": 2693.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "582f59ae.92f2a8"
+                "e38f0d80.1c1bb"
             ]
         ]
     },
     {
-        "id": "582f59ae.92f2a8",
+        "id": "e38f0d80.1c1bb",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4095.5,
-        "y": 2658,
-        "z": "cd8c161.e76ffe8",
+        "x": 4127.066665649414,
+        "y": 2692.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "b12e923.fc82e7",
+        "id": "51fd5363.368514",
         "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.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4106.5,
-        "y": 2601,
-        "z": "cd8c161.e76ffe8",
+        "x": 4138.066665649414,
+        "y": 2635.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "e8a8f72b.6c9a08",
+        "id": "2ed8b0a7.4efac8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4072.8824462890625,
-        "y": 2547.6556701660156,
-        "z": "cd8c161.e76ffe8",
+        "x": 4104.449111938477,
+        "y": 2582.2223358154297,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "212a31bf.dceac6"
+                "6b9e1826.ee6da8"
             ]
         ]
     },
     {
-        "id": "935dfeb6.9be7f8",
+        "id": "138f1f2d.7207a9",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4632,
-        "y": 2566,
-        "z": "cd8c161.e76ffe8",
+        "x": 4663.566665649414,
+        "y": 2600.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "1328892f.88f617"
+                "d1f83019.79c9b"
             ]
         ]
     },
     {
-        "id": "1328892f.88f617",
+        "id": "d1f83019.79c9b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4809,
-        "y": 2558,
-        "z": "cd8c161.e76ffe8",
+        "x": 4840.566665649414,
+        "y": 2592.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "6a8226d0.94ebf",
-                "3a8b4f5e.be2aa8"
+                "7ed11e.38da0ee4",
+                "162cc00f.d817a8"
             ]
         ]
     },
     {
-        "id": "212a31bf.dceac6",
+        "id": "6b9e1826.ee6da8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4234,
-        "y": 2562,
-        "z": "cd8c161.e76ffe8",
+        "x": 4265.566665649414,
+        "y": 2596.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "384efd0c.a6d9aa"
+                "86ec64e1.e780c"
             ]
         ]
     },
     {
-        "id": "384efd0c.a6d9aa",
+        "id": "86ec64e1.e780c",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4429,
-        "y": 2562,
-        "z": "cd8c161.e76ffe8",
+        "x": 4460.566665649414,
+        "y": 2596.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "935dfeb6.9be7f8"
+                "138f1f2d.7207a9"
             ]
         ]
     },
     {
-        "id": "3a8b4f5e.be2aa8",
+        "id": "162cc00f.d817a8",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5017,
-        "y": 2565,
-        "z": "cd8c161.e76ffe8",
+        "x": 5048.566665649414,
+        "y": 2599.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "a2f18412.fa34",
-                "938b13a9.db22e",
-                "e46fd8a5.7a34e8"
+                "e0385378.198358",
+                "503d9090.68b5e8",
+                "17aba33b.4460b5"
             ]
         ]
     },
     {
-        "id": "6a8226d0.94ebf",
+        "id": "7ed11e.38da0ee4",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5047,
-        "y": 2513,
-        "z": "cd8c161.e76ffe8",
+        "x": 5078.566665649414,
+        "y": 2547.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "a2f18412.fa34",
+        "id": "e0385378.198358",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5227,
-        "y": 2556,
-        "z": "cd8c161.e76ffe8",
+        "x": 5258.566665649414,
+        "y": 2590.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "dfc55645.4078e"
+                "2933c6cc.a68082"
             ]
         ]
     },
     {
-        "id": "938b13a9.db22e",
+        "id": "503d9090.68b5e8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5219,
-        "y": 2611,
-        "z": "cd8c161.e76ffe8",
+        "x": 5250.566665649414,
+        "y": 2645.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "ad8534e.8f07fc8"
+                "d5a44647.f1fdd8"
             ]
         ]
     },
     {
-        "id": "e46fd8a5.7a34e8",
+        "id": "17aba33b.4460b5",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5224,
-        "y": 2668,
-        "z": "cd8c161.e76ffe8",
+        "x": 5255.566665649414,
+        "y": 2702.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "292bb9fe.d0f886"
+                "8e808d45.23fde8"
             ]
         ]
     },
     {
-        "id": "292bb9fe.d0f886",
+        "id": "8e808d45.23fde8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5376,
-        "y": 2669,
-        "z": "cd8c161.e76ffe8",
+        "x": 5407.566665649414,
+        "y": 2703.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "ad8534e.8f07fc8",
+        "id": "d5a44647.f1fdd8",
         "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.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5387,
-        "y": 2614,
-        "z": "cd8c161.e76ffe8",
+        "x": 5418.566665649414,
+        "y": 2648.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "dfc55645.4078e",
+        "id": "2933c6cc.a68082",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5371.38232421875,
-        "y": 2553.6556701660156,
-        "z": "cd8c161.e76ffe8",
+        "x": 5402.948989868164,
+        "y": 2588.2223358154297,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "295d998d.b4f986"
+                "ee8d6c6a.1b65b8"
             ]
         ]
     },
     {
-        "id": "295d998d.b4f986",
+        "id": "ee8d6c6a.1b65b8",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5586,
-        "y": 2550,
-        "z": "cd8c161.e76ffe8",
+        "x": 5617.566665649414,
+        "y": 2584.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "8dfa636a.7429d",
+        "id": "80466868.45553",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2202,
-        "y": 4317,
-        "z": "cd8c161.e76ffe8",
+        "x": 2233.566665649414,
+        "y": 4351.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "da3d1785.252e3",
-                "a54ce659.29b108"
+                "be092ed.4a93b5",
+                "42aa6078.f937c"
             ]
         ]
     },
     {
-        "id": "7bd1d477.e03354",
+        "id": "580438cc.a39858",
         "type": "switchNode",
         "name": "switch dmnsidx == 0 (domainA)",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3705,
-        "y": 2776,
-        "z": "cd8c161.e76ffe8",
+        "x": 3736.566665649414,
+        "y": 2810.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "3ed7d0cf.bd363",
-                "60e3c11b.60b2b8"
+                "253b733.7c34c8c",
+                "ac577a23.1df5c8"
             ]
         ]
     },
     {
-        "id": "3ed7d0cf.bd363",
+        "id": "253b733.7c34c8c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3906,
-        "y": 2774,
-        "z": "cd8c161.e76ffe8",
+        "x": 3937.566665649414,
+        "y": 2808.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c5282b2e.c25f08"
+                "489357ce.d601e8"
             ]
         ]
     },
     {
-        "id": "7fc9a02.f9a08e",
+        "id": "4ffee2dc.bf60cc",
         "type": "set",
         "name": "set pce-src-node",
         "xml": "<set>\n<parameter name='tmp.pce-src-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 4187,
-        "y": 2724,
-        "z": "cd8c161.e76ffe8",
+        "x": 4218.566665649414,
+        "y": 2758.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "6fcb3e30.7095c8",
+        "id": "f4366d42.1a2168",
         "type": "switchNode",
         "name": "switch dmnsidx == last (domainB)",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4123,
-        "y": 2825,
-        "z": "cd8c161.e76ffe8",
+        "x": 4154.566665649414,
+        "y": 2859.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "65a08e4c.a1dc",
-                "640adf38.eff8b"
+                "ed86bff.8de464",
+                "8d9d80f9.3a4208"
             ]
         ]
     },
     {
-        "id": "65a08e4c.a1dc",
+        "id": "ed86bff.8de464",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4353,
-        "y": 2821,
-        "z": "cd8c161.e76ffe8",
+        "x": 4384.566665649414,
+        "y": 2855.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "4413ca18.7ca70c"
+                "7e911b6f.cd69e4"
             ]
         ]
     },
     {
-        "id": "8da31065.a87e4",
+        "id": "b90e6234.50db9",
         "type": "set",
         "name": "set attachment_param domain B",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />",
         "comments": "",
-        "x": 4690,
-        "y": 2765,
-        "z": "cd8c161.e76ffe8",
+        "x": 4721.566665649414,
+        "y": 2799.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "60e3c11b.60b2b8",
+        "id": "ac577a23.1df5c8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3906,
-        "y": 2823,
-        "z": "cd8c161.e76ffe8",
+        "x": 3937.566665649414,
+        "y": 2857.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "6fcb3e30.7095c8"
+                "f4366d42.1a2168"
             ]
         ]
     },
     {
-        "id": "640adf38.eff8b",
+        "id": "8d9d80f9.3a4208",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4354,
-        "y": 2867,
-        "z": "cd8c161.e76ffe8",
+        "x": 4385.566665649414,
+        "y": 2901.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "7faf9acd.559b34"
+                "c46aeca7.68602"
             ]
         ]
     },
     {
-        "id": "7faf9acd.559b34",
+        "id": "c46aeca7.68602",
         "type": "set",
         "name": "set attachment_param domain G",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 4568,
-        "y": 2867,
-        "z": "cd8c161.e76ffe8",
+        "x": 4599.566665649414,
+        "y": 2901.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "9723f206.45f868",
+        "id": "b5fed2d4.4f9558",
         "type": "set",
         "name": "set tmp.slicevpns",
         "xml": "<set>\n<parameter name='`tmp.slicevpns[$tmp.slicevpns_length]`' value=\"`$prop.vpn-binding-otnidx-uuid`\" />\n<parameter name='tmp.slicevpns_length' value=\"`$tmp.slicevpns_length + 1`\" />\n\n<parameter name='`tmp.slicevpnuuids[$prop.vpn-binding-otnidx-uuid]`' value=\"`$prop.vpn-binding-otnidx-uuid`\" />\n\n",
         "comments": "",
-        "x": 4466,
-        "y": 2916,
-        "z": "cd8c161.e76ffe8",
+        "x": 4497.566665649414,
+        "y": 2950.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "b29ba493.8896c8",
+        "id": "473c1519.d01eb4",
         "type": "switchNode",
         "name": "switch vpnuuid is for this slice",
         "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.aai.service-instance.service-instance-id `\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3030,
-        "y": 4140,
-        "z": "cd8c161.e76ffe8",
+        "x": 3061.566665649414,
+        "y": 4174.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "174edd69.713c5b",
-                "af581154.4e753"
+                "1fb0ccb2.86983b",
+                "44883739.f6f7d8"
             ]
         ]
     },
     {
-        "id": "174edd69.713c5b",
+        "id": "1fb0ccb2.86983b",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3247,
-        "y": 4119,
-        "z": "cd8c161.e76ffe8",
+        "x": 3278.566665649414,
+        "y": 4153.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "53925b1.87893a4"
+                "7e38fab1.3b9244"
             ]
         ]
     },
     {
-        "id": "af581154.4e753",
+        "id": "44883739.f6f7d8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3247,
-        "y": 4168,
-        "z": "cd8c161.e76ffe8",
+        "x": 3278.566665649414,
+        "y": 4202.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "53925b1.87893a4",
+        "id": "7e38fab1.3b9244",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3415,
-        "y": 4119,
-        "z": "cd8c161.e76ffe8",
+        "x": 3446.566665649414,
+        "y": 4153.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "14ccf193.a7ba36",
-                "4aa9ee27.313a08"
+                "114fcf9e.f212a8",
+                "5596317e.9b3628"
             ]
         ]
     },
     {
-        "id": "2f0ddb5a.e806c4",
+        "id": "a0f26d15.101368",
         "type": "set",
         "name": "set attachment_param domain A",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 4242,
-        "y": 2771,
-        "z": "cd8c161.e76ffe8",
+        "x": 4273.566665649414,
+        "y": 2805.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "c5282b2e.c25f08",
+        "id": "489357ce.d601e8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4030,
-        "y": 2765,
-        "z": "cd8c161.e76ffe8",
+        "x": 4061.566665649414,
+        "y": 2799.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "2f0ddb5a.e806c4"
+                "a0f26d15.101368"
             ]
         ]
     },
     {
-        "id": "60f94c1c.9e2504",
+        "id": "3c67b199.38de76",
         "type": "set",
         "name": "set pce-src-node",
         "xml": "<set>\n<parameter name='tmp.pce-dst-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 4642,
-        "y": 2813,
-        "z": "cd8c161.e76ffe8",
+        "x": 4673.566665649414,
+        "y": 2847.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "4413ca18.7ca70c",
+        "id": "7e911b6f.cd69e4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4486,
-        "y": 2797,
-        "z": "cd8c161.e76ffe8",
+        "x": 4517.566665649414,
+        "y": 2831.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "8da31065.a87e4"
+                "b90e6234.50db9"
             ]
         ]
     },
     {
-        "id": "93c183ce.0a9ed8",
+        "id": "6e431d76.be632c",
         "type": "get-resource",
         "name": "get-resource pnfs-list",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
         "comments": "",
         "outputs": 1,
-        "x": 1972,
-        "y": 62,
-        "z": "cd8c161.e76ffe8",
+        "x": 2003.566665649414,
+        "y": 96.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "5d8a5506.b8ac8c",
+        "id": "29e9cbd2.ce75c4",
         "type": "get-resource",
         "name": "get-resource logical-links",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
         "comments": "",
         "outputs": 1,
-        "x": 1984,
-        "y": 103,
-        "z": "cd8c161.e76ffe8",
+        "x": 2015.566665649414,
+        "y": 137.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "307d8c13.43fe3c",
+        "id": "7f3d74ad.534c3c",
         "type": "comment",
         "name": "The following two nodes are for PCE",
         "info": "",
         "comments": "",
-        "x": 2008,
-        "y": 25,
-        "z": "cd8c161.e76ffe8",
+        "x": 2039.566665649414,
+        "y": 59.56666564941406,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "86333e24.199f7",
+        "id": "6d8a85f2.9b51f4",
         "type": "set",
         "name": "set tmp.arr",
         "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",
         "comments": "",
-        "x": 1929,
-        "y": 149,
-        "z": "cd8c161.e76ffe8",
+        "x": 1960.566665649414,
+        "y": 183.56666564941406,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "63cf541.20dacac",
+        "id": "3add3536.bf190a",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamemm`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2619,
-        "y": 2361,
-        "z": "cd8c161.e76ffe8",
+        "x": 2650.566665649414,
+        "y": 2395.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "ba4816e9.f5d79",
+        "id": "d33e8b85.64336",
         "type": "set",
         "name": "set maxtpn",
         "xml": "<set>\n<parameter name='maxtpn' value='`($maxtpn + $gfp)`' />",
         "comments": "",
-        "x": 3646,
-        "y": 2964,
-        "z": "cd8c161.e76ffe8",
+        "x": 3677.566665649414,
+        "y": 2998.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "eb9a9d75.279478",
+        "id": "33633691.1ec92a",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-find-maximum-used-tpn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2812,
-        "y": 2425,
-        "z": "cd8c161.e76ffe8",
+        "x": 2843.566665649414,
+        "y": 2459.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.json
index 42490961..df10744c 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "874ff500.a76198",
+        "id": "b86b0fef.6d8f2",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 129,
-        "y": 77,
-        "z": "a1c94a24.22ed9",
+        "x": 228.56666564941406,
+        "y": 144.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "d5019c0d.28df28"
+                "2128d45c.da5aa4"
             ]
         ]
     },
     {
-        "id": "d5019c0d.28df28",
+        "id": "2128d45c.da5aa4",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,5624 +22,5624 @@
         "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='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 354.2856903076172,
-        "y": 151.23810863494873,
-        "z": "a1c94a24.22ed9",
+        "x": 453.85235595703125,
+        "y": 218.8047742843628,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "cf3663ab.d505b8"
+                "70e99b08.a81814"
             ]
         ]
     },
     {
-        "id": "cf3663ab.d505b8",
+        "id": "70e99b08.a81814",
         "type": "method",
         "name": "method tsli-vnf-topology-operation-trans-slice-modify",
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-modify' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 360.42860412597656,
-        "y": 236.00003051757812,
-        "z": "a1c94a24.22ed9",
+        "x": 459.9952697753906,
+        "y": 303.5666961669922,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "13ea815e.0d1c3f"
+                "3d648e68.8f83fa"
             ]
         ]
     },
     {
-        "id": "13ea815e.0d1c3f",
+        "id": "3d648e68.8f83fa",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 730.238037109375,
-        "y": 260.66668701171875,
-        "z": "a1c94a24.22ed9",
+        "x": 829.8047027587891,
+        "y": 328.2333526611328,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "5ce9625d.05d25c",
-                "98411814.65c58",
-                "48043489.9f26f4"
+                "4898a5d2.c4814c",
+                "43d16cc8.33970c",
+                "dd074b01.699d5"
             ]
         ]
     },
     {
-        "id": "5ce9625d.05d25c",
+        "id": "4898a5d2.c4814c",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 985.571533203125,
-        "y": 414.59698486328125,
-        "z": "a1c94a24.22ed9",
+        "x": 1085.138198852539,
+        "y": 482.1636505126953,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "98411814.65c58",
+        "id": "43d16cc8.33970c",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",
         "comments": "",
         "outputs": 1,
-        "x": 1053,
-        "y": 234,
-        "z": "a1c94a24.22ed9",
+        "x": 1152.566665649414,
+        "y": 301.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "899f7de0.012718",
-                "bf5ca541.5b386",
-                "44585e79.6d35d"
+                "5739653.c5aef1c",
+                "4e5f3667.ce514",
+                "7d9553c0.a90d3c"
             ]
         ]
     },
     {
-        "id": "899f7de0.012718",
+        "id": "5739653.c5aef1c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1278,
-        "y": 92,
-        "z": "a1c94a24.22ed9",
+        "x": 1377.566665649414,
+        "y": 159.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "63a35dfa.733074"
+                "fc0ebeea.3842e8"
             ]
         ]
     },
     {
-        "id": "bf5ca541.5b386",
+        "id": "4e5f3667.ce514",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1273.490966796875,
-        "y": 161.57403564453125,
-        "z": "a1c94a24.22ed9",
+        "x": 1373.057632446289,
+        "y": 229.1407012939453,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "5ca7f827.5517"
+                "9ccb6432.a6f758"
             ]
         ]
     },
     {
-        "id": "44585e79.6d35d",
+        "id": "7d9553c0.a90d3c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1262,
-        "y": 208,
-        "z": "a1c94a24.22ed9",
+        "x": 1361.566665649414,
+        "y": 275.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "f51f087e.0d87d8"
+                "2159c0a9.b6525"
             ]
         ]
     },
     {
-        "id": "63a35dfa.733074",
+        "id": "fc0ebeea.3842e8",
         "type": "switchNode",
         "name": "switch allotted-resources_length != 0",
         "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1517,
-        "y": 89,
-        "z": "a1c94a24.22ed9",
+        "x": 1616.566665649414,
+        "y": 156.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "8b5f7eec.f199b",
-                "d7dba561.3c951"
+                "9f0f2f3b.2aa0c8",
+                "29eb9fec.58b94"
             ]
         ]
     },
     {
-        "id": "5ca7f827.5517",
+        "id": "9ccb6432.a6f758",
         "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": 1427.0623779296875,
-        "y": 164.85977172851562,
-        "z": "a1c94a24.22ed9",
+        "x": 1526.6290435791016,
+        "y": 232.4264373779297,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "f51f087e.0d87d8",
+        "id": "2159c0a9.b6525",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1431,
-        "y": 209,
-        "z": "a1c94a24.22ed9",
+        "x": 1530.566665649414,
+        "y": 276.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "8b5f7eec.f199b",
+        "id": "9f0f2f3b.2aa0c8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1730,
-        "y": 113,
-        "z": "a1c94a24.22ed9",
+        "x": 1829.566665649414,
+        "y": 180.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "8ecf6cbb.a31c18"
+                "c939819f.3d19a"
             ]
         ]
     },
     {
-        "id": "d7dba561.3c951",
+        "id": "29eb9fec.58b94",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1732,
-        "y": 53,
-        "z": "a1c94a24.22ed9",
+        "x": 1831.566665649414,
+        "y": 120.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "b7af42d7.d75c5",
+        "id": "1c8a1ea6.0feed9",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 1032,
-        "y": 122,
-        "z": "a1c94a24.22ed9",
+        "x": 1131.566665649414,
+        "y": 189.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "8ecf6cbb.a31c18",
+        "id": "c939819f.3d19a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1675,
-        "y": 295,
-        "z": "a1c94a24.22ed9",
+        "x": 1774.566665649414,
+        "y": 362.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "8f80cd4e.6bb588",
-                "1ad0a363.7d61cd",
-                "2ea54daa.f8c89a",
-                "19fc5975.9c891f",
-                "30222136.8f9b9e",
-                "d51e1ac2.752b08"
+                "f0cde51e.fc048",
+                "5a4aff44.5be78",
+                "e781046f.1418e",
+                "127eaa7a.98449e",
+                "8780743f.a296a",
+                "323fc4b1.60fe74"
             ]
         ]
     },
     {
-        "id": "4de4347b.ee4a6c",
+        "id": "db6151f2.0aacb",
         "type": "set",
         "name": "set network-route-A",
         "xml": "<set>\n<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-name`\" />\n<!--<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-id`\" />-->\n\n\n",
         "comments": "",
-        "x": 4244,
-        "y": 802,
-        "z": "a1c94a24.22ed9",
+        "x": 4343.566665649414,
+        "y": 869.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "195d5c42.a96a64",
+        "id": "e016be81.6c64f",
         "type": "set",
         "name": "set network-route-B",
         "xml": "<set>\n<parameter name='network-route-B' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
         "comments": "",
-        "x": 4245,
-        "y": 857,
-        "z": "a1c94a24.22ed9",
+        "x": 4344.566665649414,
+        "y": 924.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "8f1217ff.70176",
+        "id": "103cc7a8.7e9b88",
         "type": "save",
         "name": "get allotted-resource from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2201,
-        "y": 252,
-        "z": "a1c94a24.22ed9",
+        "x": 2300.566665649414,
+        "y": 319.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "56c46d50.0cfc0c",
-                "c740637e.1508b",
-                "d63f588b.18e9"
+                "f2966e51.e2caf8",
+                "2b2db624.af7c1a",
+                "626f780f.86dfb8"
             ]
         ]
     },
     {
-        "id": "56c46d50.0cfc0c",
+        "id": "f2966e51.e2caf8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2417,
-        "y": 319,
-        "z": "a1c94a24.22ed9",
+        "x": 2516.566665649414,
+        "y": 386.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "576d8604.8f2d9"
+                "8eff1c95.000698"
             ]
         ]
     },
     {
-        "id": "c740637e.1508b",
+        "id": "2b2db624.af7c1a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2417.490966796875,
-        "y": 218.573974609375,
-        "z": "a1c94a24.22ed9",
+        "x": 2517.057632446289,
+        "y": 286.14064025878906,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "4e6f8b98.289464"
+                "e741338f.fadbb8"
             ]
         ]
     },
     {
-        "id": "d63f588b.18e9",
+        "id": "626f780f.86dfb8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2413,
-        "y": 268,
-        "z": "a1c94a24.22ed9",
+        "x": 2512.566665649414,
+        "y": 335.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "cf03fd08.161968"
+                "2cb8a0b4.ed0f98"
             ]
         ]
     },
     {
-        "id": "4e6f8b98.289464",
+        "id": "e741338f.fadbb8",
         "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": 2595.0625,
-        "y": 218.8597412109375,
-        "z": "a1c94a24.22ed9",
+        "x": 2694.629165649414,
+        "y": 286.42640686035156,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "cf03fd08.161968",
+        "id": "2cb8a0b4.ed0f98",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2595,
-        "y": 268,
-        "z": "a1c94a24.22ed9",
+        "x": 2694.566665649414,
+        "y": 335.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "520d2541.742f3c",
+        "id": "1c10a7b4.762648",
         "type": "save",
         "name": "get logical-link from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
         "comments": "",
         "outputs": 1,
-        "x": 3470,
-        "y": 773,
-        "z": "a1c94a24.22ed9",
+        "x": 3569.566665649414,
+        "y": 840.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "862d85b.a4a94f8",
-                "1732a1e5.237d0e",
-                "20df7142.af18a6"
+                "54f63921.d24288",
+                "11c3d54e.f4363b",
+                "e636914f.ca32e"
             ]
         ]
     },
     {
-        "id": "862d85b.a4a94f8",
+        "id": "54f63921.d24288",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3761.490966796875,
-        "y": 751.573974609375,
-        "z": "a1c94a24.22ed9",
+        "x": 3861.057632446289,
+        "y": 819.1406402587891,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "b900c0cd.a71608"
+                "4ad84bdb.1011e4"
             ]
         ]
     },
     {
-        "id": "1732a1e5.237d0e",
+        "id": "11c3d54e.f4363b",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3750,
-        "y": 796,
-        "z": "a1c94a24.22ed9",
+        "x": 3849.566665649414,
+        "y": 863.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "b39978ef.c4e1"
+                "611bd1d0.bbec68"
             ]
         ]
     },
     {
-        "id": "b900c0cd.a71608",
+        "id": "4ad84bdb.1011e4",
         "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": 3910.0625,
-        "y": 751.8597412109375,
-        "z": "a1c94a24.22ed9",
+        "x": 4009.629165649414,
+        "y": 819.4264068603516,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "b39978ef.c4e1",
+        "id": "611bd1d0.bbec68",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3909,
-        "y": 796,
-        "z": "a1c94a24.22ed9",
+        "x": 4008.566665649414,
+        "y": 863.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "20df7142.af18a6",
+        "id": "e636914f.ca32e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3756,
-        "y": 843,
-        "z": "a1c94a24.22ed9",
+        "x": 3855.566665649414,
+        "y": 910.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "b394b52b.88d4f8",
+        "id": "4dddc413.6cd63c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3910,
-        "y": 882,
-        "z": "a1c94a24.22ed9",
+        "x": 4009.566665649414,
+        "y": 949.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "4de4347b.ee4a6c",
-                "195d5c42.a96a64",
-                "f201f9ee.69f46",
-                "922f6ba7.94fc9",
-                "5c94cc42.b4c6e4",
-                "898ec19e.6e281",
-                "f986e215.6b3c08",
-                "4e189d8f.8297c4",
-                "c6ccb3e9.91ea18",
-                "6963f6fb.4a135",
-                "40ae5836.eda238",
-                "31cde3.5ded021e",
-                "e15a89e6.e78d8"
+                "db6151f2.0aacb",
+                "e016be81.6c64f",
+                "9f8998d0.ce9c48",
+                "44a9159e.85e724",
+                "8f0ab711.e0d798",
+                "d96045a7.1a29c8",
+                "7c9d6be0.59e3fc",
+                "5f01b0d6.663678",
+                "96f11e74.5cf9",
+                "32dd1d69.d1982a",
+                "fefb165c.6d9d48",
+                "afd6fb79.f36b6",
+                "1a397526.128d93"
             ]
         ]
     },
     {
-        "id": "f201f9ee.69f46",
+        "id": "9f8998d0.ce9c48",
         "type": "save",
         "name": "get network-route-A from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-A'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-A\">",
         "comments": "",
         "outputs": 1,
-        "x": 4257,
-        "y": 925,
-        "z": "a1c94a24.22ed9",
+        "x": 4356.566665649414,
+        "y": 992.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "84f44b11.dfd248",
-                "cde6943a.45f4c",
-                "c0c26e2b.b056f"
+                "ad94bc3e.2edb18",
+                "3c6b8cbe.35a074",
+                "e925e05d.5c3e7"
             ]
         ]
     },
     {
-        "id": "922f6ba7.94fc9",
+        "id": "44a9159e.85e724",
         "type": "save",
         "name": "get network-route-B from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-B'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-B\">",
         "comments": "",
         "outputs": 1,
-        "x": 4236,
-        "y": 1526.9998779296875,
-        "z": "a1c94a24.22ed9",
+        "x": 4335.566665649414,
+        "y": 1594.5665435791016,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "13feb8ce.6f8f6f",
-                "6f75f930.e4c9a8",
-                "f4b40172.6e734"
+                "ce3181da.534ae8",
+                "dd474f13.0169c8",
+                "1e53e46c.6ee5dc"
             ]
         ]
     },
     {
-        "id": "84f44b11.dfd248",
+        "id": "ad94bc3e.2edb18",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4458,
-        "y": 809,
-        "z": "a1c94a24.22ed9",
+        "x": 4557.566665649414,
+        "y": 876.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "d5ccfec3.15cf68"
+                "11095a88.1d6375"
             ]
         ]
     },
     {
-        "id": "cde6943a.45f4c",
+        "id": "3c6b8cbe.35a074",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4453.509033203125,
-        "y": 858.426025390625,
-        "z": "a1c94a24.22ed9",
+        "x": 4553.075698852539,
+        "y": 925.9926910400391,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "83e64e5.e0d02b"
+                "1c85f4a2.49e393"
             ]
         ]
     },
     {
-        "id": "c0c26e2b.b056f",
+        "id": "e925e05d.5c3e7",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4457.509033203125,
-        "y": 909.426025390625,
-        "z": "a1c94a24.22ed9",
+        "x": 4557.075698852539,
+        "y": 976.9926910400391,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "fb264c22.bb1ad8"
+                "7e7cdd76.7cfb84"
             ]
         ]
     },
     {
-        "id": "d5ccfec3.15cf68",
+        "id": "11095a88.1d6375",
         "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": 4606.571533203125,
-        "y": 808.2857666015625,
-        "z": "a1c94a24.22ed9",
+        "x": 4706.138198852539,
+        "y": 875.8524322509766,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "83e64e5.e0d02b",
+        "id": "1c85f4a2.49e393",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4596.509033203125,
-        "y": 858.426025390625,
-        "z": "a1c94a24.22ed9",
+        "x": 4696.075698852539,
+        "y": 925.9926910400391,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "13feb8ce.6f8f6f",
+        "id": "ce3181da.534ae8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4459,
-        "y": 1496.9998779296875,
-        "z": "a1c94a24.22ed9",
+        "x": 4558.566665649414,
+        "y": 1564.5665435791016,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "ff077827.d85f38"
+                "b22dee41.00f36"
             ]
         ]
     },
     {
-        "id": "6f75f930.e4c9a8",
+        "id": "dd474f13.0169c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4454.509033203125,
-        "y": 1546.4259033203125,
-        "z": "a1c94a24.22ed9",
+        "x": 4554.075698852539,
+        "y": 1613.9925689697266,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "509006fc.9b56c"
+                "6933584e.ecc31"
             ]
         ]
     },
     {
-        "id": "f4b40172.6e734",
+        "id": "1e53e46c.6ee5dc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4458.509033203125,
-        "y": 1597.4259033203125,
-        "z": "a1c94a24.22ed9",
+        "x": 4558.075698852539,
+        "y": 1664.9925689697266,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "43958ec8.7b7b1"
+                "b7fe5d85.6c90f"
             ]
         ]
     },
     {
-        "id": "ff077827.d85f38",
+        "id": "b22dee41.00f36",
         "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": 4607.571533203125,
-        "y": 1496.28564453125,
-        "z": "a1c94a24.22ed9",
+        "x": 4707.138198852539,
+        "y": 1563.852310180664,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "509006fc.9b56c",
+        "id": "6933584e.ecc31",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4597.509033203125,
-        "y": 1546.4259033203125,
-        "z": "a1c94a24.22ed9",
+        "x": 4697.075698852539,
+        "y": 1613.9925689697266,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "5e4b48a2.ecf978",
+        "id": "95843474.b9bce8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5271.66650390625,
-        "y": 953,
-        "z": "a1c94a24.22ed9",
+        "x": 5371.233169555664,
+        "y": 1020.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "3d7f3635.a666da",
-                "5948d066.6a7168",
-                "92d55b48.2c361",
-                "60b689f0.bdfe6",
-                "363286ce.e60c2a"
+                "b4615ea7.1bce1",
+                "be2e7ced.c4df",
+                "ce2c131b.42f24",
+                "71b17710.70c14",
+                "89a7842f.afd83"
             ]
         ]
     },
     {
-        "id": "8fdbb83e.80931",
+        "id": "4503129f.bd2fd4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5099,
-        "y": 954,
-        "z": "a1c94a24.22ed9",
+        "x": 5198.566665649414,
+        "y": 1021.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "5e4b48a2.ecf978"
+                "95843474.b9bce8"
             ]
         ]
     },
     {
-        "id": "c2d11145.5c5cb",
+        "id": "8659354b.96b4a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5108.490966796875,
-        "y": 996.5740356445312,
-        "z": "a1c94a24.22ed9",
+        "x": 5208.057632446289,
+        "y": 1064.1407012939453,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "f49eb8b9.2e621"
+                "df26ebdc.1c7d8"
             ]
         ]
     },
     {
-        "id": "15000269.771dce",
+        "id": "f14e9aee.41ddd",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5097,
-        "y": 1043,
-        "z": "a1c94a24.22ed9",
+        "x": 5196.566665649414,
+        "y": 1110.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "941ca63b.315eb8"
+                "779f16ad.79c298"
             ]
         ]
     },
     {
-        "id": "f49eb8b9.2e621",
+        "id": "df26ebdc.1c7d8",
         "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": 5262.0623779296875,
-        "y": 999.8597717285156,
-        "z": "a1c94a24.22ed9",
+        "x": 5361.629043579102,
+        "y": 1067.4264373779297,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "941ca63b.315eb8",
+        "id": "779f16ad.79c298",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 5266,
-        "y": 1044,
-        "z": "a1c94a24.22ed9",
+        "x": 5365.566665649414,
+        "y": 1111.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "fb264c22.bb1ad8",
+        "id": "7e7cdd76.7cfb84",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4619,
-        "y": 911,
-        "z": "a1c94a24.22ed9",
+        "x": 4718.566665649414,
+        "y": 978.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "eb451f8e.4fb418",
-                "bf3f1942.662798"
+                "d6ce477c.e6b1",
+                "6ff01134.d27b1"
             ]
         ]
     },
     {
-        "id": "43958ec8.7b7b1",
+        "id": "b7fe5d85.6c90f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4609,
-        "y": 1598.9998779296875,
-        "z": "a1c94a24.22ed9",
+        "x": 4708.566665649414,
+        "y": 1666.5665435791016,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "e17370f4.daf058",
-                "42ee84a0.63aa24"
+                "44dc4d90.b0cc4c",
+                "abe40e95.5db908"
             ]
         ]
     },
     {
-        "id": "9695016a.9d52a8",
+        "id": "12aedd33.0f1043",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5239.66650390625,
-        "y": 1789,
-        "z": "a1c94a24.22ed9",
+        "x": 5339.233169555664,
+        "y": 1856.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "798301ec.6e9398",
-                "e16e0955.66caa8",
-                "7dce5f2e.284a1",
-                "ff4b33a5.59c68",
-                "6468f05e.9836a8"
+                "e22e2a42.a26b1",
+                "cf28df7d.f3d4b",
+                "daaed265.7759a8",
+                "cb8398b0.7dbb5",
+                "7bc8d59f.6d2444"
             ]
         ]
     },
     {
-        "id": "ae7e9c7a.b5cf4",
+        "id": "9a2935ba.2db97",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5067,
-        "y": 1790,
-        "z": "a1c94a24.22ed9",
+        "x": 5166.566665649414,
+        "y": 1857.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "9695016a.9d52a8"
+                "12aedd33.0f1043"
             ]
         ]
     },
     {
-        "id": "ff1945a1.5b3fb8",
+        "id": "dcc235b8.72838",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5076.490966796875,
-        "y": 1832.5740356445312,
-        "z": "a1c94a24.22ed9",
+        "x": 5176.057632446289,
+        "y": 1900.1407012939453,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "1d67971d.5148d9"
+                "6a73fa3d.d6c2b4"
             ]
         ]
     },
     {
-        "id": "11aaad7f.ae123b",
+        "id": "262965f5.6cf9ea",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5065,
-        "y": 1879,
-        "z": "a1c94a24.22ed9",
+        "x": 5164.566665649414,
+        "y": 1946.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "cd2d5016.41656"
+                "403c1229.13a954"
             ]
         ]
     },
     {
-        "id": "1d67971d.5148d9",
+        "id": "6a73fa3d.d6c2b4",
         "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": 5230.0623779296875,
-        "y": 1835.8597717285156,
-        "z": "a1c94a24.22ed9",
+        "x": 5329.629043579102,
+        "y": 1903.4264373779297,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "cd2d5016.41656",
+        "id": "403c1229.13a954",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 5234,
-        "y": 1880,
-        "z": "a1c94a24.22ed9",
+        "x": 5333.566665649414,
+        "y": 1947.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "3d7f3635.a666da",
+        "id": "b4615ea7.1bce1",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5536,
-        "y": 937,
-        "z": "a1c94a24.22ed9",
+        "x": 5635.566665649414,
+        "y": 1004.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "3cfd3bad.5a9524",
-                "5da469b2.dc3e8"
+                "7fca3373.091184",
+                "84a28ee2.eeb658"
             ]
         ]
     },
     {
-        "id": "5da469b2.dc3e8",
+        "id": "84a28ee2.eeb658",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5759,
-        "y": 892,
-        "z": "a1c94a24.22ed9",
+        "x": 5858.566665649414,
+        "y": 959.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "688536c6.06de6"
+                "70d4fffc.d22c5"
             ]
         ]
     },
     {
-        "id": "3cfd3bad.5a9524",
+        "id": "7fca3373.091184",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5761,
-        "y": 956,
-        "z": "a1c94a24.22ed9",
+        "x": 5860.566665649414,
+        "y": 1023.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "d7550296.6875"
+                "3dce84d0.b85dd4"
             ]
         ]
     },
     {
-        "id": "8343d32.4aa5eb",
+        "id": "850dbb90.b4b68",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
         "comments": "",
-        "x": 6094,
-        "y": 847,
-        "z": "a1c94a24.22ed9",
+        "x": 6193.566665649414,
+        "y": 914.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "d7550296.6875",
+        "id": "3dce84d0.b85dd4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 5923,
-        "y": 952,
-        "z": "a1c94a24.22ed9",
+        "x": 6022.566665649414,
+        "y": 1019.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "688536c6.06de6",
+        "id": "70d4fffc.d22c5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5924,
-        "y": 889,
-        "z": "a1c94a24.22ed9",
+        "x": 6023.566665649414,
+        "y": 956.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "643d5e30.3c83d8",
-                "8343d32.4aa5eb"
+                "caf9269d.270b2",
+                "850dbb90.b4b68"
             ]
         ]
     },
     {
-        "id": "643d5e30.3c83d8",
+        "id": "caf9269d.270b2",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",
         "comments": "",
-        "x": 6095,
-        "y": 955,
-        "z": "a1c94a24.22ed9",
+        "x": 6194.566665649414,
+        "y": 1022.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "d03d942d.9c94e8",
+        "id": "59bf2583.d75a84",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 6096,
-        "y": 904,
-        "z": "a1c94a24.22ed9",
+        "x": 6195.566665649414,
+        "y": 971.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "5948d066.6a7168",
+        "id": "be2e7ced.c4df",
         "type": "execute",
         "name": "execute UUID generator for connectivity domainA",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5583,
-        "y": 1006,
-        "z": "a1c94a24.22ed9",
+        "x": 5682.566665649414,
+        "y": 1073.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "270e5bf.d3c68a4",
+        "id": "27594e13.316c22",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",
         "comments": "",
-        "x": 5472,
-        "y": 1047,
-        "z": "a1c94a24.22ed9",
+        "x": 5571.566665649414,
+        "y": 1114.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "798301ec.6e9398",
+        "id": "e22e2a42.a26b1",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5526,
-        "y": 1793.0001220703125,
-        "z": "a1c94a24.22ed9",
+        "x": 5625.566665649414,
+        "y": 1860.5667877197266,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "17eb4057.5c41d8",
-                "986119ae.163bd"
+                "b2f644ca.d12c2",
+                "b58bca2c.4bf2c"
             ]
         ]
     },
     {
-        "id": "986119ae.163bd",
+        "id": "b58bca2c.4bf2c",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5749,
-        "y": 1748.0001220703125,
-        "z": "a1c94a24.22ed9",
+        "x": 5848.566665649414,
+        "y": 1815.5667877197266,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "554f229b.2ed824"
+                "983024ad.f8675"
             ]
         ]
     },
     {
-        "id": "17eb4057.5c41d8",
+        "id": "b2f644ca.d12c2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5751,
-        "y": 1812.0001220703125,
-        "z": "a1c94a24.22ed9",
+        "x": 5850.566665649414,
+        "y": 1879.5667877197266,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "e5820266.08c2b"
+                "4af84f4.a49b8b"
             ]
         ]
     },
     {
-        "id": "59292690.4b166",
+        "id": "c96d7934.c0e9e8",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
         "comments": "",
-        "x": 6084,
-        "y": 1706.0001220703125,
-        "z": "a1c94a24.22ed9",
+        "x": 6183.566665649414,
+        "y": 1773.5667877197266,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "e5820266.08c2b",
+        "id": "4af84f4.a49b8b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 5910,
-        "y": 1831.0001220703125,
-        "z": "a1c94a24.22ed9",
+        "x": 6009.566665649414,
+        "y": 1898.5667877197266,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "554f229b.2ed824",
+        "id": "983024ad.f8675",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5914,
-        "y": 1745.0001220703125,
-        "z": "a1c94a24.22ed9",
+        "x": 6013.566665649414,
+        "y": 1812.5667877197266,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "59292690.4b166",
-                "a60da831.30b3f"
+                "c96d7934.c0e9e8",
+                "183e4dc8.9e45ba"
             ]
         ]
     },
     {
-        "id": "a60da831.30b3f",
+        "id": "183e4dc8.9e45ba",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
         "comments": "",
-        "x": 6085,
-        "y": 1811.0001220703125,
-        "z": "a1c94a24.22ed9",
+        "x": 6184.566665649414,
+        "y": 1878.5667877197266,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "bb10fbc2.a10ec8",
+        "id": "57730d78.763bfc",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 6080,
-        "y": 1760.0001220703125,
-        "z": "a1c94a24.22ed9",
+        "x": 6179.566665649414,
+        "y": 1827.5667877197266,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "7dce5f2e.284a1",
+        "id": "daaed265.7759a8",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5528,
-        "y": 1952.0001220703125,
-        "z": "a1c94a24.22ed9",
+        "x": 5627.566665649414,
+        "y": 2019.5667877197266,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "e16e0955.66caa8",
+        "id": "cf28df7d.f3d4b",
         "type": "execute",
         "name": "execute UUID generator for connectivity domainB",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5573,
-        "y": 1862.0001220703125,
-        "z": "a1c94a24.22ed9",
+        "x": 5672.566665649414,
+        "y": 1929.5667877197266,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "a786769.ba9bd08",
+        "id": "9f3e922b.b3211",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",
         "comments": "",
-        "x": 5462,
-        "y": 1900.0001220703125,
-        "z": "a1c94a24.22ed9",
+        "x": 5561.566665649414,
+        "y": 1967.5667877197266,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "5c94cc42.b4c6e4",
+        "id": "8f0ab711.e0d798",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4457,
-        "y": 2197,
-        "z": "a1c94a24.22ed9",
+        "x": 4556.566665649414,
+        "y": 2264.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "898ec19e.6e281",
+        "id": "d96045a7.1a29c8",
         "type": "set",
         "name": "set attachment_param",
         "xml": "<set>\n<parameter name='prop.connection-attachment.access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='prop.connection-attachment.access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='prop.connection-attachment.access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='prop.connection-attachment.access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='prop.connection-attachment.access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n\n<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='prop.remote.connection-attachment.access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='prop.remote.connection-attachment.access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n\n<!--<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />-->\n",
         "comments": "",
-        "x": 4251,
-        "y": 2098,
-        "z": "a1c94a24.22ed9",
+        "x": 4350.566665649414,
+        "y": 2165.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "4cbb6f6d.e8bed",
+        "id": "d2d69fa1.baa39",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "put proper values for src topology-id, node-id, ltp-id, etc (in domain A)\nand dst topology-id, node-id, ltp-id, etc (in domain B)",
         "comments": "",
-        "x": 4225,
-        "y": 2051,
-        "z": "a1c94a24.22ed9",
+        "x": 4324.566665649414,
+        "y": 2118.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "92d55b48.2c361",
+        "id": "ce2c131b.42f24",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 5666,
-        "y": 1144,
-        "z": "a1c94a24.22ed9",
+        "x": 5765.566665649414,
+        "y": 1211.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "ff4b33a5.59c68",
+        "id": "cb8398b0.7dbb5",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 5655,
-        "y": 2017.0001220703125,
-        "z": "a1c94a24.22ed9",
+        "x": 5754.566665649414,
+        "y": 2084.5667877197266,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "c675da0b.5461c8",
+        "id": "92b1873d.551bc",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 6710,
-        "y": 664,
-        "z": "a1c94a24.22ed9",
+        "x": 6809.566665649414,
+        "y": 731.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "bb4a9deb.45b028",
-                "7bfedf54.b55d88",
-                "d4dc18e1.4b9fa8"
+                "3b96c7df.05e2",
+                "1eec19a2.07645e",
+                "b1213bca.c3532"
             ]
         ]
     },
     {
-        "id": "576d8604.8f2d9",
+        "id": "8eff1c95.000698",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2597,
-        "y": 319,
-        "z": "a1c94a24.22ed9",
+        "x": 2696.566665649414,
+        "y": 386.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "8047c637.b43eb"
+                "ad97eaf2.db3cf"
             ]
         ]
     },
     {
-        "id": "bcb352a5.999038",
+        "id": "5c4d87c2.cacd08",
         "type": "outcome",
         "name": "logical-link",
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 994.0001220703125,
-        "y": 714.0001220703125,
-        "z": "a1c94a24.22ed9",
+        "x": 1093.5667877197266,
+        "y": 781.5667877197266,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "77e7cd5a.50c41c"
+                "ba05feca.357468"
             ]
         ]
     },
     {
-        "id": "64e2c5c1.d42b2c",
+        "id": "41f5506e.8f5aa",
         "type": "switchNode",
         "name": "switch allotted-resource.relationship-list not empty",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2160,
-        "y": 413,
-        "z": "a1c94a24.22ed9",
+        "x": 2259.566665649414,
+        "y": 480.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "550b6611.97dc",
-                "d80de88d.6f84f"
+                "8b2a546b.9f5318",
+                "f654fc01.bf0048"
             ]
         ]
     },
     {
-        "id": "d80de88d.6f84f",
+        "id": "f654fc01.bf0048",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2481,
-        "y": 395,
-        "z": "a1c94a24.22ed9",
+        "x": 2580.566665649414,
+        "y": 462.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "550b6611.97dc",
+        "id": "8b2a546b.9f5318",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2463,
-        "y": 493,
-        "z": "a1c94a24.22ed9",
+        "x": 2562.566665649414,
+        "y": 560.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "bcacdfd4.14c6d"
+                "24772c6a.a8483c"
             ]
         ]
     },
     {
-        "id": "c443600d.94faa8",
+        "id": "94799b47.aa87f8",
         "type": "set",
         "name": "set the current logical-link-name",
         "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n<parameter name='currLinkIsFound' value=\"false\" />\n\n\n",
         "comments": "",
-        "x": 1417,
-        "y": 617,
-        "z": "a1c94a24.22ed9",
+        "x": 1516.566665649414,
+        "y": 684.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "77e7cd5a.50c41c",
+        "id": "ba05feca.357468",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1171,
-        "y": 707,
-        "z": "a1c94a24.22ed9",
+        "x": 1270.566665649414,
+        "y": 774.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "c443600d.94faa8",
-                "adcb7aad.70c0d",
-                "7947ec90.0b2fbc"
+                "94799b47.aa87f8",
+                "433e887a.5dd2c",
+                "fc0b0bdf.af57e8"
             ]
         ]
     },
     {
-        "id": "b29eb633.564108",
+        "id": "fa0822cd.53caf",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 4799,
-        "y": 916,
-        "z": "a1c94a24.22ed9",
+        "x": 4898.566665649414,
+        "y": 983.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "eb451f8e.4fb418",
+        "id": "d6ce477c.e6b1",
         "type": "save",
         "name": "get p-interface-src from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<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 = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4842,
-        "y": 981,
-        "z": "a1c94a24.22ed9",
+        "x": 4941.566665649414,
+        "y": 1048.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "8fdbb83e.80931",
-                "c2d11145.5c5cb",
-                "15000269.771dce"
+                "4503129f.bd2fd4",
+                "8659354b.96b4a",
+                "f14e9aee.41ddd"
             ]
         ]
     },
     {
-        "id": "e17370f4.daf058",
+        "id": "44dc4d90.b0cc4c",
         "type": "save",
         "name": "get p-interface-dst from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<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 = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4839,
-        "y": 1825,
-        "z": "a1c94a24.22ed9",
+        "x": 4938.566665649414,
+        "y": 1892.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "ae7e9c7a.b5cf4",
-                "ff1945a1.5b3fb8",
-                "11aaad7f.ae123b"
+                "9a2935ba.2db97",
+                "dcc235b8.72838",
+                "262965f5.6cf9ea"
             ]
         ]
     },
     {
-        "id": "dcd9fb09.ef46f8",
+        "id": "2ca1c6c2.0f0f22",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 4800,
-        "y": 1769,
-        "z": "a1c94a24.22ed9",
+        "x": 4899.566665649414,
+        "y": 1836.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "8047c637.b43eb",
+        "id": "ad97eaf2.db3cf",
         "type": "save",
         "name": "get allotted-resource relationship from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2890,
-        "y": 266,
-        "z": "a1c94a24.22ed9",
+        "x": 2989.566665649414,
+        "y": 333.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "d1511c62.9f2f08",
-                "1f77347e.42dfe4",
-                "64ec23f4.ba3244"
+                "ef5e96fe.587c78",
+                "e171a2b9.a46c9",
+                "ed7e8b76.daabf"
             ]
         ]
     },
     {
-        "id": "1f77347e.42dfe4",
+        "id": "e171a2b9.a46c9",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3163.490966796875,
-        "y": 158.573974609375,
-        "z": "a1c94a24.22ed9",
+        "x": 3263.057632446289,
+        "y": 226.14064025878906,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "45b306de.298a5"
+                "ae21063b.421918"
             ]
         ]
     },
     {
-        "id": "45b306de.298a5",
+        "id": "ae21063b.421918",
         "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": 3341.0625,
-        "y": 158.8597412109375,
-        "z": "a1c94a24.22ed9",
+        "x": 3440.629165649414,
+        "y": 226.42640686035156,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "64ec23f4.ba3244",
+        "id": "ed7e8b76.daabf",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3159,
-        "y": 208,
-        "z": "a1c94a24.22ed9",
+        "x": 3258.566665649414,
+        "y": 275.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "fd23c3a.05df04"
+                "1fe6476a.260d99"
             ]
         ]
     },
     {
-        "id": "fd23c3a.05df04",
+        "id": "1fe6476a.260d99",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3341,
-        "y": 208,
-        "z": "a1c94a24.22ed9",
+        "x": 3440.566665649414,
+        "y": 275.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "d1511c62.9f2f08",
+        "id": "ef5e96fe.587c78",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3163,
-        "y": 259,
-        "z": "a1c94a24.22ed9",
+        "x": 3262.566665649414,
+        "y": 326.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "a1083b0f.8f91b8"
+                "5ed5bf6.6fd244"
             ]
         ]
     },
     {
-        "id": "a1083b0f.8f91b8",
+        "id": "5ed5bf6.6fd244",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3343,
-        "y": 259,
-        "z": "a1c94a24.22ed9",
+        "x": 3442.566665649414,
+        "y": 326.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "64e2c5c1.d42b2c"
+                "41f5506e.8f5aa"
             ]
         ]
     },
     {
-        "id": "1a6f80e4.595e77",
+        "id": "99ef6a45.9ad878",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 769,
-        "y": 643,
-        "z": "a1c94a24.22ed9",
+        "x": 868.5666656494141,
+        "y": 710.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "3a09f79.98a6388"
+                "99689150.5b9778"
             ]
         ]
     },
     {
-        "id": "3a09f79.98a6388",
+        "id": "99689150.5b9778",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1040,
-        "y": 639,
-        "z": "a1c94a24.22ed9",
+        "x": 1139.566665649414,
+        "y": 706.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "bcb352a5.999038"
+                "5c4d87c2.cacd08"
             ]
         ]
     },
     {
-        "id": "77ab35ed.5d2284",
+        "id": "2bf740bc.b587b",
         "type": "outcome",
         "name": "network-policy",
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3319,
-        "y": 457,
-        "z": "a1c94a24.22ed9",
+        "x": 3418.566665649414,
+        "y": 524.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "b58a3427.b81d38"
+                "3a3c2a70.68a7ee"
             ]
         ]
     },
     {
-        "id": "b58a3427.b81d38",
+        "id": "3a3c2a70.68a7ee",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3495.9998779296875,
-        "y": 449.9998779296875,
-        "z": "a1c94a24.22ed9",
+        "x": 3595.5665435791016,
+        "y": 517.5665435791016,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "362b1182.0bd166",
-                "6c82d6c3.fedf4"
+                "e9454f9d.caf03",
+                "6d43a86.3d48758"
             ]
         ]
     },
     {
-        "id": "362b1182.0bd166",
+        "id": "e9454f9d.caf03",
         "type": "set",
         "name": "set the 1st network-policy-id",
         "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
-        "x": 3738.9998779296875,
-        "y": 406.9998779296875,
-        "z": "a1c94a24.22ed9",
+        "x": 3838.5665435791016,
+        "y": 474.56654357910156,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "6c82d6c3.fedf4",
+        "id": "6d43a86.3d48758",
         "type": "save",
         "name": "get network-policy from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",
         "comments": "",
         "outputs": 1,
-        "x": 3727.9998779296875,
-        "y": 461.9998779296875,
-        "z": "a1c94a24.22ed9",
+        "x": 3827.5665435791016,
+        "y": 529.5665435791016,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "1ff2fa25.6c9396",
-                "e4e601c1.f5d79",
-                "758d093f.dcc028"
+                "8a364a72.424c28",
+                "fd07ec43.4387a",
+                "4d3c4393.f4c224"
             ]
         ]
     },
     {
-        "id": "758d093f.dcc028",
+        "id": "4d3c4393.f4c224",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3981,
-        "y": 348,
-        "z": "a1c94a24.22ed9",
+        "x": 4080.566665649414,
+        "y": 415.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "a8089973.873718"
+                "8a48cdf4.281a78"
             ]
         ]
     },
     {
-        "id": "a8089973.873718",
+        "id": "8a48cdf4.281a78",
         "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": 4129.571533203125,
-        "y": 348.2857666015625,
-        "z": "a1c94a24.22ed9",
+        "x": 4229.138198852539,
+        "y": 415.85243225097656,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "d2216009.d4e938",
+        "id": "81c305db.010dc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4128.509033203125,
-        "y": 392.426025390625,
-        "z": "a1c94a24.22ed9",
+        "x": 4228.075698852539,
+        "y": 459.99269104003906,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "e4e601c1.f5d79",
+        "id": "fd07ec43.4387a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3969.509033203125,
-        "y": 392.426025390625,
-        "z": "a1c94a24.22ed9",
+        "x": 4069.075698852539,
+        "y": 459.99269104003906,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "d2216009.d4e938"
+                "81c305db.010dc"
             ]
         ]
     },
     {
-        "id": "1ff2fa25.6c9396",
+        "id": "8a364a72.424c28",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3976.509033203125,
-        "y": 471.426025390625,
-        "z": "a1c94a24.22ed9",
+        "x": 4076.075698852539,
+        "y": 538.9926910400391,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "9a187669.a984"
+                "41b3b67d.c6f8e8"
             ]
         ]
     },
     {
-        "id": "9a187669.a984",
+        "id": "41b3b67d.c6f8e8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4115.509033203125,
-        "y": 471.426025390625,
-        "z": "a1c94a24.22ed9",
+        "x": 4215.075698852539,
+        "y": 538.9926910400391,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "83c9fbd0.4ea53",
-                "9b904bff.ec9058"
+                "f0091688.66654",
+                "4f7a1356.449274"
             ]
         ]
     },
     {
-        "id": "83c9fbd0.4ea53",
+        "id": "f0091688.66654",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
-        "x": 4321,
-        "y": 469,
-        "z": "a1c94a24.22ed9",
+        "x": 4420.566665649414,
+        "y": 536.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "bf3f1942.662798",
+        "id": "6ff01134.d27b1",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4843,
-        "y": 651,
-        "z": "a1c94a24.22ed9",
+        "x": 4942.566665649414,
+        "y": 718.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "47a119b0.eb6fa8",
-                "52820edd.aa4a2"
+                "39467319.609964",
+                "3cc969fb.c20abe"
             ]
         ]
     },
     {
-        "id": "52820edd.aa4a2",
+        "id": "3cc969fb.c20abe",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5066,
-        "y": 637,
-        "z": "a1c94a24.22ed9",
+        "x": 5165.566665649414,
+        "y": 704.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "7649e490.475914"
+                "2dfb867b.202c62"
             ]
         ]
     },
     {
-        "id": "47a119b0.eb6fa8",
+        "id": "39467319.609964",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5068,
-        "y": 670,
-        "z": "a1c94a24.22ed9",
+        "x": 5167.566665649414,
+        "y": 737.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "86cbcc23.726e88"
+                "fb83e9be.2efe"
             ]
         ]
     },
     {
-        "id": "86cbcc23.726e88",
+        "id": "fb83e9be.2efe",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 5211,
-        "y": 667,
-        "z": "a1c94a24.22ed9",
+        "x": 5310.566665649414,
+        "y": 734.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "7649e490.475914",
+        "id": "2dfb867b.202c62",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5214,
-        "y": 630,
-        "z": "a1c94a24.22ed9",
+        "x": 5313.566665649414,
+        "y": 697.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "ff121e57.29292",
-                "450151c8.427488"
+                "15d7491f.df8677",
+                "965ca101.13418"
             ]
         ]
     },
     {
-        "id": "ff121e57.29292",
+        "id": "15d7491f.df8677",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 5376,
-        "y": 625,
-        "z": "a1c94a24.22ed9",
+        "x": 5475.566665649414,
+        "y": 692.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "42ee84a0.63aa24",
+        "id": "abe40e95.5db908",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4857,
-        "y": 1487.9998779296875,
-        "z": "a1c94a24.22ed9",
+        "x": 4956.566665649414,
+        "y": 1555.5665435791016,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "1ca058bb.f36a17",
-                "11f9a295.aa46bd"
+                "d51c262f.477ec",
+                "4509355c.99159c"
             ]
         ]
     },
     {
-        "id": "11f9a295.aa46bd",
+        "id": "4509355c.99159c",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5080,
-        "y": 1473.9998779296875,
-        "z": "a1c94a24.22ed9",
+        "x": 5179.566665649414,
+        "y": 1541.5665435791016,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "49fa7605.34063"
+                "d6d3b9d3.95749"
             ]
         ]
     },
     {
-        "id": "1ca058bb.f36a17",
+        "id": "d51c262f.477ec",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5082,
-        "y": 1506.9998779296875,
-        "z": "a1c94a24.22ed9",
+        "x": 5181.566665649414,
+        "y": 1574.5665435791016,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "45cb9702.942408"
+                "41fb7895.687548"
             ]
         ]
     },
     {
-        "id": "45cb9702.942408",
+        "id": "41fb7895.687548",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 5225,
-        "y": 1503.9998779296875,
-        "z": "a1c94a24.22ed9",
+        "x": 5324.566665649414,
+        "y": 1571.5665435791016,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "49fa7605.34063",
+        "id": "d6d3b9d3.95749",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5228,
-        "y": 1466.9998779296875,
-        "z": "a1c94a24.22ed9",
+        "x": 5327.566665649414,
+        "y": 1534.5665435791016,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "875267c0.cfa878",
-                "15dbb018.1ec0a8"
+                "dc31fe9c.b39df",
+                "22e60879.c39a9"
             ]
         ]
     },
     {
-        "id": "875267c0.cfa878",
+        "id": "dc31fe9c.b39df",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 5422,
-        "y": 1470,
-        "z": "a1c94a24.22ed9",
+        "x": 5521.566665649414,
+        "y": 1537.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "48043489.9f26f4",
+        "id": "dd074b01.699d5",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 1020,
-        "y": 174,
-        "z": "a1c94a24.22ed9",
+        "x": 1119.566665649414,
+        "y": 241.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "60b689f0.bdfe6",
+        "id": "71b17710.70c14",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 5490,
-        "y": 1221,
-        "z": "a1c94a24.22ed9",
+        "x": 5589.566665649414,
+        "y": 1288.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "d6de59ef.b305d8"
+                "262b12c7.d4eb86"
             ]
         ]
     },
     {
-        "id": "d6de59ef.b305d8",
+        "id": "262b12c7.d4eb86",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5696,
-        "y": 1221,
-        "z": "a1c94a24.22ed9",
+        "x": 5795.566665649414,
+        "y": 1288.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "8fe7cd4d.34b2f"
+                "5944b4c4.a90d9c"
             ]
         ]
     },
     {
-        "id": "8fe7cd4d.34b2f",
+        "id": "5944b4c4.a90d9c",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5911.28564453125,
-        "y": 1220.82177734375,
-        "z": "a1c94a24.22ed9",
+        "x": 6010.852310180664,
+        "y": 1288.388442993164,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "a0e0dfef.59beb"
+                "97ca4a46.233f6"
             ]
         ]
     },
     {
-        "id": "a0e0dfef.59beb",
+        "id": "97ca4a46.233f6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6118.1171875,
-        "y": 1221.34033203125,
-        "z": "a1c94a24.22ed9",
+        "x": 6217.683853149414,
+        "y": 1288.906997680664,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "2cceafd0.237718",
-                "c79a44fd.7a419",
-                "b0ce172f.4e793"
+                "18a90b5a.512eed",
+                "9b9213f3.dfc428",
+                "21506293.2b15d6"
             ]
         ]
     },
     {
-        "id": "2cceafd0.237718",
+        "id": "18a90b5a.512eed",
         "type": "set",
         "name": "set source ttp-id",
         "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 6333.1171875,
-        "y": 1183.34033203125,
-        "z": "a1c94a24.22ed9",
+        "x": 6432.683853149414,
+        "y": 1250.906997680664,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "c79a44fd.7a419",
+        "id": "9b9213f3.dfc428",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 6330.1171875,
-        "y": 1222.34033203125,
-        "z": "a1c94a24.22ed9",
+        "x": 6429.683853149414,
+        "y": 1289.906997680664,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "6b7d00f0.0adfa"
+                "8cbab548.0454b"
             ]
         ]
     },
     {
-        "id": "b0ce172f.4e793",
+        "id": "21506293.2b15d6",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 6285.6171875,
-        "y": 1264.34033203125,
-        "z": "a1c94a24.22ed9",
+        "x": 6385.183853149414,
+        "y": 1331.906997680664,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "6b7d00f0.0adfa",
+        "id": "8cbab548.0454b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6510.6171875,
-        "y": 1221.34033203125,
-        "z": "a1c94a24.22ed9",
+        "x": 6610.183853149414,
+        "y": 1288.906997680664,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "646cdf92.8cc9e8"
+                "326ba546.7f7e7a"
             ]
         ]
     },
     {
-        "id": "646cdf92.8cc9e8",
+        "id": "326ba546.7f7e7a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6668.6171875,
-        "y": 1221.34033203125,
-        "z": "a1c94a24.22ed9",
+        "x": 6768.183853149414,
+        "y": 1288.906997680664,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "6ef1cda7.04969c"
+                "49cced3d.6f7764"
             ]
         ]
     },
     {
-        "id": "6ef1cda7.04969c",
+        "id": "49cced3d.6f7764",
         "type": "set",
         "name": "set source tunnel tp ip",
         "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 6875.6171875,
-        "y": 1221.34033203125,
-        "z": "a1c94a24.22ed9",
+        "x": 6975.183853149414,
+        "y": 1288.906997680664,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "6468f05e.9836a8",
+        "id": "7bc8d59f.6d2444",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 5487,
-        "y": 2090.0001220703125,
-        "z": "a1c94a24.22ed9",
+        "x": 5586.566665649414,
+        "y": 2157.5667877197266,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "592b262a.d8a79"
+                "8f6d6d5b.1cead8"
             ]
         ]
     },
     {
-        "id": "592b262a.d8a79",
+        "id": "8f6d6d5b.1cead8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5693,
-        "y": 2090.0001220703125,
-        "z": "a1c94a24.22ed9",
+        "x": 5792.566665649414,
+        "y": 2157.5667877197266,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "24f444c6.f34f94"
+                "e19b436a.7033d"
             ]
         ]
     },
     {
-        "id": "24f444c6.f34f94",
+        "id": "e19b436a.7033d",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5908.28564453125,
-        "y": 2089.8218994140625,
-        "z": "a1c94a24.22ed9",
+        "x": 6007.852310180664,
+        "y": 2157.3885650634766,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "82538773.d9e69"
+                "bec0ab0f.3e04c8"
             ]
         ]
     },
     {
-        "id": "82538773.d9e69",
+        "id": "bec0ab0f.3e04c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6115.1171875,
-        "y": 2090.3404541015625,
-        "z": "a1c94a24.22ed9",
+        "x": 6214.683853149414,
+        "y": 2157.9071197509766,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "f8555c72.503248",
-                "ccee56e4.07c16",
-                "c641b1.139d865"
+                "27fbcba1.3d3b74",
+                "ceb087f2.f1a2d",
+                "f5af142d.56f9a8"
             ]
         ]
     },
     {
-        "id": "f8555c72.503248",
+        "id": "27fbcba1.3d3b74",
         "type": "set",
         "name": "set destination ttp-id",
         "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 6330.1171875,
-        "y": 2052.3404541015625,
-        "z": "a1c94a24.22ed9",
+        "x": 6429.683853149414,
+        "y": 2119.9071197509766,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "ccee56e4.07c16",
+        "id": "ceb087f2.f1a2d",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 6327.1171875,
-        "y": 2091.3404541015625,
-        "z": "a1c94a24.22ed9",
+        "x": 6426.683853149414,
+        "y": 2158.9071197509766,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "c03544bc.a4758"
+                "3dd2b911.678516"
             ]
         ]
     },
     {
-        "id": "c641b1.139d865",
+        "id": "f5af142d.56f9a8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 6282.6171875,
-        "y": 2133.3404541015625,
-        "z": "a1c94a24.22ed9",
+        "x": 6382.183853149414,
+        "y": 2200.9071197509766,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "c03544bc.a4758",
+        "id": "3dd2b911.678516",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6507.6171875,
-        "y": 2090.3404541015625,
-        "z": "a1c94a24.22ed9",
+        "x": 6607.183853149414,
+        "y": 2157.9071197509766,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "e9ccbcc0.192618"
+                "2d748944.5ecffe"
             ]
         ]
     },
     {
-        "id": "e9ccbcc0.192618",
+        "id": "2d748944.5ecffe",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6665.6171875,
-        "y": 2090.3404541015625,
-        "z": "a1c94a24.22ed9",
+        "x": 6765.183853149414,
+        "y": 2157.9071197509766,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "8cb4312f.1b7fd"
+                "6570963f.999c3"
             ]
         ]
     },
     {
-        "id": "8cb4312f.1b7fd",
+        "id": "6570963f.999c3",
         "type": "set",
         "name": "set destination tunnel tp ip",
         "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 6872.6171875,
-        "y": 2090.3404541015625,
-        "z": "a1c94a24.22ed9",
+        "x": 6972.183853149414,
+        "y": 2157.9071197509766,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "450151c8.427488",
+        "id": "965ca101.13418",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 5403,
-        "y": 697,
-        "z": "a1c94a24.22ed9",
+        "x": 5502.566665649414,
+        "y": 764.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "a23d1a8f.c26b88",
-                "378c450d.9f83ea",
-                "dfbd70ce.dcae1"
+                "50b56074.398fb8",
+                "37713986.ac02f6",
+                "9d9c191d.f7c08"
             ]
         ]
     },
     {
-        "id": "a23d1a8f.c26b88",
+        "id": "50b56074.398fb8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5598.5001220703125,
-        "y": 649,
-        "z": "a1c94a24.22ed9",
+        "x": 5698.066787719727,
+        "y": 716.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "47f12a0.7fd7dd8"
+                "e3c2a355.360d3"
             ]
         ]
     },
     {
-        "id": "378c450d.9f83ea",
+        "id": "37713986.ac02f6",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5590.5001220703125,
-        "y": 704,
-        "z": "a1c94a24.22ed9",
+        "x": 5690.066787719727,
+        "y": 771.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "aa90c931.1acf78"
+                "f545ca2e.f44db"
             ]
         ]
     },
     {
-        "id": "dfbd70ce.dcae1",
+        "id": "9d9c191d.f7c08",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5595.5001220703125,
-        "y": 761,
-        "z": "a1c94a24.22ed9",
+        "x": 5695.066787719727,
+        "y": 828.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "23762cf6.ae956c"
+                "e48b21a8.d61508"
             ]
         ]
     },
     {
-        "id": "23762cf6.ae956c",
+        "id": "e48b21a8.d61508",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5747.5001220703125,
-        "y": 762,
-        "z": "a1c94a24.22ed9",
+        "x": 5847.066787719727,
+        "y": 829.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "aa90c931.1acf78",
+        "id": "f545ca2e.f44db",
         "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.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5758.5001220703125,
-        "y": 707,
-        "z": "a1c94a24.22ed9",
+        "x": 5858.066787719727,
+        "y": 774.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "47f12a0.7fd7dd8",
+        "id": "e3c2a355.360d3",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5742.8824462890625,
-        "y": 646.6556701660156,
-        "z": "a1c94a24.22ed9",
+        "x": 5842.449111938477,
+        "y": 714.2223358154297,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "7098fc9f.d79a4c"
+                "206fadad.185672"
             ]
         ]
     },
     {
-        "id": "afa8e9ca.a2ff88",
+        "id": "16b234e1.30a8c3",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6325,
-        "y": 665,
-        "z": "a1c94a24.22ed9",
+        "x": 6424.566665649414,
+        "y": 732.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "fcbb91a5.b44ad8"
+                "e787bf98.1dda3"
             ]
         ]
     },
     {
-        "id": "fcbb91a5.b44ad8",
+        "id": "e787bf98.1dda3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6502,
-        "y": 657,
-        "z": "a1c94a24.22ed9",
+        "x": 6601.566665649414,
+        "y": 724.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "81752885.eb63a8",
-                "c675da0b.5461c8"
+                "71a48553.06547c",
+                "92b1873d.551bc"
             ]
         ]
     },
     {
-        "id": "7098fc9f.d79a4c",
+        "id": "206fadad.185672",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 5927,
-        "y": 661,
-        "z": "a1c94a24.22ed9",
+        "x": 6026.566665649414,
+        "y": 728.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "4474e908.078af8"
+                "69c3e96a.358898"
             ]
         ]
     },
     {
-        "id": "4474e908.078af8",
+        "id": "69c3e96a.358898",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6122,
-        "y": 661,
-        "z": "a1c94a24.22ed9",
+        "x": 6221.566665649414,
+        "y": 728.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "afa8e9ca.a2ff88",
-                "82783d37.d452a8"
+                "16b234e1.30a8c3",
+                "90deb9f8.a72b18"
             ]
         ]
     },
     {
-        "id": "81752885.eb63a8",
+        "id": "71a48553.06547c",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainA id",
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 6740,
-        "y": 612,
-        "z": "a1c94a24.22ed9",
+        "x": 6839.566665649414,
+        "y": 679.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "bb4a9deb.45b028",
+        "id": "3b96c7df.05e2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6920,
-        "y": 655,
-        "z": "a1c94a24.22ed9",
+        "x": 7019.566665649414,
+        "y": 722.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "afb3d4f9.ba93a"
+                "6f8ea6fb.24df1"
             ]
         ]
     },
     {
-        "id": "7bfedf54.b55d88",
+        "id": "1eec19a2.07645e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6912,
-        "y": 710,
-        "z": "a1c94a24.22ed9",
+        "x": 7011.566665649414,
+        "y": 777.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "4c9ef7f7.e20878"
+                "91f5de57.10361"
             ]
         ]
     },
     {
-        "id": "d4dc18e1.4b9fa8",
+        "id": "b1213bca.c3532",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6917,
-        "y": 767,
-        "z": "a1c94a24.22ed9",
+        "x": 7016.566665649414,
+        "y": 834.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "af0e4e29.c0c348"
+                "62327f7e.aacf68"
             ]
         ]
     },
     {
-        "id": "af0e4e29.c0c348",
+        "id": "62327f7e.aacf68",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 7069,
-        "y": 768,
-        "z": "a1c94a24.22ed9",
+        "x": 7168.566665649414,
+        "y": 835.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "4c9ef7f7.e20878",
+        "id": "91f5de57.10361",
         "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.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 7080,
-        "y": 713,
-        "z": "a1c94a24.22ed9",
+        "x": 7179.566665649414,
+        "y": 780.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "afb3d4f9.ba93a",
+        "id": "6f8ea6fb.24df1",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 7064.38232421875,
-        "y": 652.6556701660156,
-        "z": "a1c94a24.22ed9",
+        "x": 7163.948989868164,
+        "y": 720.2223358154297,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "48d857d6.23bcb8"
+                "10e59332.2edbc5"
             ]
         ]
     },
     {
-        "id": "48d857d6.23bcb8",
+        "id": "10e59332.2edbc5",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 7279,
-        "y": 649,
-        "z": "a1c94a24.22ed9",
+        "x": 7378.566665649414,
+        "y": 716.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "15dbb018.1ec0a8",
+        "id": "22e60879.c39a9",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 5444,
-        "y": 1538,
-        "z": "a1c94a24.22ed9",
+        "x": 5543.566665649414,
+        "y": 1605.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "ddbec5c8.9e7b8",
-                "79a0af8f.4ef61",
-                "7e842000.99ad5"
+                "3be38b30.4b1f64",
+                "53e462a7.300ecc",
+                "be7dfbd6.3bfbb"
             ]
         ]
     },
     {
-        "id": "ddbec5c8.9e7b8",
+        "id": "3be38b30.4b1f64",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5639.5001220703125,
-        "y": 1490,
-        "z": "a1c94a24.22ed9",
+        "x": 5739.066787719727,
+        "y": 1557.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "dd9e895a.d361b8"
+                "3d4c22c4.8bc33e"
             ]
         ]
     },
     {
-        "id": "79a0af8f.4ef61",
+        "id": "53e462a7.300ecc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5631.5001220703125,
-        "y": 1545,
-        "z": "a1c94a24.22ed9",
+        "x": 5731.066787719727,
+        "y": 1612.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "bac9dfa5.acb0b8"
+                "cc499006.fb3a6"
             ]
         ]
     },
     {
-        "id": "7e842000.99ad5",
+        "id": "be7dfbd6.3bfbb",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5636.5001220703125,
-        "y": 1602,
-        "z": "a1c94a24.22ed9",
+        "x": 5736.066787719727,
+        "y": 1669.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "39141e3c.f5c4ba"
+                "95cfda12.13aa08"
             ]
         ]
     },
     {
-        "id": "39141e3c.f5c4ba",
+        "id": "95cfda12.13aa08",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5788.5001220703125,
-        "y": 1603,
-        "z": "a1c94a24.22ed9",
+        "x": 5888.066787719727,
+        "y": 1670.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "bac9dfa5.acb0b8",
+        "id": "cc499006.fb3a6",
         "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.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5799.5001220703125,
-        "y": 1548,
-        "z": "a1c94a24.22ed9",
+        "x": 5899.066787719727,
+        "y": 1615.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "dd9e895a.d361b8",
+        "id": "3d4c22c4.8bc33e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5783.8824462890625,
-        "y": 1487.6556701660156,
-        "z": "a1c94a24.22ed9",
+        "x": 5883.449111938477,
+        "y": 1555.2223358154297,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "73633cf3.366dcc"
+                "7d552eed.53cb2"
             ]
         ]
     },
     {
-        "id": "f9e8a04.0c1b9e",
+        "id": "6ebd5273.de974c",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6366,
-        "y": 1506,
-        "z": "a1c94a24.22ed9",
+        "x": 6465.566665649414,
+        "y": 1573.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "858146ac.41a8b8"
+                "d2cb326b.2ce928"
             ]
         ]
     },
     {
-        "id": "858146ac.41a8b8",
+        "id": "d2cb326b.2ce928",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6543,
-        "y": 1498,
-        "z": "a1c94a24.22ed9",
+        "x": 6642.566665649414,
+        "y": 1565.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "b9f112f1.16fa48",
-                "8777efed.45e25"
+                "afdd7500.c5c358",
+                "995d487d.d5b57"
             ]
         ]
     },
     {
-        "id": "73633cf3.366dcc",
+        "id": "7d552eed.53cb2",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 5968,
-        "y": 1502,
-        "z": "a1c94a24.22ed9",
+        "x": 6067.566665649414,
+        "y": 1569.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "84157579.d2bb08"
+                "6d34d717.589238"
             ]
         ]
     },
     {
-        "id": "84157579.d2bb08",
+        "id": "6d34d717.589238",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6163,
-        "y": 1502,
-        "z": "a1c94a24.22ed9",
+        "x": 6262.566665649414,
+        "y": 1569.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "f9e8a04.0c1b9e",
-                "bf377915.b45748"
+                "6ebd5273.de974c",
+                "9bbf0d49.94213"
             ]
         ]
     },
     {
-        "id": "8777efed.45e25",
+        "id": "995d487d.d5b57",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 6751,
-        "y": 1505,
-        "z": "a1c94a24.22ed9",
+        "x": 6850.566665649414,
+        "y": 1572.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "2ab532d7.7f1fb6",
-                "e8de40ac.67f83",
-                "24548740.4d9e68"
+                "bb91f7ce.3ad978",
+                "8e3f2e93.c1d45",
+                "c8e3caf1.3f9eb8"
             ]
         ]
     },
     {
-        "id": "b9f112f1.16fa48",
+        "id": "afdd7500.c5c358",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainB id",
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 6781,
-        "y": 1453,
-        "z": "a1c94a24.22ed9",
+        "x": 6880.566665649414,
+        "y": 1520.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "2ab532d7.7f1fb6",
+        "id": "bb91f7ce.3ad978",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6961,
-        "y": 1496,
-        "z": "a1c94a24.22ed9",
+        "x": 7060.566665649414,
+        "y": 1563.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "feff3b5.5e8b948"
+                "ced1d2ca.c0f7c"
             ]
         ]
     },
     {
-        "id": "e8de40ac.67f83",
+        "id": "8e3f2e93.c1d45",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6953,
-        "y": 1551,
-        "z": "a1c94a24.22ed9",
+        "x": 7052.566665649414,
+        "y": 1618.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "8e635e5c.8adab"
+                "20b91ac9.f7bb0e"
             ]
         ]
     },
     {
-        "id": "24548740.4d9e68",
+        "id": "c8e3caf1.3f9eb8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6958,
-        "y": 1608,
-        "z": "a1c94a24.22ed9",
+        "x": 7057.566665649414,
+        "y": 1675.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "13ac8b5c.0cfaed"
+                "625c69e0.19da8"
             ]
         ]
     },
     {
-        "id": "13ac8b5c.0cfaed",
+        "id": "625c69e0.19da8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 7110,
-        "y": 1609,
-        "z": "a1c94a24.22ed9",
+        "x": 7209.566665649414,
+        "y": 1676.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "8e635e5c.8adab",
+        "id": "20b91ac9.f7bb0e",
         "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.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 7121,
-        "y": 1554,
-        "z": "a1c94a24.22ed9",
+        "x": 7220.566665649414,
+        "y": 1621.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "feff3b5.5e8b948",
+        "id": "ced1d2ca.c0f7c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 7105.38232421875,
-        "y": 1493.6556701660156,
-        "z": "a1c94a24.22ed9",
+        "x": 7204.948989868164,
+        "y": 1561.2223358154297,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "953167d4.139688"
+                "483f20c0.02d49"
             ]
         ]
     },
     {
-        "id": "953167d4.139688",
+        "id": "483f20c0.02d49",
         "type": "set",
         "name": "set controller domainB data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 7320,
-        "y": 1490,
-        "z": "a1c94a24.22ed9",
+        "x": 7419.566665649414,
+        "y": 1557.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "bcacdfd4.14c6d",
+        "id": "24772c6a.a8483c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 317,
-        "y": 619,
-        "z": "a1c94a24.22ed9",
+        "x": 416.56666564941406,
+        "y": 686.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "403b2da3.dcfec4",
-                "1a6f80e4.595e77"
+                "3dd61cc7.9b7d74",
+                "99ef6a45.9ad878"
             ]
         ]
     },
     {
-        "id": "403b2da3.dcfec4",
+        "id": "3dd61cc7.9b7d74",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 763,
-        "y": 478,
-        "z": "a1c94a24.22ed9",
+        "x": 862.5666656494141,
+        "y": 545.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "9653f59e.977668"
+                "51cf951b.e925c4"
             ]
         ]
     },
     {
-        "id": "9653f59e.977668",
+        "id": "51cf951b.e925c4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3128,
-        "y": 460,
-        "z": "a1c94a24.22ed9",
+        "x": 3227.566665649414,
+        "y": 527.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "77ab35ed.5d2284"
+                "2bf740bc.b587b"
             ]
         ]
     },
     {
-        "id": "82783d37.d452a8",
+        "id": "90deb9f8.a72b18",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 6328,
-        "y": 739,
-        "z": "a1c94a24.22ed9",
+        "x": 6427.566665649414,
+        "y": 806.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "3ce4b168.0164de"
+                "d620e654.6255c"
             ]
         ]
     },
     {
-        "id": "3ce4b168.0164de",
+        "id": "d620e654.6255c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6505,
-        "y": 731,
-        "z": "a1c94a24.22ed9",
+        "x": 6604.566665649414,
+        "y": 798.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "963d2fd4.6da64"
+                "4397af3f.dc85e"
             ]
         ]
     },
     {
-        "id": "963d2fd4.6da64",
+        "id": "4397af3f.dc85e",
         "type": "set",
         "name": "set domainA ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 6740,
-        "y": 855,
-        "z": "a1c94a24.22ed9",
+        "x": 6839.566665649414,
+        "y": 922.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "8e0afe4a.b34a6",
+        "id": "40a79108.ee4848",
         "type": "set",
         "name": "set domainB ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 6780,
-        "y": 1695,
-        "z": "a1c94a24.22ed9",
+        "x": 6879.566665649414,
+        "y": 1762.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "249ec401.31a03c",
+        "id": "607a3e65.d46208",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6545,
-        "y": 1571,
-        "z": "a1c94a24.22ed9",
+        "x": 6644.566665649414,
+        "y": 1638.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "8e0afe4a.b34a6"
+                "40a79108.ee4848"
             ]
         ]
     },
     {
-        "id": "bf377915.b45748",
+        "id": "9bbf0d49.94213",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 6368,
-        "y": 1579,
-        "z": "a1c94a24.22ed9",
+        "x": 6467.566665649414,
+        "y": 1646.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "249ec401.31a03c"
+                "607a3e65.d46208"
             ]
         ]
     },
     {
-        "id": "9b904bff.ec9058",
+        "id": "4f7a1356.449274",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
-        "x": 4320,
-        "y": 515,
-        "z": "a1c94a24.22ed9",
+        "x": 4419.566665649414,
+        "y": 582.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "64d793c7.441b84",
+        "id": "d1460a52.2dc398",
         "type": "execute",
         "name": "execute UUID generator for ethernet-service-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4342,
-        "y": 650,
-        "z": "a1c94a24.22ed9",
+        "x": 4441.566665649414,
+        "y": 717.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "c6ccb3e9.91ea18",
+        "id": "96f11e74.5cf9",
         "type": "execute",
         "name": "execute UUID generator for otn-tunnel-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4323,
-        "y": 700,
-        "z": "a1c94a24.22ed9",
+        "x": 4422.566665649414,
+        "y": 767.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "8f80cd4e.6bb588",
+        "id": "f0cde51e.fc048",
         "type": "for",
         "name": "for each allotted-resource",
         "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1933,
-        "y": 248,
-        "z": "a1c94a24.22ed9",
+        "x": 2032.566665649414,
+        "y": 315.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "f465bd8c.ba2628",
-                "8f1217ff.70176"
+                "fe22e044.99d4c8",
+                "103cc7a8.7e9b88"
             ]
         ]
     },
     {
-        "id": "f465bd8c.ba2628",
+        "id": "fe22e044.99d4c8",
         "type": "set",
         "name": "set the current allotted-resource-id",
         "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",
         "comments": "",
-        "x": 2198,
-        "y": 171,
-        "z": "a1c94a24.22ed9",
+        "x": 2297.566665649414,
+        "y": 238.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "f986e215.6b3c08",
+        "id": "7c9d6be0.59e3fc",
         "type": "set",
         "name": "set query_param",
         "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",
         "comments": "",
-        "x": 4240,
-        "y": 2150,
-        "z": "a1c94a24.22ed9",
+        "x": 4339.566665649414,
+        "y": 2217.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "4e189d8f.8297c4",
+        "id": "5f01b0d6.663678",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value='' />\n<parameter name='domain-A.node-id' value='' />\n<parameter name='domain-A.network-id' value=\"\" />\n<parameter name='domain-A.provider-id' value=\"\" />\n<parameter name='domain-A.client-id' value=\"\" />\n<parameter name='domain-A.te-topo-id' value=\"\" />\n<parameter name='domain-A.network-type' value=\"\" />\n<parameter name='domain-A.ltpId' value=\"\" />\n<parameter name='tmp.domain-A.network-id' value=\"\" />\n<parameter name='tmp.domain-A.ttp-id' value=\"\" />\n<parameter name='network-route-A' value=\"\" />\n<!--<parameter name='domain-A.' value=\"\" />-->\n\n<parameter name='request-id' value='' />\n<parameter name='otn-source-node' value='' />\n<parameter name='otn-dest-node' value='' />\n<parameter name='bw-odu' value=\"\" />\n<parameter name='src-ttp-id' value='' />\n<parameter name='dst-ttp-id' value='' />\n\n<parameter name='domain-B.tunnel-tp-id' value='' />\n<parameter name='domain-B.node-id' value='' />\n<parameter name='domain-B.network-id' value=\"\" />\n<parameter name='domain-B.provider-id' value=\"\" />\n<parameter name='domain-B.client-id' value=\"\" />\n<parameter name='domain-B.te-topo-id' value=\"\" />\n<parameter name='domain-B.network-type' value=\"\" />\n<parameter name='domain-B.ltpId' value=\"\" />\n<parameter name='tmp.domain-B.network-id' value=\"\" />\n<parameter name='tmp.domain-B.ttp-id' value=\"\" />\n<parameter name='network-route-B' value=\"\" />\n<!--<parameter name='domain-B.' value=\"\" />-->\n\n\n\n\n\n",
         "comments": "",
-        "x": 4223,
-        "y": 3908,
-        "z": "a1c94a24.22ed9",
+        "x": 4322.566665649414,
+        "y": 3975.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "6963f6fb.4a135",
+        "id": "32dd1d69.d1982a",
         "type": "set",
         "name": "set new ethernet-service-name",
         "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
         "comments": "",
-        "x": 4280,
-        "y": 745,
-        "z": "a1c94a24.22ed9",
+        "x": 4379.566665649414,
+        "y": 812.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "40ae5836.eda238",
+        "id": "fefb165c.6d9d48",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 4269,
-        "y": 2390,
-        "z": "a1c94a24.22ed9",
+        "x": 4368.566665649414,
+        "y": 2457.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "2e490e87.e61d42"
+                "15c5a249.e6ba26"
             ]
         ]
     },
     {
-        "id": "5b2c57a6.c56358",
+        "id": "1531085f.c55ba",
         "type": "save",
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5397,
-        "y": 2897,
-        "z": "a1c94a24.22ed9",
+        "x": 5496.566665649414,
+        "y": 2964.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "9802e598.7a08e"
+                "fcadaec7.4e387"
             ]
         ]
     },
     {
-        "id": "457942f4.bfb36c",
+        "id": "24f90323.65c334",
         "type": "save",
         "name": "save connectivity-A relationship to vpn-binding-A, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 5969.5,
-        "y": 3001,
-        "z": "a1c94a24.22ed9",
+        "x": 6069.066665649414,
+        "y": 3068.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "9802e598.7a08e",
+        "id": "fcadaec7.4e387",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5703,
-        "y": 2896,
-        "z": "a1c94a24.22ed9",
+        "x": 5802.566665649414,
+        "y": 2963.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "c8f4f504.510ca8"
+                "47fc66cf.f2219"
             ]
         ]
     },
     {
-        "id": "c8f4f504.510ca8",
+        "id": "47fc66cf.f2219",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5912.5,
-        "y": 2896.25390625,
-        "z": "a1c94a24.22ed9",
+        "x": 6012.066665649414,
+        "y": 2963.820571899414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "dc51f3dc.862168",
+        "id": "e4910759.e9a85",
         "type": "execute",
         "name": "execute UUID generator for vpn-binding $otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5433,
-        "y": 2361,
-        "z": "a1c94a24.22ed9",
+        "x": 5532.566665649414,
+        "y": 2428.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "8f203418.5717c8",
+        "id": "19efb26.3a5054e",
         "type": "switchNode",
         "name": "switch otnidx == 0",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5306,
-        "y": 3014,
-        "z": "a1c94a24.22ed9",
+        "x": 5405.566665649414,
+        "y": 3081.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "22c6b3cb.e79214",
-                "862cb9a5.5437d"
+                "6ac91bae.a4e2fc",
+                "f696dd3e.08c3d"
             ]
         ]
     },
     {
-        "id": "22c6b3cb.e79214",
+        "id": "6ac91bae.a4e2fc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5489,
-        "y": 3014,
-        "z": "a1c94a24.22ed9",
+        "x": 5588.566665649414,
+        "y": 3081.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "2ad37e70.de6eda"
+                "5559f5ba.2a16b4"
             ]
         ]
     },
     {
-        "id": "862cb9a5.5437d",
+        "id": "f696dd3e.08c3d",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5314,
-        "y": 3161,
-        "z": "a1c94a24.22ed9",
+        "x": 5413.566665649414,
+        "y": 3228.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "6c8b8ef6.d3a3"
+                "16a87f5a.f1d3a9"
             ]
         ]
     },
     {
-        "id": "886d3de7.c041d",
+        "id": "b74045ae.325b78",
         "type": "switchNode",
         "name": "switch otnidx == last",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5655,
-        "y": 3242,
-        "z": "a1c94a24.22ed9",
+        "x": 5754.566665649414,
+        "y": 3309.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "521941d1.ae6f7",
-                "6f826e7d.af0fc8"
+                "93c212f0.0f2258",
+                "d060ce07.272bc8"
             ]
         ]
     },
     {
-        "id": "521941d1.ae6f7",
+        "id": "93c212f0.0f2258",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5840,
-        "y": 3243,
-        "z": "a1c94a24.22ed9",
+        "x": 5939.566665649414,
+        "y": 3310.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "7726ccce.f0f08c"
+                "8ce15cd2.dd2d"
             ]
         ]
     },
     {
-        "id": "6f826e7d.af0fc8",
+        "id": "d060ce07.272bc8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5859,
-        "y": 3509,
-        "z": "a1c94a24.22ed9",
+        "x": 5958.566665649414,
+        "y": 3576.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "49c1c5c0.4e8b8c"
+                "1b72857d.e58193"
             ]
         ]
     },
     {
-        "id": "905b732c.f0ad98",
+        "id": "a4b93978.557f9",
         "type": "save",
         "name": "save connectivity-B relationship to vpn-binding-B, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 6270,
-        "y": 3244,
-        "z": "a1c94a24.22ed9",
+        "x": 6369.566665649414,
+        "y": 3311.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "dd09a90e.7899b",
+        "id": "c7b0c40a.9c6038",
         "type": "execute",
         "name": "execute UUID generator for connectivity domain otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6344,
-        "y": 3542,
-        "z": "a1c94a24.22ed9",
+        "x": 6443.566665649414,
+        "y": 3609.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "fc11577c.3662e8",
+        "id": "689f50a5.dff04",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='CBS' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='EBS' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='CBS' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='EBS' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 6280,
-        "y": 3593,
-        "z": "a1c94a24.22ed9",
+        "x": 6379.566665649414,
+        "y": 3660.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "a3be8dfb.ebcf2",
+        "id": "67d0e07e.cd61f8",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 6409,
-        "y": 3643,
-        "z": "a1c94a24.22ed9",
+        "x": 6508.566665649414,
+        "y": 3710.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "28e97ea9.3189d2",
+        "id": "8bcc08c5.9c4d7",
         "type": "comment",
         "name": "connectivity has not been created for middle domains, so we have to create one",
         "info": "",
         "comments": "",
-        "x": 6419,
-        "y": 3486,
-        "z": "a1c94a24.22ed9",
+        "x": 6518.566665649414,
+        "y": 3553.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "3c225fc2.333288",
+        "id": "64006ab7.c64d44",
         "type": "save",
         "name": "save connectivity-otnidx relationship to vpn-binding-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 6377,
-        "y": 3702,
-        "z": "a1c94a24.22ed9",
+        "x": 6476.566665649414,
+        "y": 3769.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "49c1c5c0.4e8b8c",
+        "id": "1b72857d.e58193",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 6016,
-        "y": 3510,
-        "z": "a1c94a24.22ed9",
+        "x": 6115.566665649414,
+        "y": 3577.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "dd09a90e.7899b",
-                "fc11577c.3662e8",
-                "a3be8dfb.ebcf2",
-                "3c225fc2.333288",
-                "6f9b661d.d75948"
+                "c7b0c40a.9c6038",
+                "689f50a5.dff04",
+                "67d0e07e.cd61f8",
+                "64006ab7.c64d44",
+                "9642c24b.bc1f8"
             ]
         ]
     },
     {
-        "id": "2e490e87.e61d42",
+        "id": "15c5a249.e6ba26",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4526,
-        "y": 2390,
-        "z": "a1c94a24.22ed9",
+        "x": 4625.566665649414,
+        "y": 2457.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "dc51f3dc.862168",
-                "5b2c57a6.c56358",
-                "8f203418.5717c8",
-                "c3673769.ff0828",
-                "3b94d9a7.b824be",
-                "e2ccb618.b8a8d",
-                "77665e36.902488"
+                "e4910759.e9a85",
+                "1531085f.c55ba",
+                "19efb26.3a5054e",
+                "ad7dc399.bf418",
+                "59469467.70a6d4",
+                "982e5c66.4703f8",
+                "e9c05ada.bb249"
             ]
         ]
     },
     {
-        "id": "c5c2060f.16d9c8",
+        "id": "b962e9bf.f7ec68",
         "type": "set",
         "name": "set attachment_param domain A",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n\n",
         "comments": "",
-        "x": 5894,
-        "y": 3058,
-        "z": "a1c94a24.22ed9",
+        "x": 5993.566665649414,
+        "y": 3125.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "db559808.bd4158",
+        "id": "7f4b2d0d.ab9d0c",
         "type": "execute",
         "name": "execute RestApiCallNode domainA UNI Coloring",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 5947,
-        "y": 3102,
-        "z": "a1c94a24.22ed9",
+        "x": 6046.566665649414,
+        "y": 3169.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "3a25adfa.fa5c4a",
-                "1deeb503.94e2fb"
+                "d0a8f560.124258",
+                "e919fb8f.48aeb"
             ]
         ]
     },
     {
-        "id": "1deeb503.94e2fb",
+        "id": "e919fb8f.48aeb",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6218,
-        "y": 3087,
-        "z": "a1c94a24.22ed9",
+        "x": 6317.566665649414,
+        "y": 3154.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "9df348c2.491e88"
+                "408ad253.15a054"
             ]
         ]
     },
     {
-        "id": "3a25adfa.fa5c4a",
+        "id": "d0a8f560.124258",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6216.000213623047,
-        "y": 3144.99990940094,
-        "z": "a1c94a24.22ed9",
+        "x": 6315.566879272461,
+        "y": 3212.566575050354,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "6842e2ab.cc6dcc"
+                "bfaa06ad.2149c"
             ]
         ]
     },
     {
-        "id": "9df348c2.491e88",
+        "id": "408ad253.15a054",
         "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=\"Error executing UNI Coloring for domain A\" />\n",
         "comments": "",
-        "x": 6358.000247955322,
-        "y": 3087.0000009536743,
-        "z": "a1c94a24.22ed9",
+        "x": 6457.566913604736,
+        "y": 3154.5666666030884,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "6842e2ab.cc6dcc",
+        "id": "bfaa06ad.2149c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6364.02725982666,
-        "y": 3135.745394706726,
-        "z": "a1c94a24.22ed9",
+        "x": 6463.593925476074,
+        "y": 3203.31206035614,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "2ad37e70.de6eda",
+        "id": "5559f5ba.2a16b4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5630,
-        "y": 3004,
-        "z": "a1c94a24.22ed9",
+        "x": 5729.566665649414,
+        "y": 3071.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "457942f4.bfb36c",
-                "db559808.bd4158",
-                "c5c2060f.16d9c8"
+                "24f90323.65c334",
+                "7f4b2d0d.ab9d0c",
+                "b962e9bf.f7ec68"
             ]
         ]
     },
     {
-        "id": "7726ccce.f0f08c",
+        "id": "8ce15cd2.dd2d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5974,
-        "y": 3244,
-        "z": "a1c94a24.22ed9",
+        "x": 6073.566665649414,
+        "y": 3311.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "905b732c.f0ad98",
-                "7d99b03d.258298",
-                "45df9551.f0104c"
+                "a4b93978.557f9",
+                "fc367338.14f248",
+                "546374c7.67c9c4"
             ]
         ]
     },
     {
-        "id": "45df9551.f0104c",
+        "id": "546374c7.67c9c4",
         "type": "set",
         "name": "set attachment_param domain B",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n",
         "comments": "",
-        "x": 6194,
-        "y": 3288,
-        "z": "a1c94a24.22ed9",
+        "x": 6293.566665649414,
+        "y": 3355.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "7d99b03d.258298",
+        "id": "fc367338.14f248",
         "type": "execute",
         "name": "execute RestApiCallNode domainB UNI Coloring",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 6245,
-        "y": 3332,
-        "z": "a1c94a24.22ed9",
+        "x": 6344.566665649414,
+        "y": 3399.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "bd0a7a36.9d20c8",
-                "dca7fdc6.a617b"
+                "edc516eb.d6818",
+                "889681a1.8aebb"
             ]
         ]
     },
     {
-        "id": "dca7fdc6.a617b",
+        "id": "889681a1.8aebb",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6508,
-        "y": 3312,
-        "z": "a1c94a24.22ed9",
+        "x": 6607.566665649414,
+        "y": 3379.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "fccd3cd5.48582"
+                "b62983f6.8b1c68"
             ]
         ]
     },
     {
-        "id": "bd0a7a36.9d20c8",
+        "id": "edc516eb.d6818",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6509.000213623047,
-        "y": 3362.99990940094,
-        "z": "a1c94a24.22ed9",
+        "x": 6608.566879272461,
+        "y": 3430.566575050354,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "21901264.638a9e"
+                "51aaba5d.abae2c"
             ]
         ]
     },
     {
-        "id": "fccd3cd5.48582",
+        "id": "b62983f6.8b1c68",
         "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=\"Error executing UNI coloring for domain B\" />\n",
         "comments": "",
-        "x": 6648.000247955322,
-        "y": 3312.0000009536743,
-        "z": "a1c94a24.22ed9",
+        "x": 6747.566913604736,
+        "y": 3379.5666666030884,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "21901264.638a9e",
+        "id": "51aaba5d.abae2c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6654.02725982666,
-        "y": 3360.745394706726,
-        "z": "a1c94a24.22ed9",
+        "x": 6753.593925476074,
+        "y": 3428.31206035614,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "6f9b661d.d75948",
+        "id": "9642c24b.bc1f8",
         "type": "set",
         "name": "set attachment_param domain otnidx",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
         "comments": "",
-        "x": 6291,
-        "y": 3762,
-        "z": "a1c94a24.22ed9",
+        "x": 6390.566665649414,
+        "y": 3829.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "19fc5975.9c891f",
+        "id": "127eaa7a.98449e",
         "type": "save",
         "name": "get all-vpn-bindings from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3610,
-        "y": 4109,
-        "z": "a1c94a24.22ed9",
+        "x": 3709.566665649414,
+        "y": 4176.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "3b17ad03.4221a2",
-                "d69cd907.6aa748",
-                "2274d619.b436c2"
+                "4f7f9fac.fe049",
+                "7f9abc32.a826f4",
+                "58223279.e77444"
             ]
         ]
     },
     {
-        "id": "3b17ad03.4221a2",
+        "id": "4f7f9fac.fe049",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3798,
-        "y": 4122,
-        "z": "a1c94a24.22ed9",
+        "x": 3897.566665649414,
+        "y": 4189.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "c84d9923.4faed"
+                "f21f6a6d.7c0b9"
             ]
         ]
     },
     {
-        "id": "d69cd907.6aa748",
+        "id": "7f9abc32.a826f4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3798.490966796875,
-        "y": 4167.574035644531,
-        "z": "a1c94a24.22ed9",
+        "x": 3898.057632446289,
+        "y": 4235.140701293945,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "ab55f6d5.77c7d"
+                "5b9e9e7e.bd3fb8"
             ]
         ]
     },
     {
-        "id": "2274d619.b436c2",
+        "id": "58223279.e77444",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3796,
-        "y": 4211,
-        "z": "a1c94a24.22ed9",
+        "x": 3895.566665649414,
+        "y": 4278.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "7380e8da.afb22"
+                "81ac9378.5e17c8"
             ]
         ]
     },
     {
-        "id": "c84d9923.4faed",
+        "id": "f21f6a6d.7c0b9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3971,
-        "y": 4120,
-        "z": "a1c94a24.22ed9",
+        "x": 4070.566665649414,
+        "y": 4187.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "4f7659f.9cf48a8"
+                "1562d3ab.607dc4"
             ]
         ]
     },
     {
-        "id": "ab55f6d5.77c7d",
+        "id": "5b9e9e7e.bd3fb8",
         "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": 3961.0623779296875,
-        "y": 4167.859771728516,
-        "z": "a1c94a24.22ed9",
+        "x": 4060.6290435791016,
+        "y": 4235.42643737793,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "7380e8da.afb22",
+        "id": "81ac9378.5e17c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3963,
-        "y": 4210,
-        "z": "a1c94a24.22ed9",
+        "x": 4062.566665649414,
+        "y": 4277.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "2ea54daa.f8c89a",
+        "id": "e781046f.1418e",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='dmnsidx' start='0' end='`$otn-tunnel-slice_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3599,
-        "y": 4300,
-        "z": "a1c94a24.22ed9",
+        "x": 3698.566665649414,
+        "y": 4367.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "1b14a9d6.5d5776"
+                "d5bebf9c.374a9"
             ]
         ]
     },
     {
-        "id": "ae6235d1.274b2",
+        "id": "a7536813.9c6d5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4409,
-        "y": 4300,
-        "z": "a1c94a24.22ed9",
+        "x": 4508.566665649414,
+        "y": 4367.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "b2a4c6eb.8f6fb8"
+                "a13486f2.279748"
             ]
         ]
     },
     {
-        "id": "c8a00103.c44878",
+        "id": "d852a581.272668",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='stunidx' start='0' end='`$otn-tunnel-slice[$dmnsidx].list_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4181,
-        "y": 4300,
-        "z": "a1c94a24.22ed9",
+        "x": 4280.566665649414,
+        "y": 4367.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "ae6235d1.274b2"
+                "a7536813.9c6d5"
             ]
         ]
     },
     {
-        "id": "315b6688.54502a",
+        "id": "35196fa7.3e82b8",
         "type": "set",
         "name": "set providerValue",
         "xml": "<set>\n<parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />\n<parameter name='found' value='false' />\n\n\n",
         "comments": "",
-        "x": 5301,
-        "y": 4067,
-        "z": "a1c94a24.22ed9",
+        "x": 5400.566665649414,
+        "y": 4134.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "ea932ad5.e0e7e8",
+        "id": "1b7fbbc1.fdc524",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='testingvalue' value='$tmp.otninfo_length -1' />\n",
         "comments": "",
-        "x": 5603,
-        "y": 3193,
-        "z": "a1c94a24.22ed9",
+        "x": 5702.566665649414,
+        "y": 3260.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "6c8b8ef6.d3a3",
+        "id": "16a87f5a.f1d3a9",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5438,
-        "y": 3168,
-        "z": "a1c94a24.22ed9",
+        "x": 5537.566665649414,
+        "y": 3235.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "ea932ad5.e0e7e8",
-                "886d3de7.c041d"
+                "1b7fbbc1.fdc524",
+                "b74045ae.325b78"
             ]
         ]
     },
     {
-        "id": "1ad0a363.7d61cd",
+        "id": "5a4aff44.5be78",
         "type": "set",
         "name": "set tmp.arr",
         "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n<parameter name='bwModified' value='false' />\n",
         "comments": "",
-        "x": 1892,
-        "y": 198,
-        "z": "a1c94a24.22ed9",
+        "x": 1991.566665649414,
+        "y": 265.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "4f7659f.9cf48a8",
+        "id": "1562d3ab.607dc4",
         "type": "for",
         "name": "for vpnidx in all-vpn-bindings",
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4200,
-        "y": 4121,
-        "z": "a1c94a24.22ed9",
+        "x": 4299.566665649414,
+        "y": 4188.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "39723735.013e2"
+                "1d7f1d69.47cb1b"
             ]
         ]
     },
     {
-        "id": "39723735.013e2",
+        "id": "1d7f1d69.47cb1b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4415,
-        "y": 4122,
-        "z": "a1c94a24.22ed9",
+        "x": 4514.566665649414,
+        "y": 4189.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "a85f98e7.7e0e3"
+                "25f755d1.b61592"
             ]
         ]
     },
     {
-        "id": "45b1bc5.a80fac4",
+        "id": "5d5ba3f2.74414c",
         "type": "for",
         "name": "for arridx in tmp.arr",
         "xml": "<for index='arridx' start='0' end='`$tmp.arr_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 5868,
-        "y": 4042,
-        "z": "a1c94a24.22ed9",
+        "x": 5967.566665649414,
+        "y": 4109.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "6b77cda7.20313c"
+                "c853cdfd.dbbe38"
             ]
         ]
     },
     {
-        "id": "2e1bb3dd.371e44",
+        "id": "b4d44dab.0baa88",
         "type": "switchNode",
         "name": "switch $tmp.arr_length != 0",
         "xml": "<switch test='`$tmp.arr_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5334,
-        "y": 4122,
-        "z": "a1c94a24.22ed9",
+        "x": 5433.566665649414,
+        "y": 4189.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "24502626.aaa1ba",
-                "5f3af9a.344a808"
+                "62eec498.21eadc",
+                "978a0072.3fd11"
             ]
         ]
     },
     {
-        "id": "24502626.aaa1ba",
+        "id": "62eec498.21eadc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5530,
-        "y": 4092,
-        "z": "a1c94a24.22ed9",
+        "x": 5629.566665649414,
+        "y": 4159.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "d529614e.bbdc5"
+                "899efa3b.42e148"
             ]
         ]
     },
     {
-        "id": "5f3af9a.344a808",
+        "id": "978a0072.3fd11",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5531,
-        "y": 4163,
-        "z": "a1c94a24.22ed9",
+        "x": 5630.566665649414,
+        "y": 4230.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "ec475a9a.8eb8b8"
+                "214f2c3d.6d899c"
             ]
         ]
     },
     {
-        "id": "d529614e.bbdc5",
+        "id": "899efa3b.42e148",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5681,
-        "y": 4090,
-        "z": "a1c94a24.22ed9",
+        "x": 5780.566665649414,
+        "y": 4157.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "45b1bc5.a80fac4",
-                "c40fb6f1.31454"
+                "5d5ba3f2.74414c",
+                "a601628e.52c128"
             ]
         ]
     },
     {
-        "id": "6b77cda7.20313c",
+        "id": "c853cdfd.dbbe38",
         "type": "switchNode",
         "name": "switch tmp.arr[$arridx] == $providerValue",
         "xml": "<switch test='`$tmp.arr[$arridx] == $providerValue`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6159,
-        "y": 4042,
-        "z": "a1c94a24.22ed9",
+        "x": 6258.566665649414,
+        "y": 4109.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "de5fc252.aa8c8",
-                "5ea06666.14b488"
+                "32f1af6e.548f98",
+                "aa4fe454.7a4ce"
             ]
         ]
     },
     {
-        "id": "de5fc252.aa8c8",
+        "id": "32f1af6e.548f98",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6434,
-        "y": 4011,
-        "z": "a1c94a24.22ed9",
+        "x": 6533.566665649414,
+        "y": 4078.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "171b52be.079295"
+                "811e814b.5875b8"
             ]
         ]
     },
     {
-        "id": "5ea06666.14b488",
+        "id": "aa4fe454.7a4ce",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6435,
-        "y": 4082,
-        "z": "a1c94a24.22ed9",
+        "x": 6534.566665649414,
+        "y": 4149.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "9281ca71.e773a"
+                "989bacbe.4af828"
             ]
         ]
     },
     {
-        "id": "171b52be.079295",
+        "id": "811e814b.5875b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 6585,
-        "y": 4009,
-        "z": "a1c94a24.22ed9",
+        "x": 6684.566665649414,
+        "y": 4076.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "e713eb27.04e0e8",
-                "321eb6fe.b414b2",
-                "2f73393e.94f68e",
-                "3f07f766.243a2",
-                "ef925dc2.f8f9f"
+                "af4f903c.21f488",
+                "2d6d2965.4ae4be",
+                "e5b6e917.a4d33",
+                "1c32b22d.5aadde",
+                "1865add8.1adbe2"
             ]
         ]
     },
     {
-        "id": "e713eb27.04e0e8",
+        "id": "af4f903c.21f488",
         "type": "set",
         "name": "set found to true",
         "xml": "<set>\n<parameter name='found' value='true' />\n\n\n",
         "comments": "",
-        "x": 6773,
-        "y": 3969,
-        "z": "a1c94a24.22ed9",
+        "x": 6872.566665649414,
+        "y": 4036.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "321eb6fe.b414b2",
+        "id": "2d6d2965.4ae4be",
         "type": "save",
         "name": "store $arridx somewhere in vpn-binding",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx`' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 6845,
-        "y": 4014,
-        "z": "a1c94a24.22ed9",
+        "x": 6944.566665649414,
+        "y": 4081.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "ef925dc2.f8f9f",
+        "id": "1865add8.1adbe2",
         "type": "set",
         "name": "set twoD arr",
         "xml": "<set>\n\n<!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->\n<!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->\n<parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />\n\n",
         "comments": "",
-        "x": 6760,
-        "y": 4141,
-        "z": "a1c94a24.22ed9",
+        "x": 6859.566665649414,
+        "y": 4208.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "3f07f766.243a2",
+        "id": "1c32b22d.5aadde",
         "type": "set",
         "name": "set sizeOfSliceList",
         "xml": "<set>\n<parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />\n\n\n",
         "comments": "",
-        "x": 6781,
-        "y": 4077,
-        "z": "a1c94a24.22ed9",
+        "x": 6880.566665649414,
+        "y": 4144.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "ec475a9a.8eb8b8",
+        "id": "214f2c3d.6d899c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5683,
-        "y": 4163,
-        "z": "a1c94a24.22ed9",
+        "x": 5782.566665649414,
+        "y": 4230.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "1e5d0b07.cb12bd",
-                "6806bbfa.adddec"
+                "2a37cb43.8a38d4",
+                "2a56e17b.8d5c2e"
             ]
         ]
     },
     {
-        "id": "1e5d0b07.cb12bd",
+        "id": "2a37cb43.8a38d4",
         "type": "save",
         "name": "store $arridx somewhere in vpn-binding",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='0' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5938,
-        "y": 4156,
-        "z": "a1c94a24.22ed9",
+        "x": 6037.566665649414,
+        "y": 4223.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "6806bbfa.adddec",
+        "id": "2a56e17b.8d5c2e",
         "type": "set",
         "name": "set twoD array",
         "xml": "<set>\n<parameter name='tmp.arr[0]' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='1' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='1' />\n<parameter name='otn-tunnel-slice[0].list_length' value='1' />\n\n",
         "comments": "",
-        "x": 5866,
-        "y": 4203,
-        "z": "a1c94a24.22ed9",
+        "x": 5965.566665649414,
+        "y": 4270.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "c40fb6f1.31454",
+        "id": "a601628e.52c128",
         "type": "switchNode",
         "name": "switch found?",
         "xml": "<switch test='`$found`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5859,
-        "y": 4087,
-        "z": "a1c94a24.22ed9",
+        "x": 5958.566665649414,
+        "y": 4154.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "58a78c2e.66d86c",
-                "d7b2b4c.94059c8"
+                "38e10d32.2b93c2",
+                "dbcc850c.fc8dd"
             ]
         ]
     },
     {
-        "id": "58a78c2e.66d86c",
+        "id": "38e10d32.2b93c2",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6019,
-        "y": 4079,
-        "z": "a1c94a24.22ed9",
+        "x": 6118.566665649414,
+        "y": 4146.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "cde5de2c.7d36b8"
+                "b21401a.fc6228"
             ]
         ]
     },
     {
-        "id": "d7b2b4c.94059c8",
+        "id": "dbcc850c.fc8dd",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6017,
-        "y": 4116,
-        "z": "a1c94a24.22ed9",
+        "x": 6116.566665649414,
+        "y": 4183.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "74309960.8d777"
+                "e4683213.00ce18"
             ]
         ]
     },
     {
-        "id": "cde5de2c.7d36b8",
+        "id": "b21401a.fc6228",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6144,
-        "y": 4079,
-        "z": "a1c94a24.22ed9",
+        "x": 6243.566665649414,
+        "y": 4146.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "6b083096.f77d9",
+        "id": "a2a7d328.f35de8",
         "type": "save",
         "name": "store $arridx+1 somewhere in vpn-binding",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx + 1`' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 6451,
-        "y": 4137,
-        "z": "a1c94a24.22ed9",
+        "x": 6550.566665649414,
+        "y": 4204.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "74309960.8d777",
+        "id": "e4683213.00ce18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 6177,
-        "y": 4124,
-        "z": "a1c94a24.22ed9",
+        "x": 6276.566665649414,
+        "y": 4191.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "6b083096.f77d9",
-                "b4ddb8c9.5ca64"
+                "a2a7d328.f35de8",
+                "930daebd.33fb78"
             ]
         ]
     },
     {
-        "id": "b4ddb8c9.5ca64",
+        "id": "930daebd.33fb78",
         "type": "set",
         "name": "set twoD array",
         "xml": "<set>\n<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />\n\n",
         "comments": "",
-        "x": 6368,
-        "y": 4183,
-        "z": "a1c94a24.22ed9",
+        "x": 6467.566665649414,
+        "y": 4250.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "9281ca71.e773a",
+        "id": "989bacbe.4af828",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6568,
-        "y": 4081,
-        "z": "a1c94a24.22ed9",
+        "x": 6667.566665649414,
+        "y": 4148.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "2f73393e.94f68e",
+        "id": "e5b6e917.a4d33",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 6739,
-        "y": 4208,
-        "z": "a1c94a24.22ed9",
+        "x": 6838.566665649414,
+        "y": 4275.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "c3673769.ff0828",
+        "id": "ad7dc399.bf418",
         "type": "switchNode",
         "name": "switch dstPort == NULL",
         "xml": "<switch test=\"`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5136,
-        "y": 2420,
-        "z": "a1c94a24.22ed9",
+        "x": 5235.566665649414,
+        "y": 2487.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "354051ca.f807c6",
-                "2ad9a102.280abe"
+                "359b938e.1f1cd4",
+                "64d68365.eb604c"
             ]
         ]
     },
     {
-        "id": "354051ca.f807c6",
+        "id": "359b938e.1f1cd4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5525,
-        "y": 2398,
-        "z": "a1c94a24.22ed9",
+        "x": 5624.566665649414,
+        "y": 2465.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "dcf8c46b.cd2d9"
+                "73a3115c.3a191"
             ]
         ]
     },
     {
-        "id": "2ad9a102.280abe",
+        "id": "64d68365.eb604c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5526,
-        "y": 2444,
-        "z": "a1c94a24.22ed9",
+        "x": 5625.566665649414,
+        "y": 2511.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "d548eb8f.ae0418"
+                "40a2bbc1.5980e4"
             ]
         ]
     },
     {
-        "id": "dcf8c46b.cd2d9",
+        "id": "73a3115c.3a191",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n",
         "comments": "",
-        "x": 5739,
-        "y": 2397,
-        "z": "a1c94a24.22ed9",
+        "x": 5838.566665649414,
+        "y": 2464.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "d548eb8f.ae0418",
+        "id": "40a2bbc1.5980e4",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\n",
         "comments": "",
-        "x": 5737,
-        "y": 2442,
-        "z": "a1c94a24.22ed9",
+        "x": 5836.566665649414,
+        "y": 2509.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "b2a4c6eb.8f6fb8",
+        "id": "a13486f2.279748",
         "type": "set",
         "name": "set attachment_param sliceG",
         "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].request-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].request-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].bw-odu`' value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].bw-odu`\" />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].src-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].src-ttp-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].dst-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].dst-ttp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='otn-tunnel-sliceG-list_length' value='`$stunidx + 1`' />\n\n\n<parameter name=\"tmp.domainG.restapiUrl\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainurl`\" />\n<parameter name=\"tmp.domainG.restapiUser\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainuser`\" />\n<parameter name=\"tmp.domainG.restapiPassword\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainpassword`\" />",
         "comments": "",
-        "x": 4662,
-        "y": 4298,
-        "z": "a1c94a24.22ed9",
+        "x": 4761.566665649414,
+        "y": 4365.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "83baeacb.444588",
+        "id": "3fa485d1.c8f9c2",
         "type": "execute",
         "name": "execute RestApiCallNode sliceG creation domainG",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceG-list-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$tmp.domainG.restapiUrl + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$tmp.domainG.restapiUser`\" />\n<parameter name=\"restapiPassword\" value=\"`tmp.domainG.restapiPassword`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4247,
-        "y": 4406,
-        "z": "a1c94a24.22ed9",
+        "x": 4346.566665649414,
+        "y": 4473.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "27e27e6a.f2ce82",
-                "450c3617.7079e"
+                "f023dd0f.b91278",
+                "29f41b43.8a7c44"
             ]
         ]
     },
     {
-        "id": "450c3617.7079e",
+        "id": "29f41b43.8a7c44",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4530,
-        "y": 4386,
-        "z": "a1c94a24.22ed9",
+        "x": 4629.566665649414,
+        "y": 4453.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "2c8d1c7a.f387cc"
+                "e71ba272.6cc34"
             ]
         ]
     },
     {
-        "id": "27e27e6a.f2ce82",
+        "id": "f023dd0f.b91278",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4531.000213623047,
-        "y": 4436.99990940094,
-        "z": "a1c94a24.22ed9",
+        "x": 4630.566879272461,
+        "y": 4504.566575050354,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "2b775544.0b0442"
+                "7f431198.b36fd"
             ]
         ]
     },
     {
-        "id": "2c8d1c7a.f387cc",
+        "id": "e71ba272.6cc34",
         "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=\"Error executing slice creation api for domain A\" />\n",
         "comments": "",
-        "x": 4670.000247955322,
-        "y": 4386.000000953674,
-        "z": "a1c94a24.22ed9",
+        "x": 4769.566913604736,
+        "y": 4453.566666603088,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "2b775544.0b0442",
+        "id": "7f431198.b36fd",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4676.02725982666,
-        "y": 4434.745394706726,
-        "z": "a1c94a24.22ed9",
+        "x": 4775.593925476074,
+        "y": 4502.31206035614,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "3b94d9a7.b824be",
+        "id": "59469467.70a6d4",
         "type": "set",
         "name": "set srcdstpnf-name",
         "xml": "<set>\n<parameter name='tmp.srcdstpnf-name' value=\"`'networkId-providerId-' + \n                                             $tmp.access-provider-id + '-clientId-' +\n                                             $tmp.access-client-id + '-topologyId-' + \n                                             $tmp.access-topology-id + '-nodeId-' + \n                                             $tmp.srcdstpnf-id`\" />\n\n",
         "comments": "",
-        "x": 5320,
-        "y": 2540,
-        "z": "a1c94a24.22ed9",
+        "x": 5419.566665649414,
+        "y": 2607.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "e2ccb618.b8a8d",
+        "id": "982e5c66.4703f8",
         "type": "get-resource",
         "name": "get-resource tmp.srcdstpnf-name",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.srcdstpnf-name\"\n        pfx='tmp.aai.srcdst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 5364,
-        "y": 2588,
-        "z": "a1c94a24.22ed9",
+        "x": 5463.566665649414,
+        "y": 2655.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "7cc0ff8d.947d5",
-                "847ae6cc.cd8548",
-                "514e2f17.0688a8"
+                "48087d37.a26c6c",
+                "da051a0e.70b99",
+                "11fa1a3.3e28f66"
             ]
         ]
     },
     {
-        "id": "7cc0ff8d.947d5",
+        "id": "48087d37.a26c6c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5576.5,
-        "y": 2535,
-        "z": "a1c94a24.22ed9",
+        "x": 5676.066665649414,
+        "y": 2602.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "3cc1d272.0b4856"
+                "d7b6e1d4.5db9c8"
             ]
         ]
     },
     {
-        "id": "847ae6cc.cd8548",
+        "id": "da051a0e.70b99",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5588.5,
-        "y": 2585,
-        "z": "a1c94a24.22ed9",
+        "x": 5688.066665649414,
+        "y": 2652.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "3fb63137.b62f46"
+                "8bafac6.5725d5"
             ]
         ]
     },
     {
-        "id": "514e2f17.0688a8",
+        "id": "11fa1a3.3e28f66",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5579.5,
-        "y": 2640,
-        "z": "a1c94a24.22ed9",
+        "x": 5679.066665649414,
+        "y": 2707.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "e6964c37.0e1d08"
+                "1bd627d5.df5018"
             ]
         ]
     },
     {
-        "id": "e6964c37.0e1d08",
+        "id": "1bd627d5.df5018",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5724.5,
-        "y": 2639,
-        "z": "a1c94a24.22ed9",
+        "x": 5824.066665649414,
+        "y": 2706.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "3fb63137.b62f46",
+        "id": "8bafac6.5725d5",
         "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.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5735.5,
-        "y": 2582,
-        "z": "a1c94a24.22ed9",
+        "x": 5835.066665649414,
+        "y": 2649.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "3cc1d272.0b4856",
+        "id": "d7b6e1d4.5db9c8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5701.8824462890625,
-        "y": 2528.6556701660156,
-        "z": "a1c94a24.22ed9",
+        "x": 5801.449111938477,
+        "y": 2596.2223358154297,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "597135e9.9cf8dc"
+                "7412b5af.ff0f9c"
             ]
         ]
     },
     {
-        "id": "641197e8.a0857",
+        "id": "2b52018c.262d56",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6261,
-        "y": 2547,
-        "z": "a1c94a24.22ed9",
+        "x": 6360.566665649414,
+        "y": 2614.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "ec2f2380.dc3938"
+                "691fa48a.848bcc"
             ]
         ]
     },
     {
-        "id": "ec2f2380.dc3938",
+        "id": "691fa48a.848bcc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6438,
-        "y": 2539,
-        "z": "a1c94a24.22ed9",
+        "x": 6537.566665649414,
+        "y": 2606.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "f9283f20.fcecb",
-                "5f7551a8.c48a"
+                "40d861d8.1df158",
+                "6005e754.3b403"
             ]
         ]
     },
     {
-        "id": "597135e9.9cf8dc",
+        "id": "7412b5af.ff0f9c",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 5863,
-        "y": 2543,
-        "z": "a1c94a24.22ed9",
+        "x": 5962.566665649414,
+        "y": 2610.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "af459c6d.98172"
+                "cee0c51f.59e4e8"
             ]
         ]
     },
     {
-        "id": "af459c6d.98172",
+        "id": "cee0c51f.59e4e8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6058,
-        "y": 2543,
-        "z": "a1c94a24.22ed9",
+        "x": 6157.566665649414,
+        "y": 2610.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "641197e8.a0857"
+                "2b52018c.262d56"
             ]
         ]
     },
     {
-        "id": "5f7551a8.c48a",
+        "id": "6005e754.3b403",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 6646,
-        "y": 2546,
-        "z": "a1c94a24.22ed9",
+        "x": 6745.566665649414,
+        "y": 2613.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "64071614.e531b8",
-                "1c3ac340.54b235",
-                "e738e604.11d738"
+                "ba9890c1.c4a288",
+                "659d7a5f.8396d4",
+                "c60c2b5.88a3ed8"
             ]
         ]
     },
     {
-        "id": "f9283f20.fcecb",
+        "id": "40d861d8.1df158",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 6676,
-        "y": 2494,
-        "z": "a1c94a24.22ed9",
+        "x": 6775.566665649414,
+        "y": 2561.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "64071614.e531b8",
+        "id": "ba9890c1.c4a288",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6856,
-        "y": 2537,
-        "z": "a1c94a24.22ed9",
+        "x": 6955.566665649414,
+        "y": 2604.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "68b02952.bfbd08"
+                "203ebc79.0da80c"
             ]
         ]
     },
     {
-        "id": "1c3ac340.54b235",
+        "id": "659d7a5f.8396d4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6848,
-        "y": 2592,
-        "z": "a1c94a24.22ed9",
+        "x": 6947.566665649414,
+        "y": 2659.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "84e50897.107018"
+                "23f5bad7.571c16"
             ]
         ]
     },
     {
-        "id": "e738e604.11d738",
+        "id": "c60c2b5.88a3ed8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6853,
-        "y": 2649,
-        "z": "a1c94a24.22ed9",
+        "x": 6952.566665649414,
+        "y": 2716.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "69a8c55f.4a217c"
+                "d78cb5ab.fdf3"
             ]
         ]
     },
     {
-        "id": "69a8c55f.4a217c",
+        "id": "d78cb5ab.fdf3",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 7005,
-        "y": 2650,
-        "z": "a1c94a24.22ed9",
+        "x": 7104.566665649414,
+        "y": 2717.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "84e50897.107018",
+        "id": "23f5bad7.571c16",
         "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.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 7016,
-        "y": 2595,
-        "z": "a1c94a24.22ed9",
+        "x": 7115.566665649414,
+        "y": 2662.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "68b02952.bfbd08",
+        "id": "203ebc79.0da80c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 7000.38232421875,
-        "y": 2534.6556701660156,
-        "z": "a1c94a24.22ed9",
+        "x": 7099.948989868164,
+        "y": 2602.2223358154297,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "ca909332.9badd"
+                "510e20cb.08311"
             ]
         ]
     },
     {
-        "id": "ca909332.9badd",
+        "id": "510e20cb.08311",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 7215,
-        "y": 2531,
-        "z": "a1c94a24.22ed9",
+        "x": 7314.566665649414,
+        "y": 2598.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "1b14a9d6.5d5776",
+        "id": "d5bebf9c.374a9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3831,
-        "y": 4298,
-        "z": "a1c94a24.22ed9",
+        "x": 3930.566665649414,
+        "y": 4365.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "c8a00103.c44878",
-                "83baeacb.444588"
+                "d852a581.272668",
+                "3fa485d1.c8f9c2"
             ]
         ]
     },
     {
-        "id": "77665e36.902488",
+        "id": "e9c05ada.bb249",
         "type": "switchNode",
         "name": "switch dmnsidx == 0 (domainA)",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5334,
-        "y": 2757,
-        "z": "a1c94a24.22ed9",
+        "x": 5433.566665649414,
+        "y": 2824.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "84137cfa.8c833",
-                "67fc26bd.7160b"
+                "e3270b50.ca16b",
+                "1493e80e.a20608"
             ]
         ]
     },
     {
-        "id": "84137cfa.8c833",
+        "id": "e3270b50.ca16b",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5535,
-        "y": 2755,
-        "z": "a1c94a24.22ed9",
+        "x": 5634.566665649414,
+        "y": 2822.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "f473c0e8.32ced8"
+                "8c1f5350.45b238"
             ]
         ]
     },
     {
-        "id": "f473c0e8.32ced8",
+        "id": "8c1f5350.45b238",
         "type": "set",
         "name": "set attachment_param domain A",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 5749,
-        "y": 2757,
-        "z": "a1c94a24.22ed9",
+        "x": 5848.566665649414,
+        "y": 2824.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "fc82d42d.acc69",
+        "id": "efd041d2.1f57c",
         "type": "switchNode",
         "name": "switch dmnsidx == last (domainB)",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5752,
-        "y": 2806,
-        "z": "a1c94a24.22ed9",
+        "x": 5851.566665649414,
+        "y": 2873.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "7c791386.dabd3c",
-                "9bcb702f.f45c28"
+                "18ead70f.a7a7d1",
+                "86ea5500.031798"
             ]
         ]
     },
     {
-        "id": "7c791386.dabd3c",
+        "id": "18ead70f.a7a7d1",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5982,
-        "y": 2802,
-        "z": "a1c94a24.22ed9",
+        "x": 6081.566665649414,
+        "y": 2869.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "982b0489.27b268"
+                "45ea107a.0ebac8"
             ]
         ]
     },
     {
-        "id": "982b0489.27b268",
+        "id": "45ea107a.0ebac8",
         "type": "set",
         "name": "set attachment_param domain B",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />",
         "comments": "",
-        "x": 6196,
-        "y": 2805,
-        "z": "a1c94a24.22ed9",
+        "x": 6295.566665649414,
+        "y": 2872.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "67fc26bd.7160b",
+        "id": "1493e80e.a20608",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5535,
-        "y": 2804,
-        "z": "a1c94a24.22ed9",
+        "x": 5634.566665649414,
+        "y": 2871.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "fc82d42d.acc69"
+                "efd041d2.1f57c"
             ]
         ]
     },
     {
-        "id": "9bcb702f.f45c28",
+        "id": "86ea5500.031798",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5983,
-        "y": 2848,
-        "z": "a1c94a24.22ed9",
+        "x": 6082.566665649414,
+        "y": 2915.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "95308046.cfa4"
+                "7828b5dc.b70c4c"
             ]
         ]
     },
     {
-        "id": "95308046.cfa4",
+        "id": "7828b5dc.b70c4c",
         "type": "set",
         "name": "set attachment_param domain G",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 6197,
-        "y": 2848,
-        "z": "a1c94a24.22ed9",
+        "x": 6296.566665649414,
+        "y": 2915.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "20917868.85ed",
+        "id": "72c2b2cc.2ba44c",
         "type": "set",
         "name": "set tmp.slicevpns",
         "xml": "<set>\n<parameter name='`tmp.slicevpns[$tmp.slicevpns_length]`' value=\"`$prop.vpn-binding-otnidx-uuid`\" />\n<parameter name='tmp.slicevpns_length' value=\"`$tmp.slicevpns_length + 1`\" />\n\n<parameter name='`tmp.slicevpnuuids[$prop.vpn-binding-otnidx-uuid]`' value=\"`$prop.vpn-binding-otnidx-uuid`\" />\n\n",
         "comments": "",
-        "x": 6095,
-        "y": 2897,
-        "z": "a1c94a24.22ed9",
+        "x": 6194.566665649414,
+        "y": 2964.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "a85f98e7.7e0e3",
+        "id": "25f755d1.b61592",
         "type": "switchNode",
         "name": "switch vpnuuid is for this slice",
         "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n    \n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.aai.service-instance.service-instance-id `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 4659,
-        "y": 4121,
-        "z": "a1c94a24.22ed9",
+        "x": 4758.566665649414,
+        "y": 4188.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "c594891a.4ece58",
-                "9fcde7ff.ff63c8"
+                "15207d44.a4310b",
+                "179e4c90.1525b3"
             ]
         ]
     },
     {
-        "id": "c594891a.4ece58",
+        "id": "15207d44.a4310b",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4876,
-        "y": 4100,
-        "z": "a1c94a24.22ed9",
+        "x": 4975.566665649414,
+        "y": 4167.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "4b2347b3.08fa3"
+                "64fe7f3a.b5df9"
             ]
         ]
     },
     {
-        "id": "9fcde7ff.ff63c8",
+        "id": "179e4c90.1525b3",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4876,
-        "y": 4149,
-        "z": "a1c94a24.22ed9",
+        "x": 4975.566665649414,
+        "y": 4216.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "4b2347b3.08fa3",
+        "id": "64fe7f3a.b5df9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5044,
-        "y": 4100,
-        "z": "a1c94a24.22ed9",
+        "x": 5143.566665649414,
+        "y": 4167.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "315b6688.54502a",
-                "2e1bb3dd.371e44"
+                "35196fa7.3e82b8",
+                "b4d44dab.0baa88"
             ]
         ]
     },
     {
-        "id": "adcb7aad.70c0d",
+        "id": "433e887a.5dd2c",
         "type": "save",
         "name": "get logical-link from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
         "comments": "",
         "outputs": 1,
-        "x": 1384,
-        "y": 731,
-        "z": "a1c94a24.22ed9",
+        "x": 1483.566665649414,
+        "y": 798.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "89022850.9f967",
-                "75f048cb.75fe2",
-                "d7d4823f.55128"
+                "4058fc82.6dfacc",
+                "4151c29c.d64b0c",
+                "5541a408.f0ed0c"
             ]
         ]
     },
     {
-        "id": "89022850.9f967",
+        "id": "4058fc82.6dfacc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1596.490966796875,
-        "y": 697.573974609375,
-        "z": "a1c94a24.22ed9",
+        "x": 1696.057632446289,
+        "y": 765.1406402587891,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "278a0fef.2766a8"
+                "417a2c30.fd69ac"
             ]
         ]
     },
     {
-        "id": "75f048cb.75fe2",
+        "id": "4151c29c.d64b0c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1585,
-        "y": 742,
-        "z": "a1c94a24.22ed9",
+        "x": 1684.566665649414,
+        "y": 809.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "93e6204d.139fe"
+                "2fc8bb7d.787cac"
             ]
         ]
     },
     {
-        "id": "278a0fef.2766a8",
+        "id": "417a2c30.fd69ac",
         "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": 1745.0625,
-        "y": 697.8597412109375,
-        "z": "a1c94a24.22ed9",
+        "x": 1844.629165649414,
+        "y": 765.4264068603516,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "93e6204d.139fe",
+        "id": "2fc8bb7d.787cac",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1744,
-        "y": 742,
-        "z": "a1c94a24.22ed9",
+        "x": 1843.566665649414,
+        "y": 809.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "d7d4823f.55128",
+        "id": "5541a408.f0ed0c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1590,
-        "y": 785,
-        "z": "a1c94a24.22ed9",
+        "x": 1689.566665649414,
+        "y": 852.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "6c086bfb.a0d044"
+                "e145a9c3.48d208"
             ]
         ]
     },
     {
-        "id": "6c086bfb.a0d044",
+        "id": "e145a9c3.48d208",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 736,
-        "y": 1124,
-        "z": "a1c94a24.22ed9",
+        "x": 835.5666656494141,
+        "y": 1191.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "b122eb38.341668"
+                "88efa0d6.0c1808"
             ]
         ]
     },
     {
-        "id": "b122eb38.341668",
+        "id": "88efa0d6.0c1808",
         "type": "for",
         "name": "for each svc-instance relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1010,
-        "y": 1124,
-        "z": "a1c94a24.22ed9",
+        "x": 1109.566665649414,
+        "y": 1191.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "428eb2b6.4c43ec"
+                "c2dd1c9b.b3dd48"
             ]
         ]
     },
     {
-        "id": "428eb2b6.4c43ec",
+        "id": "c2dd1c9b.b3dd48",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1245.33349609375,
-        "y": 1125,
-        "z": "a1c94a24.22ed9",
+        "x": 1344.900161743164,
+        "y": 1192.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "6c08ceaa.3d7e3"
+                "e5b1da68.bc54"
             ]
         ]
     },
     {
-        "id": "6c08ceaa.3d7e3",
+        "id": "e5b1da68.bc54",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 529.000244140625,
-        "y": 1278,
-        "z": "a1c94a24.22ed9",
+        "x": 628.5669097900391,
+        "y": 1345.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "42fb5b21.64c794"
+                "fb4c81c8.58ec08"
             ]
         ]
     },
     {
-        "id": "c24bb232.38015",
+        "id": "68774cff.da4f7c",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 918,
-        "y": 1283,
-        "z": "a1c94a24.22ed9",
+        "x": 1017.5666656494141,
+        "y": 1350.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "a881a6a4.94a7c8",
-                "2e732415.a6ca64",
-                "10e50fbd.fcc5a"
+                "ae979c86.2af0a",
+                "c51e116c.9e96e",
+                "bc29e653.3cf5f8"
             ]
         ]
     },
     {
-        "id": "a881a6a4.94a7c8",
+        "id": "ae979c86.2af0a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1114,
-        "y": 1248,
-        "z": "a1c94a24.22ed9",
+        "x": 1213.566665649414,
+        "y": 1315.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "2f6cf4f3.693c54"
+                "323455e1.4146ea"
             ]
         ]
     },
     {
-        "id": "2e732415.a6ca64",
+        "id": "c51e116c.9e96e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1114.490966796875,
-        "y": 1293.5740356445312,
-        "z": "a1c94a24.22ed9",
+        "x": 1214.057632446289,
+        "y": 1361.1407012939453,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "75b4d03c.1b0488"
+                "bf9be58f.d0c428"
             ]
         ]
     },
     {
-        "id": "10e50fbd.fcc5a",
+        "id": "bc29e653.3cf5f8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1079,
-        "y": 1339,
-        "z": "a1c94a24.22ed9",
+        "x": 1178.566665649414,
+        "y": 1406.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "83cefb63.3d3958"
+                "dd499616.1dbe"
             ]
         ]
     },
     {
-        "id": "75b4d03c.1b0488",
+        "id": "bf9be58f.d0c428",
         "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": 1274.0625,
-        "y": 1290.8597412109375,
-        "z": "a1c94a24.22ed9",
+        "x": 1373.629165649414,
+        "y": 1358.4264068603516,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "83cefb63.3d3958",
+        "id": "dd499616.1dbe",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1232,
-        "y": 1341,
-        "z": "a1c94a24.22ed9",
+        "x": 1331.566665649414,
+        "y": 1408.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "f0221f2b.2ca488",
+        "id": "66825a6f.db4e3c",
         "type": "switchNode",
         "name": "switch loglink-id exists in conn",
         "xml": "<switch test='`$tmp.aai.logical-link.link-id == $tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1507,
-        "y": 1231,
-        "z": "a1c94a24.22ed9",
+        "x": 1606.566665649414,
+        "y": 1298.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "1f27bf84.77001",
-                "e05aac94.264e2"
+                "85e80e78.a683f",
+                "e9363fe4.4910f8"
             ]
         ]
     },
     {
-        "id": "1f27bf84.77001",
+        "id": "85e80e78.a683f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1718,
-        "y": 1196,
-        "z": "a1c94a24.22ed9",
+        "x": 1817.566665649414,
+        "y": 1263.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "5241d9c1.c5a"
+                "ea49207.e144c6"
             ]
         ]
     },
     {
-        "id": "e05aac94.264e2",
+        "id": "e9363fe4.4910f8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1715,
-        "y": 1257,
-        "z": "a1c94a24.22ed9",
+        "x": 1814.566665649414,
+        "y": 1324.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "7d1ab491.7a47ec",
+        "id": "a72bfa1e.2c0188",
         "type": "set",
         "name": "set currLinkIsFound",
         "xml": "<set>\n<parameter name='currLinkIsFound' value=\"true\" />\n\n\n",
         "comments": "",
-        "x": 2056,
-        "y": 1169,
-        "z": "a1c94a24.22ed9",
+        "x": 2155.566665649414,
+        "y": 1236.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "5241d9c1.c5a",
+        "id": "ea49207.e144c6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1870,
-        "y": 1197,
-        "z": "a1c94a24.22ed9",
+        "x": 1969.566665649414,
+        "y": 1264.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "7d1ab491.7a47ec"
+                "a72bfa1e.2c0188"
             ]
         ]
     },
     {
-        "id": "ac3d3bcb.07c358",
+        "id": "77625e01.45cfa",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2023,
-        "y": 1225,
-        "z": "a1c94a24.22ed9",
+        "x": 2122.566665649414,
+        "y": 1292.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "3aa19f56.483778",
+        "id": "747752c5.edcc6c",
         "type": "comment",
         "name": "currLinkIsFound. Go to the next logical-link",
         "info": "",
         "comments": "",
-        "x": 2028,
-        "y": 1119,
-        "z": "a1c94a24.22ed9",
+        "x": 2127.566665649414,
+        "y": 1186.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "7947ec90.0b2fbc",
+        "id": "fc0b0bdf.af57e8",
         "type": "switchNode",
         "name": "switch currLinkIsFound",
         "xml": "<switch test='`$currLinkIsFound`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1310,
-        "y": 849,
-        "z": "a1c94a24.22ed9",
+        "x": 1409.566665649414,
+        "y": 916.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "69298f6c.9e2dd",
-                "bb557fd5.52031"
+                "ec2c299e.a7094",
+                "12a10d8.78ec073"
             ]
         ]
     },
     {
-        "id": "69298f6c.9e2dd",
+        "id": "ec2c299e.a7094",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1496,
-        "y": 828,
-        "z": "a1c94a24.22ed9",
+        "x": 1595.566665649414,
+        "y": 895.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "cab96485.7156b"
+                "43c18e2d.dbbe18"
             ]
         ]
     },
     {
-        "id": "bb557fd5.52031",
+        "id": "12a10d8.78ec073",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1493,
-        "y": 964,
-        "z": "a1c94a24.22ed9",
+        "x": 1592.566665649414,
+        "y": 1031.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "b394b52b.88d4f8"
+                "4dddc413.6cd63c"
             ]
         ]
     },
     {
-        "id": "cab96485.7156b",
+        "id": "43c18e2d.dbbe18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1738,
-        "y": 823,
-        "z": "a1c94a24.22ed9",
+        "x": 1837.566665649414,
+        "y": 890.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "b4a6c43d.bfc078",
+        "id": "6e81ab2b.cd2004",
         "type": "comment",
         "name": "A new logical-link has been found: modify process should be triggered",
         "info": "",
         "comments": "",
-        "x": 1684,
-        "y": 927,
-        "z": "a1c94a24.22ed9",
+        "x": 1783.566665649414,
+        "y": 994.5666656494141,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "2f6cf4f3.693c54",
+        "id": "323455e1.4146ea",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1278,
-        "y": 1232,
-        "z": "a1c94a24.22ed9",
+        "x": 1377.566665649414,
+        "y": 1299.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "f0221f2b.2ca488",
-                "9c07de97.8ce1e8"
+                "66825a6f.db4e3c",
+                "4b0ae75c.1aab4"
             ]
         ]
     },
     {
-        "id": "9c07de97.8ce1e8",
+        "id": "4b0ae75c.1aab4",
         "type": "switchNode",
         "name": "switch connectivityBW == gfp",
         "xml": "<switch test='`$tmp.aai.connectivity.bandwidth-profile-name == $gfp`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1508,
-        "y": 1322,
-        "z": "a1c94a24.22ed9",
+        "x": 1607.566665649414,
+        "y": 1389.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "e92f497c.306ff",
-                "202f30a4.8a9778"
+                "c8e4becf.570ed8",
+                "efb821b0.8f5c8"
             ]
         ]
     },
     {
-        "id": "e92f497c.306ff",
+        "id": "c8e4becf.570ed8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1713,
-        "y": 1318,
-        "z": "a1c94a24.22ed9",
+        "x": 1812.566665649414,
+        "y": 1385.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "202f30a4.8a9778",
+        "id": "efb821b0.8f5c8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1715,
-        "y": 1368,
-        "z": "a1c94a24.22ed9",
+        "x": 1814.566665649414,
+        "y": 1435.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "aabbec3c.d5f948"
+                "35c21580.2c9b32"
             ]
         ]
     },
     {
-        "id": "79a3430c.be3b14",
+        "id": "fd83a72b.0cf5a8",
         "type": "set",
         "name": "set bwModified",
         "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",
         "comments": "",
-        "x": 2064,
-        "y": 1346,
-        "z": "a1c94a24.22ed9",
+        "x": 2163.566665649414,
+        "y": 1413.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "aabbec3c.d5f948",
+        "id": "35c21580.2c9b32",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1869,
-        "y": 1367,
-        "z": "a1c94a24.22ed9",
+        "x": 1968.566665649414,
+        "y": 1434.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "79a3430c.be3b14",
-                "b3b4a039.5c091"
+                "fd83a72b.0cf5a8",
+                "b1b00645.427888"
             ]
         ]
     },
     {
-        "id": "b3b4a039.5c091",
+        "id": "b1b00645.427888",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 889,
-        "y": 1572,
-        "z": "a1c94a24.22ed9",
+        "x": 988.5666656494141,
+        "y": 1639.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "74886cc5.56820c"
+                "3c4549a7.0d1376"
             ]
         ]
     },
     {
-        "id": "74886cc5.56820c",
+        "id": "3c4549a7.0d1376",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1094,
-        "y": 1572,
-        "z": "a1c94a24.22ed9",
+        "x": 1193.566665649414,
+        "y": 1639.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "ab7d3bd9.5a0118"
+                "adf26b65.8f90e"
             ]
         ]
     },
     {
-        "id": "ab7d3bd9.5a0118",
+        "id": "adf26b65.8f90e",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1260,
-        "y": 1572,
-        "z": "a1c94a24.22ed9",
+        "x": 1359.566665649414,
+        "y": 1639.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "9ac61acb.25a0c8"
+                "64e47481.3a26d4"
             ]
         ]
     },
     {
-        "id": "9ac61acb.25a0c8",
+        "id": "64e47481.3a26d4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1423,
-        "y": 1572,
-        "z": "a1c94a24.22ed9",
+        "x": 1522.566665649414,
+        "y": 1639.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "2370c115.ac8fd6",
-                "1b61e8de.a73647"
+                "6e6ea5ef.8c2224",
+                "d5aad2e.d2c753"
             ]
         ]
     },
     {
-        "id": "1b61e8de.a73647",
+        "id": "d5aad2e.d2c753",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 1652,
-        "y": 1512,
-        "z": "a1c94a24.22ed9",
+        "x": 1751.566665649414,
+        "y": 1579.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "2370c115.ac8fd6",
+        "id": "6e6ea5ef.8c2224",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1161,
-        "y": 1666,
-        "z": "a1c94a24.22ed9",
+        "x": 1260.566665649414,
+        "y": 1733.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "28298f17.ccf108",
-                "b6883dde.6b7bf8",
-                "744baf90.7b9cd8"
+                "8146e5c8.89f0a",
+                "7ba4a096.c89f48",
+                "d58f3b9.ef82248"
             ]
         ]
     },
     {
-        "id": "98131352.4a889",
+        "id": "f88195dd.98254",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1545,
-        "y": 1666,
-        "z": "a1c94a24.22ed9",
+        "x": 1644.566665649414,
+        "y": 1733.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "1b2b6a88.49f2b5",
-                "43c66f34.653488"
+                "1f6be69e.efcee9",
+                "dca75bc1.9206a8"
             ]
         ]
     },
     {
-        "id": "28298f17.ccf108",
+        "id": "8146e5c8.89f0a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1372,
-        "y": 1668,
-        "z": "a1c94a24.22ed9",
+        "x": 1471.566665649414,
+        "y": 1735.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "98131352.4a889"
+                "f88195dd.98254"
             ]
         ]
     },
     {
-        "id": "b6883dde.6b7bf8",
+        "id": "7ba4a096.c89f48",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1372.490966796875,
-        "y": 1713.5740356445312,
-        "z": "a1c94a24.22ed9",
+        "x": 1472.057632446289,
+        "y": 1781.1407012939453,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "15cd27be.d92658"
+                "e8dc9623.1376d8"
             ]
         ]
     },
     {
-        "id": "744baf90.7b9cd8",
+        "id": "d58f3b9.ef82248",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1370,
-        "y": 1757,
-        "z": "a1c94a24.22ed9",
+        "x": 1469.566665649414,
+        "y": 1824.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "d3584005.2bd19"
+                "1a1a5ddc.251932"
             ]
         ]
     },
     {
-        "id": "d3584005.2bd19",
+        "id": "1a1a5ddc.251932",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1537,
-        "y": 1774,
-        "z": "a1c94a24.22ed9",
+        "x": 1636.566665649414,
+        "y": 1841.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "15cd27be.d92658",
+        "id": "e8dc9623.1376d8",
         "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": 1535.0623779296875,
-        "y": 1713.8597717285156,
-        "z": "a1c94a24.22ed9",
+        "x": 1634.6290435791016,
+        "y": 1781.4264373779297,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "42fb5b21.64c794",
+        "id": "fb4c81c8.58ec08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 701,
-        "y": 1278,
-        "z": "a1c94a24.22ed9",
+        "x": 800.5666656494141,
+        "y": 1345.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             [
-                "c24bb232.38015",
-                "cd433210.9124b"
+                "68774cff.da4f7c",
+                "458e84.00aae97c"
             ]
         ]
     },
     {
-        "id": "cd433210.9124b",
+        "id": "458e84.00aae97c",
         "type": "set",
         "name": "unset tmp.aai.connectivity",
         "xml": "<set>\n<parameter name='tmp.aai.connectivity.' value='' />\n",
         "comments": "",
-        "x": 921,
-        "y": 1226,
-        "z": "a1c94a24.22ed9",
+        "x": 1020.5666656494141,
+        "y": 1293.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "1b2b6a88.49f2b5",
+        "id": "1f6be69e.efcee9",
         "type": "save",
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1895.5,
-        "y": 1661,
-        "z": "a1c94a24.22ed9",
+        "x": 1995.066665649414,
+        "y": 1728.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "43c66f34.653488",
+        "id": "dca75bc1.9206a8",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1822.5,
-        "y": 1725,
-        "z": "a1c94a24.22ed9",
+        "x": 1922.066665649414,
+        "y": 1792.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "54aaf2e0.b64b14",
+        "id": "ee7fd236.9ed9a8",
         "type": "comment",
         "name": "The following two nodes are for PCE",
         "info": "",
         "comments": "",
-        "x": 1967,
-        "y": 53,
-        "z": "a1c94a24.22ed9",
+        "x": 2066.566665649414,
+        "y": 120.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": []
     },
     {
-        "id": "d51e1ac2.752b08",
+        "id": "323fc4b1.60fe74",
         "type": "get-resource",
         "name": "get-resource pnfs-list",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
         "comments": "",
         "outputs": 1,
-        "x": 1927,
-        "y": 97,
-        "z": "a1c94a24.22ed9",
+        "x": 2026.566665649414,
+        "y": 164.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "30222136.8f9b9e",
+        "id": "8780743f.a296a",
         "type": "get-resource",
         "name": "get-resource logical-links",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
         "comments": "",
         "outputs": 1,
-        "x": 1940,
-        "y": 142,
-        "z": "a1c94a24.22ed9",
+        "x": 2039.566665649414,
+        "y": 209.56666564941406,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "31cde3.5ded021e",
+        "id": "afd6fb79.f36b6",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamemm`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4247,
-        "y": 2259,
-        "z": "a1c94a24.22ed9",
+        "x": 4346.566665649414,
+        "y": 2326.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "363286ce.e60c2a",
+        "id": "89a7842f.afd83",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5538,
-        "y": 1096,
-        "z": "a1c94a24.22ed9",
+        "x": 5637.566665649414,
+        "y": 1163.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
     },
     {
-        "id": "e15a89e6.e78d8",
+        "id": "1a397526.128d93",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-find-maximum-used-tpn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4436,
-        "y": 2331,
-        "z": "a1c94a24.22ed9",
+        "x": 4535.566665649414,
+        "y": 2398.566665649414,
+        "z": "25a21122.0e2cfe",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
index 4c336b63..8e743ff6 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
@@ -35,12 +35,12 @@
                             <block>
                                 <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                                               resource="pnfs"
-                                              key="selflink = 'https://aai.onap:8443/aai/v21/network/pnfs?depth=0'"
+                                              key="selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0"
                                               local-only="false"
                                               pfx="ccsdkTopopnfs" ></get-resource>
                                 <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                                               resource="logical-links"
-                                              key="selflink = 'https://aai.onap:8443/aai/v21/network/logical-links?depth=0'"
+                                              key="selflink = 'https://aai.onap:8443/aai/v25/network/logical-links?depth=0'"
                                               local-only="false"
                                               pfx="ccsdkTopologicalLinks" ></get-resource>
                                 <set>
@@ -386,9 +386,9 @@
                                                                                                                                 <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                 <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                                 <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                                <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                                <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                                <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
                                                                                                                                 <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                             </save>
                                                                                                                             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -642,9 +642,9 @@
                                                                                                                                 <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                 <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                                 <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                                <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                                <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                                <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
                                                                                                                                 <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                             </save>
                                                                                                                             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -888,9 +888,9 @@
                                                                                                                 <parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />
                                                                                                                 <parameter name='route-distinguisher' value='`$gfp`' />
                                                                                                                 <parameter name='operational-status' value='Created' />
-                                                                                                                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
                                                                                                                 <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
                                                                                                                 <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
                                                                                                                 <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
@@ -1011,9 +1011,9 @@
                                                                                                                                         <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                         <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                                         <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                                        <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                                        <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                                        <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
                                                                                                                                         <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                                     </save>
                                                                                                                                     <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.xml
index 9a8a9179..bc0505d4 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.xml
@@ -35,12 +35,12 @@
                             <block>
                                 <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                                               resource="pnfs"
-                                              key="selflink = 'https://aai.onap:8443/aai/v21/network/pnfs?depth=0'"
+                                              key="selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0"
                                               local-only="false"
                                               pfx="ccsdkTopopnfs" ></get-resource>
                                 <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                                               resource="logical-links"
-                                              key="selflink = 'https://aai.onap:8443/aai/v21/network/logical-links?depth=0'"
+                                              key="selflink = 'https://aai.onap:8443/aai/v25/network/logical-links?depth=0'"
                                               local-only="false"
                                               pfx="ccsdkTopologicalLinks" ></get-resource>
                                 <set>
@@ -500,9 +500,9 @@
                                                                                                                                 <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                 <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                                 <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                                <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                                <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                                <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
                                                                                                                                 <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                             </save>
                                                                                                                             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -756,9 +756,9 @@
                                                                                                                                 <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                 <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                                 <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                                <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                                <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                                <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
                                                                                                                                 <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                             </save>
                                                                                                                             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -998,9 +998,9 @@
                                                                                                                 <parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />
                                                                                                                 <parameter name='route-distinguisher' value='`$gfp`' />
                                                                                                                 <parameter name='operational-status' value='Created' />
-                                                                                                                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
                                                                                                                 <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
                                                                                                                 <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
                                                                                                                 <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
@@ -1120,9 +1120,9 @@
                                                                                                                                         <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                         <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                                         <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                                        <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                                        <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                                        <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
                                                                                                                                         <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                                     </save>
                                                                                                                                     <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
-- 
2.16.6