From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Fri, 29 Jan 2021 22:22:22 +0000 (+0000)
Subject: Adding code in oder to supporting multiple E-Line services per each Transport Slice.
X-Git-Tag: 2.1.1~13
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=8f77d7fe0dd148054ed048642bf87ee7724dc2be

Adding code in oder to supporting multiple E-Line services per each Transport Slice.

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

Former-commit-id: 7189c44abd762ce9459c619e8da16ba46dfc35ff
---

diff --git a/installation/src/main/properties/generic-resource-api-dg.properties b/installation/src/main/properties/generic-resource-api-dg.properties
index 389670bc..d4127133 100644
--- a/installation/src/main/properties/generic-resource-api-dg.properties
+++ b/installation/src/main/properties/generic-resource-api-dg.properties
@@ -36,6 +36,8 @@ restapi.sotn-attachment.templatefile=sotn-attachment-allotted-resource.json
 restapi.sdwan-attachment.templatefile=sdwan-attachment-allotted-resource.json
 restapi.oof-getpath.templatefile=oof-getpath.json
 restapi.transport-slice-creation.templatefile=ts-allocate-tn-slice.json
+restapi.transport-sliceA-list-creation.templatefile=ts-allocate-tn-sliceA-list.json
+restapi.transport-sliceB-list-creation.templatefile=ts-allocate-tn-sliceB-list.json
 restapi.ts-otn-src-domain-creation.templatefile=ts-otn-tunnel-src-domain.json
 restapi.ts-otn-dst-domain-creation.templatefile=ts-otn-tunnel-dst-domain.json
 restapi.ts-ethernet-service.templatefile=ts-ethernet-service.json
diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
index 5f057be1..5256b6c7 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "785080f2.6936b8",
+        "id": "abafb433.2b07c",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 183,
-        "y": 123,
+        "x": 149,
+        "y": 95,
         "z": "f861838.07df98",
         "wires": [
             [
-                "4da9bc1a.de21c4"
+                "8a2adf01.004b9"
             ]
         ]
     },
     {
-        "id": "4da9bc1a.de21c4",
+        "id": "8a2adf01.004b9",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1631 +22,1789 @@
         "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": 308,
-        "y": 449.00001525878906,
+        "x": 274,
+        "y": 421.00001525878906,
         "z": "f861838.07df98",
         "wires": [
             [
-                "4d41d418.8146fc"
+                "870eb920.3a709"
             ]
         ]
     },
     {
-        "id": "4d41d418.8146fc",
+        "id": "870eb920.3a709",
         "type": "method",
         "name": "tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",
         "xml": "<method rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 372.0001220703125,
-        "y": 542,
+        "x": 338.0001220703125,
+        "y": 514,
         "z": "f861838.07df98",
         "wires": [
             [
-                "e5176e39.ab5f58"
+                "12c71cb4.bbd213"
             ]
         ]
     },
     {
-        "id": "8caf5150.39185",
+        "id": "7b12bbea.4b296c",
         "type": "execute",
         "name": "execute RestApiCallNode getPath from OOF",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\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`\" />",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url + '?ethsrvType=' + $prop.ethsrvType`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 854.9730834960938,
-        "y": 200.99600219726562,
+        "x": 820.9730834960938,
+        "y": 172.99600219726562,
         "z": "f861838.07df98",
         "wires": [
             [
-                "4d2dbd72.56d1c4",
-                "d1c68f83.41e85"
+                "838f6988.2e418",
+                "daadcad7.8d5718"
             ]
         ]
     },
     {
-        "id": "4d2dbd72.56d1c4",
+        "id": "838f6988.2e418",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1094.9732246398926,
-        "y": 224.9959716796875,
+        "x": 1060.9732246398926,
+        "y": 196.9959716796875,
         "z": "f861838.07df98",
         "wires": [
             [
-                "f83b56b9.c9b638"
+                "e2aa0c83.94cd5"
             ]
         ]
     },
     {
-        "id": "e8159436.f6c238",
+        "id": "1cd84c7f.13b994",
         "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 OOF api\" />\n",
         "comments": "",
-        "x": 1233.973258972168,
-        "y": 173.99606323242188,
+        "x": 1199.973258972168,
+        "y": 145.99606323242188,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "d1c68f83.41e85",
+        "id": "daadcad7.8d5718",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1093.9730110168457,
-        "y": 173.99606227874756,
+        "x": 1059.9730110168457,
+        "y": 145.99606227874756,
         "z": "f861838.07df98",
         "wires": [
             [
-                "e8159436.f6c238"
+                "1cd84c7f.13b994"
             ]
         ]
     },
     {
-        "id": "820d1c3.af11fe",
+        "id": "fe1658e6.6b98a8",
         "type": "comment",
         "name": "OTN tunnel path computation",
         "info": "TODO: check input parameters -- they should be\nthe source and destination of ETH node+tp.",
         "comments": "",
-        "x": 826.4768829345703,
-        "y": 157.00000190734863,
+        "x": 792.4768829345703,
+        "y": 129.00000190734863,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "74bde20c.a7fc74",
+        "id": "b6d123ad.aaa61",
         "type": "for",
         "name": "for vidx..otn-oof.solutions_length[]",
         "xml": "<for index='vidx' start='0' end='`$otn-oof.solutions_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 845.972900390625,
-        "y": 510.2457275390625,
+        "x": 811.972900390625,
+        "y": 482.2457275390625,
         "z": "f861838.07df98",
         "wires": [
             [
-                "4106c3e4.394aa4"
+                "64a6a0a3.de9e88"
             ]
         ]
     },
     {
-        "id": "cd87cc44.8c15b8",
+        "id": "32873616.6130da",
         "type": "comment",
         "name": "Loop through OTN links",
         "info": "",
         "comments": "",
-        "x": 929.4732055664062,
-        "y": 589.74609375,
+        "x": 895.4732055664062,
+        "y": 561.74609375,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "4106c3e4.394aa4",
+        "id": "64a6a0a3.de9e88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 950.5001220703125,
-        "y": 701.2864990234375,
+        "x": 916.5001220703125,
+        "y": 673.2864990234375,
         "z": "f861838.07df98",
         "wires": [
             [
-                "ce760c47.cc25c",
-                "881e4d7c.ab39a8"
+                "ebe50f50.427a98",
+                "c378542a.988188",
+                "b9a4e12.dabba2"
             ]
         ]
     },
     {
-        "id": "ce760c47.cc25c",
+        "id": "ebe50f50.427a98",
         "type": "get-resource",
         "name": "get-resource cross-link",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"logical-link\" \n\t\tkey=\"logical-link.link-name = $otn-oof.link-name\"\n        pfx='tmp.aai.cross-link' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1217.5001220703125,
-        "y": 621.2864685058594,
+        "x": 1173.5001220703125,
+        "y": 663.2864990234375,
         "z": "f861838.07df98",
         "wires": [
             [
-                "ad346b3e.ce4fa8",
-                "fc5baf89.e9e038",
-                "996489b0.d36438"
+                "383ad684.d27f02",
+                "92e0b7cd.135e8",
+                "fc9654b0.26f8f8"
             ]
         ]
     },
     {
-        "id": "996489b0.d36438",
+        "id": "fc9654b0.26f8f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1409.0001220703125,
-        "y": 566.2864685058594,
+        "x": 1375.0001220703125,
+        "y": 538.2864685058594,
         "z": "f861838.07df98",
         "wires": [
             [
-                "3ceef7ce.6836e"
+                "a60f2416.5968c8"
             ]
         ]
     },
     {
-        "id": "ad346b3e.ce4fa8",
+        "id": "383ad684.d27f02",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1445.0001220703125,
-        "y": 691.2864990234375,
+        "x": 1411.0001220703125,
+        "y": 663.2864990234375,
         "z": "f861838.07df98",
         "wires": [
             [
-                "ac6169c7.f0845"
+                "1ff2406e.1859a"
             ]
         ]
     },
     {
-        "id": "fc5baf89.e9e038",
+        "id": "92e0b7cd.135e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1439.0001220703125,
-        "y": 741.2864990234375,
+        "x": 1405.0001220703125,
+        "y": 713.2864990234375,
         "z": "f861838.07df98",
         "wires": [
             [
-                "63822e63.363e4"
+                "a40efbb6.9e2848"
             ]
         ]
     },
     {
-        "id": "ac6169c7.f0845",
+        "id": "1ff2406e.1859a",
         "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": 1606.0001220703125,
-        "y": 680.2864990234375,
+        "x": 1572.0001220703125,
+        "y": 652.2864990234375,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "63822e63.363e4",
+        "id": "a40efbb6.9e2848",
         "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": 1604.0001220703125,
-        "y": 736.2864990234375,
+        "x": 1570.0001220703125,
+        "y": 708.2864990234375,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "dd34e96e.f687",
+        "id": "4cfcfa39.a67414",
         "type": "comment",
         "name": "get cross-domain-link information",
         "info": "",
         "comments": "",
-        "x": 1218.5001220703125,
-        "y": 582.2864685058594,
+        "x": 1179.5001220703125,
+        "y": 612.2864990234375,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "881e4d7c.ab39a8",
+        "id": "c378542a.988188",
         "type": "set",
-        "name": "set otn-oof.link-name",
-        "xml": "<set>\n<parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].link`' />",
+        "name": "set otn-oof.link-name and etc.",
+        "xml": "<set>\n<parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].link`' />\n<parameter name='otn-oof.start-node' value='`$otn-oof.solutions[$vidx].start_node`' />\n<parameter name='otn-oof.end-node' value='`$otn-oof.solutions[$vidx].end_node`' />",
         "comments": "",
-        "x": 1200.0001220703125,
-        "y": 531.2864685058594,
+        "x": 1163.0001220703125,
+        "y": 566.2864990234375,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "f83b56b9.c9b638",
+        "id": "e2aa0c83.94cd5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1240.0002708435059,
-        "y": 222.74145698547363,
+        "x": 1206.0002708435059,
+        "y": 194.74145698547363,
         "z": "f861838.07df98",
         "wires": [
             []
         ]
     },
     {
-        "id": "e5176e39.ab5f58",
+        "id": "12c71cb4.bbd213",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 612.9688835144043,
-        "y": 468.74163722991943,
+        "x": 578.9688835144043,
+        "y": 440.74163722991943,
         "z": "f861838.07df98",
         "wires": [
             [
-                "74bde20c.a7fc74",
-                "8caf5150.39185"
+                "b6d123ad.aaa61",
+                "7b12bbea.4b296c"
             ]
         ]
     },
     {
-        "id": "26918861.79c318",
+        "id": "eed9f90d.625c7",
         "type": "switchNode",
         "name": "test cross-domain-link role",
         "xml": "<switch test='`$tmp.aai.cross-link.link-role`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1724.5001220703125,
-        "y": 566,
+        "x": 1690.5001220703125,
+        "y": 538,
         "z": "f861838.07df98",
         "wires": [
             [
-                "3531deb1.d8e4aa"
+                "84eec670.e2767"
             ]
         ]
     },
     {
-        "id": "3531deb1.d8e4aa",
+        "id": "84eec670.e2767",
         "type": "outcome",
         "name": "outcome cross-domain",
         "xml": "<outcome value='cross-domain'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1960.5001220703125,
-        "y": 567,
+        "x": 1926.5001220703125,
+        "y": 539,
         "z": "f861838.07df98",
         "wires": [
             [
-                "eebcac2b.5130c8"
+                "4da26d84.4c4d14"
             ]
         ]
     },
     {
-        "id": "7e986d4a.8efc2c",
+        "id": "1a6d08c1.f63207",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2279.5,
-        "y": 1044,
+        "x": 2245.5,
+        "y": 1016,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "eebcac2b.5130c8",
+        "id": "4da26d84.4c4d14",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2163.5001220703125,
-        "y": 568,
+        "x": 2129.5001220703125,
+        "y": 540,
         "z": "f861838.07df98",
         "wires": [
             [
-                "7e986d4a.8efc2c",
-                "ea827dd1.08ec5",
-                "baf2958a.4c4df8",
-                "fb366a0b.531b8"
+                "1a6d08c1.f63207",
+                "1f33bea3.a37e41",
+                "a53fb0ab.3215e8",
+                "1a72a670.f5c5ba"
             ]
         ]
     },
     {
-        "id": "a6afce7.6f2473",
+        "id": "d525a55b.c81c5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2604,
-        "y": 535,
+        "x": 2570,
+        "y": 507,
         "z": "f861838.07df98",
         "wires": [
             [
-                "f8be66de.741848"
+                "424e6de2.ee50a4"
             ]
         ]
     },
     {
-        "id": "2f1a9902.061d36",
+        "id": "48c96b61.49802c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2637.0001220703125,
-        "y": 593,
+        "x": 2603.0001220703125,
+        "y": 565,
         "z": "f861838.07df98",
         "wires": [
             [
-                "dbfe4fc5.e26958"
+                "90a49841.e9abd"
             ]
         ]
     },
     {
-        "id": "9127ce8b.3def68",
+        "id": "27012bae.421594",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2640.0001220703125,
-        "y": 645,
+        "x": 2606.0001220703125,
+        "y": 617,
         "z": "f861838.07df98",
         "wires": [
             [
-                "c41edc57.5a3f3"
+                "3218b6b1.58d4da"
             ]
         ]
     },
     {
-        "id": "dbfe4fc5.e26958",
+        "id": "90a49841.e9abd",
         "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": 2822.0001220703125,
-        "y": 597,
+        "x": 2788.0001220703125,
+        "y": 569,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "c41edc57.5a3f3",
+        "id": "3218b6b1.58d4da",
         "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": 2810.0001220703125,
-        "y": 648,
+        "x": 2776.0001220703125,
+        "y": 620,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "ecb2deab.b51cf",
+        "id": "818ff562.39e0e",
         "type": "set",
         "name": "set domain A node ttp-id",
         "xml": "<set>\n<parameter name='tmp.domain-A.ttp-id' value=\"`$tmp.aai.src-tp.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 3940.5,
-        "y": 450,
+        "x": 3906.5,
+        "y": 422,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "d1cdcf8f.8a3938",
+        "id": "f9b5c841.bb08a",
         "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.domain-A.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3948.5,
-        "y": 502,
+        "x": 3914.5,
+        "y": 474,
         "z": "f861838.07df98",
         "wires": [
             [
-                "5ec14125.845248"
+                "a8ab9ca9.5f37d"
             ]
         ]
     },
     {
-        "id": "5ec14125.845248",
+        "id": "a8ab9ca9.5f37d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4155,
-        "y": 480,
+        "x": 4121,
+        "y": 452,
         "z": "f861838.07df98",
         "wires": [
             [
-                "ca7d08dc.2600e"
+                "f4704103.56f298"
             ]
         ]
     },
     {
-        "id": "c49d7c6a.28c258",
+        "id": "d07aee9c.38cf",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3492.66845703125,
-        "y": 528.4815063476562,
+        "x": 3458.66845703125,
+        "y": 500.48150634765625,
         "z": "f861838.07df98",
         "wires": [
             [
-                "dd92713b.0e1d48"
+                "f5a5a2ae.b150d8"
             ]
         ]
     },
     {
-        "id": "d42ddf1f.aa33b8",
+        "id": "94ee2310.15a178",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.src-tp.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2955.3828125,
-        "y": 530.6597290039062,
+        "x": 2921.3828125,
+        "y": 502.65972900390625,
         "z": "f861838.07df98",
         "wires": [
             [
-                "422b69de.73fa7"
+                "116f7db2.ea55a2"
             ]
         ]
     },
     {
-        "id": "422b69de.73fa7",
+        "id": "116f7db2.ea55a2",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-tp.relationship-list.relationship[$vidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3207.3828125,
-        "y": 527.6597290039062,
+        "x": 3173.3828125,
+        "y": 499.65972900390625,
         "z": "f861838.07df98",
         "wires": [
             [
-                "c49d7c6a.28c258"
+                "d07aee9c.38cf"
             ]
         ]
     },
     {
-        "id": "dd92713b.0e1d48",
+        "id": "f5a5a2ae.b150d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3719.5,
-        "y": 517,
+        "x": 3685.5,
+        "y": 489,
         "z": "f861838.07df98",
         "wires": [
             [
-                "ecb2deab.b51cf",
-                "d1cdcf8f.8a3938",
-                "971f1502.6917e",
-                "c7ca7420.72c18",
-                "8d70c942.44a4b"
+                "818ff562.39e0e",
+                "f9b5c841.bb08a",
+                "fa235f06.dbc5c8",
+                "825f6c70.9f6d6",
+                "6fa2423a.fd13dc"
             ]
         ]
     },
     {
-        "id": "ea827dd1.08ec5",
+        "id": "1f33bea3.a37e41",
         "type": "get-resource",
         "name": "get-resource dst tp",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.dst-ltpId\"\n        pfx='tmp.aai.dst-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2360.5001220703125,
-        "y": 940,
+        "x": 2326.5001220703125,
+        "y": 912,
         "z": "f861838.07df98",
         "wires": [
             [
-                "6be782aa.b86974",
-                "6d662459.228964",
-                "898db702.b7dc98"
+                "d37211e1.0a8088",
+                "51af98c.c752568",
+                "3fe7a459.6ee934"
             ]
         ]
     },
     {
-        "id": "6be782aa.b86974",
+        "id": "d37211e1.0a8088",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2583,
-        "y": 1082,
+        "x": 2549,
+        "y": 1054,
         "z": "f861838.07df98",
         "wires": [
             [
-                "65a0fa24.29df6c"
+                "f87a46b2.f2f308"
             ]
         ]
     },
     {
-        "id": "6d662459.228964",
+        "id": "51af98c.c752568",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2567,
-        "y": 1133,
+        "x": 2533,
+        "y": 1105,
         "z": "f861838.07df98",
         "wires": [
             [
-                "b65b40fe.974c6"
+                "87af46d4.1052d"
             ]
         ]
     },
     {
-        "id": "898db702.b7dc98",
+        "id": "3fe7a459.6ee934",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2570,
-        "y": 1185,
+        "x": 2536,
+        "y": 1157,
         "z": "f861838.07df98",
         "wires": [
             [
-                "bfee6332.37f66"
+                "f5945933.94bc1"
             ]
         ]
     },
     {
-        "id": "bfee6332.37f66",
+        "id": "f5945933.94bc1",
         "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": 2740,
-        "y": 1188,
+        "x": 2706,
+        "y": 1160,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "b65b40fe.974c6",
+        "id": "87af46d4.1052d",
         "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": 2752,
-        "y": 1137,
+        "x": 2718,
+        "y": 1109,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "8d7d4d68.6b1788",
+        "id": "ee005d71.029a7",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.dst-tp.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2939.3828125,
-        "y": 1092.6597290039062,
+        "x": 2905.3828125,
+        "y": 1064.6597290039062,
         "z": "f861838.07df98",
         "wires": [
             [
-                "575ceb9c.cab194"
+                "d2d24abe.aac6a"
             ]
         ]
     },
     {
-        "id": "575ceb9c.cab194",
+        "id": "d2d24abe.aac6a",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.dst-tp.relationship-list.relationship[$vidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3182.3828125,
-        "y": 1091.6597290039062,
+        "x": 3148.3828125,
+        "y": 1063.6597290039062,
         "z": "f861838.07df98",
         "wires": [
             [
-                "b72d167f.fee4e"
+                "328b374b.e6dea8"
             ]
         ]
     },
     {
-        "id": "a539cf03.6d6808",
+        "id": "a3d738bb.01d098",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4948.5,
-        "y": 893,
+        "x": 4914.5,
+        "y": 865,
         "z": "f861838.07df98",
         "wires": [
             [
-                "d5068892.e23ae8",
-                "81d0dbc4.fd6ab8",
-                "7f9bc054.18256"
+                "d76ed9f4.607e58",
+                "4049d8d0.576ec8",
+                "6d1ae1e8.8376b8"
             ]
         ]
     },
     {
-        "id": "b72d167f.fee4e",
+        "id": "328b374b.e6dea8",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3438.66845703125,
-        "y": 1091.4815063476562,
+        "x": 3404.66845703125,
+        "y": 1063.4815063476562,
         "z": "f861838.07df98",
         "wires": [
             [
-                "9c7f096e.2675b8"
+                "daeaf8a3.f790f8"
             ]
         ]
     },
     {
-        "id": "9378bfdf.c4bd08",
+        "id": "b11078d7.b3b858",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4735.5,
-        "y": 892,
+        "x": 4701.5,
+        "y": 864,
         "z": "f861838.07df98",
         "wires": [
             [
-                "a539cf03.6d6808"
+                "a3d738bb.01d098"
             ]
         ]
     },
     {
-        "id": "9c7f096e.2675b8",
+        "id": "daeaf8a3.f790f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3738.5,
-        "y": 1089,
+        "x": 3704.5,
+        "y": 1061,
         "z": "f861838.07df98",
         "wires": [
             [
-                "176fbec8.809f09",
-                "4808dba3.0d097c",
-                "a9a61e4c.61cea8",
-                "967b7a6e.29dcc",
-                "eb2816b.38b8868"
+                "590b13b.935b9ec",
+                "b7482d1e.97b0b8",
+                "4d91a36f.ea12e4",
+                "32404ee3.71aeda",
+                "88a4d7d3.2c52b"
             ]
         ]
     },
     {
-        "id": "176fbec8.809f09",
+        "id": "590b13b.935b9ec",
         "type": "set",
         "name": "set domain B node ttp-id",
         "xml": "<set>\n<parameter name='tmp.domain-B.ttp-id' value=\"`$tmp.aai.dst-tp.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 3980.5,
-        "y": 1043,
+        "x": 3946.5,
+        "y": 1015,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "4808dba3.0d097c",
+        "id": "b7482d1e.97b0b8",
         "type": "get-resource",
         "name": "get-resource dst 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.domain-B.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3970.5,
-        "y": 1094,
+        "x": 3936.5,
+        "y": 1066,
         "z": "f861838.07df98",
         "wires": [
             [
-                "4a5731eb.8e0df8"
+                "3475127.fd4c36e"
             ]
         ]
     },
     {
-        "id": "4a5731eb.8e0df8",
+        "id": "3475127.fd4c36e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4158,
-        "y": 1092,
+        "x": 4124,
+        "y": 1064,
         "z": "f861838.07df98",
         "wires": [
             [
-                "53c0541b.770fcc"
+                "8e8366a6.32694"
             ]
         ]
     },
     {
-        "id": "d5068892.e23ae8",
+        "id": "d76ed9f4.607e58",
         "type": "set",
         "name": "set domain B network-id",
         "xml": "<set>\n<parameter name='tmp.domain-B.network-id' value=\"`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5218.5,
-        "y": 869,
+        "x": 5184.5,
+        "y": 841,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "81d0dbc4.fd6ab8",
+        "id": "4049d8d0.576ec8",
         "type": "get-resource",
         "name": "get-resource dst network-resource",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-B.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-network-resource' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5228.5,
-        "y": 915,
+        "x": 5194.5,
+        "y": 887,
         "z": "f861838.07df98",
         "wires": [
             [
-                "584862de.86be1c"
+                "e9f242cc.c24dd8"
             ]
         ]
     },
     {
-        "id": "584862de.86be1c",
+        "id": "e9f242cc.c24dd8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5444,
-        "y": 906,
+        "x": 5410,
+        "y": 878,
         "z": "f861838.07df98",
         "wires": [
             [
-                "419ec6e9.6efd2"
+                "43e26006.8bc19"
             ]
         ]
     },
     {
-        "id": "419ec6e9.6efd2",
+        "id": "43e26006.8bc19",
         "type": "set",
         "name": "set domain B network-id, topo-id, client-id, etc",
         "xml": "<set>\n<parameter name='domain-B.network-id' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='domain-B.provider-id' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='domain-B.client-id' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='domain-B.te-topo-id' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='domain-B.network-type' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n\n\n",
         "comments": "",
-        "x": 5698.5,
-        "y": 912,
+        "x": 5664.5,
+        "y": 884,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "f8be66de.741848",
+        "id": "424e6de2.ee50a4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2738,
-        "y": 531,
+        "x": 2704,
+        "y": 503,
         "z": "f861838.07df98",
         "wires": [
             [
-                "d42ddf1f.aa33b8"
+                "94ee2310.15a178"
             ]
         ]
     },
     {
-        "id": "65a0fa24.29df6c",
+        "id": "f87a46b2.f2f308",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2729,
-        "y": 1073,
+        "x": 2695,
+        "y": 1045,
         "z": "f861838.07df98",
         "wires": [
             [
-                "8d7d4d68.6b1788"
+                "ee005d71.029a7"
             ]
         ]
     },
     {
-        "id": "3ceef7ce.6836e",
+        "id": "a60f2416.5968c8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1543,
-        "y": 568,
+        "x": 1509,
+        "y": 540,
         "z": "f861838.07df98",
         "wires": [
             [
-                "26918861.79c318"
+                "eed9f90d.625c7"
             ]
         ]
     },
     {
-        "id": "baf2958a.4c4df8",
+        "id": "a53fb0ab.3215e8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='lridx' start='0' end='`$tmp.aai.cross-link.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2313,
-        "y": 352,
+        "x": 2279,
+        "y": 324,
         "z": "f861838.07df98",
         "wires": [
             [
-                "98d39228.4f43c"
+                "128e534.d6bf2ad"
             ]
         ]
     },
     {
-        "id": "98d39228.4f43c",
+        "id": "128e534.d6bf2ad",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2512,
-        "y": 349,
+        "x": 2478,
+        "y": 321,
         "z": "f861838.07df98",
         "wires": [
             [
-                "1abf5c4f.924da4"
+                "11b1dca5.336a6b"
             ]
         ]
     },
     {
-        "id": "1abf5c4f.924da4",
+        "id": "11b1dca5.336a6b",
         "type": "outcome",
         "name": "p-interface",
         "xml": "<outcome value='p-interface'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2689.117431640625,
-        "y": 347.34027099609375,
+        "x": 2655.117431640625,
+        "y": 319.34027099609375,
         "z": "f861838.07df98",
         "wires": [
             [
-                "d47f9442.a83a08"
+                "16999964.0052a7"
             ]
         ]
     },
     {
-        "id": "8b0d1bcd.9b2bf8",
+        "id": "a9fc0be8.cb4e7",
         "type": "set",
-        "name": "set src-ltpId and dst-ltpId",
-        "xml": "<set>\n<parameter name='tmp.cross-link.src-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`\" />\n<parameter name='tmp.cross-link.dst-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[1].relationship-value`\" />\n\n<parameter name='tmp.src-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />\n<parameter name='tmp.dst-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`\" />\n\n\n",
+        "name": "set src-ltpId",
+        "xml": "<set>\n<parameter name='tmp.cross-link.src-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`\" />\n<parameter name='tmp.src-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />\n\n\n\n\n",
         "comments": "",
-        "x": 3003,
-        "y": 291,
+        "x": 3507,
+        "y": 233,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "69b5dc47.c8bab4",
+        "id": "bbad66bd.203d28",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2964,
-        "y": 354,
+        "x": 3492,
+        "y": 281,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "d47f9442.a83a08",
+        "id": "16999964.0052a7",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2829,
-        "y": 332,
+        "x": 2795,
+        "y": 304,
         "z": "f861838.07df98",
         "wires": [
             [
-                "8b0d1bcd.9b2bf8",
-                "69b5dc47.c8bab4"
+                "c4129dee.e1028",
+                "4b41d356.da9dfc"
             ]
         ]
     },
     {
-        "id": "ca7d08dc.2600e",
+        "id": "f4704103.56f298",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4330,
-        "y": 476,
+        "x": 4296,
+        "y": 448,
         "z": "f861838.07df98",
         "wires": [
             [
-                "4e511808.615928"
+                "9beffd2c.502c6"
             ]
         ]
     },
     {
-        "id": "53c0541b.770fcc",
+        "id": "8e8366a6.32694",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4347,
-        "y": 1081,
+        "x": 4313,
+        "y": 1053,
         "z": "f861838.07df98",
         "wires": [
             [
-                "1d3fc9e2.e7e6d6"
+                "2782166b.894a72"
             ]
         ]
     },
     {
-        "id": "fb366a0b.531b8",
+        "id": "1a72a670.f5c5ba",
         "type": "get-resource",
         "name": "get-resource src tp",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.src-ltpId\"\n        pfx='tmp.aai.src-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2406.5001220703125,
-        "y": 574,
+        "x": 2372.5001220703125,
+        "y": 546,
         "z": "f861838.07df98",
         "wires": [
             [
-                "a6afce7.6f2473",
-                "2f1a9902.061d36",
-                "9127ce8b.3def68"
+                "d525a55b.c81c5",
+                "48c96b61.49802c",
+                "27012bae.421594"
             ]
         ]
     },
     {
-        "id": "971f1502.6917e",
+        "id": "fa235f06.dbc5c8",
         "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-pnf-name\"\n        pfx='tmp.aai.src-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3810,
-        "y": 320,
+        "x": 3776,
+        "y": 292,
         "z": "f861838.07df98",
         "wires": [
             [
-                "806ba724.7c9cb",
-                "6ff47511.68ce04",
-                "3a2344e6.758334"
+                "97e1c7ea.89c31",
+                "a32ada2.7e46ba8",
+                "6c014e40.0055a8"
             ]
         ]
     },
     {
-        "id": "806ba724.7c9cb",
+        "id": "97e1c7ea.89c31",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4005.5001220703125,
-        "y": 272,
+        "x": 3971.5001220703125,
+        "y": 244,
         "z": "f861838.07df98",
         "wires": [
             [
-                "198edc3a.f7e7a4"
+                "76aa8066.8a0a68"
             ]
         ]
     },
     {
-        "id": "6ff47511.68ce04",
+        "id": "a32ada2.7e46ba8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3997.5001220703125,
-        "y": 327,
+        "x": 3963.5001220703125,
+        "y": 299,
         "z": "f861838.07df98",
         "wires": [
             [
-                "658b18f7.6c229"
+                "e78aff2c.f74de8"
             ]
         ]
     },
     {
-        "id": "3a2344e6.758334",
+        "id": "6c014e40.0055a8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4002.5001220703125,
-        "y": 384,
+        "x": 3968.5001220703125,
+        "y": 356,
         "z": "f861838.07df98",
         "wires": [
             [
-                "10fe2a63.edb7de"
+                "72ca8bf8.aa197c"
             ]
         ]
     },
     {
-        "id": "10fe2a63.edb7de",
+        "id": "72ca8bf8.aa197c",
         "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": 4154.5001220703125,
-        "y": 385,
+        "x": 4120.5001220703125,
+        "y": 357,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "658b18f7.6c229",
+        "id": "e78aff2c.f74de8",
         "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": 4165.5001220703125,
-        "y": 330,
+        "x": 4131.5001220703125,
+        "y": 302,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "198edc3a.f7e7a4",
+        "id": "76aa8066.8a0a68",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4149.8824462890625,
-        "y": 269.6556701660156,
+        "x": 4115.8824462890625,
+        "y": 241.65567016601562,
         "z": "f861838.07df98",
         "wires": [
             [
-                "3a3ab784.901e48",
-                "a97b2a05.9f73a"
+                "2bdb018d.2fcdb6",
+                "d5b2333f.df7ba8"
             ]
         ]
     },
     {
-        "id": "3a3ab784.901e48",
+        "id": "2bdb018d.2fcdb6",
         "type": "set",
         "name": "set domain A node-id and tpn",
         "xml": "<set>\n<parameter name='domain-A.node-id' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='domain-A.tpn' value='1' />\n",
         "comments": "",
-        "x": 4375,
-        "y": 225,
+        "x": 4341,
+        "y": 197,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "c7ca7420.72c18",
+        "id": "825f6c70.9f6d6",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3897,
-        "y": 567,
+        "x": 3863,
+        "y": 539,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "4e511808.615928",
+        "id": "9beffd2c.502c6",
         "type": "set",
         "name": "set domain A tunnel tp ip",
         "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 4591,
-        "y": 473,
+        "x": 4557,
+        "y": 445,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "967b7a6e.29dcc",
+        "id": "32404ee3.71aeda",
         "type": "get-resource",
         "name": "get-resource dst pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\"\n        pfx='tmp.aai.dst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3807,
-        "y": 923,
+        "x": 3773,
+        "y": 895,
         "z": "f861838.07df98",
         "wires": [
             [
-                "e327bfa4.a9a3a8",
-                "d6f6e8cf.638658",
-                "370c2654.35ab6a"
+                "38443514.32f97a",
+                "3f48494d.b1e386",
+                "1d72a1d4.29172e"
             ]
         ]
     },
     {
-        "id": "370c2654.35ab6a",
+        "id": "1d72a1d4.29172e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4002.5001220703125,
-        "y": 875,
+        "x": 3968.5001220703125,
+        "y": 847,
         "z": "f861838.07df98",
         "wires": [
             [
-                "750d9871.e65c38"
+                "e3710364.81565"
             ]
         ]
     },
     {
-        "id": "d6f6e8cf.638658",
+        "id": "3f48494d.b1e386",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3994.5001220703125,
-        "y": 930,
+        "x": 3960.5001220703125,
+        "y": 902,
         "z": "f861838.07df98",
         "wires": [
             [
-                "a22c9c14.dad95"
+                "1d46287c.a3abe"
             ]
         ]
     },
     {
-        "id": "e327bfa4.a9a3a8",
+        "id": "38443514.32f97a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3999.5001220703125,
-        "y": 987,
+        "x": 3965.5001220703125,
+        "y": 959,
         "z": "f861838.07df98",
         "wires": [
             [
-                "68964b02.e7fefc"
+                "cdfeb34e.901888"
             ]
         ]
     },
     {
-        "id": "750d9871.e65c38",
+        "id": "e3710364.81565",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4146.8824462890625,
-        "y": 872.6556701660156,
+        "x": 4112.8824462890625,
+        "y": 844.6556701660156,
         "z": "f861838.07df98",
         "wires": [
             [
-                "93208213.553588",
-                "71258e68.5cbd58"
+                "f36692a0.716e88",
+                "2c5d340f.626864"
             ]
         ]
     },
     {
-        "id": "a22c9c14.dad95",
+        "id": "1d46287c.a3abe",
         "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": 4162.5001220703125,
-        "y": 933,
+        "x": 4128.5001220703125,
+        "y": 905,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "68964b02.e7fefc",
+        "id": "cdfeb34e.901888",
         "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": 4151.5001220703125,
-        "y": 988,
+        "x": 4117.5001220703125,
+        "y": 960,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "93208213.553588",
+        "id": "f36692a0.716e88",
         "type": "set",
         "name": "set domain B node-id and tpn",
         "xml": "<set>\n<parameter name='domain-B.node-id' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='domain-B.tpn' value='1' />\n",
         "comments": "",
-        "x": 4356,
-        "y": 840,
+        "x": 4322,
+        "y": 812,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "a9a61e4c.61cea8",
+        "id": "4d91a36f.ea12e4",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3926,
-        "y": 1135,
+        "x": 3892,
+        "y": 1107,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "1d3fc9e2.e7e6d6",
+        "id": "2782166b.894a72",
         "type": "set",
         "name": "set domain B tunnel tp id",
         "xml": "<set>\n<parameter name='domain-B.tunnel-tp-id' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 4580,
-        "y": 1080,
+        "x": 4546,
+        "y": 1052,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "57d0de73.a03a68",
+        "id": "93bc95bd.015218",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4732,
-        "y": 288,
+        "x": 4698,
+        "y": 260,
         "z": "f861838.07df98",
         "wires": [
             [
-                "ed098b6a.2cacf8"
+                "12aa4902.54d527"
             ]
         ]
     },
     {
-        "id": "ed098b6a.2cacf8",
+        "id": "12aa4902.54d527",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4909,
-        "y": 280,
+        "x": 4875,
+        "y": 252,
         "z": "f861838.07df98",
         "wires": [
             [
-                "61d12009.69ae18",
-                "bb57da49.8f1178",
-                "85c9485f.31b9d8"
+                "e133ac15.1cfeb8",
+                "50016229.5d7aa4",
+                "9731bbf6.0aee28"
             ]
         ]
     },
     {
-        "id": "61d12009.69ae18",
+        "id": "e133ac15.1cfeb8",
         "type": "set",
         "name": "set domain A network-id",
         "xml": "<set>\n<parameter name='tmp.domain-A.network-id' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5124,
-        "y": 261,
+        "x": 5090,
+        "y": 233,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "bb57da49.8f1178",
+        "id": "50016229.5d7aa4",
         "type": "get-resource",
         "name": "get-resource src network-resource",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-A.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-network-resource' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5141,
-        "y": 325,
+        "x": 5107,
+        "y": 297,
         "z": "f861838.07df98",
         "wires": [
             [
-                "603dc665.e100a"
+                "64fc1e3d.6c54a8"
             ]
         ]
     },
     {
-        "id": "603dc665.e100a",
+        "id": "64fc1e3d.6c54a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5364.5,
-        "y": 326,
+        "x": 5330.5,
+        "y": 298,
         "z": "f861838.07df98",
         "wires": [
             [
-                "bfe1407d.be933"
+                "269c6440.2d1124"
             ]
         ]
     },
     {
-        "id": "bfe1407d.be933",
+        "id": "269c6440.2d1124",
         "type": "set",
         "name": "set domain A network-id, topo-id, client-id, etc",
         "xml": "<set>\n<parameter name='domain-A.network-id' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='domain-A.provider-id' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='domain-A.client-id' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='domain-A.te-topo-id' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='domain-A.network-type' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n\n\n",
         "comments": "",
-        "x": 5629,
-        "y": 315,
+        "x": 5595,
+        "y": 287,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "a97b2a05.9f73a",
+        "id": "d5b2333f.df7ba8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4334,
-        "y": 284,
+        "x": 4300,
+        "y": 256,
         "z": "f861838.07df98",
         "wires": [
             [
-                "2c83d3d0.5ba494"
+                "4f6b55da.d022d4"
             ]
         ]
     },
     {
-        "id": "2c83d3d0.5ba494",
+        "id": "4f6b55da.d022d4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4529,
-        "y": 284,
+        "x": 4495,
+        "y": 256,
         "z": "f861838.07df98",
         "wires": [
             [
-                "57d0de73.a03a68"
+                "93bc95bd.015218"
             ]
         ]
     },
     {
-        "id": "85c9485f.31b9d8",
+        "id": "9731bbf6.0aee28",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5068,
-        "y": 378,
+        "x": 5034,
+        "y": 350,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "71258e68.5cbd58",
+        "id": "2c5d340f.626864",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4335,
-        "y": 891,
+        "x": 4301,
+        "y": 863,
         "z": "f861838.07df98",
         "wires": [
             [
-                "1cdec3b0.3edecc"
+                "a0eb4786.ca84c8"
             ]
         ]
     },
     {
-        "id": "1cdec3b0.3edecc",
+        "id": "a0eb4786.ca84c8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4530,
-        "y": 891,
+        "x": 4496,
+        "y": 863,
         "z": "f861838.07df98",
         "wires": [
             [
-                "9378bfdf.c4bd08"
+                "b11078d7.b3b858"
             ]
         ]
     },
     {
-        "id": "7f9bc054.18256",
+        "id": "6d1ae1e8.8376b8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5154,
-        "y": 971,
+        "x": 5120,
+        "y": 943,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "8d70c942.44a4b",
+        "id": "6fa2423a.fd13dc",
         "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.src-tp`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-src-tp\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3838,
-        "y": 114,
+        "x": 3804,
+        "y": 86,
         "z": "f861838.07df98",
         "wires": [
             [
-                "f6a321aa.4933d",
-                "d873be99.cdd6b8"
+                "c37dc1f9.38a388",
+                "f701d80.fcde128"
             ]
         ]
     },
     {
-        "id": "d873be99.cdd6b8",
+        "id": "f701d80.fcde128",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4059,
-        "y": 82,
+        "x": 4025,
+        "y": 54,
         "z": "f861838.07df98",
         "wires": [
             [
-                "aee73e2c.22e008"
+                "72fa8a9d.201954"
             ]
         ]
     },
     {
-        "id": "f6a321aa.4933d",
+        "id": "c37dc1f9.38a388",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4059,
-        "y": 129,
+        "x": 4025,
+        "y": 101,
         "z": "f861838.07df98",
         "wires": [
             [
-                "58dfd18f.2c2408"
+                "11d67749.03e0d9"
             ]
         ]
     },
     {
-        "id": "aee73e2c.22e008",
+        "id": "72fa8a9d.201954",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4224,
-        "y": 79,
+        "x": 4190,
+        "y": 51,
         "z": "f861838.07df98",
         "wires": [
             [
-                "e00cc6b0.3f2b6"
+                "bbea1bea.ff9688"
             ]
         ]
     },
     {
-        "id": "e00cc6b0.3f2b6",
+        "id": "bbea1bea.ff9688",
         "type": "set",
         "name": "set domain-A.ltpId",
         "xml": "<set>\n<parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />\n",
         "comments": "",
-        "x": 4406,
-        "y": 83,
+        "x": 4372,
+        "y": 55,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "58dfd18f.2c2408",
+        "id": "11d67749.03e0d9",
         "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": 4226,
-        "y": 129,
+        "x": 4192,
+        "y": 101,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "eb2816b.38b8868",
+        "id": "88a4d7d3.2c52b",
         "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.dst-tp`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-dst-tp\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3846,
-        "y": 738,
+        "x": 3812,
+        "y": 710,
         "z": "f861838.07df98",
         "wires": [
             [
-                "4540307f.4c5428",
-                "da15be4.fdd654"
+                "584895a0.b3ab74",
+                "d8e0f12d.021a28"
             ]
         ]
     },
     {
-        "id": "da15be4.fdd654",
+        "id": "d8e0f12d.021a28",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4067,
-        "y": 706,
+        "x": 4033,
+        "y": 678,
         "z": "f861838.07df98",
         "wires": [
             [
-                "344ce354.79f65c"
+                "18ffb32b.dc39ad"
             ]
         ]
     },
     {
-        "id": "4540307f.4c5428",
+        "id": "584895a0.b3ab74",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4067,
-        "y": 753,
+        "x": 4033,
+        "y": 725,
         "z": "f861838.07df98",
         "wires": [
             [
-                "e36b8ad2.500998"
+                "5fcd9d7d.d620cc"
             ]
         ]
     },
     {
-        "id": "344ce354.79f65c",
+        "id": "18ffb32b.dc39ad",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4232,
-        "y": 703,
+        "x": 4198,
+        "y": 675,
         "z": "f861838.07df98",
         "wires": [
             [
-                "2f5cfc52.4cced4"
+                "ef90ab42.074438"
             ]
         ]
     },
     {
-        "id": "2f5cfc52.4cced4",
+        "id": "ef90ab42.074438",
         "type": "set",
         "name": "set domain-B.ltpId",
         "xml": "<set>\n<parameter name='domain-B.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />\n",
         "comments": "",
-        "x": 4428,
-        "y": 700,
+        "x": 4394,
+        "y": 672,
         "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "e36b8ad2.500998",
+        "id": "5fcd9d7d.d620cc",
         "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": 4234,
-        "y": 753,
+        "x": 4200,
+        "y": 725,
+        "z": "f861838.07df98",
+        "wires": []
+    },
+    {
+        "id": "b9a4e12.dabba2",
+        "type": "set",
+        "name": "unset parameters",
+        "xml": "<set>\n<parameter name='otn-oof.link-name' value='' />\n<parameter name='tmp.aai.cross-link' value='' />\n<parameter name='tmp.aai.cross-link.' value='' />\n<parameter name='tmp.aai.cross-link.link-role' value='' />",
+        "comments": "",
+        "x": 1154,
+        "y": 495,
+        "z": "f861838.07df98",
+        "wires": []
+    },
+    {
+        "id": "c4129dee.e1028",
+        "type": "switchNode",
+        "name": "switch value == start-node",
+        "xml": "<switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value == $otn-oof.start-node`'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 2990,
+        "y": 265,
+        "z": "f861838.07df98",
+        "wires": [
+            [
+                "c507ecc7.0f698"
+            ]
+        ]
+    },
+    {
+        "id": "55770297.b0eaec",
+        "type": "outcome",
+        "name": "otn-oof.start-node",
+        "xml": "<outcome value='`$otn-oof.start-node`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3142,
+        "y": 180,
+        "z": "f861838.07df98",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e83d3f89.4fb8f",
+        "type": "outcome",
+        "name": "otn-oof.end-node",
+        "xml": "<outcome value='`$otn-oof.end-node`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3145,
+        "y": 399,
+        "z": "f861838.07df98",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e09f6c32.6da1e8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3320,
+        "y": 249,
+        "z": "f861838.07df98",
+        "wires": [
+            [
+                "a9fc0be8.cb4e7"
+            ]
+        ]
+    },
+    {
+        "id": "3bd5ba40.547cce",
+        "type": "set",
+        "name": "set dst-ltpId",
+        "xml": "<set>\n<parameter name='tmp.cross-link.dst-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`\" />\n<parameter name='tmp.dst-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />\n\n\n\n",
+        "comments": "",
+        "x": 3517,
+        "y": 335,
         "z": "f861838.07df98",
         "wires": []
+    },
+    {
+        "id": "bf0c687c.786c3",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 3500,
+        "y": 375,
+        "z": "f861838.07df98",
+        "wires": []
+    },
+    {
+        "id": "e18153ce.f19278",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3338,
+        "y": 347,
+        "z": "f861838.07df98",
+        "wires": [
+            [
+                "3bd5ba40.547cce"
+            ]
+        ]
+    },
+    {
+        "id": "c507ecc7.0f698",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3178,
+        "y": 252,
+        "z": "f861838.07df98",
+        "wires": [
+            [
+                "e09f6c32.6da1e8"
+            ]
+        ]
+    },
+    {
+        "id": "4b41d356.da9dfc",
+        "type": "switchNode",
+        "name": "switch value == end-node",
+        "xml": "<switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value == $otn-oof.end-node`'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 2988,
+        "y": 329,
+        "z": "f861838.07df98",
+        "wires": [
+            [
+                "2bcfa57c.bd2fea"
+            ]
+        ]
+    },
+    {
+        "id": "2bcfa57c.bd2fea",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3173,
+        "y": 333,
+        "z": "f861838.07df98",
+        "wires": [
+            [
+                "e18153ce.f19278"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
index 44b359b2..1e6a51c5 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
@@ -227,7 +227,7 @@
         "id": "25e7d332.a761fc",
         "type": "set",
         "name": "set attachment_param for OTN A",
-        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<parameter name='dst-tpn-id' value='1' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",
+        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",
         "comments": "",
         "x": 3849,
         "y": 191,
@@ -774,7 +774,7 @@
         "id": "27bc86e9.1c4e52",
         "type": "set",
         "name": "set attachment_param for OTN B",
-        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<parameter name='src-tpn-id' value='1' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",
+        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",
         "comments": "",
         "x": 3829,
         "y": 995,
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 b9e4d5ca..8c72d0c8 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
@@ -117,8 +117,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1361.490966796875,
-        "y": 176.57403564453125,
+        "x": 1347.490966796875,
+        "y": 203.57403564453125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -133,8 +133,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1350,
-        "y": 223,
+        "x": 1336,
+        "y": 250,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -146,7 +146,7 @@
         "id": "dfc9a5db.996c4",
         "type": "switchNode",
         "name": "switch allotted-resources_length != 0",
-        "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources_length != 0`'>\n",
+        "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1591,
@@ -165,8 +165,8 @@
         "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": 1515.0623779296875,
-        "y": 179.85977172851562,
+        "x": 1501.0623779296875,
+        "y": 206.85977172851562,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -176,19 +176,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1519,
-        "y": 224,
-        "z": "4d37a11.42c136",
-        "wires": []
-    },
-    {
-        "id": "ca7ed950.c4257",
-        "type": "set",
-        "name": "set the 1st allotted-resource-id",
-        "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[0].id`\" />\n\n\n",
-        "comments": "",
-        "x": 1990,
-        "y": 198,
+        "x": 1505,
+        "y": 251,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -246,8 +235,9 @@
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "ca7ed950.c4257",
-                "78e29884.225c08"
+                "23c06925.0d2eb6",
+                "a5814717.4b953",
+                "39b144a2.fc3a7c"
             ]
         ]
     },
@@ -255,10 +245,10 @@
         "id": "50cd8b4c.3fbe34",
         "type": "set",
         "name": "set network-route-A",
-        "xml": "<set>\n<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",
+        "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": 2370,
-        "y": 822,
+        "x": 2652,
+        "y": 843,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -268,8 +258,8 @@
         "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": 2371,
-        "y": 877,
+        "x": 2653,
+        "y": 898,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -280,8 +270,8 @@
         "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": 1993,
-        "y": 273,
+        "x": 2275,
+        "y": 294,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -298,8 +288,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2209,
-        "y": 340,
+        "x": 2491,
+        "y": 361,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -314,8 +304,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2209.490966796875,
-        "y": 239.573974609375,
+        "x": 2491.490966796875,
+        "y": 260.573974609375,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -330,8 +320,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2205,
-        "y": 289,
+        "x": 2487,
+        "y": 310,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -345,8 +335,8 @@
         "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": 2387.0625,
-        "y": 239.8597412109375,
+        "x": 2669.0625,
+        "y": 260.8597412109375,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -356,8 +346,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2387,
-        "y": 289,
+        "x": 2669,
+        "y": 310,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -368,14 +358,14 @@
         "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": 1728,
-        "y": 762,
+        "x": 2010,
+        "y": 783,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "a6a55952.b90f",
                 "4070a4d0.4176d4",
-                "60c71e39.2f942"
+                "60c71e39.2f942",
+                "a6a55952.b90f"
             ]
         ]
     },
@@ -386,8 +376,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2019.490966796875,
-        "y": 740.573974609375,
+        "x": 2301.490966796875,
+        "y": 761.573974609375,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -402,8 +392,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2008,
-        "y": 785,
+        "x": 2290,
+        "y": 806,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -417,8 +407,8 @@
         "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": 2168.0625,
-        "y": 740.8597412109375,
+        "x": 2450.0625,
+        "y": 761.8597412109375,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -428,8 +418,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2167,
-        "y": 785,
+        "x": 2449,
+        "y": 806,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -440,8 +430,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2015,
-        "y": 864,
+        "x": 2297,
+        "y": 885,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -457,8 +447,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2154,
-        "y": 864,
+        "x": 2436,
+        "y": 885,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -475,13 +465,13 @@
                 "260f00b5.585908",
                 "134248ca.e0fa77",
                 "fc2a7bf0.e878b",
-                "a5814717.4b953",
                 "84749d0f.3038c8",
-                "39b144a2.fc3a7c",
                 "21292318.735edc",
                 "ce066c5d.e7734",
+                "e927f664.5c872",
+                "29397b6c.248454",
                 "c19c2198.0de5c",
-                "303c5717.c426f"
+                "488403ee.0379ac"
             ]
         ]
     },
@@ -492,8 +482,8 @@
         "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": 2383,
-        "y": 945,
+        "x": 2665,
+        "y": 966,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -510,8 +500,8 @@
         "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": 2362,
-        "y": 1546.9998779296875,
+        "x": 2644,
+        "y": 1567.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -528,8 +518,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2584,
-        "y": 829,
+        "x": 2866,
+        "y": 850,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -544,8 +534,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2579.509033203125,
-        "y": 878.426025390625,
+        "x": 2861.509033203125,
+        "y": 899.426025390625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -560,8 +550,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2583.509033203125,
-        "y": 929.426025390625,
+        "x": 2865.509033203125,
+        "y": 950.426025390625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -575,8 +565,8 @@
         "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": 2732.571533203125,
-        "y": 828.2857666015625,
+        "x": 3014.571533203125,
+        "y": 849.2857666015625,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -586,8 +576,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2722.509033203125,
-        "y": 878.426025390625,
+        "x": 3004.509033203125,
+        "y": 899.426025390625,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -598,8 +588,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2585,
-        "y": 1516.9998779296875,
+        "x": 2867,
+        "y": 1537.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -614,8 +604,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2580.509033203125,
-        "y": 1566.4259033203125,
+        "x": 2862.509033203125,
+        "y": 1587.4259033203125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -630,8 +620,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2584.509033203125,
-        "y": 1617.4259033203125,
+        "x": 2866.509033203125,
+        "y": 1638.4259033203125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -645,8 +635,8 @@
         "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": 2733.571533203125,
-        "y": 1516.28564453125,
+        "x": 3015.571533203125,
+        "y": 1537.28564453125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -656,8 +646,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2723.509033203125,
-        "y": 1566.4259033203125,
+        "x": 3005.509033203125,
+        "y": 1587.4259033203125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -668,8 +658,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3397.66650390625,
-        "y": 973,
+        "x": 3679.66650390625,
+        "y": 994,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -688,8 +678,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3225,
-        "y": 974,
+        "x": 3507,
+        "y": 995,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -704,8 +694,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3234.490966796875,
-        "y": 1016.5740356445312,
+        "x": 3516.490966796875,
+        "y": 1037.5740356445312,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -720,8 +710,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3223,
-        "y": 1063,
+        "x": 3505,
+        "y": 1084,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -735,8 +725,8 @@
         "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": 3388.0623779296875,
-        "y": 1019.8597717285156,
+        "x": 3670.0623779296875,
+        "y": 1040.8597717285156,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -746,8 +736,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3392,
-        "y": 1064,
+        "x": 3674,
+        "y": 1085,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -758,8 +748,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2745,
-        "y": 931,
+        "x": 3027,
+        "y": 952,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -775,8 +765,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2735,
-        "y": 1618.9998779296875,
+        "x": 3017,
+        "y": 1639.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -792,8 +782,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3365.66650390625,
-        "y": 1809,
+        "x": 3647.66650390625,
+        "y": 1830,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -812,8 +802,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3193,
-        "y": 1810,
+        "x": 3475,
+        "y": 1831,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -828,8 +818,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3202.490966796875,
-        "y": 1852.5740356445312,
+        "x": 3484.490966796875,
+        "y": 1873.5740356445312,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -844,8 +834,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3191,
-        "y": 1899,
+        "x": 3473,
+        "y": 1920,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -859,8 +849,8 @@
         "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": 3356.0623779296875,
-        "y": 1855.8597717285156,
+        "x": 3638.0623779296875,
+        "y": 1876.8597717285156,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -870,8 +860,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3360,
-        "y": 1900,
+        "x": 3642,
+        "y": 1921,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -882,8 +872,8 @@
         "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": 3662,
-        "y": 957,
+        "x": 3944,
+        "y": 978,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -899,8 +889,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3885,
-        "y": 912,
+        "x": 4167,
+        "y": 933,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -915,8 +905,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3887,
-        "y": 976,
+        "x": 4169,
+        "y": 997,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -930,8 +920,8 @@
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
         "comments": "",
-        "x": 4220,
-        "y": 870,
+        "x": 4502,
+        "y": 888,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -941,8 +931,8 @@
         "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": 4049,
-        "y": 972,
+        "x": 4331,
+        "y": 993,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -953,8 +943,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4050,
-        "y": 909,
+        "x": 4332,
+        "y": 930,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -969,8 +959,8 @@
         "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": 4221,
-        "y": 975,
+        "x": 4503,
+        "y": 996,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -980,8 +970,8 @@
         "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": 4222,
-        "y": 924,
+        "x": 4504,
+        "y": 945,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -992,8 +982,8 @@
         "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='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\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": 3664,
-        "y": 1116,
+        "x": 3946,
+        "y": 1137,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1006,8 +996,8 @@
         "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": 3709,
-        "y": 1026,
+        "x": 3991,
+        "y": 1047,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1019,8 +1009,8 @@
         "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": 3598,
-        "y": 1067,
+        "x": 3880,
+        "y": 1088,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1031,8 +1021,8 @@
         "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": 3652,
-        "y": 1813.0001220703125,
+        "x": 3934,
+        "y": 1834.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1048,8 +1038,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3875,
-        "y": 1768.0001220703125,
+        "x": 4157,
+        "y": 1789.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1064,8 +1054,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3877,
-        "y": 1832.0001220703125,
+        "x": 4159,
+        "y": 1853.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1079,8 +1069,8 @@
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
         "comments": "",
-        "x": 4210,
-        "y": 1726.0001220703125,
+        "x": 4492,
+        "y": 1747.0001220703125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1090,8 +1080,8 @@
         "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": 4036,
-        "y": 1851.0001220703125,
+        "x": 4318,
+        "y": 1872.0001220703125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1102,8 +1092,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4040,
-        "y": 1765.0001220703125,
+        "x": 4322,
+        "y": 1786.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1118,8 +1108,8 @@
         "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": 4211,
-        "y": 1831.0001220703125,
+        "x": 4493,
+        "y": 1852.0001220703125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1129,8 +1119,8 @@
         "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": 4206,
-        "y": 1780.0001220703125,
+        "x": 4488,
+        "y": 1801.0001220703125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1141,8 +1131,8 @@
         "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='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\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": 3654,
-        "y": 1972.0001220703125,
+        "x": 3936,
+        "y": 1993.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1155,8 +1145,8 @@
         "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": 3699,
-        "y": 1882.0001220703125,
+        "x": 3981,
+        "y": 1903.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1168,8 +1158,8 @@
         "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": 3588,
-        "y": 1920.0001220703125,
+        "x": 3870,
+        "y": 1941.0001220703125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1180,8 +1170,8 @@
         "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": 2563,
-        "y": 2047,
+        "x": 2845,
+        "y": 2068,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1193,8 +1183,8 @@
         "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": 2357,
-        "y": 1987,
+        "x": 2639,
+        "y": 1969,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1204,8 +1194,8 @@
         "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": 2331,
-        "y": 1940,
+        "x": 2613,
+        "y": 1922,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1213,11 +1203,11 @@
         "id": "7ca2c5af.473d34",
         "type": "save",
         "name": "save vpn-binding A resource (aka. OTN domainA) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='access-provider-id' value='`$domain-A.provider-id`' />\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<parameter name='access-client-id' value='`$domain-A.client-id`' />\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<parameter name='access-topology-id' value='`$domain-A.te-topo-id`' />\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<parameter name='src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<!--<parameter name='src-access-ltp-id' value='`$source.tunnel-tp-id`' />-->\n<parameter name='src-access-ltp-id' value='' />\n<parameter name='dst-access-node-id' value='`$domain-A.node-id`' />\n<parameter name='dst-access-ltp-id' value='`$domain-A.tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\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",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />\n<parameter name='access-provider-id' value='`$domain-A.provider-id`' />\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<parameter name='access-client-id' value='`$domain-A.client-id`' />\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<parameter name='access-topology-id' value='`$domain-A.te-topo-id`' />\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<parameter name='src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<!--<parameter name='src-access-ltp-id' value='`$source.tunnel-tp-id`' />-->\n<parameter name='src-access-ltp-id' value='' />\n<parameter name='dst-access-node-id' value='`$domain-A.node-id`' />\n<parameter name='dst-access-ltp-id' value='`$domain-A.tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\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",
         "comments": "",
         "outputs": 1,
-        "x": 2439,
-        "y": 2206,
+        "x": 2721,
+        "y": 2227,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1232,8 +1222,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-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": 2442.5,
-        "y": 2276,
+        "x": 2724.5,
+        "y": 2297,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1246,8 +1236,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3090.5,
-        "y": 2195,
+        "x": 3372.5,
+        "y": 2216,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1260,8 +1250,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$dst-ltpId`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3092.5,
-        "y": 2234,
+        "x": 3374.5,
+        "y": 2255,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1274,8 +1264,8 @@
         "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": 3792,
-        "y": 1164,
+        "x": 4074,
+        "y": 1185,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1288,8 +1278,8 @@
         "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": 3781,
-        "y": 2037.0001220703125,
+        "x": 4063,
+        "y": 2058.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1302,8 +1292,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2739,
-        "y": 2213,
+        "x": 3021,
+        "y": 2234,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1319,8 +1309,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2879.500244140625,
-        "y": 2214.25390625,
+        "x": 3161.500244140625,
+        "y": 2235.25390625,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1332,8 +1322,8 @@
         "name": "TODO: FIXME: do we need this relationship?",
         "info": "",
         "comments": "",
-        "x": 3127,
-        "y": 2154,
+        "x": 3409,
+        "y": 2175,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1343,8 +1333,8 @@
         "name": "TODO: FIXME: put proper values",
         "info": "",
         "comments": "",
-        "x": 2406,
-        "y": 2166,
+        "x": 2688,
+        "y": 2187,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1352,11 +1342,11 @@
         "id": "b46ca414.99697",
         "type": "save",
         "name": "save vpn-binding B resource (aka. OTN domainB) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='access-provider-id' value='`$domain-B.provider-id`' />\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<parameter name='access-client-id' value='`$domain-B.client-id`' />\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<parameter name='access-topology-id' value='`$domain-B.te-topo-id`' />\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<parameter name='src-access-node-id' value='`$domain-B.node-id`' />\n<parameter name='src-access-ltp-id' value='`$domain-B.tunnel-tp-id`' />\n<parameter name='dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<!--<parameter name='dst-access-ltp-id' value='`$destination.tunnel-tp-id`' />-->\n<parameter name='dst-access-ltp-id' value='' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\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",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />\n<parameter name='access-provider-id' value='`$domain-B.provider-id`' />\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<parameter name='access-client-id' value='`$domain-B.client-id`' />\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<parameter name='access-topology-id' value='`$domain-B.te-topo-id`' />\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<parameter name='src-access-node-id' value='`$domain-B.node-id`' />\n<parameter name='src-access-ltp-id' value='`$domain-B.tunnel-tp-id`' />\n<parameter name='dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<!--<parameter name='dst-access-ltp-id' value='`$destination.tunnel-tp-id`' />-->\n<parameter name='dst-access-ltp-id' value='' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\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",
         "comments": "",
         "outputs": 1,
-        "x": 2442,
-        "y": 2494,
+        "x": 2724,
+        "y": 2515,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1370,8 +1360,8 @@
         "name": "TODO: FIXME: do we need this relationship?",
         "info": "",
         "comments": "",
-        "x": 3130,
-        "y": 2434,
+        "x": 3412,
+        "y": 2455,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1382,8 +1372,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3093.5,
-        "y": 2475,
+        "x": 3375.5,
+        "y": 2496,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1396,8 +1386,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$dst-ltpId`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3095.5,
-        "y": 2514,
+        "x": 3377.5,
+        "y": 2535,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1411,8 +1401,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2882.500244140625,
-        "y": 2494.25390625,
+        "x": 3164.500244140625,
+        "y": 2515.25390625,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1425,8 +1415,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2742,
-        "y": 2493,
+        "x": 3024,
+        "y": 2514,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1440,8 +1430,8 @@
         "name": "TODO: FIXME: put proper values",
         "info": "",
         "comments": "",
-        "x": 2422,
-        "y": 2454,
+        "x": 2704,
+        "y": 2475,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1452,8 +1442,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-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": 2440.5,
-        "y": 2534,
+        "x": 2722.5,
+        "y": 2555,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1465,8 +1455,8 @@
         "name": "TODO: FIXME:",
         "info": "set attachment param and send request to NCE-T\nfor bandwidth matrix\nmay require a new template for JSON body",
         "comments": "",
-        "x": 2314,
-        "y": 2617,
+        "x": 2596,
+        "y": 2638,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1474,10 +1464,10 @@
         "id": "fc2a7bf0.e878b",
         "type": "set",
         "name": "set attachment_param domain A",
-        "xml": "<set>\n<parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='otn-dest-node' value='`$domain-A.node-id`' />\n<parameter name='bw-odu' value=\"`'0,' + $gfp`\" />\n<!--<parameter name='src-ttp-id' value='`$source.tunnel-tp-id`' />-->\n<parameter name='dst-ttp-id' value='`$domain-A.tunnel-tp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
+        "xml": "<set>\n<!--<parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />-->\n<!--<parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='otn-dest-node' value='`$domain-A.node-id`' />-->\n<!--<parameter name='bw-odu' value=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='dst-ttp-id' value='`$domain-A.tunnel-tp-id`' />-->\n<!--<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n\n\n\n<parameter name='`otn-tunnel-sliceA-list[$idx].request-id`' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].otn-dest-node`' value='`$domain-A.node-id`' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-sliceA-list[$idx].src-ttp-id`' value='' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].dst-ttp-id`' value='`$domain-A.tunnel-tp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-sliceA-list_length`' value='`$idx + 1`' />\n\n<!--otn-tunnel-slice-list[$idx]-->\n\n",
         "comments": "",
-        "x": 2379,
-        "y": 2662,
+        "x": 2661,
+        "y": 2683,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1488,8 +1478,8 @@
         "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": 4836,
-        "y": 684,
+        "x": 5118,
+        "y": 705,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1506,8 +1496,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2389,
-        "y": 340,
+        "x": 2671,
+        "y": 361,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1522,8 +1512,8 @@
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1319.0001220703125,
-        "y": 757.0001220703125,
+        "x": 1601.0001220703125,
+        "y": 778.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1538,8 +1528,8 @@
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2057,
-        "y": 463,
+        "x": 2339,
+        "y": 484,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1555,8 +1545,8 @@
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2367,
-        "y": 470,
+        "x": 2649,
+        "y": 491,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1569,8 +1559,8 @@
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2366,
-        "y": 524,
+        "x": 2648,
+        "y": 545,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1581,11 +1571,11 @@
     {
         "id": "badc6972.d68008",
         "type": "set",
-        "name": "set the 1st logical-link-name",
+        "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": 1739,
-        "y": 707,
+        "x": 2021,
+        "y": 728,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1596,8 +1586,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1496,
-        "y": 750,
+        "x": 1778,
+        "y": 771,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1612,8 +1602,8 @@
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 2925,
-        "y": 936,
+        "x": 3207,
+        "y": 957,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1624,8 +1614,8 @@
         "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": 2968,
-        "y": 1001,
+        "x": 3250,
+        "y": 1022,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1642,8 +1632,8 @@
         "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": 2965,
-        "y": 1845,
+        "x": 3247,
+        "y": 1866,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1659,8 +1649,8 @@
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 2926,
-        "y": 1789,
+        "x": 3208,
+        "y": 1810,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1671,8 +1661,8 @@
         "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": 2682,
-        "y": 287,
+        "x": 2964,
+        "y": 308,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1689,8 +1679,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2955.490966796875,
-        "y": 179.573974609375,
+        "x": 3237.490966796875,
+        "y": 200.573974609375,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1704,8 +1694,8 @@
         "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": 3133.0625,
-        "y": 179.8597412109375,
+        "x": 3415.0625,
+        "y": 200.8597412109375,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1716,8 +1706,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2951,
-        "y": 229,
+        "x": 3233,
+        "y": 250,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1731,8 +1721,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3133,
-        "y": 229,
+        "x": 3415,
+        "y": 250,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1743,8 +1733,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2955,
-        "y": 280,
+        "x": 3237,
+        "y": 301,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1759,8 +1749,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3135,
-        "y": 280,
+        "x": 3417,
+        "y": 301,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1775,8 +1765,8 @@
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2626,
-        "y": 504,
+        "x": 2908,
+        "y": 525,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1791,8 +1781,8 @@
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2906,
-        "y": 504,
+        "x": 3188,
+        "y": 525,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1807,8 +1797,8 @@
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3111,
-        "y": 478,
+        "x": 3393,
+        "y": 499,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1823,8 +1813,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3287.9998779296875,
-        "y": 470.9998779296875,
+        "x": 3569.9998779296875,
+        "y": 491.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1839,8 +1829,8 @@
         "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": 3530.9998779296875,
-        "y": 427.9998779296875,
+        "x": 3812.9998779296875,
+        "y": 448.9998779296875,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1851,8 +1841,8 @@
         "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": 3519.9998779296875,
-        "y": 482.9998779296875,
+        "x": 3801.9998779296875,
+        "y": 503.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1869,8 +1859,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3773,
-        "y": 369,
+        "x": 4055,
+        "y": 390,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1884,8 +1874,8 @@
         "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": 3921.571533203125,
-        "y": 369.2857666015625,
+        "x": 4203.571533203125,
+        "y": 390.2857666015625,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1895,8 +1885,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3920.509033203125,
-        "y": 413.426025390625,
+        "x": 4202.509033203125,
+        "y": 434.426025390625,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1907,8 +1897,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3761.509033203125,
-        "y": 413.426025390625,
+        "x": 4043.509033203125,
+        "y": 434.426025390625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1923,8 +1913,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3768.509033203125,
-        "y": 492.426025390625,
+        "x": 4050.509033203125,
+        "y": 513.426025390625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1940,8 +1930,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3907.509033203125,
-        "y": 492.426025390625,
+        "x": 4189.509033203125,
+        "y": 513.426025390625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1956,8 +1946,8 @@
         "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": 4113,
-        "y": 490,
+        "x": 4395,
+        "y": 511,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1968,8 +1958,8 @@
         "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": 2969,
-        "y": 671,
+        "x": 3251,
+        "y": 692,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1985,8 +1975,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3192,
-        "y": 657,
+        "x": 3474,
+        "y": 678,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2001,8 +1991,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3194,
-        "y": 690,
+        "x": 3476,
+        "y": 711,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2016,8 +2006,8 @@
         "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": 3337,
-        "y": 687,
+        "x": 3619,
+        "y": 708,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2028,8 +2018,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3340,
-        "y": 650,
+        "x": 3622,
+        "y": 671,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2044,8 +2034,8 @@
         "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": 3502,
-        "y": 645,
+        "x": 3784,
+        "y": 666,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2056,8 +2046,8 @@
         "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": 2983,
-        "y": 1507.9998779296875,
+        "x": 3265,
+        "y": 1528.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2073,8 +2063,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3206,
-        "y": 1493.9998779296875,
+        "x": 3488,
+        "y": 1514.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2089,8 +2079,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3208,
-        "y": 1526.9998779296875,
+        "x": 3490,
+        "y": 1547.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2104,8 +2094,8 @@
         "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": 3351,
-        "y": 1523.9998779296875,
+        "x": 3633,
+        "y": 1544.9998779296875,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2116,8 +2106,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3354,
-        "y": 1486.9998779296875,
+        "x": 3636,
+        "y": 1507.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2132,8 +2122,8 @@
         "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": 3548,
-        "y": 1490,
+        "x": 3830,
+        "y": 1511,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2158,8 +2148,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-domainA-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2445,
-        "y": 2128,
+        "x": 2727,
+        "y": 2149,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -2172,8 +2162,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-domainB-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2443,
-        "y": 2416,
+        "x": 2725,
+        "y": 2437,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -2186,8 +2176,8 @@
         "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": 3616,
-        "y": 1241,
+        "x": 3898,
+        "y": 1262,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2202,8 +2192,8 @@
         "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3822,
-        "y": 1241,
+        "x": 4104,
+        "y": 1262,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2218,8 +2208,8 @@
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4037.28564453125,
-        "y": 1240.82177734375,
+        "x": 4319.28564453125,
+        "y": 1261.82177734375,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2234,8 +2224,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4244.1171875,
-        "y": 1241.34033203125,
+        "x": 4526.1171875,
+        "y": 1262.34033203125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2251,8 +2241,8 @@
         "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": 4459.1171875,
-        "y": 1203.34033203125,
+        "x": 4741.1171875,
+        "y": 1224.34033203125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2263,8 +2253,8 @@
         "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": 4456.1171875,
-        "y": 1242.34033203125,
+        "x": 4738.1171875,
+        "y": 1263.34033203125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2278,8 +2268,8 @@
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4411.6171875,
-        "y": 1284.34033203125,
+        "x": 4693.6171875,
+        "y": 1305.34033203125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2290,8 +2280,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4636.6171875,
-        "y": 1241.34033203125,
+        "x": 4918.6171875,
+        "y": 1262.34033203125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2306,8 +2296,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4794.6171875,
-        "y": 1241.34033203125,
+        "x": 5076.6171875,
+        "y": 1262.34033203125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2321,8 +2311,8 @@
         "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": 5001.6171875,
-        "y": 1241.34033203125,
+        "x": 5283.6171875,
+        "y": 1262.34033203125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2333,8 +2323,8 @@
         "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": 3613,
-        "y": 2110.0001220703125,
+        "x": 3895,
+        "y": 2131.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2349,8 +2339,8 @@
         "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3819,
-        "y": 2110.0001220703125,
+        "x": 4101,
+        "y": 2131.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2365,8 +2355,8 @@
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4034.28564453125,
-        "y": 2109.8218994140625,
+        "x": 4316.28564453125,
+        "y": 2130.8218994140625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2381,8 +2371,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4241.1171875,
-        "y": 2110.3404541015625,
+        "x": 4523.1171875,
+        "y": 2131.3404541015625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2398,8 +2388,8 @@
         "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": 4456.1171875,
-        "y": 2072.3404541015625,
+        "x": 4738.1171875,
+        "y": 2093.3404541015625,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2410,8 +2400,8 @@
         "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": 4453.1171875,
-        "y": 2111.3404541015625,
+        "x": 4735.1171875,
+        "y": 2132.3404541015625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2425,8 +2415,8 @@
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4408.6171875,
-        "y": 2153.3404541015625,
+        "x": 4690.6171875,
+        "y": 2174.3404541015625,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2437,8 +2427,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4633.6171875,
-        "y": 2110.3404541015625,
+        "x": 4915.6171875,
+        "y": 2131.3404541015625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2453,8 +2443,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4791.6171875,
-        "y": 2110.3404541015625,
+        "x": 5073.6171875,
+        "y": 2131.3404541015625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2468,8 +2458,8 @@
         "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": 4998.6171875,
-        "y": 2110.3404541015625,
+        "x": 5280.6171875,
+        "y": 2131.3404541015625,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2477,10 +2467,10 @@
         "id": "84749d0f.3038c8",
         "type": "set",
         "name": "set attachment_param domain B",
-        "xml": "<set>\n<parameter name='request-id' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='otn-source-node' value='`$domain-B.node-id`' />\n<parameter name='otn-dest-node' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<!--<parameter name='bw-odu' value='`$maximum-bandwidth /10`' />-->\n<parameter name='bw-odu' value=\"`'0,' + $gfp`\" />\n<parameter name='src-ttp-id' value='`$domain-B.tunnel-tp-id`' />\n<!--<parameter name='dst-ttp-id' value='`$destination.tunnel-tp-id`' />-->\n<parameter name='dst-ttp-id' value='' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
+        "xml": "<set>\n<!--<parameter name='request-id' value='`$prop.vpn-binding-domainB-uuid`' />-->\n<!--<parameter name='otn-source-node' value='`$domain-B.node-id`' />-->\n<!--<parameter name='otn-dest-node' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='bw-odu' value=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='src-ttp-id' value='`$domain-B.tunnel-tp-id`' />-->\n<!--<parameter name='dst-ttp-id' value='' />-->\n<!--<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n\n\n<parameter name='`otn-tunnel-sliceB-list[$idx].request-id`' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].otn-source-node`' value='`$domain-B.node-id`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-sliceB-list[$idx].src-ttp-id`' value='`$domain-B.tunnel-tp-id`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].dst-ttp-id`' value='' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-sliceB-list_length`' value='`$idx + 1`' />\n",
         "comments": "",
-        "x": 2374,
-        "y": 3037,
+        "x": 2656,
+        "y": 3058,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2491,8 +2481,8 @@
         "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": 3529,
-        "y": 717,
+        "x": 3811,
+        "y": 738,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2509,8 +2499,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3724.5001220703125,
-        "y": 669,
+        "x": 4006.5001220703125,
+        "y": 690,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2525,8 +2515,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3716.5001220703125,
-        "y": 724,
+        "x": 3998.5001220703125,
+        "y": 745,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2541,8 +2531,8 @@
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3721.5001220703125,
-        "y": 781,
+        "x": 4003.5001220703125,
+        "y": 802,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2556,8 +2546,8 @@
         "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": 3873.5001220703125,
-        "y": 782,
+        "x": 4155.5001220703125,
+        "y": 803,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2567,8 +2557,8 @@
         "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": 3884.5001220703125,
-        "y": 727,
+        "x": 4166.5001220703125,
+        "y": 748,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2580,8 +2570,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3868.8824462890625,
-        "y": 666.6556701660156,
+        "x": 4150.8824462890625,
+        "y": 687.6556701660156,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2596,8 +2586,8 @@
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4451,
-        "y": 685,
+        "x": 4733,
+        "y": 706,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2612,8 +2602,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4628,
-        "y": 677,
+        "x": 4910,
+        "y": 698,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2629,8 +2619,8 @@
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4053,
-        "y": 681,
+        "x": 4335,
+        "y": 702,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2645,8 +2635,8 @@
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4248,
-        "y": 681,
+        "x": 4530,
+        "y": 702,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2661,8 +2651,8 @@
         "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": 4866,
-        "y": 632,
+        "x": 5148,
+        "y": 653,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2673,8 +2663,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5046,
-        "y": 675,
+        "x": 5328,
+        "y": 696,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2689,8 +2679,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5038,
-        "y": 730,
+        "x": 5320,
+        "y": 751,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2705,8 +2695,8 @@
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5043,
-        "y": 787,
+        "x": 5325,
+        "y": 808,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2720,8 +2710,8 @@
         "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": 5195,
-        "y": 788,
+        "x": 5477,
+        "y": 809,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2731,8 +2721,8 @@
         "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": 5206,
-        "y": 733,
+        "x": 5488,
+        "y": 754,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2744,8 +2734,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5190.38232421875,
-        "y": 672.6556701660156,
+        "x": 5472.38232421875,
+        "y": 693.6556701660156,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2759,8 +2749,8 @@
         "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": 5405,
-        "y": 669,
+        "x": 5687,
+        "y": 690,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2771,8 +2761,8 @@
         "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": 3570,
-        "y": 1558,
+        "x": 3852,
+        "y": 1579,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2789,8 +2779,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3765.5001220703125,
-        "y": 1510,
+        "x": 4047.5001220703125,
+        "y": 1531,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2805,8 +2795,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3757.5001220703125,
-        "y": 1565,
+        "x": 4039.5001220703125,
+        "y": 1586,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2821,8 +2811,8 @@
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3762.5001220703125,
-        "y": 1622,
+        "x": 4044.5001220703125,
+        "y": 1643,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2836,8 +2826,8 @@
         "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": 3914.5001220703125,
-        "y": 1623,
+        "x": 4196.5001220703125,
+        "y": 1644,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2847,8 +2837,8 @@
         "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": 3925.5001220703125,
-        "y": 1568,
+        "x": 4207.5001220703125,
+        "y": 1589,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2860,8 +2850,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3909.8824462890625,
-        "y": 1507.6556701660156,
+        "x": 4191.8824462890625,
+        "y": 1528.6556701660156,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2876,8 +2866,8 @@
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4492,
-        "y": 1526,
+        "x": 4774,
+        "y": 1547,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2892,8 +2882,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4669,
-        "y": 1518,
+        "x": 4951,
+        "y": 1539,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2909,8 +2899,8 @@
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4094,
-        "y": 1522,
+        "x": 4376,
+        "y": 1543,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2925,8 +2915,8 @@
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4289,
-        "y": 1522,
+        "x": 4571,
+        "y": 1543,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2942,8 +2932,8 @@
         "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": 4877,
-        "y": 1525,
+        "x": 5159,
+        "y": 1546,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2959,8 +2949,8 @@
         "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": 4907,
-        "y": 1473,
+        "x": 5189,
+        "y": 1494,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2971,8 +2961,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5087,
-        "y": 1516,
+        "x": 5369,
+        "y": 1537,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2987,8 +2977,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5079,
-        "y": 1571,
+        "x": 5361,
+        "y": 1592,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3003,8 +2993,8 @@
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5084,
-        "y": 1628,
+        "x": 5366,
+        "y": 1649,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3018,8 +3008,8 @@
         "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": 5236,
-        "y": 1629,
+        "x": 5518,
+        "y": 1650,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3029,8 +3019,8 @@
         "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": 5247,
-        "y": 1574,
+        "x": 5529,
+        "y": 1595,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3042,8 +3032,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5231.38232421875,
-        "y": 1513.6556701660156,
+        "x": 5513.38232421875,
+        "y": 1534.6556701660156,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3057,8 +3047,8 @@
         "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": 5446,
-        "y": 1510,
+        "x": 5728,
+        "y": 1531,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3066,11 +3056,11 @@
         "id": "a5814717.4b953",
         "type": "execute",
         "name": "execute RestApiCallNode slice creation domainA",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\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=\"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`\" />",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceA-list-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\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=\"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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2425,
-        "y": 2720,
+        "x": 1959,
+        "y": 2744,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3086,8 +3076,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2691,
-        "y": 2700,
+        "x": 2242,
+        "y": 2724,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3102,8 +3092,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2692.000213623047,
-        "y": 2750.99990940094,
+        "x": 2243.000213623047,
+        "y": 2774.99990940094,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3117,8 +3107,8 @@
         "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": 2831.0002479553223,
-        "y": 2700.0000009536743,
+        "x": 2382.0002479553223,
+        "y": 2724.0000009536743,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3130,8 +3120,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2837.02725982666,
-        "y": 2748.745394706726,
+        "x": 2388.02725982666,
+        "y": 2772.745394706726,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -3141,11 +3131,11 @@
         "id": "39b144a2.fc3a7c",
         "type": "execute",
         "name": "execute RestApiCallNode slice creation domainB",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\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=\"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`\" />",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceB-list-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\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=\"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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2425,
-        "y": 3092,
+        "x": 1959,
+        "y": 3110,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3161,8 +3151,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2691,
-        "y": 3072,
+        "x": 2233,
+        "y": 3090,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3177,8 +3167,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2692.000213623047,
-        "y": 3122.99990940094,
+        "x": 2234.000213623047,
+        "y": 3140.99990940094,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3192,8 +3182,8 @@
         "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 B\" />\n",
         "comments": "",
-        "x": 2831.0002479553223,
-        "y": 3072.0000009536743,
+        "x": 2373.0002479553223,
+        "y": 3090.0000009536743,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3205,8 +3195,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2837.02725982666,
-        "y": 3120.745394706726,
+        "x": 2379.02725982666,
+        "y": 3138.745394706726,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -3219,8 +3209,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2530,
-        "y": 450,
+        "x": 2812,
+        "y": 471,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3236,8 +3226,8 @@
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2811,
-        "y": 406,
+        "x": 3093,
+        "y": 427,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3252,8 +3242,8 @@
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3073,
-        "y": 406,
+        "x": 3355,
+        "y": 427,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3268,8 +3258,8 @@
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4454,
-        "y": 759,
+        "x": 4736,
+        "y": 780,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3284,8 +3274,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4631,
-        "y": 751,
+        "x": 4913,
+        "y": 772,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3299,8 +3289,8 @@
         "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": 4866,
-        "y": 875,
+        "x": 5148,
+        "y": 896,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3310,8 +3300,8 @@
         "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": 4906,
-        "y": 1715,
+        "x": 5188,
+        "y": 1736,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3322,8 +3312,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4671,
-        "y": 1591,
+        "x": 4953,
+        "y": 1612,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3338,8 +3328,8 @@
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4494,
-        "y": 1599,
+        "x": 4776,
+        "y": 1620,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3354,8 +3344,8 @@
         "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": 2427,
-        "y": 2853,
+        "x": 2721,
+        "y": 2870,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3371,8 +3361,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2693,
-        "y": 2833,
+        "x": 2987,
+        "y": 2850,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3387,8 +3377,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2694.000213623047,
-        "y": 2883.99990940094,
+        "x": 2988.000213623047,
+        "y": 2900.99990940094,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3402,8 +3392,8 @@
         "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": 2833.0002479553223,
-        "y": 2833.0000009536743,
+        "x": 3127.0002479553223,
+        "y": 2850.0000009536743,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3415,8 +3405,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2839.02725982666,
-        "y": 2881.745394706726,
+        "x": 3133.02725982666,
+        "y": 2898.745394706726,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -3429,8 +3419,8 @@
         "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": 2427,
-        "y": 3219,
+        "x": 2721,
+        "y": 3236,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3446,8 +3436,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2693,
-        "y": 3199,
+        "x": 2987,
+        "y": 3216,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3462,8 +3452,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2694.000213623047,
-        "y": 3249.99990940094,
+        "x": 2988.000213623047,
+        "y": 3266.99990940094,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3477,8 +3467,8 @@
         "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": 2833.0002479553223,
-        "y": 3199.0000009536743,
+        "x": 3127.0002479553223,
+        "y": 3216.0000009536743,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3490,8 +3480,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2839.02725982666,
-        "y": 3247.745394706726,
+        "x": 3133.02725982666,
+        "y": 3264.745394706726,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -3503,8 +3493,8 @@
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
-        "x": 4112,
-        "y": 536,
+        "x": 4394,
+        "y": 557,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3515,8 +3505,8 @@
         "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": 2468,
-        "y": 730,
+        "x": 2750,
+        "y": 691,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -3529,11 +3519,72 @@
         "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": 2448,
-        "y": 770,
+        "x": 2731,
+        "y": 741,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "23c06925.0d2eb6",
+        "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": 1988,
+        "y": 243,
+        "z": "4d37a11.42c136",
+        "wires": [
+            [
+                "f805b6b.c60f548",
+                "78e29884.225c08"
+            ]
+        ]
+    },
+    {
+        "id": "f805b6b.c60f548",
+        "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": 2272,
+        "y": 213,
+        "z": "4d37a11.42c136",
+        "wires": []
+    },
+    {
+        "id": "e927f664.5c872",
+        "type": "set",
+        "name": "set query_param",
+        "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",
+        "comments": "",
+        "x": 2628,
+        "y": 2021,
+        "z": "4d37a11.42c136",
+        "wires": []
+    },
+    {
+        "id": "29397b6c.248454",
+        "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": 2618,
+        "y": 3327,
+        "z": "4d37a11.42c136",
+        "wires": []
+    },
+    {
+        "id": "488403ee.0379ac",
+        "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\n\n",
+        "comments": "",
+        "x": 2688,
+        "y": 786,
+        "z": "4d37a11.42c136",
+        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
index e1b76faf..f6c1c6f8 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
@@ -5,7 +5,7 @@
         <block atomic="true">
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`" />
-                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />
+                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url + '?ethsrvType=' + $prop.ethsrvType`" />
                 <parameter name="restapiUser" value="`$prop.oof.user`" />
                 <parameter name="restapiPassword" value="`$prop.oof.password`" />
                 <parameter name="format" value="json"/>
@@ -29,8 +29,16 @@
             </execute>
             <for index='vidx' start='0' end='`$otn-oof.solutions_length`' >
                 <block atomic="true">
+                    <set>
+                        <parameter name='otn-oof.link-name' value='' />
+                        <parameter name='tmp.aai.cross-link' value='' />
+                        <parameter name='tmp.aai.cross-link.' value='' />
+                        <parameter name='tmp.aai.cross-link.link-role' value='' />
+                    </set>
                     <set>
                         <parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].link`' />
+                        <parameter name='otn-oof.start-node' value='`$otn-oof.solutions[$vidx].start_node`' />
+                        <parameter name='otn-oof.end-node' value='`$otn-oof.solutions[$vidx].end_node`' />
                     </set>
                     <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                                   resource="logical-link"
@@ -46,13 +54,26 @@
                                                 <switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`'>
                                                     <outcome value='p-interface'>
                                                         <block>
-                                                            <set>
-                                                                <parameter name='tmp.cross-link.src-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />
-                                                                <parameter name='tmp.cross-link.dst-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[1].relationship-value`" />
-                                                                <parameter name='tmp.src-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />
-                                                                <parameter name='tmp.dst-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`" />
-                                                            </set>
-                                                            <break/>
+                                                            <switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value == $otn-oof.start-node`'>
+                                                                <outcome value='true'>
+                                                                    <block atomic="true">
+                                                                        <set>
+                                                                            <parameter name='tmp.cross-link.src-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />
+                                                                            <parameter name='tmp.src-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />
+                                                                        </set>
+                                                                    </block>
+                                                                </outcome>
+                                                            </switch>
+                                                            <switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value == $otn-oof.end-node`'>
+                                                                <outcome value='true'>
+                                                                    <block atomic="true">
+                                                                        <set>
+                                                                            <parameter name='tmp.cross-link.dst-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />
+                                                                            <parameter name='tmp.dst-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />
+                                                                        </set>
+                                                                    </block>
+                                                                </outcome>
+                                                            </switch>
                                                         </block>
                                                     </outcome>
                                                 </switch>
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml
index e9766c5c..40906dad 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml
@@ -59,7 +59,8 @@
                                                                                 <set>
                                                                                     <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />
                                                                                     <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />
-                                                                                    <parameter name='dst-tpn-id' value='1' />
+                                                                                    <!--<parameter name='dst-tpn-id' value='1' />-->
+                                                                                    <parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />
                                                                                     <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />
                                                                                     <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
                                                                                     <parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
@@ -239,7 +240,8 @@
                                                                                         <set>
                                                                                             <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />
                                                                                             <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />
-                                                                                            <parameter name='src-tpn-id' value='1' />
+                                                                                            <!--<parameter name='src-tpn-id' value='1' />-->
+                                                                                            <parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />
                                                                                             <parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />
                                                                                             <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
                                                                                             <parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
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 4c6b84b0..88b7ddba 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
@@ -29,180 +29,182 @@
                 <!--	local-only="false"-->
                 <!--	force="true" pfx="tmp.aai.service-instance">-->
                 <outcome value='success'>
-                    <switch test='`$tmp.aai.service-instance.allotted-resources_length != 0`'>
+                    <switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>
                         <outcome value='false'></outcome>
                         <outcome value='true'>
                             <block>
-                                <set>
-                                    <parameter name='allotted-resource-id' value="`$tmp.aai.service-instance.allotted-resources.allotted-resource[0].id`" />
-                                </set>
-                                <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
-                                <!--	resource="allotted-resource"-->
-                                <!--	key='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->
-                                <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->
-                                <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->
-                                <!--         AND allotted-resource.id = $allotted-resource-id'-->
-                                <!--	local-only="false"-->
-                                <!--	force="true" pfx="tmp.aai.allotted-resource">-->
-                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                              resource="allotted-resource"
-                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+                                <for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >
+                                    <set>
+                                        <parameter name='allotted-resource-id' value="`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`" />
+                                    </set>
+                                    <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                    <!--	resource="allotted-resource"-->
+                                    <!--	key='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->
+                                    <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->
+                                    <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->
+                                    <!--         AND allotted-resource.id = $allotted-resource-id'-->
+                                    <!--	local-only="false"-->
+                                    <!--	force="true" pfx="tmp.aai.allotted-resource">-->
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                  resource="allotted-resource"
+                                                  key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
          AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
          AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type
          AND allotted-resource.id = $allotted-resource-id'
-                                              local-only="false"
-                                              force="true" pfx="tmp.aai.allotted-resource">
-                                    <outcome value='not-found'>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                        </return>
-                                    </outcome>
-                                    <outcome value='failure'>
-                                        <return status='failure'>
-                                            <parameter name='error-code' value='' />
-                                            <parameter name='error-message' value='' />
-                                        </return>
-                                    </outcome>
-                                    <outcome value='success'>
-                                        <block atomic="true">
-                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                          resource="allotted-resource:relationship-list"
-                                                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+                                                  local-only="false"
+                                                  force="true" pfx="tmp.aai.allotted-resource">
+                                        <outcome value='not-found'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='error-code' value='' />
+                                                <parameter name='error-message' value='' />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='success'>
+                                            <block atomic="true">
+                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                              resource="allotted-resource:relationship-list"
+                                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
          AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
          AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type
          AND allotted-resource.id = $allotted-resource-id'
-                                                          local-only="false"
-                                                          force="true" pfx="tmp.aai.allotted-resource.relationship-list">
-                                                <outcome value='not-found'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                    </return>
-                                                </outcome>
-                                                <outcome value='failure'>
-                                                    <return status='failure'>
-                                                        <parameter name='error-code' value='' />
-                                                        <parameter name='error-message' value='' />
-                                                    </return>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <block atomic="true">
-                                                        <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>
-                                                            <outcome value='false'></outcome>
-                                                            <outcome value='true'>
-                                                                <block atomic="true">
-                                                                    <for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >
-                                                                        <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>
-                                                                            <outcome value='network-policy'>
-                                                                                <block atomic="true">
-                                                                                    <set>
-                                                                                        <parameter name='network-policy-id' value="`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`" />
-                                                                                    </set>
-                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                  resource="network-policy"
-                                                                                                  key='network-policy.network-policy-id = $network-policy-id'
-                                                                                                  local-only="false"
-                                                                                                  force="true" pfx="tmp.aai.network-policy">
-                                                                                        <outcome value='not-found'>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                <parameter name="error-code" value="500" />
-                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                            </return>
-                                                                                        </outcome>
-                                                                                        <outcome value='failure'>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='error-code' value='' />
-                                                                                                <parameter name='error-message' value='' />
-                                                                                            </return>
-                                                                                        </outcome>
-                                                                                        <outcome value='success'>
-                                                                                            <block>
-                                                                                                <set>
-                                                                                                    <parameter name='maximum-bandwidth' value="`$tmp.aai.network-policy.max-bandwidth`" />
-                                                                                                    <parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />
-                                                                                                </set>
-                                                                                                <set>
-                                                                                                    <parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />
-                                                                                                </set>
-                                                                                            </block>
-                                                                                        </outcome>
-                                                                                    </get-resource>
-                                                                                </block>
-                                                                            </outcome>
-                                                                        </switch>
-                                                                    </for>
-                                                                    <for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >
-                                                                        <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>
-                                                                            <outcome value='logical-link'>
-                                                                                <block atomic="true">
-                                                                                    <set>
-                                                                                        <parameter name='logical-link-name' value="`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`" />
-                                                                                    </set>
-                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                  resource="logical-link"
-                                                                                                  key='logical-link.link-name = $logical-link-name'
-                                                                                                  local-only="false"
-                                                                                                  force="true" pfx="tmp.aai.logical-link">
-                                                                                        <outcome value='not-found'>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                <parameter name="error-code" value="500" />
-                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                            </return>
-                                                                                        </outcome>
-                                                                                        <outcome value='failure'>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='error-code' value='' />
-                                                                                                <parameter name='error-message' value='' />
-                                                                                            </return>
-                                                                                        </outcome>
-                                                                                        <outcome value='success'>
-                                                                                            <block>
-                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                    <parameter name="ctx-destination" value="prop.ethernet-service-name"/>
-                                                                                                </execute>
-                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                    <parameter name="ctx-destination" value="prop.otn-tunnel-name"/>
-                                                                                                </execute>
-                                                                                                <set>
-                                                                                                    <parameter name='network-route-A' value="`$tmp.aai.logical-link.link-name`" />
-                                                                                                </set>
-                                                                                                <set>
-                                                                                                    <parameter name='network-route-B' value="`$tmp.aai.logical-link.link-name2`" />
-                                                                                                </set>
-                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                              resource="network-route"
-                                                                                                              key='network-route.route-id = $network-route-A'
-                                                                                                              local-only="false"
-                                                                                                              force="true" pfx="tmp.aai.network-route-A">
-                                                                                                    <outcome value='not-found'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='failure'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='error-code' value='' />
-                                                                                                            <parameter name='error-message' value='' />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='success'>
-                                                                                                        <block atomic="true">
-                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                                                                                <parameter name="original_string" value='`$tmp.aai.network-route-A.next-hop`'/>
-                                                                                                                <!--<parameter name="regex" value="[^-]+$"/>-->
-                                                                                                                <parameter name="regex" value="[-]+"/>
-                                                                                                                <parameter name="ctx_memory_result_key" value="param-prefix-domainA-pnfName"/>
-                                                                                                                <outcome value='success'>
-                                                                                                                    <block atomic="true">
-                                                                                                                        <set>
-                                                                                                                            <parameter name='tmp.src.domainA.pnf-name' value="`$param-prefix-domainA-pnfName[0] + '-' +
+                                                              local-only="false"
+                                                              force="true" pfx="tmp.aai.allotted-resource.relationship-list">
+                                                    <outcome value='not-found'>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
+                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='failure'>
+                                                        <return status='failure'>
+                                                            <parameter name='error-code' value='' />
+                                                            <parameter name='error-message' value='' />
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='success'>
+                                                        <block atomic="true">
+                                                            <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>
+                                                                <outcome value='false'></outcome>
+                                                                <outcome value='true'>
+                                                                    <block atomic="true">
+                                                                        <for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >
+                                                                            <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>
+                                                                                <outcome value='network-policy'>
+                                                                                    <block atomic="true">
+                                                                                        <set>
+                                                                                            <parameter name='network-policy-id' value="`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`" />
+                                                                                        </set>
+                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                      resource="network-policy"
+                                                                                                      key='network-policy.network-policy-id = $network-policy-id'
+                                                                                                      local-only="false"
+                                                                                                      force="true" pfx="tmp.aai.network-policy">
+                                                                                            <outcome value='not-found'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='failure'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='error-code' value='' />
+                                                                                                    <parameter name='error-message' value='' />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='success'>
+                                                                                                <block>
+                                                                                                    <set>
+                                                                                                        <parameter name='maximum-bandwidth' value="`$tmp.aai.network-policy.max-bandwidth`" />
+                                                                                                        <parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />
+                                                                                                    </set>
+                                                                                                </block>
+                                                                                            </outcome>
+                                                                                        </get-resource>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                            </switch>
+                                                                        </for>
+                                                                        <for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >
+                                                                            <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>
+                                                                                <outcome value='logical-link'>
+                                                                                    <block atomic="true">
+                                                                                        <set>
+                                                                                            <parameter name='logical-link-name' value="`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`" />
+                                                                                        </set>
+                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                      resource="logical-link"
+                                                                                                      key='logical-link.link-name = $logical-link-name'
+                                                                                                      local-only="false"
+                                                                                                      force="true" pfx="tmp.aai.logical-link">
+                                                                                            <outcome value='not-found'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='failure'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='error-code' value='' />
+                                                                                                    <parameter name='error-message' value='' />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='success'>
+                                                                                                <block>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                        <parameter name="ctx-destination" value="prop.otn-tunnel-name"/>
+                                                                                                    </execute>
+                                                                                                    <set>
+                                                                                                        <parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-name`" />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <!--<parameter name='network-route-A' value="`$tmp.aai.logical-link.link-name`" />-->
+                                                                                                        <parameter name='network-route-A' value="`$tmp.aai.logical-link.link-id`" />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='network-route-B' value="`$tmp.aai.logical-link.link-name2`" />
+                                                                                                    </set>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="network-route"
+                                                                                                                  key='network-route.route-id = $network-route-A'
+                                                                                                                  local-only="false"
+                                                                                                                  force="true" pfx="tmp.aai.network-route-A">
+                                                                                                        <outcome value='not-found'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                <parameter name='error-message' value='' />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                    <parameter name="original_string" value='`$tmp.aai.network-route-A.next-hop`'/>
+                                                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                    <parameter name="regex" value="[-]+"/>
+                                                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-domainA-pnfName"/>
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic="true">
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.src.domainA.pnf-name' value="`$param-prefix-domainA-pnfName[0] + '-' +
                                                    $param-prefix-domainA-pnfName[1] + '-' +
                                                    $param-prefix-domainA-pnfName[2] + '-' +
                                                    $param-prefix-domainA-pnfName[3] + '-' +
@@ -211,254 +213,254 @@
                                                    $param-prefix-domainA-pnfName[6] + '-' +
                                                    $param-prefix-domainA-pnfName[7] + '-' +
                                                    $param-prefix-domainA-pnfName[8]`" />
-                                                                                                                        </set>
-                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                      resource="pnf"
-                                                                                                                                      key="pnf.pnf-name = $tmp.src.domainA.pnf-name"
-                                                                                                                                      pfx='tmp.aai.source-pnf' local-only='false' >
-                                                                                                                            <!--AND depth = '0'"-->
-                                                                                                                            <outcome value='success'>
-                                                                                                                                <block>
-                                                                                                                                    <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
-                                                                                                                                        <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
-                                                                                                                                            <outcome value='esr-thirdparty-sdnc'>
-                                                                                                                                                <block atomic="true">
-                                                                                                                                                    <set>
-                                                                                                                                                        <parameter name='tmp.domainA.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
-                                                                                                                                                    </set>
-                                                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                                                  resource="esr-thirdparty-sdnc"
-                                                                                                                                                                  key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND
+                                                                                                                            </set>
+                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                          resource="pnf"
+                                                                                                                                          key="pnf.pnf-name = $tmp.src.domainA.pnf-name"
+                                                                                                                                          pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                                                                                <!--AND depth = '0'"-->
+                                                                                                                                <outcome value='success'>
+                                                                                                                                    <block>
+                                                                                                                                        <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
+                                                                                                                                            <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                                                                                <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                                                    <block atomic="true">
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='tmp.domainA.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                                        </set>
+                                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                                      resource="esr-thirdparty-sdnc"
+                                                                                                                                                                      key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND
 		     depth = '1'"
-                                                                                                                                                                  pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >
-                                                                                                                                                        <outcome value='success'>
-                                                                                                                                                            <block>
-                                                                                                                                                                <set>
-                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                                                                                                                    <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                                                                                                                    <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                                                                                                                    <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                                                                                                                    <!--<parameter name="format" value="json"/>-->
-                                                                                                                                                                    <!--<parameter name="httpMethod" value="get"/>-->
-                                                                                                                                                                    <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                                                                                                                    <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                                                                                                                    <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                                                                                                                    <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                                                                                                                    <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                                                                                                                                </set>
-                                                                                                                                                            </block>
-                                                                                                                                                        </outcome>
-                                                                                                                                                        <outcome value='not-found'>
-                                                                                                                                                            <return status='failure'>
-                                                                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                                            </return>
-                                                                                                                                                        </outcome>
-                                                                                                                                                        <outcome value='Other'>
-                                                                                                                                                            <return status='failure'>
-                                                                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                                            </return>
-                                                                                                                                                        </outcome>
-                                                                                                                                                    </get-resource>
-                                                                                                                                                </block>
-                                                                                                                                            </outcome>
-                                                                                                                                            <outcome value='network-resource'>
-                                                                                                                                                <block atomic="true">
-                                                                                                                                                    <set>
-                                                                                                                                                        <parameter name='tmp.domainA.eth-network-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
-                                                                                                                                                    </set>
-                                                                                                                                                </block>
-                                                                                                                                            </outcome>
-                                                                                                                                        </switch>
-                                                                                                                                    </for>
-                                                                                                                                </block>
-                                                                                                                            </outcome>
-                                                                                                                            <outcome value='not-found'>
-                                                                                                                                <return status='failure'>
-                                                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                </return>
-                                                                                                                            </outcome>
-                                                                                                                            <outcome value='Other'>
-                                                                                                                                <return status='failure'>
-                                                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                </return>
-                                                                                                                            </outcome>
-                                                                                                                        </get-resource>
-                                                                                                                    </block>
-                                                                                                                </outcome>
-                                                                                                                <outcome value='failure'>
-                                                                                                                    <return status='failure'>
-                                                                                                                        <parameter name='error-code' value='' />
-                                                                                                                        <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                                                                                    </return>
-                                                                                                                </outcome>
-                                                                                                            </execute>
-                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                          resource="p-interface"
-                                                                                                                          key="pnf.pnf-name = $tmp.src.domainA.pnf-name
+                                                                                                                                                                      pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                                            <outcome value='success'>
+                                                                                                                                                                <block>
+                                                                                                                                                                    <set>
+                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                                                        <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                                                        <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                                                                        <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                                                                        <!--<parameter name="format" value="json"/>-->
+                                                                                                                                                                        <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                                                                        <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                    </set>
+                                                                                                                                                                </block>
+                                                                                                                                                            </outcome>
+                                                                                                                                                            <outcome value='not-found'>
+                                                                                                                                                                <return status='failure'>
+                                                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                                </return>
+                                                                                                                                                            </outcome>
+                                                                                                                                                            <outcome value='Other'>
+                                                                                                                                                                <return status='failure'>
+                                                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                                </return>
+                                                                                                                                                            </outcome>
+                                                                                                                                                        </get-resource>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                                <outcome value='network-resource'>
+                                                                                                                                                    <block atomic="true">
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='tmp.domainA.eth-network-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                                        </set>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                            </switch>
+                                                                                                                                        </for>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='not-found'>
+                                                                                                                                    <return status='failure'>
+                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                    </return>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='Other'>
+                                                                                                                                    <return status='failure'>
+                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                    </return>
+                                                                                                                                </outcome>
+                                                                                                                            </get-resource>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='failure'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='error-code' value='' />
+                                                                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </execute>
+                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                              resource="p-interface"
+                                                                                                                              key="pnf.pnf-name = $tmp.src.domainA.pnf-name
 	        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop"
-                                                                                                                          local-only="false"
-                                                                                                                          pfx="tmp.aai.network-route-A.p-interface-src" >
-                                                                                                                <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
-                                                                                                                <!--	resource="p-interface"-->
-                                                                                                                <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
-                                                                                                                <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
-                                                                                                                <!--		local-only="false" -->
-                                                                                                                <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
-                                                                                                                <outcome value='success'>
-                                                                                                                    <block atomic="true">
-                                                                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                                                                                            <parameter name="original_string" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>
-                                                                                                                            <!--<parameter name="regex" value="[^-]+$"/>-->
-                                                                                                                            <parameter name="regex" value="[-]+"/>
-                                                                                                                            <parameter name="ctx_memory_result_key" value="param-prefix-domainA"/>
-                                                                                                                            <outcome value='success'>
-                                                                                                                                <block atomic="true">
-                                                                                                                                    <set>
-                                                                                                                                        <parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
-                                                                                                                                    </set>
-                                                                                                                                    <set>
-                                                                                                                                        <parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
-                                                                                                                                    </set>
-                                                                                                                                </block>
-                                                                                                                            </outcome>
-                                                                                                                            <outcome value='failure'>
-                                                                                                                                <return status='failure'>
-                                                                                                                                    <parameter name='error-code' value='' />
-                                                                                                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                                                                                                </return>
-                                                                                                                            </outcome>
-                                                                                                                        </execute>
-                                                                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                                            <parameter name="ctx-destination" value="uuid.connectivity-domainA-uuid"/>
-                                                                                                                        </execute>
-                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                              key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>
-                                                                                                                            <parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />
-                                                                                                                            <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
-                                                                                                                            <parameter name='operational-status' value='Created' />
-                                                                                                                            <parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
-                                                                                                                            <parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />
-                                                                                                                            <parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />
-                                                                                                                            <parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
-                                                                                                                            <parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
-                                                                                                                            <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />
-                                                                                                                            <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
-                                                                                                                            <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
-                                                                                                                            <parameter name='CIR' value='`$prop.sotn.cir`' />
-                                                                                                                            <parameter name='EIR' value='`$prop.sotn.eir`' />
-                                                                                                                            <parameter name='CBS' value='`$prop.sotn.cbs`' />
-                                                                                                                            <parameter name='EBS' value='`$prop.sotn.ebs`' />
-                                                                                                                            <!--<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='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'
-                                                                                                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
-         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
-         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
-                                                                                                                              force="true" pfx="tmp.AnAI-data">
-                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />
-                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />
-                                                                                                                            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
-                                                                                                                            <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
-                                                                                                                            <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
-                                                                                                                            <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
-                                                                                                                            <!--      force="true" pfx="tmp.AnAI-data">-->
-                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
-                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
-                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
-                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
-                                                                                                                        </save>
-                                                                                                                        <for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >
-                                                                                                                            <switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>
-                                                                                                                                <outcome value='tunnel-termination-point'>
+                                                                                                                              local-only="false"
+                                                                                                                              pfx="tmp.aai.network-route-A.p-interface-src" >
+                                                                                                                    <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                                                                                                    <!--	resource="p-interface"-->
+                                                                                                                    <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
+                                                                                                                    <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
+                                                                                                                    <!--		local-only="false" -->
+                                                                                                                    <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic="true">
+                                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                                <parameter name="original_string" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>
+                                                                                                                                <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                                <parameter name="regex" value="[-]+"/>
+                                                                                                                                <parameter name="ctx_memory_result_key" value="param-prefix-domainA"/>
+                                                                                                                                <outcome value='success'>
                                                                                                                                     <block atomic="true">
                                                                                                                                         <set>
-                                                                                                                                            <parameter name='tmp.source.ttp-id' value="`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`" />
+                                                                                                                                            <parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
+                                                                                                                                        </set>
+                                                                                                                                        <set>
+                                                                                                                                            <parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
                                                                                                                                         </set>
-                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                                      resource="tunnel-termination-point"
-                                                                                                                                                      key="tunnel-termination-point.ttp-id = $tmp.source.ttp-id
-		AND depth = '0'"
-                                                                                                                                                      pfx='tmp.aai.source-ttp' local-only='false' >
-                                                                                                                                            <outcome value='success'>
-                                                                                                                                                <block atomic="true">
-                                                                                                                                                    <set>
-                                                                                                                                                        <parameter name='source.tunnel-tp-id' value="`$tmp.aai.source-ttp.tunnel-tp-id`" />
-                                                                                                                                                    </set>
-                                                                                                                                                </block>
-                                                                                                                                            </outcome>
-                                                                                                                                        </get-resource>
-                                                                                                                                        <break/>
                                                                                                                                     </block>
                                                                                                                                 </outcome>
-                                                                                                                            </switch>
-                                                                                                                        </for>
-                                                                                                                    </block>
-                                                                                                                </outcome>
-                                                                                                                <outcome value='not-found'>
-                                                                                                                    <return status='failure'>
-                                                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                                                        <parameter name="error-code" value="500" />
-                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                                                    </return>
-                                                                                                                </outcome>
-                                                                                                                <outcome value='failure'>
-                                                                                                                    <return status='failure'>
-                                                                                                                        <parameter name='error-code' value='' />
-                                                                                                                        <parameter name='error-message' value='' />
-                                                                                                                    </return>
-                                                                                                                </outcome>
-                                                                                                            </get-resource>
-                                                                                                        </block>
-                                                                                                    </outcome>
-                                                                                                </get-resource>
-                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                              resource="network-route"
-                                                                                                              key='network-route.route-id = $network-route-B'
-                                                                                                              local-only="false"
-                                                                                                              force="true" pfx="tmp.aai.network-route-B">
-                                                                                                    <outcome value='not-found'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='failure'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='error-code' value='' />
-                                                                                                            <parameter name='error-message' value='' />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='success'>
-                                                                                                        <block atomic="true">
-                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                                                                                <parameter name="original_string" value='`$tmp.aai.network-route-B.next-hop`'/>
-                                                                                                                <!--<parameter name="regex" value="[^-]+$"/>-->
-                                                                                                                <parameter name="regex" value="[-]+"/>
-                                                                                                                <parameter name="ctx_memory_result_key" value="param-prefix-domainB-pnfName"/>
-                                                                                                                <outcome value='success'>
-                                                                                                                    <block atomic="true">
-                                                                                                                        <set>
-                                                                                                                            <parameter name='tmp.dst.domainB.pnf-name' value="`$param-prefix-domainB-pnfName[0] + '-' +
+                                                                                                                                <outcome value='failure'>
+                                                                                                                                    <return status='failure'>
+                                                                                                                                        <parameter name='error-code' value='' />
+                                                                                                                                        <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                                    </return>
+                                                                                                                                </outcome>
+                                                                                                                            </execute>
+                                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                                                <parameter name="ctx-destination" value="uuid.connectivity-domainA-uuid"/>
+                                                                                                                            </execute>
+                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                  key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>
+                                                                                                                                <parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />
+                                                                                                                                <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
+                                                                                                                                <parameter name='operational-status' value='Created' />
+                                                                                                                                <parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
+                                                                                                                                <parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />
+                                                                                                                                <parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />
+                                                                                                                                <parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                                                <parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
+                                                                                                                                <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />
+                                                                                                                                <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
+                                                                                                                                <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
+                                                                                                                                <parameter name='CIR' value='`$prop.sotn.cir`' />
+                                                                                                                                <parameter name='EIR' value='`$prop.sotn.eir`' />
+                                                                                                                                <parameter name='CBS' value='`$prop.sotn.cbs`' />
+                                                                                                                                <parameter name='EBS' value='`$prop.sotn.ebs`' />
+                                                                                                                                <!--<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='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'
+                                                                                                                                  key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                                                                                                                                  force="true" pfx="tmp.AnAI-data">
+                                                                                                                                <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />
+                                                                                                                                <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
+                                                                                                                                <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
+                                                                                                                                <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
+                                                                                                                                <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
+                                                                                                                                <!--      force="true" pfx="tmp.AnAI-data">-->
+                                                                                                                                <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
+                                                                                                                                <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
+                                                                                                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
+                                                                                                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
+                                                                                                                            </save>
+                                                                                                                            <for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >
+                                                                                                                                <switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>
+                                                                                                                                    <outcome value='tunnel-termination-point'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.source.ttp-id' value="`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`" />
+                                                                                                                                            </set>
+                                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                          resource="tunnel-termination-point"
+                                                                                                                                                          key="tunnel-termination-point.ttp-id = $tmp.source.ttp-id
+		AND depth = '0'"
+                                                                                                                                                          pfx='tmp.aai.source-ttp' local-only='false' >
+                                                                                                                                                <outcome value='success'>
+                                                                                                                                                    <block atomic="true">
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='source.tunnel-tp-id' value="`$tmp.aai.source-ttp.tunnel-tp-id`" />
+                                                                                                                                                        </set>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                            </get-resource>
+                                                                                                                                            <break/>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                </switch>
+                                                                                                                            </for>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='not-found'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='failure'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='error-code' value='' />
+                                                                                                                            <parameter name='error-message' value='' />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </get-resource>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="network-route"
+                                                                                                                  key='network-route.route-id = $network-route-B'
+                                                                                                                  local-only="false"
+                                                                                                                  force="true" pfx="tmp.aai.network-route-B">
+                                                                                                        <outcome value='not-found'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                <parameter name='error-message' value='' />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                    <parameter name="original_string" value='`$tmp.aai.network-route-B.next-hop`'/>
+                                                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                    <parameter name="regex" value="[-]+"/>
+                                                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-domainB-pnfName"/>
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic="true">
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.dst.domainB.pnf-name' value="`$param-prefix-domainB-pnfName[0] + '-' +
                                                    $param-prefix-domainB-pnfName[1] + '-' +
                                                    $param-prefix-domainB-pnfName[2] + '-' +
                                                    $param-prefix-domainB-pnfName[3] + '-' +
@@ -467,448 +469,500 @@
                                                    $param-prefix-domainB-pnfName[6] + '-' +
                                                    $param-prefix-domainB-pnfName[7] + '-' +
                                                    $param-prefix-domainB-pnfName[8]`" />
-                                                                                                                        </set>
-                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                      resource="pnf"
-                                                                                                                                      key="pnf.pnf-name = $tmp.dst.domainB.pnf-name"
-                                                                                                                                      pfx='tmp.aai.destination-pnf' local-only='false' >
-                                                                                                                            <!--AND depth = '0'"-->
-                                                                                                                            <outcome value='success'>
-                                                                                                                                <block>
-                                                                                                                                    <for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >
-                                                                                                                                        <switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>
-                                                                                                                                            <outcome value='esr-thirdparty-sdnc'>
-                                                                                                                                                <block atomic="true">
-                                                                                                                                                    <set>
-                                                                                                                                                        <parameter name='tmp.domainB.esr-thirdparty-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
-                                                                                                                                                    </set>
-                                                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                                                  resource="esr-thirdparty-sdnc"
-                                                                                                                                                                  key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND
+                                                                                                                            </set>
+                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                          resource="pnf"
+                                                                                                                                          key="pnf.pnf-name = $tmp.dst.domainB.pnf-name"
+                                                                                                                                          pfx='tmp.aai.destination-pnf' local-only='false' >
+                                                                                                                                <!--AND depth = '0'"-->
+                                                                                                                                <outcome value='success'>
+                                                                                                                                    <block>
+                                                                                                                                        <for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >
+                                                                                                                                            <switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>
+                                                                                                                                                <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                                                    <block atomic="true">
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='tmp.domainB.esr-thirdparty-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                                        </set>
+                                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                                      resource="esr-thirdparty-sdnc"
+                                                                                                                                                                      key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND
 		     depth = '1'"
-                                                                                                                                                                  pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >
-                                                                                                                                                        <outcome value='success'>
-                                                                                                                                                            <block>
-                                                                                                                                                                <set>
-                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                                                                                                                    <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                                                                                                                    <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                                                                                                                    <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                                                                                                                    <!--<parameter name="format" value="json"/>-->
-                                                                                                                                                                    <!--<parameter name="httpMethod" value="get"/>-->
-                                                                                                                                                                    <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                                                                                                                    <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                                                                                                                    <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                                                                                                                    <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                                                                                                                    <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                                                                                                                                </set>
-                                                                                                                                                            </block>
-                                                                                                                                                        </outcome>
-                                                                                                                                                        <outcome value='not-found'>
-                                                                                                                                                            <return status='failure'>
-                                                                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                                            </return>
-                                                                                                                                                        </outcome>
-                                                                                                                                                        <outcome value='Other'>
-                                                                                                                                                            <return status='failure'>
-                                                                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                                            </return>
-                                                                                                                                                        </outcome>
-                                                                                                                                                    </get-resource>
-                                                                                                                                                </block>
-                                                                                                                                            </outcome>
-                                                                                                                                            <outcome value='network-resource'>
-                                                                                                                                                <block atomic="true">
-                                                                                                                                                    <set>
-                                                                                                                                                        <parameter name='tmp.domainB.eth-network-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
-                                                                                                                                                    </set>
-                                                                                                                                                </block>
-                                                                                                                                            </outcome>
-                                                                                                                                        </switch>
-                                                                                                                                    </for>
-                                                                                                                                </block>
-                                                                                                                            </outcome>
-                                                                                                                            <outcome value='not-found'>
-                                                                                                                                <return status='failure'>
-                                                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                </return>
-                                                                                                                            </outcome>
-                                                                                                                            <outcome value='Other'>
-                                                                                                                                <return status='failure'>
-                                                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                </return>
-                                                                                                                            </outcome>
-                                                                                                                        </get-resource>
-                                                                                                                    </block>
-                                                                                                                </outcome>
-                                                                                                                <outcome value='failure'>
-                                                                                                                    <return status='failure'>
-                                                                                                                        <parameter name='error-code' value='' />
-                                                                                                                        <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                                                                                    </return>
-                                                                                                                </outcome>
-                                                                                                            </execute>
-                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                          resource="p-interface"
-                                                                                                                          key="pnf.pnf-name = $tmp.dst.domainB.pnf-name
+                                                                                                                                                                      pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                                            <outcome value='success'>
+                                                                                                                                                                <block>
+                                                                                                                                                                    <set>
+                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                                                        <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                                                        <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                                                                        <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                                                                        <!--<parameter name="format" value="json"/>-->
+                                                                                                                                                                        <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                                                                        <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                    </set>
+                                                                                                                                                                </block>
+                                                                                                                                                            </outcome>
+                                                                                                                                                            <outcome value='not-found'>
+                                                                                                                                                                <return status='failure'>
+                                                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                                </return>
+                                                                                                                                                            </outcome>
+                                                                                                                                                            <outcome value='Other'>
+                                                                                                                                                                <return status='failure'>
+                                                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                                </return>
+                                                                                                                                                            </outcome>
+                                                                                                                                                        </get-resource>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                                <outcome value='network-resource'>
+                                                                                                                                                    <block atomic="true">
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='tmp.domainB.eth-network-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                                        </set>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                            </switch>
+                                                                                                                                        </for>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='not-found'>
+                                                                                                                                    <return status='failure'>
+                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                    </return>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='Other'>
+                                                                                                                                    <return status='failure'>
+                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                    </return>
+                                                                                                                                </outcome>
+                                                                                                                            </get-resource>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='failure'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='error-code' value='' />
+                                                                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </execute>
+                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                              resource="p-interface"
+                                                                                                                              key="pnf.pnf-name = $tmp.dst.domainB.pnf-name
 	        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop"
-                                                                                                                          local-only="false"
-                                                                                                                          pfx="tmp.aai.network-route-B.p-interface-dst" >
-                                                                                                                <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
-                                                                                                                <!--	resource="p-interface"-->
-                                                                                                                <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
-                                                                                                                <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
-                                                                                                                <!--		local-only="false" -->
-                                                                                                                <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
-                                                                                                                <outcome value='success'>
-                                                                                                                    <block atomic="true">
-                                                                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                                                                                            <parameter name="original_string" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>
-                                                                                                                            <!--<parameter name="regex" value="[^-]+$"/>-->
-                                                                                                                            <parameter name="regex" value="[-]+"/>
-                                                                                                                            <parameter name="ctx_memory_result_key" value="param-prefix-domainB"/>
-                                                                                                                            <outcome value='success'>
-                                                                                                                                <block atomic="true">
-                                                                                                                                    <set>
-                                                                                                                                        <parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
-                                                                                                                                    </set>
-                                                                                                                                    <set>
-                                                                                                                                        <parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
-                                                                                                                                    </set>
-                                                                                                                                </block>
-                                                                                                                            </outcome>
-                                                                                                                            <outcome value='failure'>
-                                                                                                                                <return status='failure'>
-                                                                                                                                    <parameter name='error-code' value='' />
-                                                                                                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                                                                                                </return>
-                                                                                                                            </outcome>
-                                                                                                                        </execute>
-                                                                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                                            <parameter name="ctx-destination" value="prop.connectivity-domainB-uuid"/>
-                                                                                                                        </execute>
-                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                              key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>
-                                                                                                                            <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />
-                                                                                                                            <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
-                                                                                                                            <parameter name='operational-status' value='Created' />
-                                                                                                                            <parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />
-                                                                                                                            <parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />
-                                                                                                                            <parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />
-                                                                                                                            <parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
-                                                                                                                            <parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
-                                                                                                                            <parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />
-                                                                                                                            <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
-                                                                                                                            <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
-                                                                                                                            <parameter name='CIR' value='`$prop.sotn.cir`' />
-                                                                                                                            <parameter name='EIR' value='`$prop.sotn.eir`' />
-                                                                                                                            <parameter name='CBS' value='`$prop.sotn.cbs`' />
-                                                                                                                            <parameter name='EBS' value='`$prop.sotn.ebs`' />
-                                                                                                                            <!--<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='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'
-                                                                                                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
-         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
-         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
-                                                                                                                              force="true" pfx="tmp.AnAI-data">
-                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />
-                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
-                                                                                                                            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
-                                                                                                                            <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
-                                                                                                                            <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
-                                                                                                                            <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
-                                                                                                                            <!--      force="true" pfx="tmp.AnAI-data">-->
-                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
-                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
-                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
-                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
-                                                                                                                        </save>
-                                                                                                                        <for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >
-                                                                                                                            <switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>
-                                                                                                                                <outcome value='tunnel-termination-point'>
+                                                                                                                              local-only="false"
+                                                                                                                              pfx="tmp.aai.network-route-B.p-interface-dst" >
+                                                                                                                    <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                                                                                                    <!--	resource="p-interface"-->
+                                                                                                                    <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
+                                                                                                                    <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
+                                                                                                                    <!--		local-only="false" -->
+                                                                                                                    <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic="true">
+                                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                                <parameter name="original_string" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>
+                                                                                                                                <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                                <parameter name="regex" value="[-]+"/>
+                                                                                                                                <parameter name="ctx_memory_result_key" value="param-prefix-domainB"/>
+                                                                                                                                <outcome value='success'>
                                                                                                                                     <block atomic="true">
                                                                                                                                         <set>
-                                                                                                                                            <parameter name='tmp.destination.ttp-id' value="`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`" />
+                                                                                                                                            <parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
+                                                                                                                                        </set>
+                                                                                                                                        <set>
+                                                                                                                                            <parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
                                                                                                                                         </set>
-                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                                      resource="tunnel-termination-point"
-                                                                                                                                                      key="tunnel-termination-point.ttp-id = $tmp.destination.ttp-id
-		AND depth = '0'"
-                                                                                                                                                      pfx='tmp.aai.destination-ttp' local-only='false' >
-                                                                                                                                            <outcome value='success'>
-                                                                                                                                                <block atomic="true">
-                                                                                                                                                    <set>
-                                                                                                                                                        <parameter name='destination.tunnel-tp-id' value="`$tmp.aai.destination-ttp.tunnel-tp-id`" />
-                                                                                                                                                    </set>
-                                                                                                                                                </block>
-                                                                                                                                            </outcome>
-                                                                                                                                        </get-resource>
-                                                                                                                                        <break/>
                                                                                                                                     </block>
                                                                                                                                 </outcome>
-                                                                                                                            </switch>
-                                                                                                                        </for>
-                                                                                                                    </block>
-                                                                                                                </outcome>
-                                                                                                                <outcome value='not-found'>
-                                                                                                                    <return status='failure'>
-                                                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                                                        <parameter name="error-code" value="500" />
-                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                                                    </return>
-                                                                                                                </outcome>
-                                                                                                                <outcome value='failure'>
-                                                                                                                    <return status='failure'>
-                                                                                                                        <parameter name='error-code' value='' />
-                                                                                                                        <parameter name='error-message' value='' />
-                                                                                                                    </return>
-                                                                                                                </outcome>
-                                                                                                            </get-resource>
-                                                                                                        </block>
-                                                                                                    </outcome>
-                                                                                                </get-resource>
-                                                                                                <set>
-                                                                                                    <parameter name='prop.connection-attachment.access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
-                                                                                                    <parameter name='prop.connection-attachment.access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />
-                                                                                                    <parameter name='prop.connection-attachment.access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />
-                                                                                                    <parameter name='prop.connection-attachment.access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
-                                                                                                    <parameter name='prop.connection-attachment.access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
-                                                                                                    <parameter name='prop.remote.connection-attachment.access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />
-                                                                                                    <parameter name='prop.remote.connection-attachment.access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />
-                                                                                                    <parameter name='prop.remote.connection-attachment.access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />
-                                                                                                    <parameter name='prop.remote.connection-attachment.access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
-                                                                                                    <parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
-                                                                                                    <!--<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />-->
-                                                                                                    <!--<parameter name='prop.remote.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />-->
-                                                                                                    <!--<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />-->
-                                                                                                    <!--<parameter name='prop.remote.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />-->
-                                                                                                    <!--<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />-->
-                                                                                                </set>
-                                                                                                <call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' ></call>
-                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                    <parameter name="ctx-destination" value="prop.vpn-binding-domainA-uuid"/>
-                                                                                                </execute>
-                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >
-                                                                                                    <parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />
-                                                                                                    <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
-                                                                                                    <parameter name='access-provider-id' value='`$domain-A.provider-id`' />
-                                                                                                    <!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->
-                                                                                                    <parameter name='access-client-id' value='`$domain-A.client-id`' />
-                                                                                                    <!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->
-                                                                                                    <parameter name='access-topology-id' value='`$domain-A.te-topo-id`' />
-                                                                                                    <!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->
-                                                                                                    <parameter name='src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
-                                                                                                    <!--<parameter name='src-access-ltp-id' value='`$source.tunnel-tp-id`' />-->
-                                                                                                    <parameter name='src-access-ltp-id' value='' />
-                                                                                                    <parameter name='dst-access-node-id' value='`$domain-A.node-id`' />
-                                                                                                    <parameter name='dst-access-ltp-id' value='`$domain-A.tunnel-tp-id`' />
-                                                                                                    <parameter name='route-distinguisher' value='`$gfp`' />
-                                                                                                    <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
-                                                                                                    <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`' />
-                                                                                                    <outcome value='success'>
-                                                                                                        <block></block>
-                                                                                                    </outcome>
-                                                                                                </save>
-                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
-                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid'
-                                                                                                      force="true" pfx="tmp.AnAI-data">
-                                                                                                    <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />
-                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />
-                                                                                                </save>
-                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                    <parameter name="ctx-destination" value="prop.vpn-binding-domainB-uuid"/>
-                                                                                                </execute>
-                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >
-                                                                                                    <parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />
-                                                                                                    <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
-                                                                                                    <parameter name='access-provider-id' value='`$domain-B.provider-id`' />
-                                                                                                    <!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->
-                                                                                                    <parameter name='access-client-id' value='`$domain-B.client-id`' />
-                                                                                                    <!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->
-                                                                                                    <parameter name='access-topology-id' value='`$domain-B.te-topo-id`' />
-                                                                                                    <!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->
-                                                                                                    <parameter name='src-access-node-id' value='`$domain-B.node-id`' />
-                                                                                                    <parameter name='src-access-ltp-id' value='`$domain-B.tunnel-tp-id`' />
-                                                                                                    <parameter name='dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
-                                                                                                    <!--<parameter name='dst-access-ltp-id' value='`$destination.tunnel-tp-id`' />-->
-                                                                                                    <parameter name='dst-access-ltp-id' value='' />
-                                                                                                    <parameter name='route-distinguisher' value='`$gfp`' />
-                                                                                                    <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
-                                                                                                    <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`' />
-                                                                                                    <outcome value='success'>
-                                                                                                        <block></block>
-                                                                                                    </outcome>
-                                                                                                </save>
-                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
-                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid'
-                                                                                                      force="true" pfx="tmp.AnAI-data">
-                                                                                                    <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />
-                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
-                                                                                                </save>
-                                                                                                <set>
-                                                                                                    <parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />
-                                                                                                    <parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
-                                                                                                    <parameter name='otn-dest-node' value='`$domain-A.node-id`' />
-                                                                                                    <parameter name='bw-odu' value="`'0,' + $gfp`" />
-                                                                                                    <!--<parameter name='src-ttp-id' value='`$source.tunnel-tp-id`' />-->
-                                                                                                    <parameter name='dst-ttp-id' value='`$domain-A.tunnel-tp-id`' />
-                                                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                </set>
-                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`" />
-                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`" />
-                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
-                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
-                                                                                                    <parameter name="format" value="json"/>
-                                                                                                    <parameter name="httpMethod" value="post"/>
-                                                                                                    <parameter name="responsePrefix" value="otn-oof"/>
-                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                                                    <outcome value='failure'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="Error executing slice creation api for domain A" />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='success'>
-                                                                                                        <block></block>
-                                                                                                    </outcome>
-                                                                                                </execute>
-                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />
-                                                                                                    <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' `" />
-                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
-                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
-                                                                                                    <parameter name="format" value="json"/>
-                                                                                                    <parameter name="httpMethod" value="patch"/>
-                                                                                                    <parameter name="responsePrefix" value="otn-oof"/>
-                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                                                    <outcome value='failure'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="Error executing UNI Coloring for domain A" />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='success'>
-                                                                                                        <block></block>
-                                                                                                    </outcome>
-                                                                                                </execute>
-                                                                                                <set>
-                                                                                                    <parameter name='request-id' value='`$prop.vpn-binding-domainB-uuid`' />
-                                                                                                    <parameter name='otn-source-node' value='`$domain-B.node-id`' />
-                                                                                                    <parameter name='otn-dest-node' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
-                                                                                                    <!--<parameter name='bw-odu' value='`$maximum-bandwidth /10`' />-->
-                                                                                                    <parameter name='bw-odu' value="`'0,' + $gfp`" />
-                                                                                                    <parameter name='src-ttp-id' value='`$domain-B.tunnel-tp-id`' />
-                                                                                                    <!--<parameter name='dst-ttp-id' value='`$destination.tunnel-tp-id`' />-->
-                                                                                                    <parameter name='dst-ttp-id' value='' />
-                                                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                </set>
-                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`" />
-                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`" />
-                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
-                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
-                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
-                                                                                                    <parameter name="format" value="json"/>
-                                                                                                    <parameter name="httpMethod" value="post"/>
-                                                                                                    <parameter name="responsePrefix" value="otn-oof"/>
-                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                                                    <outcome value='failure'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="Error executing slice creation api for domain B" />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='success'>
-                                                                                                        <block></block>
-                                                                                                    </outcome>
-                                                                                                </execute>
-                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />
-                                                                                                    <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' `" />
-                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
-                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
-                                                                                                    <parameter name="format" value="json"/>
-                                                                                                    <parameter name="httpMethod" value="patch"/>
-                                                                                                    <parameter name="responsePrefix" value="otn-oof"/>
-                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                                                    <outcome value='failure'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="Error executing UNI coloring for domain B" />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='success'>
-                                                                                                        <block></block>
-                                                                                                    </outcome>
-                                                                                                </execute>
-                                                                                            </block>
-                                                                                        </outcome>
-                                                                                    </get-resource>
-                                                                                </block>
-                                                                            </outcome>
-                                                                        </switch>
-                                                                    </for>
-                                                                </block>
-                                                            </outcome>
-                                                        </switch>
-                                                    </block>
-                                                </outcome>
-                                            </get-resource>
-                                        </block>
+                                                                                                                                <outcome value='failure'>
+                                                                                                                                    <return status='failure'>
+                                                                                                                                        <parameter name='error-code' value='' />
+                                                                                                                                        <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                                    </return>
+                                                                                                                                </outcome>
+                                                                                                                            </execute>
+                                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                                                <parameter name="ctx-destination" value="prop.connectivity-domainB-uuid"/>
+                                                                                                                            </execute>
+                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                  key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>
+                                                                                                                                <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />
+                                                                                                                                <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
+                                                                                                                                <parameter name='operational-status' value='Created' />
+                                                                                                                                <parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />
+                                                                                                                                <parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />
+                                                                                                                                <parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />
+                                                                                                                                <parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                                                <parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
+                                                                                                                                <parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />
+                                                                                                                                <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
+                                                                                                                                <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
+                                                                                                                                <parameter name='CIR' value='`$prop.sotn.cir`' />
+                                                                                                                                <parameter name='EIR' value='`$prop.sotn.eir`' />
+                                                                                                                                <parameter name='CBS' value='`$prop.sotn.cbs`' />
+                                                                                                                                <parameter name='EBS' value='`$prop.sotn.ebs`' />
+                                                                                                                                <!--<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='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'
+                                                                                                                                  key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                                                                                                                                  force="true" pfx="tmp.AnAI-data">
+                                                                                                                                <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
+                                                                                                                                <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
+                                                                                                                                <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
+                                                                                                                                <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
+                                                                                                                                <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
+                                                                                                                                <!--      force="true" pfx="tmp.AnAI-data">-->
+                                                                                                                                <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
+                                                                                                                                <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
+                                                                                                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
+                                                                                                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
+                                                                                                                            </save>
+                                                                                                                            <for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >
+                                                                                                                                <switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>
+                                                                                                                                    <outcome value='tunnel-termination-point'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.destination.ttp-id' value="`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`" />
+                                                                                                                                            </set>
+                                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                          resource="tunnel-termination-point"
+                                                                                                                                                          key="tunnel-termination-point.ttp-id = $tmp.destination.ttp-id
+		AND depth = '0'"
+                                                                                                                                                          pfx='tmp.aai.destination-ttp' local-only='false' >
+                                                                                                                                                <outcome value='success'>
+                                                                                                                                                    <block atomic="true">
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='destination.tunnel-tp-id' value="`$tmp.aai.destination-ttp.tunnel-tp-id`" />
+                                                                                                                                                        </set>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                            </get-resource>
+                                                                                                                                            <break/>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                </switch>
+                                                                                                                            </for>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='not-found'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='failure'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='error-code' value='' />
+                                                                                                                            <parameter name='error-message' value='' />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </get-resource>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <set>
+                                                                                                        <parameter name='prop.connection-attachment.access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
+                                                                                                        <parameter name='prop.connection-attachment.access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />
+                                                                                                        <parameter name='prop.connection-attachment.access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />
+                                                                                                        <parameter name='prop.connection-attachment.access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                        <parameter name='prop.connection-attachment.access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
+                                                                                                        <parameter name='prop.remote.connection-attachment.access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />
+                                                                                                        <parameter name='prop.remote.connection-attachment.access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />
+                                                                                                        <parameter name='prop.remote.connection-attachment.access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />
+                                                                                                        <parameter name='prop.remote.connection-attachment.access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                        <parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
+                                                                                                        <!--<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />-->
+                                                                                                        <!--<parameter name='prop.remote.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />-->
+                                                                                                        <!--<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />-->
+                                                                                                        <!--<parameter name='prop.remote.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />-->
+                                                                                                        <!--<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />-->
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='prop.ethsrvType' value='`$network-route-A`' />
+                                                                                                    </set>
+                                                                                                    <call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' ></call>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                        <parameter name="ctx-destination" value="prop.vpn-binding-domainA-uuid"/>
+                                                                                                    </execute>
+                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >
+                                                                                                        <parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />
+                                                                                                        <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
+                                                                                                        <parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />
+                                                                                                        <parameter name='access-provider-id' value='`$domain-A.provider-id`' />
+                                                                                                        <!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->
+                                                                                                        <parameter name='access-client-id' value='`$domain-A.client-id`' />
+                                                                                                        <!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->
+                                                                                                        <parameter name='access-topology-id' value='`$domain-A.te-topo-id`' />
+                                                                                                        <!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->
+                                                                                                        <parameter name='src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                        <!--<parameter name='src-access-ltp-id' value='`$source.tunnel-tp-id`' />-->
+                                                                                                        <parameter name='src-access-ltp-id' value='' />
+                                                                                                        <parameter name='dst-access-node-id' value='`$domain-A.node-id`' />
+                                                                                                        <parameter name='dst-access-ltp-id' value='`$domain-A.tunnel-tp-id`' />
+                                                                                                        <parameter name='route-distinguisher' value='`$gfp`' />
+                                                                                                        <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
+                                                                                                        <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`' />
+                                                                                                        <outcome value='success'>
+                                                                                                            <block></block>
+                                                                                                        </outcome>
+                                                                                                    </save>
+                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
+                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid'
+                                                                                                          force="true" pfx="tmp.AnAI-data">
+                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />
+                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />
+                                                                                                    </save>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                        <parameter name="ctx-destination" value="prop.vpn-binding-domainB-uuid"/>
+                                                                                                    </execute>
+                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >
+                                                                                                        <parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />
+                                                                                                        <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
+                                                                                                        <parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />
+                                                                                                        <parameter name='access-provider-id' value='`$domain-B.provider-id`' />
+                                                                                                        <!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->
+                                                                                                        <parameter name='access-client-id' value='`$domain-B.client-id`' />
+                                                                                                        <!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->
+                                                                                                        <parameter name='access-topology-id' value='`$domain-B.te-topo-id`' />
+                                                                                                        <!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->
+                                                                                                        <parameter name='src-access-node-id' value='`$domain-B.node-id`' />
+                                                                                                        <parameter name='src-access-ltp-id' value='`$domain-B.tunnel-tp-id`' />
+                                                                                                        <parameter name='dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                        <!--<parameter name='dst-access-ltp-id' value='`$destination.tunnel-tp-id`' />-->
+                                                                                                        <parameter name='dst-access-ltp-id' value='' />
+                                                                                                        <parameter name='route-distinguisher' value='`$gfp`' />
+                                                                                                        <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
+                                                                                                        <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`' />
+                                                                                                        <outcome value='success'>
+                                                                                                            <block></block>
+                                                                                                        </outcome>
+                                                                                                    </save>
+                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
+                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid'
+                                                                                                          force="true" pfx="tmp.AnAI-data">
+                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />
+                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
+                                                                                                    </save>
+                                                                                                    <set>
+                                                                                                        <!--<parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />-->
+                                                                                                        <!--<parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->
+                                                                                                        <!--<parameter name='otn-dest-node' value='`$domain-A.node-id`' />-->
+                                                                                                        <!--<parameter name='bw-odu' value="`'0,' + $gfp`" />-->
+                                                                                                        <!--<parameter name='dst-ttp-id' value='`$domain-A.tunnel-tp-id`' />-->
+                                                                                                        <!--<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->
+                                                                                                        <parameter name='`otn-tunnel-sliceA-list[$idx].request-id`' value='`$prop.vpn-binding-domainA-uuid`' />
+                                                                                                        <parameter name='`otn-tunnel-sliceA-list[$idx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                        <parameter name='`otn-tunnel-sliceA-list[$idx].otn-dest-node`' value='`$domain-A.node-id`' />
+                                                                                                        <parameter name='`otn-tunnel-sliceA-list[$idx].bw-odu`' value="`'0,' + $gfp`" />
+                                                                                                        <parameter name='`otn-tunnel-sliceA-list[$idx].src-ttp-id`' value='' />
+                                                                                                        <parameter name='`otn-tunnel-sliceA-list[$idx].dst-ttp-id`' value='`$domain-A.tunnel-tp-id`' />
+                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                        <parameter name='`otn-tunnel-sliceA-list_length`' value='`$idx + 1`' />
+                                                                                                        <!--otn-tunnel-slice-list[$idx]-->
+                                                                                                    </set>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />
+                                                                                                        <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' `" />
+                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
+                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                                                                                        <parameter name="format" value="json"/>
+                                                                                                        <parameter name="httpMethod" value="patch"/>
+                                                                                                        <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="Error executing UNI Coloring for domain A" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block></block>
+                                                                                                        </outcome>
+                                                                                                    </execute>
+                                                                                                    <set>
+                                                                                                        <!--<parameter name='request-id' value='`$prop.vpn-binding-domainB-uuid`' />-->
+                                                                                                        <!--<parameter name='otn-source-node' value='`$domain-B.node-id`' />-->
+                                                                                                        <!--<parameter name='otn-dest-node' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->
+                                                                                                        <!--<parameter name='bw-odu' value="`'0,' + $gfp`" />-->
+                                                                                                        <!--<parameter name='src-ttp-id' value='`$domain-B.tunnel-tp-id`' />-->
+                                                                                                        <!--<parameter name='dst-ttp-id' value='' />-->
+                                                                                                        <!--<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->
+                                                                                                        <parameter name='`otn-tunnel-sliceB-list[$idx].request-id`' value='`$prop.vpn-binding-domainB-uuid`' />
+                                                                                                        <parameter name='`otn-tunnel-sliceB-list[$idx].otn-source-node`' value='`$domain-B.node-id`' />
+                                                                                                        <parameter name='`otn-tunnel-sliceB-list[$idx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                        <parameter name='`otn-tunnel-sliceB-list[$idx].bw-odu`' value="`'0,' + $gfp`" />
+                                                                                                        <parameter name='`otn-tunnel-sliceB-list[$idx].src-ttp-id`' value='`$domain-B.tunnel-tp-id`' />
+                                                                                                        <parameter name='`otn-tunnel-sliceB-list[$idx].dst-ttp-id`' value='' />
+                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                        <parameter name='`otn-tunnel-sliceB-list_length`' value='`$idx + 1`' />
+                                                                                                    </set>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />
+                                                                                                        <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' `" />
+                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
+                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
+                                                                                                        <parameter name="format" value="json"/>
+                                                                                                        <parameter name="httpMethod" value="patch"/>
+                                                                                                        <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="Error executing UNI coloring for domain B" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block></block>
+                                                                                                        </outcome>
+                                                                                                    </execute>
+                                                                                                    <set>
+                                                                                                        <parameter name='domain-A.tunnel-tp-id' value='' />
+                                                                                                        <parameter name='domain-A.node-id' value='' />
+                                                                                                        <parameter name='domain-A.network-id' value="" />
+                                                                                                        <parameter name='domain-A.provider-id' value="" />
+                                                                                                        <parameter name='domain-A.client-id' value="" />
+                                                                                                        <parameter name='domain-A.te-topo-id' value="" />
+                                                                                                        <parameter name='domain-A.network-type' value="" />
+                                                                                                        <parameter name='domain-A.ltpId' value="" />
+                                                                                                        <parameter name='tmp.domain-A.network-id' value="" />
+                                                                                                        <parameter name='tmp.domain-A.ttp-id' value="" />
+                                                                                                        <parameter name='network-route-A' value="" />
+                                                                                                        <!--<parameter name='domain-A.' value="" />-->
+                                                                                                        <parameter name='request-id' value='' />
+                                                                                                        <parameter name='otn-source-node' value='' />
+                                                                                                        <parameter name='otn-dest-node' value='' />
+                                                                                                        <parameter name='bw-odu' value="" />
+                                                                                                        <parameter name='src-ttp-id' value='' />
+                                                                                                        <parameter name='dst-ttp-id' value='' />
+                                                                                                        <parameter name='domain-B.tunnel-tp-id' value='' />
+                                                                                                        <parameter name='domain-B.node-id' value='' />
+                                                                                                        <parameter name='domain-B.network-id' value="" />
+                                                                                                        <parameter name='domain-B.provider-id' value="" />
+                                                                                                        <parameter name='domain-B.client-id' value="" />
+                                                                                                        <parameter name='domain-B.te-topo-id' value="" />
+                                                                                                        <parameter name='domain-B.network-type' value="" />
+                                                                                                        <parameter name='domain-B.ltpId' value="" />
+                                                                                                        <parameter name='tmp.domain-B.network-id' value="" />
+                                                                                                        <parameter name='tmp.domain-B.ttp-id' value="" />
+                                                                                                        <parameter name='network-route-B' value="" />
+                                                                                                        <!--<parameter name='domain-B.' value="" />-->
+                                                                                                    </set>
+                                                                                                </block>
+                                                                                            </outcome>
+                                                                                        </get-resource>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                            </switch>
+                                                                        </for>
+                                                                    </block>
+                                                                </outcome>
+                                                            </switch>
+                                                        </block>
+                                                    </outcome>
+                                                </get-resource>
+                                            </block>
+                                        </outcome>
+                                    </get-resource>
+                                </for>
+                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceA-list-creation.templatefile`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`" />
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                    <parameter name="format" value="json"/>
+                                    <parameter name="httpMethod" value="post"/>
+                                    <parameter name="responsePrefix" value="otn-oof"/>
+                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                    <parameter name="trustStorePassword" value="adminadmin"/>
+                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                    <parameter name="keyStorePassword" value="adminadmin"/>
+                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                    <outcome value='failure'>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="Error executing slice creation api for domain A" />
+                                        </return>
+                                    </outcome>
+                                    <outcome value='success'>
+                                        <block></block>
+                                    </outcome>
+                                </execute>
+                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceB-list-creation.templatefile`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`" />
+                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
+                                    <parameter name="format" value="json"/>
+                                    <parameter name="httpMethod" value="post"/>
+                                    <parameter name="responsePrefix" value="otn-oof"/>
+                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                    <parameter name="trustStorePassword" value="adminadmin"/>
+                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                    <parameter name="keyStorePassword" value="adminadmin"/>
+                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                    <outcome value='failure'>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="Error executing slice creation api for domain B" />
+                                        </return>
+                                    </outcome>
+                                    <outcome value='success'>
+                                        <block></block>
                                     </outcome>
-                                </get-resource>
+                                </execute>
                             </block>
                         </outcome>
                     </switch>
diff --git a/platform-logic/restapi-templates/src/main/json/ts-allocate-tn-sliceA-list.json b/platform-logic/restapi-templates/src/main/json/ts-allocate-tn-sliceA-list.json
new file mode 100644
index 00000000..25726ead
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/ts-allocate-tn-sliceA-list.json
@@ -0,0 +1,22 @@
+{
+  "ietf-optical-slice:input": {
+    "otn-tunnel-list": [
+
+        ${repeat:otn-tunnel-sliceA-list_length:
+            {
+              "tunnel-name": ${otn-tunnel-sliceA-list[${1}].request-id},
+              "source": ${otn-tunnel-sliceA-list[${1}].otn-source-node},
+              "destination": ${otn-tunnel-sliceA-list[${1}].otn-dest-node},
+              "tunnel-bandwidth": ${otn-tunnel-sliceA-list[${1}].bw-odu},
+              "src-tunnel-tp-id": ${otn-tunnel-sliceA-list[${1}].src-ttp-id},
+              "dst-tunnel-tp-id": ${otn-tunnel-sliceA-list[${1}].dst-ttp-id}
+            },
+        }
+
+      ],
+
+      "slice-id": ${slice-instance-id}
+
+   }
+}
+
diff --git a/platform-logic/restapi-templates/src/main/json/ts-allocate-tn-sliceB-list.json b/platform-logic/restapi-templates/src/main/json/ts-allocate-tn-sliceB-list.json
new file mode 100644
index 00000000..9059d215
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/ts-allocate-tn-sliceB-list.json
@@ -0,0 +1,22 @@
+{
+  "ietf-optical-slice:input": {
+    "otn-tunnel-list": [
+
+        ${repeat:otn-tunnel-sliceB-list_length:
+            {
+              "tunnel-name": ${otn-tunnel-sliceB-list[${1}].request-id},
+              "source": ${otn-tunnel-sliceB-list[${1}].otn-source-node},
+              "destination": ${otn-tunnel-sliceB-list[${1}].otn-dest-node},
+              "tunnel-bandwidth": ${otn-tunnel-sliceB-list[${1}].bw-odu},
+              "src-tunnel-tp-id": ${otn-tunnel-sliceB-list[${1}].src-ttp-id},
+              "dst-tunnel-tp-id": ${otn-tunnel-sliceB-list[${1}].dst-ttp-id}
+            },
+        }
+
+      ],
+
+      "slice-id": ${slice-instance-id}
+
+   }
+}
+