From 13267a899ccd06491f79f653caf1483957563149 Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Mon, 22 Feb 2021 15:30:38 +0000
Subject: Supporting 3 or more network domains for Transport Slicing use case.
 Issue-ID: SDNC-1487

Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: Ia497741d70eff0f5fba12ad487f0f240709b5cb5

Former-commit-id: c2ff57f8ac2f830bb4709a29dca9644dd8d4c82d
---
 ...ogy-operation-get-otn-tunnel-path-from-oof.json | 1371 +++---
 ...nf-topology-operation-trans-slice-activate.json | 1697 +++++---
 ...nf-topology-operation-trans-slice-allocate.json | 4595 ++++++++++++++------
 ...-topology-operation-trans-slice-deactivate.json |  713 +--
 ...-vnf-topology-operation-trans-slice-delete.json |  723 +--
 ...logy-operation-get-otn-tunnel-path-from-oof.xml |   34 +
 ...vnf-topology-operation-trans-slice-activate.xml |  476 +-
 ...vnf-topology-operation-trans-slice-allocate.xml |  672 ++-
 ...f-topology-operation-trans-slice-deactivate.xml |   77 +-
 ...i-vnf-topology-operation-trans-slice-delete.xml |   51 +-
 10 files changed, 6867 insertions(+), 3542 deletions(-)

(limited to 'platform-logic/generic-resource-api/src')

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 5256b6c7..4fe850a3 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": "abafb433.2b07c",
+        "id": "fa52a170.206e7",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 149,
-        "y": 95,
-        "z": "f861838.07df98",
+        "x": 178,
+        "y": 101,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "8a2adf01.004b9"
+                "2c5db495.a5dd34"
             ]
         ]
     },
     {
-        "id": "8a2adf01.004b9",
+        "id": "2c5db495.a5dd34",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1789 +22,1926 @@
         "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": 274,
-        "y": 421.00001525878906,
-        "z": "f861838.07df98",
+        "x": 303,
+        "y": 427.00001525878906,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "870eb920.3a709"
+                "4ae6db6f.435c7c"
             ]
         ]
     },
     {
-        "id": "870eb920.3a709",
+        "id": "4ae6db6f.435c7c",
         "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": 338.0001220703125,
-        "y": 514,
-        "z": "f861838.07df98",
+        "x": 367.0001220703125,
+        "y": 520,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "12c71cb4.bbd213"
+                "6312c3c3.704cf4"
             ]
         ]
     },
     {
-        "id": "7b12bbea.4b296c",
+        "id": "6bdd3c50.e0d3d4",
         "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 + '?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": 820.9730834960938,
-        "y": 172.99600219726562,
-        "z": "f861838.07df98",
+        "x": 849.9730834960938,
+        "y": 178.99600219726562,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "838f6988.2e418",
-                "daadcad7.8d5718"
+                "7939df96.b1122",
+                "945597b.d7df068"
             ]
         ]
     },
     {
-        "id": "838f6988.2e418",
+        "id": "7939df96.b1122",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1060.9732246398926,
-        "y": 196.9959716796875,
-        "z": "f861838.07df98",
+        "x": 1089.9732246398926,
+        "y": 202.9959716796875,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "e2aa0c83.94cd5"
+                "50ded459.a3ce3c"
             ]
         ]
     },
     {
-        "id": "1cd84c7f.13b994",
+        "id": "b5aef0e7.4cc018",
         "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": 1199.973258972168,
-        "y": 145.99606323242188,
-        "z": "f861838.07df98",
+        "x": 1259.97314453125,
+        "y": 142.99606323242188,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "daadcad7.8d5718",
+        "id": "945597b.d7df068",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1059.9730110168457,
-        "y": 145.99606227874756,
-        "z": "f861838.07df98",
+        "x": 1088.9730110168457,
+        "y": 151.99606227874756,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "1cd84c7f.13b994"
+                "b5aef0e7.4cc018"
             ]
         ]
     },
     {
-        "id": "fe1658e6.6b98a8",
+        "id": "e01d4a36.839a2",
         "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": 792.4768829345703,
-        "y": 129.00000190734863,
-        "z": "f861838.07df98",
+        "x": 821.4768829345703,
+        "y": 135.00000190734863,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "b6d123ad.aaa61",
+        "id": "9cfd026a.5e4728",
         "type": "for",
         "name": "for vidx..otn-oof.solutions_length[]",
         "xml": "<for index='vidx' start='0' end='`$otn-oof.solutions_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 811.972900390625,
-        "y": 482.2457275390625,
-        "z": "f861838.07df98",
+        "x": 840.972900390625,
+        "y": 488.2457275390625,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "64a6a0a3.de9e88"
+                "8402c7cf.20d6c"
             ]
         ]
     },
     {
-        "id": "32873616.6130da",
+        "id": "e807132a.83466",
         "type": "comment",
         "name": "Loop through OTN links",
         "info": "",
         "comments": "",
-        "x": 895.4732055664062,
-        "y": 561.74609375,
-        "z": "f861838.07df98",
+        "x": 924.4732055664062,
+        "y": 567.74609375,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "64a6a0a3.de9e88",
+        "id": "8402c7cf.20d6c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 916.5001220703125,
-        "y": 673.2864990234375,
-        "z": "f861838.07df98",
+        "x": 945.5001220703125,
+        "y": 679.2864990234375,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "ebe50f50.427a98",
-                "c378542a.988188",
-                "b9a4e12.dabba2"
+                "5b85782.fa3db08",
+                "2d5a2685.b40dfa",
+                "20564e8a.e84492"
             ]
         ]
     },
     {
-        "id": "ebe50f50.427a98",
+        "id": "5b85782.fa3db08",
         "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": 1173.5001220703125,
-        "y": 663.2864990234375,
-        "z": "f861838.07df98",
+        "x": 1202.5001220703125,
+        "y": 669.2864990234375,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "383ad684.d27f02",
-                "92e0b7cd.135e8",
-                "fc9654b0.26f8f8"
+                "d48feed1.3a38",
+                "5943270e.4826e8",
+                "990db839.99a8f8"
             ]
         ]
     },
     {
-        "id": "fc9654b0.26f8f8",
+        "id": "990db839.99a8f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1375.0001220703125,
-        "y": 538.2864685058594,
-        "z": "f861838.07df98",
+        "x": 1404.0001220703125,
+        "y": 544.2864685058594,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "a60f2416.5968c8"
+                "a9f1b4b6.1c30e8"
             ]
         ]
     },
     {
-        "id": "383ad684.d27f02",
+        "id": "d48feed1.3a38",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1411.0001220703125,
-        "y": 663.2864990234375,
-        "z": "f861838.07df98",
+        "x": 1440.0001220703125,
+        "y": 669.2864990234375,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "1ff2406e.1859a"
+                "ac3b3843.658d4"
             ]
         ]
     },
     {
-        "id": "92e0b7cd.135e8",
+        "id": "5943270e.4826e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1405.0001220703125,
-        "y": 713.2864990234375,
-        "z": "f861838.07df98",
+        "x": 1434.0001220703125,
+        "y": 719.2864990234375,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "a40efbb6.9e2848"
+                "da410969.0b2cc"
             ]
         ]
     },
     {
-        "id": "1ff2406e.1859a",
+        "id": "ac3b3843.658d4",
         "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": 1572.0001220703125,
-        "y": 652.2864990234375,
-        "z": "f861838.07df98",
+        "x": 1601.0001220703125,
+        "y": 658.2864990234375,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "a40efbb6.9e2848",
+        "id": "da410969.0b2cc",
         "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": 1570.0001220703125,
-        "y": 708.2864990234375,
-        "z": "f861838.07df98",
+        "x": 1599.0001220703125,
+        "y": 714.2864990234375,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "4cfcfa39.a67414",
+        "id": "d48fe5f1.e695e8",
         "type": "comment",
         "name": "get cross-domain-link information",
         "info": "",
         "comments": "",
-        "x": 1179.5001220703125,
-        "y": 612.2864990234375,
-        "z": "f861838.07df98",
+        "x": 1208.5001220703125,
+        "y": 618.2864990234375,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "c378542a.988188",
+        "id": "2d5a2685.b40dfa",
         "type": "set",
         "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": 1163.0001220703125,
-        "y": 566.2864990234375,
-        "z": "f861838.07df98",
+        "x": 1192.0001220703125,
+        "y": 572.2864990234375,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "e2aa0c83.94cd5",
+        "id": "50ded459.a3ce3c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1206.0002708435059,
-        "y": 194.74145698547363,
-        "z": "f861838.07df98",
+        "x": 1235.0002708435059,
+        "y": 200.74145698547363,
+        "z": "97fec48c.8eada",
         "wires": [
             []
         ]
     },
     {
-        "id": "12c71cb4.bbd213",
+        "id": "6312c3c3.704cf4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 578.9688835144043,
-        "y": 440.74163722991943,
-        "z": "f861838.07df98",
+        "x": 607.9688835144043,
+        "y": 446.74163722991943,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "b6d123ad.aaa61",
-                "7b12bbea.4b296c"
+                "9cfd026a.5e4728",
+                "6bdd3c50.e0d3d4",
+                "3d2e0b8f.457abc"
             ]
         ]
     },
     {
-        "id": "eed9f90d.625c7",
+        "id": "2581c748.7cabd8",
         "type": "switchNode",
         "name": "test cross-domain-link role",
         "xml": "<switch test='`$tmp.aai.cross-link.link-role`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1690.5001220703125,
-        "y": 538,
-        "z": "f861838.07df98",
+        "x": 1719.5001220703125,
+        "y": 544,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "84eec670.e2767"
+                "22f3b1f4.9256fe"
             ]
         ]
     },
     {
-        "id": "84eec670.e2767",
+        "id": "22f3b1f4.9256fe",
         "type": "outcome",
         "name": "outcome cross-domain",
         "xml": "<outcome value='cross-domain'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1926.5001220703125,
-        "y": 539,
-        "z": "f861838.07df98",
+        "x": 1955.5001220703125,
+        "y": 545,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "4da26d84.4c4d14"
+                "8b1c590c.dc55d"
             ]
         ]
     },
     {
-        "id": "1a6d08c1.f63207",
+        "id": "a2b70b63.3ba9c8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2245.5,
-        "y": 1016,
-        "z": "f861838.07df98",
+        "x": 2359.4998779296875,
+        "y": 1005,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "4da26d84.4c4d14",
+        "id": "8b1c590c.dc55d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2129.5001220703125,
-        "y": 540,
-        "z": "f861838.07df98",
+        "x": 2158.5001220703125,
+        "y": 546,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "1a6d08c1.f63207",
-                "1f33bea3.a37e41",
-                "a53fb0ab.3215e8",
-                "1a72a670.f5c5ba"
+                "a2b70b63.3ba9c8",
+                "4ab81af3.e377f4",
+                "b2e8772a.8ac6e8",
+                "a42edec8.e98fb"
             ]
         ]
     },
     {
-        "id": "d525a55b.c81c5",
+        "id": "3bc9b9f2.81b29e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2570,
-        "y": 507,
-        "z": "f861838.07df98",
+        "x": 2683.9998779296875,
+        "y": 496,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "424e6de2.ee50a4"
+                "5d4d6dbf.b923ac"
             ]
         ]
     },
     {
-        "id": "48c96b61.49802c",
+        "id": "37303a4c.954af6",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2603.0001220703125,
-        "y": 565,
-        "z": "f861838.07df98",
+        "x": 2717,
+        "y": 554,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "90a49841.e9abd"
+                "9e71e39b.7fa1"
             ]
         ]
     },
     {
-        "id": "27012bae.421594",
+        "id": "fd9ad854.5b33c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2606.0001220703125,
-        "y": 617,
-        "z": "f861838.07df98",
+        "x": 2720,
+        "y": 606,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "3218b6b1.58d4da"
+                "72bd806e.4e60a8"
             ]
         ]
     },
     {
-        "id": "90a49841.e9abd",
+        "id": "9e71e39b.7fa1",
         "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": 2788.0001220703125,
-        "y": 569,
-        "z": "f861838.07df98",
+        "x": 2902,
+        "y": 558,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "3218b6b1.58d4da",
+        "id": "72bd806e.4e60a8",
         "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": 2776.0001220703125,
-        "y": 620,
-        "z": "f861838.07df98",
+        "x": 2890,
+        "y": 609,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "818ff562.39e0e",
+        "id": "a1ab74dd.259888",
         "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": 3906.5,
-        "y": 422,
-        "z": "f861838.07df98",
+        "x": 4020.4998779296875,
+        "y": 411,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "f9b5c841.bb08a",
+        "id": "78028b3.737cf74",
         "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": 3914.5,
-        "y": 474,
-        "z": "f861838.07df98",
+        "x": 4028.4998779296875,
+        "y": 463,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "a8ab9ca9.5f37d"
+                "f334aa73.fafd8"
             ]
         ]
     },
     {
-        "id": "a8ab9ca9.5f37d",
+        "id": "f334aa73.fafd8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4121,
-        "y": 452,
-        "z": "f861838.07df98",
+        "x": 4234.9998779296875,
+        "y": 441,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "f4704103.56f298"
+                "198591da.45bba6"
             ]
         ]
     },
     {
-        "id": "d07aee9c.38cf",
+        "id": "c586fad5.100ad",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3458.66845703125,
-        "y": 500.48150634765625,
-        "z": "f861838.07df98",
+        "x": 3572.6683349609375,
+        "y": 489.48150634765625,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "f5a5a2ae.b150d8"
+                "8d515769.aa6f4"
             ]
         ]
     },
     {
-        "id": "94ee2310.15a178",
+        "id": "18757b7c.bab055",
         "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": 2921.3828125,
-        "y": 502.65972900390625,
-        "z": "f861838.07df98",
+        "x": 3035.3826904296875,
+        "y": 491.65972900390625,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "116f7db2.ea55a2"
+                "e5aaccbc.1746e"
             ]
         ]
     },
     {
-        "id": "116f7db2.ea55a2",
+        "id": "e5aaccbc.1746e",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-tp.relationship-list.relationship[$vidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3173.3828125,
-        "y": 499.65972900390625,
-        "z": "f861838.07df98",
+        "x": 3287.3826904296875,
+        "y": 488.65972900390625,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "d07aee9c.38cf"
+                "c586fad5.100ad"
             ]
         ]
     },
     {
-        "id": "f5a5a2ae.b150d8",
+        "id": "8d515769.aa6f4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3685.5,
-        "y": 489,
-        "z": "f861838.07df98",
+        "x": 3799.4998779296875,
+        "y": 478,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "818ff562.39e0e",
-                "f9b5c841.bb08a",
-                "fa235f06.dbc5c8",
-                "825f6c70.9f6d6",
-                "6fa2423a.fd13dc"
+                "a1ab74dd.259888",
+                "78028b3.737cf74",
+                "e29873e7.48a55",
+                "60eed173.f1208",
+                "c69a19d0.8fe6d"
             ]
         ]
     },
     {
-        "id": "1f33bea3.a37e41",
+        "id": "4ab81af3.e377f4",
         "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": 2326.5001220703125,
-        "y": 912,
-        "z": "f861838.07df98",
+        "x": 2440.5,
+        "y": 901,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "d37211e1.0a8088",
-                "51af98c.c752568",
-                "3fe7a459.6ee934"
+                "995af278.af1ac8",
+                "c9dcb57d.818b28",
+                "86496d30.4c8b08"
             ]
         ]
     },
     {
-        "id": "d37211e1.0a8088",
+        "id": "995af278.af1ac8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2549,
-        "y": 1054,
-        "z": "f861838.07df98",
+        "x": 2662.9998779296875,
+        "y": 1043,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "f87a46b2.f2f308"
+                "298c76a3.790b2a"
             ]
         ]
     },
     {
-        "id": "51af98c.c752568",
+        "id": "c9dcb57d.818b28",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2533,
-        "y": 1105,
-        "z": "f861838.07df98",
+        "x": 2646.9998779296875,
+        "y": 1094,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "87af46d4.1052d"
+                "e35f9b5f.fe69c8"
             ]
         ]
     },
     {
-        "id": "3fe7a459.6ee934",
+        "id": "86496d30.4c8b08",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2536,
-        "y": 1157,
-        "z": "f861838.07df98",
+        "x": 2649.9998779296875,
+        "y": 1146,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "f5945933.94bc1"
+                "fe485369.3b129"
             ]
         ]
     },
     {
-        "id": "f5945933.94bc1",
+        "id": "fe485369.3b129",
         "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": 2706,
-        "y": 1160,
-        "z": "f861838.07df98",
+        "x": 2819.9998779296875,
+        "y": 1149,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "87af46d4.1052d",
+        "id": "e35f9b5f.fe69c8",
         "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": 2718,
-        "y": 1109,
-        "z": "f861838.07df98",
+        "x": 2831.9998779296875,
+        "y": 1098,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "ee005d71.029a7",
+        "id": "b29ef002.3d9bd8",
         "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": 2905.3828125,
-        "y": 1064.6597290039062,
-        "z": "f861838.07df98",
+        "x": 3019.3826904296875,
+        "y": 1053.6597290039062,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "d2d24abe.aac6a"
+                "1420228.3521e5e"
             ]
         ]
     },
     {
-        "id": "d2d24abe.aac6a",
+        "id": "1420228.3521e5e",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.dst-tp.relationship-list.relationship[$vidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3148.3828125,
-        "y": 1063.6597290039062,
-        "z": "f861838.07df98",
+        "x": 3262.3826904296875,
+        "y": 1052.6597290039062,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "328b374b.e6dea8"
+                "5d8a1ce9.20e95c"
             ]
         ]
     },
     {
-        "id": "a3d738bb.01d098",
+        "id": "50d5c6dd.fd8458",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4914.5,
-        "y": 865,
-        "z": "f861838.07df98",
+        "x": 5028.4998779296875,
+        "y": 854,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "d76ed9f4.607e58",
-                "4049d8d0.576ec8",
-                "6d1ae1e8.8376b8"
+                "6e9eddf0.722754",
+                "4df00122.6ae7d8",
+                "5c18dd82.55be5c"
             ]
         ]
     },
     {
-        "id": "328b374b.e6dea8",
+        "id": "5d8a1ce9.20e95c",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3404.66845703125,
-        "y": 1063.4815063476562,
-        "z": "f861838.07df98",
+        "x": 3518.6683349609375,
+        "y": 1052.4815063476562,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "daeaf8a3.f790f8"
+                "431b8e7f.397f08"
             ]
         ]
     },
     {
-        "id": "b11078d7.b3b858",
+        "id": "5d78c070.cc21d",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4701.5,
-        "y": 864,
-        "z": "f861838.07df98",
+        "x": 4815.4998779296875,
+        "y": 853,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "a3d738bb.01d098"
+                "50d5c6dd.fd8458"
             ]
         ]
     },
     {
-        "id": "daeaf8a3.f790f8",
+        "id": "431b8e7f.397f08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3704.5,
-        "y": 1061,
-        "z": "f861838.07df98",
+        "x": 3818.4998779296875,
+        "y": 1050,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "590b13b.935b9ec",
-                "b7482d1e.97b0b8",
-                "4d91a36f.ea12e4",
-                "32404ee3.71aeda",
-                "88a4d7d3.2c52b"
+                "9fe095e8.34fca",
+                "9f30760a.8f0188",
+                "3e68bf5c.62e23",
+                "16edc927.badbff",
+                "c1a0d70e.9bb548"
             ]
         ]
     },
     {
-        "id": "590b13b.935b9ec",
+        "id": "9fe095e8.34fca",
         "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": 3946.5,
-        "y": 1015,
-        "z": "f861838.07df98",
+        "x": 4060.4998779296875,
+        "y": 1004,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "b7482d1e.97b0b8",
+        "id": "9f30760a.8f0188",
         "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": 3936.5,
-        "y": 1066,
-        "z": "f861838.07df98",
+        "x": 4050.4998779296875,
+        "y": 1055,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "3475127.fd4c36e"
+                "f0dbdf9f.2f9a"
             ]
         ]
     },
     {
-        "id": "3475127.fd4c36e",
+        "id": "f0dbdf9f.2f9a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4124,
-        "y": 1064,
-        "z": "f861838.07df98",
+        "x": 4237.9998779296875,
+        "y": 1053,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "8e8366a6.32694"
+                "aaf730ad.ded658"
             ]
         ]
     },
     {
-        "id": "d76ed9f4.607e58",
+        "id": "6e9eddf0.722754",
         "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": 5184.5,
-        "y": 841,
-        "z": "f861838.07df98",
+        "x": 5298.4998779296875,
+        "y": 830,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "4049d8d0.576ec8",
+        "id": "4df00122.6ae7d8",
         "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": 5194.5,
-        "y": 887,
-        "z": "f861838.07df98",
+        "x": 5308.4998779296875,
+        "y": 876,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "e9f242cc.c24dd8"
+                "6bfb2c0.fcf9cd4"
             ]
         ]
     },
     {
-        "id": "e9f242cc.c24dd8",
+        "id": "6bfb2c0.fcf9cd4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5410,
-        "y": 878,
-        "z": "f861838.07df98",
+        "x": 5523.9998779296875,
+        "y": 867,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "43e26006.8bc19"
+                "46a8e7db.6247c8"
             ]
         ]
     },
     {
-        "id": "43e26006.8bc19",
+        "id": "46a8e7db.6247c8",
         "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",
+        "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<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-id`' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-provider-id`' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-client-id`' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-topology-id`' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-type`' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 5664.5,
-        "y": 884,
-        "z": "f861838.07df98",
+        "x": 5778.4998779296875,
+        "y": 873,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "424e6de2.ee50a4",
+        "id": "5d4d6dbf.b923ac",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2704,
-        "y": 503,
-        "z": "f861838.07df98",
+        "x": 2817.9998779296875,
+        "y": 492,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "94ee2310.15a178"
+                "18757b7c.bab055"
             ]
         ]
     },
     {
-        "id": "f87a46b2.f2f308",
+        "id": "298c76a3.790b2a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2695,
-        "y": 1045,
-        "z": "f861838.07df98",
+        "x": 2808.9998779296875,
+        "y": 1034,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "ee005d71.029a7"
+                "b29ef002.3d9bd8"
             ]
         ]
     },
     {
-        "id": "a60f2416.5968c8",
+        "id": "a9f1b4b6.1c30e8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1509,
-        "y": 540,
-        "z": "f861838.07df98",
+        "x": 1538,
+        "y": 546,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "eed9f90d.625c7"
+                "2581c748.7cabd8"
             ]
         ]
     },
     {
-        "id": "a53fb0ab.3215e8",
+        "id": "b2e8772a.8ac6e8",
         "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": 2279,
-        "y": 324,
-        "z": "f861838.07df98",
+        "x": 2392.9998779296875,
+        "y": 313,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "128e534.d6bf2ad"
+                "3399a4f5.011714"
             ]
         ]
     },
     {
-        "id": "128e534.d6bf2ad",
+        "id": "3399a4f5.011714",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2478,
-        "y": 321,
-        "z": "f861838.07df98",
+        "x": 2591.9998779296875,
+        "y": 310,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "11b1dca5.336a6b"
+                "d2b9c322.61b4e"
             ]
         ]
     },
     {
-        "id": "11b1dca5.336a6b",
+        "id": "d2b9c322.61b4e",
         "type": "outcome",
         "name": "p-interface",
         "xml": "<outcome value='p-interface'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2655.117431640625,
-        "y": 319.34027099609375,
-        "z": "f861838.07df98",
+        "x": 2769.1173095703125,
+        "y": 308.34027099609375,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "16999964.0052a7"
+                "daf680e0.e985f"
             ]
         ]
     },
     {
-        "id": "a9fc0be8.cb4e7",
+        "id": "614113e.09a2a6c",
         "type": "set",
         "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",
+        "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<!--<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-ltp-id`' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`\" />-->\n<!--<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-node-id`' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />-->\n\n<!--<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />-->\n",
         "comments": "",
-        "x": 3507,
-        "y": 233,
-        "z": "f861838.07df98",
+        "x": 3620.9998779296875,
+        "y": 222,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "bbad66bd.203d28",
+        "id": "c1945a01.da39d8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3492,
-        "y": 281,
-        "z": "f861838.07df98",
+        "x": 3605.9998779296875,
+        "y": 270,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "16999964.0052a7",
+        "id": "daf680e0.e985f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2795,
-        "y": 304,
-        "z": "f861838.07df98",
+        "x": 2908.9998779296875,
+        "y": 293,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "c4129dee.e1028",
-                "4b41d356.da9dfc"
+                "56dc1543.ce88ec",
+                "b07af7fc.6b63b8"
             ]
         ]
     },
     {
-        "id": "f4704103.56f298",
+        "id": "198591da.45bba6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4296,
-        "y": 448,
-        "z": "f861838.07df98",
+        "x": 4409.9998779296875,
+        "y": 437,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "9beffd2c.502c6"
+                "c08fd8d6.2bd66"
             ]
         ]
     },
     {
-        "id": "8e8366a6.32694",
+        "id": "aaf730ad.ded658",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4313,
-        "y": 1053,
-        "z": "f861838.07df98",
+        "x": 4426.9998779296875,
+        "y": 1042,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "2782166b.894a72"
+                "64775e7a.bf3908"
             ]
         ]
     },
     {
-        "id": "1a72a670.f5c5ba",
+        "id": "a42edec8.e98fb",
         "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": 2372.5001220703125,
-        "y": 546,
-        "z": "f861838.07df98",
+        "x": 2486.5,
+        "y": 535,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "d525a55b.c81c5",
-                "48c96b61.49802c",
-                "27012bae.421594"
+                "3bc9b9f2.81b29e",
+                "37303a4c.954af6",
+                "fd9ad854.5b33c8"
             ]
         ]
     },
     {
-        "id": "fa235f06.dbc5c8",
+        "id": "e29873e7.48a55",
         "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": 3776,
-        "y": 292,
-        "z": "f861838.07df98",
+        "x": 3889.9998779296875,
+        "y": 281,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "97e1c7ea.89c31",
-                "a32ada2.7e46ba8",
-                "6c014e40.0055a8"
+                "98eef2c3.4b1e6",
+                "b3fdc3b3.daa6d",
+                "bb3698f8.9dc54"
             ]
         ]
     },
     {
-        "id": "97e1c7ea.89c31",
+        "id": "98eef2c3.4b1e6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3971.5001220703125,
-        "y": 244,
-        "z": "f861838.07df98",
+        "x": 4085.5,
+        "y": 233,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "76aa8066.8a0a68"
+                "1e54913c.73cd4f"
             ]
         ]
     },
     {
-        "id": "a32ada2.7e46ba8",
+        "id": "b3fdc3b3.daa6d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3963.5001220703125,
-        "y": 299,
-        "z": "f861838.07df98",
+        "x": 4077.5,
+        "y": 288,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "e78aff2c.f74de8"
+                "8746e11a.2a66c"
             ]
         ]
     },
     {
-        "id": "6c014e40.0055a8",
+        "id": "bb3698f8.9dc54",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3968.5001220703125,
-        "y": 356,
-        "z": "f861838.07df98",
+        "x": 4082.5,
+        "y": 345,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "72ca8bf8.aa197c"
+                "be336b5b.cedab8"
             ]
         ]
     },
     {
-        "id": "72ca8bf8.aa197c",
+        "id": "be336b5b.cedab8",
         "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": 4120.5001220703125,
-        "y": 357,
-        "z": "f861838.07df98",
+        "x": 4234.5,
+        "y": 346,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "e78aff2c.f74de8",
+        "id": "8746e11a.2a66c",
         "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": 4131.5001220703125,
-        "y": 302,
-        "z": "f861838.07df98",
+        "x": 4245.5,
+        "y": 291,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "76aa8066.8a0a68",
+        "id": "1e54913c.73cd4f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4115.8824462890625,
-        "y": 241.65567016601562,
-        "z": "f861838.07df98",
+        "x": 4229.88232421875,
+        "y": 230.65567016601562,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "2bdb018d.2fcdb6",
-                "d5b2333f.df7ba8"
+                "e08a0980.5d50e",
+                "8e112ac6.c7732"
             ]
         ]
     },
     {
-        "id": "2bdb018d.2fcdb6",
+        "id": "e08a0980.5d50e",
         "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",
+        "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\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-node-id`' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />",
         "comments": "",
-        "x": 4341,
-        "y": 197,
-        "z": "f861838.07df98",
+        "x": 4454.9998779296875,
+        "y": 186,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "825f6c70.9f6d6",
+        "id": "60eed173.f1208",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3863,
-        "y": 539,
-        "z": "f861838.07df98",
+        "x": 3976.9998779296875,
+        "y": 528,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "9beffd2c.502c6",
+        "id": "c08fd8d6.2bd66",
         "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",
+        "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-tunnel-tp-id`' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />\n",
         "comments": "",
-        "x": 4557,
-        "y": 445,
-        "z": "f861838.07df98",
+        "x": 4670.9998779296875,
+        "y": 434,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "32404ee3.71aeda",
+        "id": "16edc927.badbff",
         "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": 3773,
-        "y": 895,
-        "z": "f861838.07df98",
+        "x": 3886.9998779296875,
+        "y": 884,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "38443514.32f97a",
-                "3f48494d.b1e386",
-                "1d72a1d4.29172e"
+                "123bf516.85c49b",
+                "6c28943b.60b994",
+                "19639884.e536cf"
             ]
         ]
     },
     {
-        "id": "1d72a1d4.29172e",
+        "id": "19639884.e536cf",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3968.5001220703125,
-        "y": 847,
-        "z": "f861838.07df98",
+        "x": 4082.5,
+        "y": 836,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "e3710364.81565"
+                "c2d1aecb.85e098"
             ]
         ]
     },
     {
-        "id": "3f48494d.b1e386",
+        "id": "6c28943b.60b994",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3960.5001220703125,
-        "y": 902,
-        "z": "f861838.07df98",
+        "x": 4074.5,
+        "y": 891,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "1d46287c.a3abe"
+                "1ac89a13.d0df06"
             ]
         ]
     },
     {
-        "id": "38443514.32f97a",
+        "id": "123bf516.85c49b",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3965.5001220703125,
-        "y": 959,
-        "z": "f861838.07df98",
+        "x": 4079.5,
+        "y": 948,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "cdfeb34e.901888"
+                "b06bf8cb.62556"
             ]
         ]
     },
     {
-        "id": "e3710364.81565",
+        "id": "c2d1aecb.85e098",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4112.8824462890625,
-        "y": 844.6556701660156,
-        "z": "f861838.07df98",
+        "x": 4226.88232421875,
+        "y": 833.6556701660156,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "f36692a0.716e88",
-                "2c5d340f.626864"
+                "a9a60061.b99928",
+                "cfa839ce.804738"
             ]
         ]
     },
     {
-        "id": "1d46287c.a3abe",
+        "id": "1ac89a13.d0df06",
         "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": 4128.5001220703125,
-        "y": 905,
-        "z": "f861838.07df98",
+        "x": 4242.5,
+        "y": 894,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "cdfeb34e.901888",
+        "id": "b06bf8cb.62556",
         "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": 4117.5001220703125,
-        "y": 960,
-        "z": "f861838.07df98",
+        "x": 4231.5,
+        "y": 949,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "f36692a0.716e88",
+        "id": "a9a60061.b99928",
         "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",
+        "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\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-node-id`' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 4322,
-        "y": 812,
-        "z": "f861838.07df98",
+        "x": 4435.9998779296875,
+        "y": 801,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "4d91a36f.ea12e4",
+        "id": "3e68bf5c.62e23",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3892,
-        "y": 1107,
-        "z": "f861838.07df98",
+        "x": 4005.9998779296875,
+        "y": 1096,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "2782166b.894a72",
+        "id": "64775e7a.bf3908",
         "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",
+        "xml": "<set>\n<parameter name='domain-B.tunnel-tp-id' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-tunnel-tp-id`' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 4546,
-        "y": 1052,
-        "z": "f861838.07df98",
+        "x": 4659.9998779296875,
+        "y": 1041,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "93bc95bd.015218",
+        "id": "8aefd07e.260d8",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4698,
-        "y": 260,
-        "z": "f861838.07df98",
+        "x": 4811.9998779296875,
+        "y": 249,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "12aa4902.54d527"
+                "4f8861e6.824728"
             ]
         ]
     },
     {
-        "id": "12aa4902.54d527",
+        "id": "4f8861e6.824728",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4875,
-        "y": 252,
-        "z": "f861838.07df98",
+        "x": 4988.9998779296875,
+        "y": 241,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "e133ac15.1cfeb8",
-                "50016229.5d7aa4",
-                "9731bbf6.0aee28"
+                "8261f1c0.e8f31",
+                "36d8211f.467a7e",
+                "49234c70.a5c64c"
             ]
         ]
     },
     {
-        "id": "e133ac15.1cfeb8",
+        "id": "8261f1c0.e8f31",
         "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": 5090,
-        "y": 233,
-        "z": "f861838.07df98",
+        "x": 5203.9998779296875,
+        "y": 222,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "50016229.5d7aa4",
+        "id": "36d8211f.467a7e",
         "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": 5107,
-        "y": 297,
-        "z": "f861838.07df98",
+        "x": 5220.9998779296875,
+        "y": 286,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "64fc1e3d.6c54a8"
+                "92167a44.d7bee"
             ]
         ]
     },
     {
-        "id": "64fc1e3d.6c54a8",
+        "id": "92167a44.d7bee",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5330.5,
-        "y": 298,
-        "z": "f861838.07df98",
+        "x": 5444.4998779296875,
+        "y": 287,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "269c6440.2d1124"
+                "eafcd68a.31cbf"
             ]
         ]
     },
     {
-        "id": "269c6440.2d1124",
+        "id": "eafcd68a.31cbf",
         "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",
+        "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<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-id`' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-provider-id`' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-client-id`' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-topology-id`' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-type`' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />\n\n\n",
         "comments": "",
-        "x": 5595,
-        "y": 287,
-        "z": "f861838.07df98",
+        "x": 5708.9998779296875,
+        "y": 276,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "d5b2333f.df7ba8",
+        "id": "8e112ac6.c7732",
         "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": 4300,
-        "y": 256,
-        "z": "f861838.07df98",
+        "x": 4413.9998779296875,
+        "y": 245,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "4f6b55da.d022d4"
+                "7a3db7fd.944d68"
             ]
         ]
     },
     {
-        "id": "4f6b55da.d022d4",
+        "id": "7a3db7fd.944d68",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4495,
-        "y": 256,
-        "z": "f861838.07df98",
+        "x": 4608.9998779296875,
+        "y": 245,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "93bc95bd.015218"
+                "8aefd07e.260d8"
             ]
         ]
     },
     {
-        "id": "9731bbf6.0aee28",
+        "id": "49234c70.a5c64c",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5034,
-        "y": 350,
-        "z": "f861838.07df98",
+        "x": 5147.9998779296875,
+        "y": 339,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "2c5d340f.626864",
+        "id": "cfa839ce.804738",
         "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": 4301,
-        "y": 863,
-        "z": "f861838.07df98",
+        "x": 4414.9998779296875,
+        "y": 852,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "a0eb4786.ca84c8"
+                "4d05ba94.558ef4"
             ]
         ]
     },
     {
-        "id": "a0eb4786.ca84c8",
+        "id": "4d05ba94.558ef4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4496,
-        "y": 863,
-        "z": "f861838.07df98",
+        "x": 4609.9998779296875,
+        "y": 852,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "b11078d7.b3b858"
+                "5d78c070.cc21d"
             ]
         ]
     },
     {
-        "id": "6d1ae1e8.8376b8",
+        "id": "5c18dd82.55be5c",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5120,
-        "y": 943,
-        "z": "f861838.07df98",
+        "x": 5233.9998779296875,
+        "y": 932,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "6fa2423a.fd13dc",
+        "id": "c69a19d0.8fe6d",
         "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": 3804,
-        "y": 86,
-        "z": "f861838.07df98",
+        "x": 3917.9998779296875,
+        "y": 75,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "c37dc1f9.38a388",
-                "f701d80.fcde128"
+                "4ca85973.1ae2a",
+                "285acc14.d6b794"
             ]
         ]
     },
     {
-        "id": "f701d80.fcde128",
+        "id": "285acc14.d6b794",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4025,
-        "y": 54,
-        "z": "f861838.07df98",
+        "x": 4138.9998779296875,
+        "y": 43,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "72fa8a9d.201954"
+                "2fdf8051.c7f6a8"
             ]
         ]
     },
     {
-        "id": "c37dc1f9.38a388",
+        "id": "4ca85973.1ae2a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4025,
-        "y": 101,
-        "z": "f861838.07df98",
+        "x": 4138.9998779296875,
+        "y": 90,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "11d67749.03e0d9"
+                "be0791af.66d9e"
             ]
         ]
     },
     {
-        "id": "72fa8a9d.201954",
+        "id": "2fdf8051.c7f6a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4190,
-        "y": 51,
-        "z": "f861838.07df98",
+        "x": 4303.9998779296875,
+        "y": 40,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "bbea1bea.ff9688"
+                "a66ce9ac.c44538"
             ]
         ]
     },
     {
-        "id": "bbea1bea.ff9688",
+        "id": "a66ce9ac.c44538",
         "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",
+        "xml": "<set>\n<parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-ltp-id`' value=\"`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />",
         "comments": "",
-        "x": 4372,
-        "y": 55,
-        "z": "f861838.07df98",
+        "x": 4485.9998779296875,
+        "y": 44,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "11d67749.03e0d9",
+        "id": "be0791af.66d9e",
         "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": 4192,
-        "y": 101,
-        "z": "f861838.07df98",
+        "x": 4305.9998779296875,
+        "y": 90,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "88a4d7d3.2c52b",
+        "id": "c1a0d70e.9bb548",
         "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": 3812,
-        "y": 710,
-        "z": "f861838.07df98",
+        "x": 3925.9998779296875,
+        "y": 699,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "584895a0.b3ab74",
-                "d8e0f12d.021a28"
+                "50687959.886b6",
+                "99d4fed5.f7a3f"
             ]
         ]
     },
     {
-        "id": "d8e0f12d.021a28",
+        "id": "99d4fed5.f7a3f",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4033,
-        "y": 678,
-        "z": "f861838.07df98",
+        "x": 4146.9998779296875,
+        "y": 667,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "18ffb32b.dc39ad"
+                "9d94fa7.027cb88"
             ]
         ]
     },
     {
-        "id": "584895a0.b3ab74",
+        "id": "50687959.886b6",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4033,
-        "y": 725,
-        "z": "f861838.07df98",
+        "x": 4146.9998779296875,
+        "y": 714,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "5fcd9d7d.d620cc"
+                "7a52ffa3.7e9d28"
             ]
         ]
     },
     {
-        "id": "18ffb32b.dc39ad",
+        "id": "9d94fa7.027cb88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4198,
-        "y": 675,
-        "z": "f861838.07df98",
+        "x": 4311.9998779296875,
+        "y": 664,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "ef90ab42.074438"
+                "675b55d9.b9c0ec"
             ]
         ]
     },
     {
-        "id": "ef90ab42.074438",
+        "id": "675b55d9.b9c0ec",
         "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",
+        "xml": "<set>\n<parameter name='domain-B.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-ltp-id`' value=\"`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 4394,
-        "y": 672,
-        "z": "f861838.07df98",
+        "x": 4507.9998779296875,
+        "y": 661,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "5fcd9d7d.d620cc",
+        "id": "7a52ffa3.7e9d28",
         "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": 4200,
-        "y": 725,
-        "z": "f861838.07df98",
+        "x": 4313.9998779296875,
+        "y": 714,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "b9a4e12.dabba2",
+        "id": "20564e8a.e84492",
         "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",
+        "x": 1183,
+        "y": 501,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "c4129dee.e1028",
+        "id": "56dc1543.ce88ec",
         "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",
+        "x": 3103.9998779296875,
+        "y": 254,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "c507ecc7.0f698"
+                "a156113e.6f73f"
             ]
         ]
     },
     {
-        "id": "55770297.b0eaec",
+        "id": "f7b52e29.d7e28",
         "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",
+        "x": 3255.9998779296875,
+        "y": 169,
+        "z": "97fec48c.8eada",
         "wires": [
             []
         ]
     },
     {
-        "id": "e83d3f89.4fb8f",
+        "id": "fcffac67.9ba8e",
         "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",
+        "x": 3258.9998779296875,
+        "y": 388,
+        "z": "97fec48c.8eada",
         "wires": [
             []
         ]
     },
     {
-        "id": "e09f6c32.6da1e8",
+        "id": "edb2a900.9a7b1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3320,
-        "y": 249,
-        "z": "f861838.07df98",
+        "x": 3433.9998779296875,
+        "y": 238,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "a9fc0be8.cb4e7"
+                "614113e.09a2a6c"
             ]
         ]
     },
     {
-        "id": "3bd5ba40.547cce",
+        "id": "bc992c4c.01fac8",
         "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",
+        "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<!--<parameter name='`tmp.otninfo[$vidx+1].srcPort.src-access-ltp-id`' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`\" />-->\n<!--<parameter name='`tmp.otninfo[$vidx+1].srcPort.src-access-node-id`' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />-->\n\n<!--<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />-->\n\n",
         "comments": "",
-        "x": 3517,
-        "y": 335,
-        "z": "f861838.07df98",
+        "x": 3630.9998779296875,
+        "y": 324,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "bf0c687c.786c3",
+        "id": "4fb57d55.78b35c",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3500,
-        "y": 375,
-        "z": "f861838.07df98",
+        "x": 3613.9998779296875,
+        "y": 364,
+        "z": "97fec48c.8eada",
         "wires": []
     },
     {
-        "id": "e18153ce.f19278",
+        "id": "7a290eee.406588",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3338,
-        "y": 347,
-        "z": "f861838.07df98",
+        "x": 3451.9998779296875,
+        "y": 336,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "3bd5ba40.547cce"
+                "bc992c4c.01fac8"
             ]
         ]
     },
     {
-        "id": "c507ecc7.0f698",
+        "id": "a156113e.6f73f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3178,
-        "y": 252,
-        "z": "f861838.07df98",
+        "x": 3291.9998779296875,
+        "y": 241,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "e09f6c32.6da1e8"
+                "edb2a900.9a7b1"
             ]
         ]
     },
     {
-        "id": "4b41d356.da9dfc",
+        "id": "b07af7fc.6b63b8",
         "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",
+        "x": 3101.9998779296875,
+        "y": 318,
+        "z": "97fec48c.8eada",
+        "wires": [
+            [
+                "adae2c31.77bd68"
+            ]
+        ]
+    },
+    {
+        "id": "adae2c31.77bd68",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3286.9998779296875,
+        "y": 322,
+        "z": "97fec48c.8eada",
+        "wires": [
+            [
+                "7a290eee.406588"
+            ]
+        ]
+    },
+    {
+        "id": "fdcdd209.036438",
+        "type": "comment",
+        "name": "Not useful anymore",
+        "info": "this domain-A.ltpId is not used anymore",
+        "comments": "",
+        "x": 4528.9998779296875,
+        "y": 20,
+        "z": "97fec48c.8eada",
+        "wires": []
+    },
+    {
+        "id": "335fd86d.6b1ff",
+        "type": "comment",
+        "name": "Not useful anymore",
+        "info": "this domain-B.ltpId is not used anymore",
+        "comments": "",
+        "x": 4550.9998779296875,
+        "y": 633,
+        "z": "97fec48c.8eada",
+        "wires": []
+    },
+    {
+        "id": "b9740a82.273f8",
+        "type": "switchNode",
+        "name": "test $vidx == first",
+        "xml": "<switch test='`$vidx == 0`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2366,
+        "y": 100,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "2bcfa57c.bd2fea"
+                "fac1138.38454f",
+                "4fd6928.61fb8ec"
             ]
         ]
     },
     {
-        "id": "2bcfa57c.bd2fea",
+        "id": "fac1138.38454f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3173,
-        "y": 333,
-        "z": "f861838.07df98",
+        "x": 2550,
+        "y": 62,
+        "z": "97fec48c.8eada",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4fd6928.61fb8ec",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2548,
+        "y": 131,
+        "z": "97fec48c.8eada",
+        "wires": [
+            [
+                "49bef92e.99a498"
+            ]
+        ]
+    },
+    {
+        "id": "49bef92e.99a498",
+        "type": "switchNode",
+        "name": "test $vidx == last",
+        "xml": "<switch test='`$vidx == $otn-oof.solutions_length - 1`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2729,
+        "y": 128,
+        "z": "97fec48c.8eada",
         "wires": [
             [
-                "e18153ce.f19278"
+                "4a491f2.2eab56",
+                "98392658.063f78"
             ]
         ]
+    },
+    {
+        "id": "98392658.063f78",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2895,
+        "y": 167,
+        "z": "97fec48c.8eada",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4a491f2.2eab56",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2897,
+        "y": 93,
+        "z": "97fec48c.8eada",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3d2e0b8f.457abc",
+        "type": "set",
+        "name": "unset parameters",
+        "xml": "<set>\n<parameter name='`tmp.otninfo.`' value='' />\n<parameter name='`tmp.otninfo_length`' value='0' />",
+        "comments": "",
+        "x": 829,
+        "y": 402,
+        "z": "97fec48c.8eada",
+        "wires": []
+    },
+    {
+        "id": "d9b3c779.af79",
+        "type": "comment",
+        "name": "May not be necessary",
+        "info": "",
+        "comments": "",
+        "x": 841,
+        "y": 370,
+        "z": "97fec48c.8eada",
+        "wires": []
     }
 ]
\ 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 1e6a51c5..5681c261 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
@@ -1,20 +1,20 @@
 [
     {
-        "id": "d9508d21.fa5b3",
+        "id": "c170e1ed.7b781",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 144,
-        "y": 116,
-        "z": "8a9c455f.82beb8",
+        "x": 137,
+        "y": 82,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "cae32381.bce9d"
+                "9970ac63.cab4e"
             ]
         ]
     },
     {
-        "id": "cae32381.bce9d",
+        "id": "9970ac63.cab4e",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1741 +22,2248 @@
         "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": 275.2856903076172,
-        "y": 165.23810863494873,
-        "z": "8a9c455f.82beb8",
+        "x": 268.2856903076172,
+        "y": 131.23810863494873,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "82cfa8a0.a91dc"
+                "d984e08f.709ec8"
             ]
         ]
     },
     {
-        "id": "82cfa8a0.a91dc",
+        "id": "d984e08f.709ec8",
         "type": "method",
         "name": "method tsli-vnf-topology-operation-trans-slice-activate",
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-activate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 278.4286193847656,
-        "y": 250.00003242492676,
-        "z": "8a9c455f.82beb8",
+        "x": 271.4286193847656,
+        "y": 216.00003242492676,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "f6fef19d.8fc9f8"
+                "8e4db78f.c5ff38"
             ]
         ]
     },
     {
-        "id": "f6fef19d.8fc9f8",
+        "id": "8e4db78f.c5ff38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 428.238037109375,
-        "y": 379.6666564941406,
-        "z": "8a9c455f.82beb8",
+        "x": 421.238037109375,
+        "y": 345.6666564941406,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "c70167ce.7f9118",
-                "6aca196e.a4377",
-                "e86e6571.913898"
+                "6bde1442.84f93c",
+                "d81cbe5a.85cea",
+                "2a368168.cab60e"
             ]
         ]
     },
     {
-        "id": "c70167ce.7f9118",
+        "id": "6bde1442.84f93c",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 696.5716552734375,
-        "y": 766.59716796875,
-        "z": "8a9c455f.82beb8",
+        "x": 689.5716552734375,
+        "y": 732.59716796875,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "d841551.d686928",
+        "id": "233d87e5.a24f7",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 728,
-        "y": 441,
-        "z": "8a9c455f.82beb8",
+        "x": 721,
+        "y": 407,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "6aca196e.a4377",
+        "id": "d81cbe5a.85cea",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",
         "comments": "",
         "outputs": 1,
-        "x": 748,
-        "y": 537,
-        "z": "8a9c455f.82beb8",
+        "x": 741,
+        "y": 503,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "8dfdefd.d3d4d9",
-                "f6a9e3a5.f26778",
-                "6cad2633.e5f528"
+                "b0036e6b.1878c8",
+                "7901c2f.e699b3c",
+                "120c06e4.dff209"
             ]
         ]
     },
     {
-        "id": "8dfdefd.d3d4d9",
+        "id": "b0036e6b.1878c8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 967,
-        "y": 475,
-        "z": "8a9c455f.82beb8",
+        "x": 960,
+        "y": 441,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "f2dd8538.5d3378"
+                "9167ffc3.5d91a"
             ]
         ]
     },
     {
-        "id": "f6a9e3a5.f26778",
+        "id": "7901c2f.e699b3c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 976.490966796875,
-        "y": 517.5740356445312,
-        "z": "8a9c455f.82beb8",
+        "x": 969.490966796875,
+        "y": 483.57403564453125,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "59b21b6f.e70b7c"
+                "fe34f5d.3d31308"
             ]
         ]
     },
     {
-        "id": "6cad2633.e5f528",
+        "id": "120c06e4.dff209",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 965,
-        "y": 564,
-        "z": "8a9c455f.82beb8",
+        "x": 958,
+        "y": 530,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "95c7d05e.93c3e"
+                "6d39868f.7f25c8"
             ]
         ]
     },
     {
-        "id": "59b21b6f.e70b7c",
+        "id": "fe34f5d.3d31308",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1130.0623779296875,
-        "y": 520.8597717285156,
-        "z": "8a9c455f.82beb8",
+        "x": 1123.0623779296875,
+        "y": 486.8597717285156,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "95c7d05e.93c3e",
+        "id": "6d39868f.7f25c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1134,
-        "y": 565,
-        "z": "8a9c455f.82beb8",
+        "x": 1127,
+        "y": 531,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "f2dd8538.5d3378",
+        "id": "9167ffc3.5d91a",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1164,
-        "y": 471,
-        "z": "8a9c455f.82beb8",
+        "x": 1157,
+        "y": 437,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "94e5618.e7d282"
+                "5c1ddd56.ddffa4"
             ]
         ]
     },
     {
-        "id": "94e5618.e7d282",
+        "id": "5c1ddd56.ddffa4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1387.33349609375,
-        "y": 470.99993896484375,
-        "z": "8a9c455f.82beb8",
+        "x": 1380.33349609375,
+        "y": 436.99993896484375,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "32140056.199ae"
+                "aeacbf90.6ab9e"
             ]
         ]
     },
     {
-        "id": "32140056.199ae",
+        "id": "aeacbf90.6ab9e",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1588.0001335144043,
-        "y": 472.00002098083496,
-        "z": "8a9c455f.82beb8",
+        "x": 1581.0001335144043,
+        "y": 438.00002098083496,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "9174febc.b8b998"
+                "7ea091c4.73eb6"
             ]
         ]
     },
     {
-        "id": "25e7d332.a761fc",
+        "id": "fd4d27b6.bd205",
         "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-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,
-        "z": "8a9c455f.82beb8",
+        "x": 4400,
+        "y": 154,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "fee47d9.4382e",
+        "id": "7648091a.a03898",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te: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": 3930,
-        "y": 506,
-        "z": "8a9c455f.82beb8",
+        "x": 4481,
+        "y": 469,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "445402d7.16a9f4",
-                "d34714f7.10a51"
+                "9edc273d.67b87",
+                "9c60eb24.47f378"
             ]
         ]
     },
     {
-        "id": "445402d7.16a9f4",
+        "id": "9edc273d.67b87",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4239.5,
-        "y": 475,
-        "z": "8a9c455f.82beb8",
+        "x": 4790.5,
+        "y": 438,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "69fb5a0d.27a12c"
+                "9905c30a.05be"
             ]
         ]
     },
     {
-        "id": "d34714f7.10a51",
+        "id": "9c60eb24.47f378",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4244.5,
-        "y": 540,
-        "z": "8a9c455f.82beb8",
+        "x": 4795.5,
+        "y": 503,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "f0eccde.2c0533"
+                "8e92f9d2.75f4a8"
             ]
         ]
     },
     {
-        "id": "69fb5a0d.27a12c",
+        "id": "9905c30a.05be",
         "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 Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4415.5,
-        "y": 475,
-        "z": "8a9c455f.82beb8",
+        "x": 4966.5,
+        "y": 438,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "f0eccde.2c0533",
+        "id": "8e92f9d2.75f4a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4411,
-        "y": 540,
-        "z": "8a9c455f.82beb8",
+        "x": 4962,
+        "y": 503,
+        "z": "bc289cb4.31b288",
         "wires": [
             []
         ]
     },
     {
-        "id": "a96cdedb.06ef48",
+        "id": "7974f996.7603f8",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",
         "comments": "",
-        "x": 3796.5,
-        "y": 694,
-        "z": "8a9c455f.82beb8",
+        "x": 4347.5,
+        "y": 657,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "616c98c7.f82ea8",
+        "id": "1460b865.7cff48",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\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='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3950.5,
-        "y": 742,
-        "z": "8a9c455f.82beb8",
+        "x": 4501.5,
+        "y": 705,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "eef8ae3.fdd1a5",
-                "8f2e62b6.e98788"
+                "d6a6995b.244f78",
+                "3058a60d.1382f2"
             ]
         ]
     },
     {
-        "id": "eef8ae3.fdd1a5",
+        "id": "d6a6995b.244f78",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4296,
-        "y": 723,
-        "z": "8a9c455f.82beb8",
+        "x": 4847,
+        "y": 686,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "f08a069b.6042c8"
+                "9008a0fb.361338"
             ]
         ]
     },
     {
-        "id": "8f2e62b6.e98788",
+        "id": "3058a60d.1382f2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4300,
-        "y": 763,
-        "z": "8a9c455f.82beb8",
+        "x": 4851,
+        "y": 726,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "b227b2c.229c1d"
+                "5c04d202.902b9c"
             ]
         ]
     },
     {
-        "id": "f08a069b.6042c8",
+        "id": "9008a0fb.361338",
         "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 Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 4454,
-        "y": 723,
-        "z": "8a9c455f.82beb8",
+        "x": 5005,
+        "y": 686,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "b227b2c.229c1d",
+        "id": "5c04d202.902b9c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4457.5,
-        "y": 763,
-        "z": "8a9c455f.82beb8",
+        "x": 5008.5,
+        "y": 726,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "2af71c81.1e5aec",
-                "5fe9896d.3d8e98"
+                "ec17d55b.a0804",
+                "144849a3.b4133e"
             ]
         ]
     },
     {
-        "id": "c5970f4b.9679a8",
+        "id": "471d2a77.3a42ac",
         "type": "comment",
         "name": "TODO: FIXME:",
         "info": "put proper values based on connectivity resource retrieved from AAI",
         "comments": "",
-        "x": 3794,
-        "y": 650,
-        "z": "8a9c455f.82beb8",
+        "x": 4345,
+        "y": 613,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "2af71c81.1e5aec",
+        "id": "ec17d55b.a0804",
         "type": "save",
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4788,
-        "y": 728,
-        "z": "8a9c455f.82beb8",
+        "x": 5339,
+        "y": 691,
+        "z": "bc289cb4.31b288",
         "wires": [
             []
         ]
     },
     {
-        "id": "48dd1ec4.51cb4",
+        "id": "4e9eb117.9357d",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 4652,
-        "y": 687,
-        "z": "8a9c455f.82beb8",
+        "x": 5203,
+        "y": 650,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "5fe9896d.3d8e98",
+        "id": "144849a3.b4133e",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4715,
-        "y": 774,
-        "z": "8a9c455f.82beb8",
+        "x": 5266,
+        "y": 737,
+        "z": "bc289cb4.31b288",
         "wires": [
             []
         ]
     },
     {
-        "id": "75d6c996.11aeb",
+        "id": "4f40e2d1.4262ec",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 3787,
-        "y": 239,
-        "z": "8a9c455f.82beb8",
+        "x": 4338,
+        "y": 202,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "c824ab5b.360f6",
+        "id": "8abcb98.e721cc8",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3813,
-        "y": 356,
-        "z": "8a9c455f.82beb8",
+        "x": 4364,
+        "y": 319,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "19cd8085.d8fca7",
-                "ff1311fc.28b29",
-                "929f1027.4a5828"
+                "3115ae28.00936a",
+                "34440f82.2778b8",
+                "5e322ae1.288484"
             ]
         ]
     },
     {
-        "id": "19cd8085.d8fca7",
+        "id": "3115ae28.00936a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4008.5001220703125,
-        "y": 308,
-        "z": "8a9c455f.82beb8",
+        "x": 4559.5001220703125,
+        "y": 271,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "a2185ea8.7f403"
+                "5640c3a4.e53454"
             ]
         ]
     },
     {
-        "id": "ff1311fc.28b29",
+        "id": "34440f82.2778b8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4000.5001220703125,
-        "y": 363,
-        "z": "8a9c455f.82beb8",
+        "x": 4551.5001220703125,
+        "y": 326,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "c3cea897.f88808"
+                "b5a71ca6.0ed8a"
             ]
         ]
     },
     {
-        "id": "a2185ea8.7f403",
+        "id": "5640c3a4.e53454",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4152.8824462890625,
-        "y": 307.6556701660156,
-        "z": "8a9c455f.82beb8",
+        "x": 4703.8824462890625,
+        "y": 270.6556701660156,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "eb7f6fc2.5f3468"
+                "4125afdc.dc7c38"
             ]
         ]
     },
     {
-        "id": "a0fa7da8.75192",
+        "id": "e2a3abe6.94632",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4735,
-        "y": 310,
-        "z": "8a9c455f.82beb8",
+        "x": 5286,
+        "y": 273,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "809287e6.83f07"
+                "e7a85e47.2ddf5"
             ]
         ]
     },
     {
-        "id": "eb7f6fc2.5f3468",
+        "id": "4125afdc.dc7c38",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4337,
-        "y": 306,
-        "z": "8a9c455f.82beb8",
+        "x": 4888,
+        "y": 269,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "21971ee2.f88962"
+                "7289fd85.50ab7c"
             ]
         ]
     },
     {
-        "id": "21971ee2.f88962",
+        "id": "7289fd85.50ab7c",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4532,
-        "y": 306,
-        "z": "8a9c455f.82beb8",
+        "x": 5083,
+        "y": 269,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "a0fa7da8.75192"
+                "e2a3abe6.94632"
             ]
         ]
     },
     {
-        "id": "929f1027.4a5828",
+        "id": "5e322ae1.288484",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4005.5001220703125,
-        "y": 420,
-        "z": "8a9c455f.82beb8",
+        "x": 4556.5001220703125,
+        "y": 383,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "5ece63ab.72534c"
+                "a5591b6a.a340a8"
             ]
         ]
     },
     {
-        "id": "5ece63ab.72534c",
+        "id": "a5591b6a.a340a8",
         "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": 4157.5001220703125,
-        "y": 421,
-        "z": "8a9c455f.82beb8",
+        "x": 4708.5001220703125,
+        "y": 384,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "c3cea897.f88808",
+        "id": "b5a71ca6.0ed8a",
         "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": 4168.5001220703125,
-        "y": 364,
-        "z": "8a9c455f.82beb8",
+        "x": 4719.5001220703125,
+        "y": 327,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "fd9485b.71b4af8",
+        "id": "ca9f1df7.d822c",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5120,
-        "y": 323,
-        "z": "8a9c455f.82beb8",
+        "x": 5671,
+        "y": 286,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "12fe3fd6.ccef78",
-                "5cf62e0d.6aa85",
-                "156d902b.c3731"
+                "d6fa81cb.78d2d",
+                "bcf1b063.c95248",
+                "109a3661.2bbbd2"
             ]
         ]
     },
     {
-        "id": "809287e6.83f07",
+        "id": "e7a85e47.2ddf5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4914,
-        "y": 310,
-        "z": "8a9c455f.82beb8",
+        "x": 5465,
+        "y": 273,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "a1955015.d4546",
-                "fd9485b.71b4af8"
+                "211b93a9.ce5f0c",
+                "ca9f1df7.d822c"
             ]
         ]
     },
     {
-        "id": "a1955015.d4546",
+        "id": "211b93a9.ce5f0c",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainA id",
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5150,
-        "y": 271,
-        "z": "8a9c455f.82beb8",
+        "x": 5701,
+        "y": 234,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "12fe3fd6.ccef78",
+        "id": "d6fa81cb.78d2d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5330,
-        "y": 314,
-        "z": "8a9c455f.82beb8",
+        "x": 5881,
+        "y": 277,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "cc3a75a4.21fc7"
+                "bf2e4f3b.81ed8"
             ]
         ]
     },
     {
-        "id": "5cf62e0d.6aa85",
+        "id": "bcf1b063.c95248",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5322,
-        "y": 369,
-        "z": "8a9c455f.82beb8",
+        "x": 5873,
+        "y": 332,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "bff3bfa.5f55cc"
+                "bfa4b512.849248"
             ]
         ]
     },
     {
-        "id": "156d902b.c3731",
+        "id": "109a3661.2bbbd2",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5327,
-        "y": 426,
-        "z": "8a9c455f.82beb8",
+        "x": 5878,
+        "y": 389,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "be590afe.7cc5a8"
+                "76f805.e622cffc"
             ]
         ]
     },
     {
-        "id": "be590afe.7cc5a8",
+        "id": "76f805.e622cffc",
         "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": 5479,
-        "y": 427,
-        "z": "8a9c455f.82beb8",
+        "x": 6030,
+        "y": 390,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "bff3bfa.5f55cc",
+        "id": "bfa4b512.849248",
         "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": 5490,
-        "y": 372,
-        "z": "8a9c455f.82beb8",
+        "x": 6041,
+        "y": 335,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "cc3a75a4.21fc7",
+        "id": "bf2e4f3b.81ed8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5474.38232421875,
-        "y": 311.6556701660156,
-        "z": "8a9c455f.82beb8",
+        "x": 6025.38232421875,
+        "y": 274.6556701660156,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "665ad654.79ee8"
+                "76b40334.8bd094"
             ]
         ]
     },
     {
-        "id": "665ad654.79ee8",
+        "id": "76b40334.8bd094",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5689,
-        "y": 308,
-        "z": "8a9c455f.82beb8",
+        "x": 6240,
+        "y": 271,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "e86e6571.913898",
+        "id": "2a368168.cab60e",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 714,
-        "y": 485,
-        "z": "8a9c455f.82beb8",
+        "x": 707,
+        "y": 451,
+        "z": "bc289cb4.31b288",
         "wires": [
             []
         ]
     },
     {
-        "id": "27bc86e9.1c4e52",
+        "id": "3bea0429.f0ebac",
         "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-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,
-        "z": "8a9c455f.82beb8",
+        "x": 3807,
+        "y": 1611,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "f8350413.ea8398",
+        "id": "d501f859.eecd18",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te: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": 3892,
-        "y": 1324,
-        "z": "8a9c455f.82beb8",
+        "x": 3870,
+        "y": 1940,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "4e841df5.4d2d34",
-                "5e6f0ddb.0967b4"
+                "8a516999.f983f8",
+                "e1e3477c.cb45b"
             ]
         ]
     },
     {
-        "id": "4e841df5.4d2d34",
+        "id": "8a516999.f983f8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4187.5,
-        "y": 1291,
-        "z": "8a9c455f.82beb8",
+        "x": 4165.5,
+        "y": 1907,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "8fb2eae.74bbb98"
+                "1f32cbd.2007fb4"
             ]
         ]
     },
     {
-        "id": "5e6f0ddb.0967b4",
+        "id": "e1e3477c.cb45b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4192.5,
-        "y": 1356,
-        "z": "8a9c455f.82beb8",
+        "x": 4170.5,
+        "y": 1972,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "9fef13b3.660c58"
+                "5be15aea.63aa2c"
             ]
         ]
     },
     {
-        "id": "8fb2eae.74bbb98",
+        "id": "1f32cbd.2007fb4",
         "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 Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4355.5,
-        "y": 1291,
-        "z": "8a9c455f.82beb8",
+        "x": 4333.5,
+        "y": 1907,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "9fef13b3.660c58",
+        "id": "5be15aea.63aa2c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4366,
-        "y": 1356,
-        "z": "8a9c455f.82beb8",
+        "x": 4344,
+        "y": 1972,
+        "z": "bc289cb4.31b288",
         "wires": [
             []
         ]
     },
     {
-        "id": "2fd670.86d5219",
+        "id": "32f45e6c.4d0bea",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",
         "comments": "",
-        "x": 3768,
-        "y": 1052,
-        "z": "8a9c455f.82beb8",
+        "x": 3746,
+        "y": 1668,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "8581969f.3e9f8",
+        "id": "e8ca7925.e0f8c",
         "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.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3788,
-        "y": 1149,
-        "z": "8a9c455f.82beb8",
+        "x": 3766,
+        "y": 1765,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "3c9a5980.f5df5e",
-                "6737c173.340e3",
-                "68a240da.0733"
+                "9bb092a5.d05b48",
+                "221dd2f3.9ac236",
+                "26d51b0f.5d004c"
             ]
         ]
     },
     {
-        "id": "3c9a5980.f5df5e",
+        "id": "9bb092a5.d05b48",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3990.5001220703125,
-        "y": 1102,
-        "z": "8a9c455f.82beb8",
+        "x": 3968.5001220703125,
+        "y": 1718,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "ea38c477.b7b2f"
+                "b690bac2.55724"
             ]
         ]
     },
     {
-        "id": "6737c173.340e3",
+        "id": "221dd2f3.9ac236",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3982.5001220703125,
-        "y": 1157,
-        "z": "8a9c455f.82beb8",
+        "x": 3960.5001220703125,
+        "y": 1773,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "8bbc992f.718ea"
+                "b19648bb.51984"
             ]
         ]
     },
     {
-        "id": "ea38c477.b7b2f",
+        "id": "b690bac2.55724",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4134.8824462890625,
-        "y": 1099.6556701660156,
-        "z": "8a9c455f.82beb8",
+        "x": 4112.8824462890625,
+        "y": 1715.6556701660156,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "18cecfe3.6de9e"
+                "bc889fde.13a798"
             ]
         ]
     },
     {
-        "id": "18cecfe3.6de9e",
+        "id": "bc889fde.13a798",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4319,
-        "y": 1114,
-        "z": "8a9c455f.82beb8",
+        "x": 4297,
+        "y": 1730,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "68f9f038.67b62"
+                "6cdbe20d.6924d4"
             ]
         ]
     },
     {
-        "id": "68a240da.0733",
+        "id": "26d51b0f.5d004c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3987.5001220703125,
-        "y": 1214,
-        "z": "8a9c455f.82beb8",
+        "x": 3965.5001220703125,
+        "y": 1830,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "20686ade.8b231e"
+                "5f4cb2c4.11fb94"
             ]
         ]
     },
     {
-        "id": "20686ade.8b231e",
+        "id": "5f4cb2c4.11fb94",
         "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": 4139.5001220703125,
-        "y": 1215,
-        "z": "8a9c455f.82beb8",
+        "x": 4117.5001220703125,
+        "y": 1831,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "8bbc992f.718ea",
+        "id": "b19648bb.51984",
         "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": 4150.5001220703125,
-        "y": 1160,
-        "z": "8a9c455f.82beb8",
+        "x": 4128.5001220703125,
+        "y": 1776,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "597aa62c.50d3c",
+        "id": "73a1b393.2e09c4",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4717,
-        "y": 1118,
-        "z": "8a9c455f.82beb8",
+        "x": 4695,
+        "y": 1734,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "e04d6fa3.eba9f"
+                "ab9ee354.2292b"
             ]
         ]
     },
     {
-        "id": "68f9f038.67b62",
+        "id": "6cdbe20d.6924d4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4514,
-        "y": 1114,
-        "z": "8a9c455f.82beb8",
+        "x": 4492,
+        "y": 1730,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "597aa62c.50d3c"
+                "73a1b393.2e09c4"
             ]
         ]
     },
     {
-        "id": "2f50548b.6d0f1c",
+        "id": "1f5d9d19.39869b",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5102,
-        "y": 1117,
-        "z": "8a9c455f.82beb8",
+        "x": 5080,
+        "y": 1733,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "a769e440.df581",
-                "a7207c49.d2bbc",
-                "1e0583ed.3bab5c"
+                "9355225.5c1536",
+                "66c76394.d1fea4",
+                "2e8b8501.9ee95a"
             ]
         ]
     },
     {
-        "id": "e04d6fa3.eba9f",
+        "id": "ab9ee354.2292b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4894,
-        "y": 1110,
-        "z": "8a9c455f.82beb8",
+        "x": 4872,
+        "y": 1726,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "eacacb80.08d4c",
-                "2f50548b.6d0f1c"
+                "28e5278d.3f4238",
+                "1f5d9d19.39869b"
             ]
         ]
     },
     {
-        "id": "eacacb80.08d4c",
+        "id": "28e5278d.3f4238",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainB id",
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5132,
-        "y": 1065,
-        "z": "8a9c455f.82beb8",
+        "x": 5110,
+        "y": 1681,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "61827e75.b97ad8",
+        "id": "8616ea00.2e5968",
         "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": 5461,
-        "y": 1221,
-        "z": "8a9c455f.82beb8",
+        "x": 5439,
+        "y": 1837,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "b6c7c29b.5ee08",
+        "id": "8ef11dae.da91",
         "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": 5472,
-        "y": 1166,
-        "z": "8a9c455f.82beb8",
+        "x": 5450,
+        "y": 1782,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "7c1b7b20.2d7bbc",
+        "id": "d4ab39c.829a8c8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5456.38232421875,
-        "y": 1105.6556701660156,
-        "z": "8a9c455f.82beb8",
+        "x": 5434.38232421875,
+        "y": 1721.6556701660156,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "9190ad56.af3378"
+                "4d0c934c.0c9114"
             ]
         ]
     },
     {
-        "id": "9190ad56.af3378",
+        "id": "4d0c934c.0c9114",
         "type": "set",
         "name": "set controller domainB data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5671,
-        "y": 1102,
-        "z": "8a9c455f.82beb8",
+        "x": 5649,
+        "y": 1718,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "a769e440.df581",
+        "id": "9355225.5c1536",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5312,
-        "y": 1108,
-        "z": "8a9c455f.82beb8",
+        "x": 5290,
+        "y": 1724,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "7c1b7b20.2d7bbc"
+                "d4ab39c.829a8c8"
             ]
         ]
     },
     {
-        "id": "a7207c49.d2bbc",
+        "id": "66c76394.d1fea4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5304,
-        "y": 1163,
-        "z": "8a9c455f.82beb8",
+        "x": 5282,
+        "y": 1779,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "b6c7c29b.5ee08"
+                "8ef11dae.da91"
             ]
         ]
     },
     {
-        "id": "1e0583ed.3bab5c",
+        "id": "2e8b8501.9ee95a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5309,
-        "y": 1220,
-        "z": "8a9c455f.82beb8",
+        "x": 5287,
+        "y": 1836,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "61827e75.b97ad8"
+                "8616ea00.2e5968"
             ]
         ]
     },
     {
-        "id": "9174febc.b8b998",
+        "id": "7ea091c4.73eb6",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1826,
-        "y": 474,
-        "z": "8a9c455f.82beb8",
+        "x": 1819,
+        "y": 440,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "c96ce0ff.9fbaf8",
-                "96dddcba.eaaec8",
-                "4ccaabcc.f5bb34"
+                "cf96a339.12fc08",
+                "ebf1abf2.c0a2b8",
+                "a6813928.711c6"
             ]
         ]
     },
     {
-        "id": "c96ce0ff.9fbaf8",
+        "id": "cf96a339.12fc08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2034,
-        "y": 438,
-        "z": "8a9c455f.82beb8",
+        "x": 2027,
+        "y": 404,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "5281d926.1c9dd"
+                "7e9b774d.9e8c28"
             ]
         ]
     },
     {
-        "id": "96dddcba.eaaec8",
+        "id": "ebf1abf2.c0a2b8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2034.490966796875,
-        "y": 483.57403564453125,
-        "z": "8a9c455f.82beb8",
+        "x": 2027.490966796875,
+        "y": 449.57403564453125,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "50a19d40.768324"
+                "b2e1099a.08fc3"
             ]
         ]
     },
     {
-        "id": "4ccaabcc.f5bb34",
+        "id": "a6813928.711c6",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2032,
-        "y": 527,
-        "z": "8a9c455f.82beb8",
+        "x": 2025,
+        "y": 493,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "ffedf4ef.62de2"
+                "8f5ccf37.c152"
             ]
         ]
     },
     {
-        "id": "50a19d40.768324",
+        "id": "b2e1099a.08fc3",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2197.0623779296875,
-        "y": 483.8597717285156,
-        "z": "8a9c455f.82beb8",
+        "x": 2190.0623779296875,
+        "y": 449.8597717285156,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "ffedf4ef.62de2",
+        "id": "8f5ccf37.c152",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2201,
-        "y": 528,
-        "z": "8a9c455f.82beb8",
+        "x": 2194,
+        "y": 494,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "113dd07d.86f868",
+        "id": "2f04c146.0a3af6",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2507,
-        "y": 527,
-        "z": "8a9c455f.82beb8",
+        "x": 2500,
+        "y": 493,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "2b6a4b71.479d3c",
-                "34c32e6f.a9d052",
-                "c2c66c33.7e24d"
+                "675654a6.d7ff34",
+                "15ae8ffb.52d9c8",
+                "5de62fdc.3f5a78"
             ]
         ]
     },
     {
-        "id": "7a40580d.1d5388",
+        "id": "c4252359.e0b548",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2891,
-        "y": 527,
-        "z": "8a9c455f.82beb8",
+        "x": 2884,
+        "y": 493,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "eeee2acf.9c0ba8",
-                "57847c7b.2f3dbc"
+                "cf117e36.f49698",
+                "9e15ad66.cb5638"
             ]
         ]
     },
     {
-        "id": "2b6a4b71.479d3c",
+        "id": "675654a6.d7ff34",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2718,
-        "y": 529,
-        "z": "8a9c455f.82beb8",
+        "x": 2711,
+        "y": 495,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "7a40580d.1d5388"
+                "c4252359.e0b548"
             ]
         ]
     },
     {
-        "id": "34c32e6f.a9d052",
+        "id": "15ae8ffb.52d9c8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2718.490966796875,
-        "y": 574.5740356445312,
-        "z": "8a9c455f.82beb8",
+        "x": 2711.490966796875,
+        "y": 540.5740356445312,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "17c937f3.281d28"
+                "1c0c1f66.646011"
             ]
         ]
     },
     {
-        "id": "c2c66c33.7e24d",
+        "id": "5de62fdc.3f5a78",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2716,
-        "y": 618,
-        "z": "8a9c455f.82beb8",
+        "x": 2709,
+        "y": 584,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "45484d04.351e94"
+                "96b5913.ff6507"
             ]
         ]
     },
     {
-        "id": "45484d04.351e94",
+        "id": "96b5913.ff6507",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2883,
-        "y": 617,
-        "z": "8a9c455f.82beb8",
+        "x": 2876,
+        "y": 583,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "17c937f3.281d28",
+        "id": "1c0c1f66.646011",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2881.0623779296875,
-        "y": 574.8597717285156,
-        "z": "8a9c455f.82beb8",
+        "x": 2874.0623779296875,
+        "y": 540.8597717285156,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "5281d926.1c9dd",
+        "id": "7e9b774d.9e8c28",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2235,
-        "y": 433,
-        "z": "8a9c455f.82beb8",
+        "x": 2228,
+        "y": 399,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "24c8cf8c.d35f5"
+                "a33b5641.550dd8"
             ]
         ]
     },
     {
-        "id": "24c8cf8c.d35f5",
+        "id": "a33b5641.550dd8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2440,
-        "y": 433,
-        "z": "8a9c455f.82beb8",
+        "x": 2433,
+        "y": 399,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "ffd8562e.6c7ab"
+                "dcc9c2f.bdc72c"
             ]
         ]
     },
     {
-        "id": "ffd8562e.6c7ab",
+        "id": "dcc9c2f.bdc72c",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2606,
-        "y": 433,
-        "z": "8a9c455f.82beb8",
+        "x": 2599,
+        "y": 399,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "1639e360.7db745"
+                "b86471e.744979"
             ]
         ]
     },
     {
-        "id": "1639e360.7db745",
+        "id": "b86471e.744979",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2769,
-        "y": 433,
-        "z": "8a9c455f.82beb8",
+        "x": 2762,
+        "y": 399,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "113dd07d.86f868",
-                "b864657f.9c5a"
+                "2f04c146.0a3af6",
+                "65e4f8bf.6cf8f"
             ]
         ]
     },
     {
-        "id": "eeee2acf.9c0ba8",
+        "id": "cf117e36.f49698",
         "type": "switchNode",
         "name": "switch vpn-binding has dst-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3145,
-        "y": 526,
-        "z": "8a9c455f.82beb8",
+        "x": 3138,
+        "y": 492,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "888039c0.be2748",
-                "40c5843d.11f78c"
+                "965ac3c2.a1d608",
+                "6bf420f8.6129c8"
             ]
         ]
     },
     {
-        "id": "888039c0.be2748",
+        "id": "965ac3c2.a1d608",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3398,
-        "y": 560,
-        "z": "8a9c455f.82beb8",
+        "x": 3391,
+        "y": 526,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "d751d093.92a62"
+                "f82e8947.2d7ce8"
             ]
         ]
     },
     {
-        "id": "40c5843d.11f78c",
+        "id": "6bf420f8.6129c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3398,
-        "y": 504,
-        "z": "8a9c455f.82beb8",
+        "x": 3391,
+        "y": 470,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "ddefc1a3.6644c8"
+                "aacf39c3.b541a"
             ]
         ]
     },
     {
-        "id": "d751d093.92a62",
+        "id": "f82e8947.2d7ce8",
         "type": "switchNode",
         "name": "switch vpn-binding has src-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3137,
-        "y": 1346,
-        "z": "8a9c455f.82beb8",
+        "x": 3115,
+        "y": 1962,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "b9609f04.c7afe8",
-                "28e97c84.2c5ab4"
+                "10da65e0.f509ca",
+                "73ba091f.6ce2a"
             ]
         ]
     },
     {
-        "id": "b9609f04.c7afe8",
+        "id": "10da65e0.f509ca",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3390,
-        "y": 1380,
-        "z": "8a9c455f.82beb8",
+        "x": 3368,
+        "y": 1996,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "ee3de09a.383318"
+                "d3f311e2.47dc9"
             ]
         ]
     },
     {
-        "id": "28e97c84.2c5ab4",
+        "id": "73ba091f.6ce2a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3390,
-        "y": 1324,
-        "z": "8a9c455f.82beb8",
+        "x": 3368,
+        "y": 1940,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "b80c5827.1a79a"
+                "4a6141b6.6b0c98"
             ]
         ]
     },
     {
-        "id": "ee3de09a.383318",
+        "id": "d3f311e2.47dc9",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3541,
-        "y": 1380,
-        "z": "8a9c455f.82beb8",
+        "x": 3519,
+        "y": 1996,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "8527e1fa.cc6b4",
+        "id": "fb92b32f.578d9",
         "type": "set",
         "name": "set vpn-bindingA and connectivityA",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",
         "comments": "",
-        "x": 3844,
-        "y": 131,
-        "z": "8a9c455f.82beb8",
+        "x": 4395,
+        "y": 94,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "615fdc8e.20c4e4",
+        "id": "16b6eb5a.c037cd",
         "type": "set",
         "name": "set vpn-bindingB and connectivityB",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",
         "comments": "",
-        "x": 3825,
-        "y": 937,
-        "z": "8a9c455f.82beb8",
+        "x": 3803,
+        "y": 1553,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "ddefc1a3.6644c8",
+        "id": "b5fbea6d.693118",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3566,
-        "y": 506,
-        "z": "8a9c455f.82beb8",
+        "x": 4086,
+        "y": 351,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "8527e1fa.cc6b4",
-                "25e7d332.a761fc",
-                "75d6c996.11aeb",
-                "c824ab5b.360f6",
-                "a96cdedb.06ef48",
-                "616c98c7.f82ea8",
-                "fee47d9.4382e"
+                "fb92b32f.578d9",
+                "fd4d27b6.bd205",
+                "4f40e2d1.4262ec",
+                "8abcb98.e721cc8",
+                "7974f996.7603f8",
+                "1460b865.7cff48",
+                "7648091a.a03898"
             ]
         ]
     },
     {
-        "id": "b80c5827.1a79a",
+        "id": "4a6141b6.6b0c98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3541,
-        "y": 1323,
-        "z": "8a9c455f.82beb8",
+        "x": 3519,
+        "y": 1939,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "615fdc8e.20c4e4",
-                "27bc86e9.1c4e52",
-                "2fd670.86d5219",
-                "8581969f.3e9f8",
-                "f8350413.ea8398",
-                "96b5aedc.4196d",
-                "e2e659bb.42dea"
+                "16b6eb5a.c037cd",
+                "3bea0429.f0ebac",
+                "32f45e6c.4d0bea",
+                "e8ca7925.e0f8c",
+                "d501f859.eecd18",
+                "dfc89384.6f3b98",
+                "7e08fa79.0c018c"
             ]
         ]
     },
     {
-        "id": "96b5aedc.4196d",
+        "id": "dfc89384.6f3b98",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",
         "comments": "",
-        "x": 3770,
-        "y": 1466,
-        "z": "8a9c455f.82beb8",
+        "x": 3748,
+        "y": 2082,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "e2e659bb.42dea",
+        "id": "7e08fa79.0c018c",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\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=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3924,
-        "y": 1514,
-        "z": "8a9c455f.82beb8",
+        "x": 3902,
+        "y": 2130,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "a28581db.fa7cb",
-                "a3f78a52.db8928"
+                "dd71fa1b.6e05f",
+                "23079c35.06b53c"
             ]
         ]
     },
     {
-        "id": "a28581db.fa7cb",
+        "id": "dd71fa1b.6e05f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4269.5,
-        "y": 1495,
-        "z": "8a9c455f.82beb8",
+        "x": 4247.5,
+        "y": 2111,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "14523534.ce6de3"
+                "531e9904.6c0cf"
             ]
         ]
     },
     {
-        "id": "a3f78a52.db8928",
+        "id": "23079c35.06b53c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4273.5,
-        "y": 1535,
-        "z": "8a9c455f.82beb8",
+        "x": 4251.5,
+        "y": 2151,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "2e9384b8.e29014"
+                "ca751a91.a1fc5"
             ]
         ]
     },
     {
-        "id": "14523534.ce6de3",
+        "id": "531e9904.6c0cf",
         "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 Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 4427.5,
-        "y": 1495,
-        "z": "8a9c455f.82beb8",
+        "x": 4405.5,
+        "y": 2111,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "2e9384b8.e29014",
+        "id": "ca751a91.a1fc5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4431,
-        "y": 1535,
-        "z": "8a9c455f.82beb8",
+        "x": 4409,
+        "y": 2151,
+        "z": "bc289cb4.31b288",
         "wires": [
             [
-                "b54e7482.e242c8",
-                "df1f167a.857918"
+                "acce8a06.32f9",
+                "300cb80e.add27"
             ]
         ]
     },
     {
-        "id": "364ac531.cfcb5a",
+        "id": "ed3d8ab7.5da83",
         "type": "comment",
         "name": "TODO: FIXME:",
         "info": "put proper values based on connectivity resource retrieved from AAI",
         "comments": "",
-        "x": 3767.5,
-        "y": 1422,
-        "z": "8a9c455f.82beb8",
+        "x": 3745.5,
+        "y": 2038,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "b54e7482.e242c8",
+        "id": "acce8a06.32f9",
         "type": "save",
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4771,
-        "y": 1534,
-        "z": "8a9c455f.82beb8",
+        "x": 4749,
+        "y": 2150,
+        "z": "bc289cb4.31b288",
         "wires": [
             []
         ]
     },
     {
-        "id": "68be1db9.7e03ec",
+        "id": "dd0732a8.6dcd38",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 4629,
-        "y": 1492,
-        "z": "8a9c455f.82beb8",
+        "x": 4607,
+        "y": 2108,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "df1f167a.857918",
+        "id": "300cb80e.add27",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4700,
-        "y": 1583,
-        "z": "8a9c455f.82beb8",
+        "x": 4678,
+        "y": 2199,
+        "z": "bc289cb4.31b288",
         "wires": [
             []
         ]
     },
     {
-        "id": "57847c7b.2f3dbc",
+        "id": "9e15ad66.cb5638",
         "type": "set",
-        "name": "set attachment_param for OTN",
+        "name": "set attachment_param (gfp-n) for OTN",
         "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",
         "comments": "",
-        "x": 3132,
-        "y": 432,
-        "z": "8a9c455f.82beb8",
+        "x": 3125,
+        "y": 398,
+        "z": "bc289cb4.31b288",
         "wires": []
     },
     {
-        "id": "b864657f.9c5a",
+        "id": "65e4f8bf.6cf8f",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 2953,
-        "y": 304,
-        "z": "8a9c455f.82beb8",
+        "x": 2946,
+        "y": 270,
+        "z": "bc289cb4.31b288",
+        "wires": []
+    },
+    {
+        "id": "198fcdf8.1e22c2",
+        "type": "comment",
+        "name": "only dst ttp exists. No src",
+        "info": "",
+        "comments": "",
+        "x": 3907,
+        "y": 308,
+        "z": "bc289cb4.31b288",
+        "wires": []
+    },
+    {
+        "id": "ca0cd7a2.5ca728",
+        "type": "comment",
+        "name": "only src ttp exists. No dst",
+        "info": "",
+        "comments": "",
+        "x": 3464,
+        "y": 1886,
+        "z": "bc289cb4.31b288",
+        "wires": []
+    },
+    {
+        "id": "aacf39c3.b541a",
+        "type": "switchNode",
+        "name": "switch vpn-binding has src-access-ltp",
+        "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3615,
+        "y": 468,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "df2281b1.f49f38",
+                "aea11bc2.879238"
+            ]
+        ]
+    },
+    {
+        "id": "aea11bc2.879238",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3885,
+        "y": 1059,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "f4291584.31d5f8"
+            ]
+        ]
+    },
+    {
+        "id": "df2281b1.f49f38",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3879,
+        "y": 350,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "b5fbea6d.693118"
+            ]
+        ]
+    },
+    {
+        "id": "f4291584.31d5f8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4043,
+        "y": 1058,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "507acb8a.026844",
+                "328f5ebe.d2c3f2",
+                "282b55f0.c4b452",
+                "f1d5dfc2.902f38",
+                "e32fad74.744d"
+            ]
+        ]
+    },
+    {
+        "id": "328f5ebe.d2c3f2",
+        "type": "set",
+        "name": "set attachment_param for OTN G",
+        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",
+        "comments": "",
+        "x": 4307,
+        "y": 941,
+        "z": "bc289cb4.31b288",
+        "wires": []
+    },
+    {
+        "id": "e32fad74.744d",
+        "type": "execute",
+        "name": "execute RestApiCallNode Create OTN tunnel with token",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.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": 4388,
+        "y": 1256,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "4fa7d7bd.5a2ab",
+                "f472be3.5d0074"
+            ]
+        ]
+    },
+    {
+        "id": "4fa7d7bd.5a2ab",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4697.5,
+        "y": 1225,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "1f127e35.6d237a"
+            ]
+        ]
+    },
+    {
+        "id": "f472be3.5d0074",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4702.5,
+        "y": 1290,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "5d6567d4.56edf"
+            ]
+        ]
+    },
+    {
+        "id": "1f127e35.6d237a",
+        "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 Create OTN tunnel rest api\" />\n",
+        "comments": "",
+        "x": 4873.5,
+        "y": 1225,
+        "z": "bc289cb4.31b288",
+        "wires": []
+    },
+    {
+        "id": "5d6567d4.56edf",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 4869,
+        "y": 1290,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "282b55f0.c4b452",
+        "type": "set",
+        "name": "set pnf-name",
+        "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",
+        "comments": "",
+        "x": 4245,
+        "y": 989,
+        "z": "bc289cb4.31b288",
+        "wires": []
+    },
+    {
+        "id": "f1d5dfc2.902f38",
+        "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.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4271,
+        "y": 1106,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "b1abc6d5.732f1",
+                "5f6c0c85.ca44ac",
+                "386d37a9.f48098"
+            ]
+        ]
+    },
+    {
+        "id": "b1abc6d5.732f1",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4466.5001220703125,
+        "y": 1058,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "7b990f0b.20c288"
+            ]
+        ]
+    },
+    {
+        "id": "5f6c0c85.ca44ac",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4458.5001220703125,
+        "y": 1113,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "315f8841.f40a1"
+            ]
+        ]
+    },
+    {
+        "id": "7b990f0b.20c288",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4610.8824462890625,
+        "y": 1057.6556701660156,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "c8fb728b.2dc648"
+            ]
+        ]
+    },
+    {
+        "id": "c8fb728b.2dc648",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4795,
+        "y": 1056,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "d59f0b39.d31cc8"
+            ]
+        ]
+    },
+    {
+        "id": "d59f0b39.d31cc8",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4990,
+        "y": 1056,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "7e05c38e.6d5cbc"
+            ]
+        ]
+    },
+    {
+        "id": "386d37a9.f48098",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4463.5001220703125,
+        "y": 1170,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "46492ab4.cb6c04"
+            ]
+        ]
+    },
+    {
+        "id": "46492ab4.cb6c04",
+        "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": 4615.5001220703125,
+        "y": 1171,
+        "z": "bc289cb4.31b288",
+        "wires": []
+    },
+    {
+        "id": "315f8841.f40a1",
+        "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": 4626.5001220703125,
+        "y": 1114,
+        "z": "bc289cb4.31b288",
+        "wires": []
+    },
+    {
+        "id": "507acb8a.026844",
+        "type": "set",
+        "name": "set vpn-bindingG and connectivityG",
+        "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",
+        "comments": "",
+        "x": 4302,
+        "y": 881,
+        "z": "bc289cb4.31b288",
+        "wires": []
+    },
+    {
+        "id": "7e05c38e.6d5cbc",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5193,
+        "y": 1060,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "436389a3.57fb78"
+            ]
+        ]
+    },
+    {
+        "id": "6a766cec.04fc1c",
+        "type": "execute",
+        "name": "get esr-thirdparty-sdnc",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 5578,
+        "y": 1073,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "985e5e77.801e6",
+                "a10da0b1.afaa18",
+                "4e466bf1.fc05c4"
+            ]
+        ]
+    },
+    {
+        "id": "436389a3.57fb78",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5372,
+        "y": 1060,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "507f9c6b.ef2c2c",
+                "6a766cec.04fc1c"
+            ]
+        ]
+    },
+    {
+        "id": "507f9c6b.ef2c2c",
+        "type": "set",
+        "name": "set esr-thirdparty-sdnc domainG id",
+        "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 5608,
+        "y": 1021,
+        "z": "bc289cb4.31b288",
+        "wires": []
+    },
+    {
+        "id": "985e5e77.801e6",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5788,
+        "y": 1064,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "37e160ea.8f86d8"
+            ]
+        ]
+    },
+    {
+        "id": "a10da0b1.afaa18",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5780,
+        "y": 1119,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "81ccddb5.3e1b1"
+            ]
+        ]
+    },
+    {
+        "id": "4e466bf1.fc05c4",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5785,
+        "y": 1176,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "c4f4a10b.e46a6"
+            ]
+        ]
+    },
+    {
+        "id": "c4f4a10b.e46a6",
+        "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": 5937,
+        "y": 1177,
+        "z": "bc289cb4.31b288",
+        "wires": []
+    },
+    {
+        "id": "81ccddb5.3e1b1",
+        "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": 5948,
+        "y": 1122,
+        "z": "bc289cb4.31b288",
+        "wires": []
+    },
+    {
+        "id": "37e160ea.8f86d8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5932.38232421875,
+        "y": 1061.6556701660156,
+        "z": "bc289cb4.31b288",
+        "wires": [
+            [
+                "4cbb09e8.a29488"
+            ]
+        ]
+    },
+    {
+        "id": "4cbb09e8.a29488",
+        "type": "set",
+        "name": "set controller domainG data",
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
+        "comments": "",
+        "x": 6147,
+        "y": 1058,
+        "z": "bc289cb4.31b288",
+        "wires": []
+    },
+    {
+        "id": "28d376a3.473102",
+        "type": "comment",
+        "name": "both src and dst exist",
+        "info": "",
+        "comments": "",
+        "x": 3921,
+        "y": 999,
+        "z": "bc289cb4.31b288",
         "wires": []
     }
 ]
\ 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-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 8c72d0c8..b1d61faf 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "187a8cd0.b6793b",
+        "id": "df3491bc.625428",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 144,
-        "y": 132,
-        "z": "4d37a11.42c136",
+        "x": 128,
+        "y": 113,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "5ea5ad17.ee4964"
+                "f93a4fe6.087538"
             ]
         ]
     },
     {
-        "id": "5ea5ad17.ee4964",
+        "id": "f93a4fe6.087538",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,3569 +22,5632 @@
         "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": 428.2856903076172,
-        "y": 193.23810863494873,
-        "z": "4d37a11.42c136",
+        "x": 412.2856903076172,
+        "y": 174.23810863494873,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "9dad8fbc.f24f98"
+                "3a78d95d.5e3c5e"
             ]
         ]
     },
     {
-        "id": "9dad8fbc.f24f98",
+        "id": "3a78d95d.5e3c5e",
         "type": "method",
         "name": "method tsli-vnf-topology-operation-trans-slice-allocate",
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-allocate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 434.42860412597656,
-        "y": 278.0000305175781,
-        "z": "4d37a11.42c136",
+        "x": 418.42860412597656,
+        "y": 259.0000305175781,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "ca46cddf.f67038"
+                "35ecb5b7.3f1b02"
             ]
         ]
     },
     {
-        "id": "ca46cddf.f67038",
+        "id": "35ecb5b7.3f1b02",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 804.238037109375,
-        "y": 302.66668701171875,
-        "z": "4d37a11.42c136",
+        "x": 788.238037109375,
+        "y": 283.66668701171875,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "506e7f5c.19244",
-                "7c740453.8a159c",
-                "ac58016f.1c2c1"
+                "a99ea7b2.f5e618",
+                "183025fe.418fa2",
+                "d352d101.d008a8"
             ]
         ]
     },
     {
-        "id": "506e7f5c.19244",
+        "id": "a99ea7b2.f5e618",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 1105.571533203125,
-        "y": 573.5969848632812,
-        "z": "4d37a11.42c136",
+        "x": 1089.571533203125,
+        "y": 554.5969848632812,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "7c740453.8a159c",
+        "id": "183025fe.418fa2",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",
         "comments": "",
         "outputs": 1,
-        "x": 1127,
-        "y": 276,
-        "z": "4d37a11.42c136",
+        "x": 1111,
+        "y": 257,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "78f50d5a.2a0cec",
-                "c34c58a5.11a148",
-                "f82c0a42.39fea8"
+                "47f816cc.c0286",
+                "318d2442.efdd34",
+                "4265fd48.9eb024"
             ]
         ]
     },
     {
-        "id": "78f50d5a.2a0cec",
+        "id": "47f816cc.c0286",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1352,
-        "y": 134,
-        "z": "4d37a11.42c136",
+        "x": 1336,
+        "y": 115,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "dfc9a5db.996c4"
+                "6fd78e9c.961b2"
             ]
         ]
     },
     {
-        "id": "c34c58a5.11a148",
+        "id": "318d2442.efdd34",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1347.490966796875,
-        "y": 203.57403564453125,
-        "z": "4d37a11.42c136",
+        "x": 1331.490966796875,
+        "y": 184.57403564453125,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "5383933.3cbeeec"
+                "aa8b68cf.4936c"
             ]
         ]
     },
     {
-        "id": "f82c0a42.39fea8",
+        "id": "4265fd48.9eb024",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1336,
-        "y": 250,
-        "z": "4d37a11.42c136",
+        "x": 1320,
+        "y": 231,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "3912b121.be04f6"
+                "ea9381a6.8a9938"
             ]
         ]
     },
     {
-        "id": "dfc9a5db.996c4",
+        "id": "6fd78e9c.961b2",
         "type": "switchNode",
         "name": "switch allotted-resources_length != 0",
         "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1591,
-        "y": 131,
-        "z": "4d37a11.42c136",
+        "x": 1575,
+        "y": 112,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "fea7170c.7030f8",
-                "8bbb818c.845db"
+                "a9515923.c68db8",
+                "3b6a0136.f8dee6"
             ]
         ]
     },
     {
-        "id": "5383933.3cbeeec",
+        "id": "aa8b68cf.4936c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1501.0623779296875,
-        "y": 206.85977172851562,
-        "z": "4d37a11.42c136",
+        "x": 1485.0623779296875,
+        "y": 187.85977172851562,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "3912b121.be04f6",
+        "id": "ea9381a6.8a9938",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1505,
-        "y": 251,
-        "z": "4d37a11.42c136",
+        "x": 1489,
+        "y": 232,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "fea7170c.7030f8",
+        "id": "a9515923.c68db8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1804,
-        "y": 155,
-        "z": "4d37a11.42c136",
+        "x": 1788,
+        "y": 136,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "bf993d83.a36c8"
+                "8d77a4c9.47348"
             ]
         ]
     },
     {
-        "id": "8bbb818c.845db",
+        "id": "3b6a0136.f8dee6",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1806,
-        "y": 95,
-        "z": "4d37a11.42c136",
+        "x": 1790,
+        "y": 76,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "f5ddac6.6343fd",
+        "id": "2b9472b2.e91dbe",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 1106,
-        "y": 164,
-        "z": "4d37a11.42c136",
+        "x": 1090,
+        "y": 145,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "bf993d83.a36c8",
+        "id": "8d77a4c9.47348",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1789,
-        "y": 243,
-        "z": "4d37a11.42c136",
+        "x": 1773,
+        "y": 224,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "23c06925.0d2eb6",
-                "a5814717.4b953",
-                "39b144a2.fc3a7c"
+                "2dfd81e1.a251ae",
+                "bc1d9c19.8a817",
+                "d0adb7e4.435f98",
+                "bf30e0be.23b998"
             ]
         ]
     },
     {
-        "id": "50cd8b4c.3fbe34",
+        "id": "4b515bec.7b07fc",
         "type": "set",
         "name": "set network-route-A",
         "xml": "<set>\n<!--<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
         "comments": "",
-        "x": 2652,
-        "y": 843,
-        "z": "4d37a11.42c136",
+        "x": 2636,
+        "y": 824,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "4f854478.eff1a4",
+        "id": "1fb3da4d.f9823e",
         "type": "set",
         "name": "set network-route-B",
         "xml": "<set>\n<parameter name='network-route-B' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
         "comments": "",
-        "x": 2653,
-        "y": 898,
-        "z": "4d37a11.42c136",
+        "x": 2637,
+        "y": 879,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "78e29884.225c08",
+        "id": "1fed210d.6adb97",
         "type": "save",
         "name": "get allotted-resource from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2275,
-        "y": 294,
-        "z": "4d37a11.42c136",
+        "x": 2259,
+        "y": 275,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "e80669a1.e9e15",
-                "2a720603.9816ea",
-                "13ab43c3.0c3b8c"
+                "1d390c60.f37264",
+                "828d1344.2eeb18",
+                "35c0fff4.63034"
             ]
         ]
     },
     {
-        "id": "e80669a1.e9e15",
+        "id": "1d390c60.f37264",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2491,
-        "y": 361,
-        "z": "4d37a11.42c136",
+        "x": 2475,
+        "y": 342,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "14dca185.e1b46e"
+                "1dfc0585.305702"
             ]
         ]
     },
     {
-        "id": "2a720603.9816ea",
+        "id": "828d1344.2eeb18",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2491.490966796875,
-        "y": 260.573974609375,
-        "z": "4d37a11.42c136",
+        "x": 2475.490966796875,
+        "y": 241.573974609375,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "e741b978.cc2c38"
+                "899f4256.fc61"
             ]
         ]
     },
     {
-        "id": "13ab43c3.0c3b8c",
+        "id": "35c0fff4.63034",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2487,
-        "y": 310,
-        "z": "4d37a11.42c136",
+        "x": 2471,
+        "y": 291,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "b16bf403.baad58"
+                "5b10d117.cfe6d8"
             ]
         ]
     },
     {
-        "id": "e741b978.cc2c38",
+        "id": "899f4256.fc61",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2669.0625,
-        "y": 260.8597412109375,
-        "z": "4d37a11.42c136",
+        "x": 2653.0625,
+        "y": 241.8597412109375,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "b16bf403.baad58",
+        "id": "5b10d117.cfe6d8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2669,
-        "y": 310,
-        "z": "4d37a11.42c136",
+        "x": 2653,
+        "y": 291,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "6e843ab.3582ec4",
+        "id": "e459bf6d.9da9d8",
         "type": "save",
         "name": "get logical-link from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
         "comments": "",
         "outputs": 1,
-        "x": 2010,
-        "y": 783,
-        "z": "4d37a11.42c136",
+        "x": 1994,
+        "y": 764,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "4070a4d0.4176d4",
-                "60c71e39.2f942",
-                "a6a55952.b90f"
+                "f5d3816e.ab2828",
+                "4956f23f.0bb47c",
+                "fe0f59f6.d97868"
             ]
         ]
     },
     {
-        "id": "4070a4d0.4176d4",
+        "id": "f5d3816e.ab2828",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2301.490966796875,
-        "y": 761.573974609375,
-        "z": "4d37a11.42c136",
+        "x": 2285.490966796875,
+        "y": 742.573974609375,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "77c211be.bc11e8"
+                "9822556a.f611a"
             ]
         ]
     },
     {
-        "id": "60c71e39.2f942",
+        "id": "4956f23f.0bb47c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2290,
-        "y": 806,
-        "z": "4d37a11.42c136",
+        "x": 2274,
+        "y": 787,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "fbd7810f.a3734"
+                "6c100a4d.9d821c"
             ]
         ]
     },
     {
-        "id": "77c211be.bc11e8",
+        "id": "9822556a.f611a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2450.0625,
-        "y": 761.8597412109375,
-        "z": "4d37a11.42c136",
+        "x": 2434.0625,
+        "y": 742.8597412109375,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "fbd7810f.a3734",
+        "id": "6c100a4d.9d821c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2449,
-        "y": 806,
-        "z": "4d37a11.42c136",
+        "x": 2433,
+        "y": 787,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "a6a55952.b90f",
+        "id": "fe0f59f6.d97868",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2297,
-        "y": 885,
-        "z": "4d37a11.42c136",
+        "x": 2281,
+        "y": 866,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "22d259e0.d6e2e6"
+                "6d1afb47.ab3814"
             ]
         ]
     },
     {
-        "id": "22d259e0.d6e2e6",
+        "id": "6d1afb47.ab3814",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2436,
-        "y": 885,
-        "z": "4d37a11.42c136",
+        "x": 2420,
+        "y": 866,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "50cd8b4c.3fbe34",
-                "4f854478.eff1a4",
-                "14a4c097.be654f",
-                "644a5f8e.b0774",
-                "79e86730.1965c8",
-                "4f1b84d7.aafb5c",
-                "7ca2c5af.473d34",
-                "28a40435.4178ec",
-                "b46ca414.99697",
-                "57fdafb2.9eec08",
-                "260f00b5.585908",
-                "134248ca.e0fa77",
-                "fc2a7bf0.e878b",
-                "84749d0f.3038c8",
-                "21292318.735edc",
-                "ce066c5d.e7734",
-                "e927f664.5c872",
-                "29397b6c.248454",
-                "c19c2198.0de5c",
-                "488403ee.0379ac"
+                "4b515bec.7b07fc",
+                "1fb3da4d.f9823e",
+                "97eccb48.84f6c",
+                "c57ab47a.d333d8",
+                "10cbf4f3.49fe3b",
+                "49d3005f.62282",
+                "15e0419f.a2cb36",
+                "e6402796.6c8a4",
+                "1f03402a.5db7",
+                "56710693.e24068",
+                "84b0870f.4db1e",
+                "3323f682.f60c3a",
+                "13ac3dbd.1f366a"
             ]
         ]
     },
     {
-        "id": "14a4c097.be654f",
+        "id": "97eccb48.84f6c",
         "type": "save",
         "name": "get network-route-A from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-A'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-A\">",
         "comments": "",
         "outputs": 1,
-        "x": 2665,
-        "y": 966,
-        "z": "4d37a11.42c136",
+        "x": 2649,
+        "y": 947,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "7df96ca0.99ecc4",
-                "50b0a0cb.3236a8",
-                "a3437ac7.e0ee1"
+                "8c8a4891.ac867",
+                "8506ad3d.b7e4c",
+                "a3b6635c.c539f8"
             ]
         ]
     },
     {
-        "id": "644a5f8e.b0774",
+        "id": "c57ab47a.d333d8",
         "type": "save",
         "name": "get network-route-B from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-B'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-B\">",
         "comments": "",
         "outputs": 1,
-        "x": 2644,
-        "y": 1567.9998779296875,
-        "z": "4d37a11.42c136",
+        "x": 2628,
+        "y": 1548.9998779296875,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "ece670c3.4f34a8",
-                "263c76fe.5b3242",
-                "97139121.0331f8"
+                "506562cd.b8f74c",
+                "8d73f82f.8988f8",
+                "24728d1d.df92ba"
             ]
         ]
     },
     {
-        "id": "7df96ca0.99ecc4",
+        "id": "8c8a4891.ac867",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2866,
-        "y": 850,
-        "z": "4d37a11.42c136",
+        "x": 2850,
+        "y": 831,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "a6fc1138.23945"
+                "40f9d3c1.86e1ec"
             ]
         ]
     },
     {
-        "id": "50b0a0cb.3236a8",
+        "id": "8506ad3d.b7e4c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2861.509033203125,
-        "y": 899.426025390625,
-        "z": "4d37a11.42c136",
+        "x": 2845.509033203125,
+        "y": 880.426025390625,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "6e6d0210.60f404"
+                "6f975963.47cb7"
             ]
         ]
     },
     {
-        "id": "a3437ac7.e0ee1",
+        "id": "a3b6635c.c539f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2865.509033203125,
-        "y": 950.426025390625,
-        "z": "4d37a11.42c136",
+        "x": 2849.509033203125,
+        "y": 931.426025390625,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "d860cdb2.412c48"
+                "61bb235e.2775f4"
             ]
         ]
     },
     {
-        "id": "a6fc1138.23945",
+        "id": "40f9d3c1.86e1ec",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3014.571533203125,
-        "y": 849.2857666015625,
-        "z": "4d37a11.42c136",
+        "x": 2998.571533203125,
+        "y": 830.2857666015625,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "6e6d0210.60f404",
+        "id": "6f975963.47cb7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3004.509033203125,
-        "y": 899.426025390625,
-        "z": "4d37a11.42c136",
+        "x": 2988.509033203125,
+        "y": 880.426025390625,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "ece670c3.4f34a8",
+        "id": "506562cd.b8f74c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2867,
-        "y": 1537.9998779296875,
-        "z": "4d37a11.42c136",
+        "x": 2851,
+        "y": 1518.9998779296875,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "f4c07ea8.414868"
+                "7f769faa.864248"
             ]
         ]
     },
     {
-        "id": "263c76fe.5b3242",
+        "id": "8d73f82f.8988f8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2862.509033203125,
-        "y": 1587.4259033203125,
-        "z": "4d37a11.42c136",
+        "x": 2846.509033203125,
+        "y": 1568.4259033203125,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "ce13d349.caf3b8"
+                "cc9ee8f2.77fda8"
             ]
         ]
     },
     {
-        "id": "97139121.0331f8",
+        "id": "24728d1d.df92ba",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2866.509033203125,
-        "y": 1638.4259033203125,
-        "z": "4d37a11.42c136",
+        "x": 2850.509033203125,
+        "y": 1619.4259033203125,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "d30e3d8d.09cef8"
+                "8a29f509.d58fe8"
             ]
         ]
     },
     {
-        "id": "f4c07ea8.414868",
+        "id": "7f769faa.864248",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3015.571533203125,
-        "y": 1537.28564453125,
-        "z": "4d37a11.42c136",
+        "x": 2999.571533203125,
+        "y": 1518.28564453125,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "ce13d349.caf3b8",
+        "id": "cc9ee8f2.77fda8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3005.509033203125,
-        "y": 1587.4259033203125,
-        "z": "4d37a11.42c136",
+        "x": 2989.509033203125,
+        "y": 1568.4259033203125,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "e31af50c.926d2",
+        "id": "b720785b.7c7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3679.66650390625,
-        "y": 994,
-        "z": "4d37a11.42c136",
+        "x": 3663.66650390625,
+        "y": 975,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "c203b1ea.86f6c",
-                "d4cb3bd3.a349c8",
-                "5d25d92f.6f798",
-                "a5aee8f6.ab5e58",
-                "c830d981.aee038"
+                "f3775fbc.163688",
+                "77e2870c.e28a38",
+                "ac8bf04e.ff247",
+                "7c2c78d5.f4945",
+                "bb95643a.1dafd8"
             ]
         ]
     },
     {
-        "id": "b7824d8a.d2e4f8",
+        "id": "669f51ab.4dcf7",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3507,
-        "y": 995,
-        "z": "4d37a11.42c136",
+        "x": 3491,
+        "y": 976,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "e31af50c.926d2"
+                "b720785b.7c7"
             ]
         ]
     },
     {
-        "id": "5d5b9681.b7598",
+        "id": "bfa60b88.954ac8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3516.490966796875,
-        "y": 1037.5740356445312,
-        "z": "4d37a11.42c136",
+        "x": 3500.490966796875,
+        "y": 1018.5740356445312,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "4fc1bcc7.eeb784"
+                "f78f70ff.0f2c38"
             ]
         ]
     },
     {
-        "id": "6e8be76c.59d528",
+        "id": "83a912b8.5c33b",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3505,
-        "y": 1084,
-        "z": "4d37a11.42c136",
+        "x": 3489,
+        "y": 1065,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "ac4a57cf.bef8e8"
+                "d7142401.9476c"
             ]
         ]
     },
     {
-        "id": "4fc1bcc7.eeb784",
+        "id": "f78f70ff.0f2c38",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3670.0623779296875,
-        "y": 1040.8597717285156,
-        "z": "4d37a11.42c136",
+        "x": 3654.0623779296875,
+        "y": 1021.8597717285156,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "ac4a57cf.bef8e8",
+        "id": "d7142401.9476c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3674,
-        "y": 1085,
-        "z": "4d37a11.42c136",
+        "x": 3658,
+        "y": 1066,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "d860cdb2.412c48",
+        "id": "61bb235e.2775f4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3027,
-        "y": 952,
-        "z": "4d37a11.42c136",
+        "x": 3011,
+        "y": 933,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "62113903.77ec78",
-                "c9fe9947.c06348"
+                "4914fb6.031ad84",
+                "4835023e.e8e8cc"
             ]
         ]
     },
     {
-        "id": "d30e3d8d.09cef8",
+        "id": "8a29f509.d58fe8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3017,
-        "y": 1639.9998779296875,
-        "z": "4d37a11.42c136",
+        "x": 3001,
+        "y": 1620.9998779296875,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "4ecc6dae.def654",
-                "669a0eda.d8f578"
+                "33a198b5.ec1ae",
+                "684cf1ab.a79f48"
             ]
         ]
     },
     {
-        "id": "a1006da4.a872e",
+        "id": "d9ace0a0.b4a76",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3647.66650390625,
-        "y": 1830,
-        "z": "4d37a11.42c136",
+        "x": 3631.66650390625,
+        "y": 1811,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "a3aca2eb.21f5a8",
-                "d3723bfd.d9b168",
-                "d3c0c42f.4b437",
-                "2512774e.7c83b8",
-                "d281a70f.336618"
+                "a2003991.03fd4",
+                "52dfb8b2.652278",
+                "22f952b9.882086",
+                "eb4dde28.2b2138",
+                "60f3b421.08732c"
             ]
         ]
     },
     {
-        "id": "c9dbe459.2e8d58",
+        "id": "cc45c64e.73066",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3475,
-        "y": 1831,
-        "z": "4d37a11.42c136",
+        "x": 3459,
+        "y": 1812,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "a1006da4.a872e"
+                "d9ace0a0.b4a76"
             ]
         ]
     },
     {
-        "id": "dab2f9a8.cea26",
+        "id": "33759aa.996c566",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3484.490966796875,
-        "y": 1873.5740356445312,
-        "z": "4d37a11.42c136",
+        "x": 3468.490966796875,
+        "y": 1854.5740356445312,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "6f793776.f883f"
+                "28b2902a.f0c46"
             ]
         ]
     },
     {
-        "id": "f5d094cc.fe5d68",
+        "id": "fff61c46.59cf58",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3473,
-        "y": 1920,
-        "z": "4d37a11.42c136",
+        "x": 3457,
+        "y": 1901,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "f383fe68.3b83"
+                "c4e6ae73.bdead"
             ]
         ]
     },
     {
-        "id": "6f793776.f883f",
+        "id": "28b2902a.f0c46",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3638.0623779296875,
-        "y": 1876.8597717285156,
-        "z": "4d37a11.42c136",
+        "x": 3622.0623779296875,
+        "y": 1857.8597717285156,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "f383fe68.3b83",
+        "id": "c4e6ae73.bdead",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3642,
-        "y": 1921,
-        "z": "4d37a11.42c136",
+        "x": 3626,
+        "y": 1902,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "c203b1ea.86f6c",
+        "id": "f3775fbc.163688",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3944,
-        "y": 978,
-        "z": "4d37a11.42c136",
+        "x": 3928,
+        "y": 959,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "6fb08f41.de4d4",
-                "183e3f66.48a0d1"
+                "17df8b10.734cad",
+                "e9e72181.7c2d78"
             ]
         ]
     },
     {
-        "id": "183e3f66.48a0d1",
+        "id": "e9e72181.7c2d78",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4167,
-        "y": 933,
-        "z": "4d37a11.42c136",
+        "x": 4151,
+        "y": 914,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "e55834d1.3ca1b8"
+                "c8b8d5f9.b22ca8"
             ]
         ]
     },
     {
-        "id": "6fb08f41.de4d4",
+        "id": "17df8b10.734cad",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4169,
-        "y": 997,
-        "z": "4d37a11.42c136",
+        "x": 4153,
+        "y": 978,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "f45e344f.88a748"
+                "59177303.95ce1c"
             ]
         ]
     },
     {
-        "id": "5bf466f.7bcdb98",
+        "id": "e95ea736.29045",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
         "comments": "",
-        "x": 4502,
-        "y": 888,
-        "z": "4d37a11.42c136",
+        "x": 4486,
+        "y": 869,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "f45e344f.88a748",
+        "id": "59177303.95ce1c",
         "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": 4331,
-        "y": 993,
-        "z": "4d37a11.42c136",
+        "x": 4315,
+        "y": 974,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "e55834d1.3ca1b8",
+        "id": "c8b8d5f9.b22ca8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4332,
-        "y": 930,
-        "z": "4d37a11.42c136",
+        "x": 4316,
+        "y": 911,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "194d0d3d.11557b",
-                "5bf466f.7bcdb98"
+                "f09148e0.5a878",
+                "e95ea736.29045"
             ]
         ]
     },
     {
-        "id": "194d0d3d.11557b",
+        "id": "f09148e0.5a878",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",
         "comments": "",
-        "x": 4503,
-        "y": 996,
-        "z": "4d37a11.42c136",
+        "x": 4487,
+        "y": 977,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "dd1a9ea9.6d631",
+        "id": "2c408fec.1a81a",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 4504,
-        "y": 945,
-        "z": "4d37a11.42c136",
+        "x": 4488,
+        "y": 926,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "5d25d92f.6f798",
+        "id": "ac8bf04e.ff247",
         "type": "save",
         "name": "save connectivity resource in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$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": 3946,
-        "y": 1137,
-        "z": "4d37a11.42c136",
+        "x": 3930,
+        "y": 1118,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "d4cb3bd3.a349c8",
+        "id": "77e2870c.e28a38",
         "type": "execute",
         "name": "execute UUID generator for connectivity domainA",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3991,
-        "y": 1047,
-        "z": "4d37a11.42c136",
+        "x": 3975,
+        "y": 1028,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "6324b9d6.c58fe",
+        "id": "936488c4.d6b8e",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",
         "comments": "",
-        "x": 3880,
-        "y": 1088,
-        "z": "4d37a11.42c136",
+        "x": 3864,
+        "y": 1069,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "a3aca2eb.21f5a8",
+        "id": "a2003991.03fd4",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3934,
-        "y": 1834.0001220703125,
-        "z": "4d37a11.42c136",
+        "x": 3918,
+        "y": 1815.0001220703125,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "37186f70.3d57",
-                "4ffb9846.2cd768"
+                "f2d8cb03.1eed48",
+                "6e32cf18.31944"
             ]
         ]
     },
     {
-        "id": "4ffb9846.2cd768",
+        "id": "6e32cf18.31944",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4157,
-        "y": 1789.0001220703125,
-        "z": "4d37a11.42c136",
+        "x": 4141,
+        "y": 1770.0001220703125,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "17371f4a.955d61"
+                "201ffc86.8db20c"
             ]
         ]
     },
     {
-        "id": "37186f70.3d57",
+        "id": "f2d8cb03.1eed48",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4159,
-        "y": 1853.0001220703125,
-        "z": "4d37a11.42c136",
+        "x": 4143,
+        "y": 1834.0001220703125,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "1981566c.49d212"
+                "b29b2d4c.c3046"
             ]
         ]
     },
     {
-        "id": "17f707eb.a2a908",
+        "id": "2386e717.060b18",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
         "comments": "",
-        "x": 4492,
-        "y": 1747.0001220703125,
-        "z": "4d37a11.42c136",
+        "x": 4476,
+        "y": 1728.0001220703125,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "1981566c.49d212",
+        "id": "b29b2d4c.c3046",
         "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": 4318,
-        "y": 1872.0001220703125,
-        "z": "4d37a11.42c136",
+        "x": 4302,
+        "y": 1853.0001220703125,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "17371f4a.955d61",
+        "id": "201ffc86.8db20c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4322,
-        "y": 1786.0001220703125,
-        "z": "4d37a11.42c136",
+        "x": 4306,
+        "y": 1767.0001220703125,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "17f707eb.a2a908",
-                "ca2d1022.cf4e88"
+                "2386e717.060b18",
+                "c71df80d.cfbb08"
             ]
         ]
     },
     {
-        "id": "ca2d1022.cf4e88",
+        "id": "c71df80d.cfbb08",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
         "comments": "",
-        "x": 4493,
-        "y": 1852.0001220703125,
-        "z": "4d37a11.42c136",
+        "x": 4477,
+        "y": 1833.0001220703125,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "8cfd8f17.95a8e",
+        "id": "e385afea.eec45",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 4488,
-        "y": 1801.0001220703125,
-        "z": "4d37a11.42c136",
+        "x": 4472,
+        "y": 1782.0001220703125,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "d3c0c42f.4b437",
+        "id": "22f952b9.882086",
         "type": "save",
         "name": "save connectivity resource in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n\n<parameter name='bandwidth-profile-name' value='`$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": 3936,
-        "y": 1993.0001220703125,
-        "z": "4d37a11.42c136",
+        "x": 3920,
+        "y": 1974.0001220703125,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "d3723bfd.d9b168",
+        "id": "52dfb8b2.652278",
         "type": "execute",
         "name": "execute UUID generator for connectivity domainB",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3981,
-        "y": 1903.0001220703125,
-        "z": "4d37a11.42c136",
+        "x": 3965,
+        "y": 1884.0001220703125,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "1765f0ec.e922ff",
+        "id": "4961c905.9d4bb",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",
         "comments": "",
-        "x": 3870,
-        "y": 1941.0001220703125,
-        "z": "4d37a11.42c136",
+        "x": 3854,
+        "y": 1922.0001220703125,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "79e86730.1965c8",
+        "id": "10cbf4f3.49fe3b",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2845,
-        "y": 2068,
-        "z": "4d37a11.42c136",
+        "x": 2848,
+        "y": 2278,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "4f1b84d7.aafb5c",
+        "id": "49d3005f.62282",
         "type": "set",
         "name": "set attachment_param",
         "xml": "<set>\n<parameter name='prop.connection-attachment.access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='prop.connection-attachment.access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='prop.connection-attachment.access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='prop.connection-attachment.access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='prop.connection-attachment.access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n\n<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='prop.remote.connection-attachment.access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='prop.remote.connection-attachment.access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n\n<!--<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />-->\n",
         "comments": "",
-        "x": 2639,
-        "y": 1969,
-        "z": "4d37a11.42c136",
+        "x": 2642,
+        "y": 2179,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "3db83432.384b6c",
+        "id": "9f05df83.0d8378",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "put proper values for src topology-id, node-id, ltp-id, etc (in domain A)\nand dst topology-id, node-id, ltp-id, etc (in domain B)",
         "comments": "",
-        "x": 2613,
-        "y": 1922,
-        "z": "4d37a11.42c136",
+        "x": 2616,
+        "y": 2132,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "7ca2c5af.473d34",
+        "id": "65916227.3c1154",
         "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='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": 2721,
-        "y": 2227,
-        "z": "4d37a11.42c136",
+        "x": 2796,
+        "y": 2831,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "57191dce.959cfc"
+                "17bd32c6.c38a7d"
             ]
         ]
     },
     {
-        "id": "28a40435.4178ec",
+        "id": "fa5ee7b8.d80d3",
         "type": "save",
         "name": "save connectivity-A relationship to vpn-binding-A, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-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": 2724.5,
-        "y": 2297,
-        "z": "4d37a11.42c136",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "82428356.c63018",
-        "type": "save",
-        "name": "save srcLTP relationship in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3372.5,
-        "y": 2216,
-        "z": "4d37a11.42c136",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "356966b3.03f20a",
-        "type": "save",
-        "name": "save dstLTP relationship in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$dst-ltpId`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 3374.5,
-        "y": 2255,
-        "z": "4d37a11.42c136",
+        "x": 2787.5,
+        "y": 2880,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "a5aee8f6.ab5e58",
+        "id": "7c2c78d5.f4945",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 4074,
-        "y": 1185,
-        "z": "4d37a11.42c136",
+        "x": 4058,
+        "y": 1166,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "2512774e.7c83b8",
+        "id": "eb4dde28.2b2138",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 4063,
-        "y": 2058.0001220703125,
-        "z": "4d37a11.42c136",
+        "x": 4047,
+        "y": 2039.0001220703125,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "57191dce.959cfc",
+        "id": "17bd32c6.c38a7d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3021,
-        "y": 2234,
-        "z": "4d37a11.42c136",
+        "x": 3082,
+        "y": 2838,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "dcb72301.82c018"
+                "20a19a36.cfd0d6"
             ]
         ]
     },
     {
-        "id": "dcb72301.82c018",
+        "id": "20a19a36.cfd0d6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3161.500244140625,
-        "y": 2235.25390625,
-        "z": "4d37a11.42c136",
+        "x": 3222.500244140625,
+        "y": 2839.25390625,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "6975c99d.325498",
-        "type": "comment",
-        "name": "TODO: FIXME: do we need this relationship?",
-        "info": "",
-        "comments": "",
-        "x": 3409,
-        "y": 2175,
-        "z": "4d37a11.42c136",
-        "wires": []
-    },
-    {
-        "id": "e85b69e.5211998",
+        "id": "dba0a851.2f60f8",
         "type": "comment",
         "name": "TODO: FIXME: put proper values",
         "info": "",
         "comments": "",
-        "x": 2688,
-        "y": 2187,
-        "z": "4d37a11.42c136",
+        "x": 2718,
+        "y": 2777,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "b46ca414.99697",
+        "id": "cb2d65a2.90a53",
         "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='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": 2724,
-        "y": 2515,
-        "z": "4d37a11.42c136",
+        "x": 2786,
+        "y": 3121,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "e64b3d38.e980a"
+                "a71dc667.1e8b48"
             ]
         ]
     },
     {
-        "id": "58f4ff2f.89d75",
-        "type": "comment",
-        "name": "TODO: FIXME: do we need this relationship?",
-        "info": "",
-        "comments": "",
-        "x": 3412,
-        "y": 2455,
-        "z": "4d37a11.42c136",
-        "wires": []
-    },
-    {
-        "id": "cad39d05.aea5f",
-        "type": "save",
-        "name": "save srcLTP relationship in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3375.5,
-        "y": 2496,
-        "z": "4d37a11.42c136",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "489163b9.d640b4",
-        "type": "save",
-        "name": "save dstLTP relationship in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$dst-ltpId`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 3377.5,
-        "y": 2535,
-        "z": "4d37a11.42c136",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d0ea482.a9901b8",
+        "id": "c245f255.688bf",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3164.500244140625,
-        "y": 2515.25390625,
-        "z": "4d37a11.42c136",
+        "x": 3226.500244140625,
+        "y": 3121.25390625,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "e64b3d38.e980a",
+        "id": "a71dc667.1e8b48",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3024,
-        "y": 2514,
-        "z": "4d37a11.42c136",
+        "x": 3086,
+        "y": 3120,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "d0ea482.a9901b8"
+                "c245f255.688bf"
             ]
         ]
     },
     {
-        "id": "9cd3d1db.fb7ce8",
+        "id": "86719a40.1873b8",
         "type": "comment",
         "name": "TODO: FIXME: put proper values",
         "info": "",
         "comments": "",
-        "x": 2704,
-        "y": 2475,
-        "z": "4d37a11.42c136",
+        "x": 2712,
+        "y": 3073,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "57fdafb2.9eec08",
+        "id": "ca75e77c.cd7028",
         "type": "save",
         "name": "save connectivity-B relationship to vpn-binding-B, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-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": 2722.5,
-        "y": 2555,
-        "z": "4d37a11.42c136",
+        "x": 2784.5,
+        "y": 3161,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "aa4b663b.c9d06",
+        "id": "a23bd528.d58958",
         "type": "comment",
         "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": 2596,
-        "y": 2638,
-        "z": "4d37a11.42c136",
+        "x": 2593,
+        "y": 3241,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "fc2a7bf0.e878b",
+        "id": "15e0419f.a2cb36",
         "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='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": 2661,
-        "y": 2683,
-        "z": "4d37a11.42c136",
+        "x": 2658,
+        "y": 3286,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "2c916faf.da498",
+        "id": "2d08c6.2cc1e73a",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5118,
-        "y": 705,
-        "z": "4d37a11.42c136",
+        "x": 5102,
+        "y": 686,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "883ac008.74f89",
-                "6cf958ca.c3e4a8",
-                "e70b241a.97d7e8"
+                "fe7f5526.b757d",
+                "ace94fc7.113e6",
+                "42739782.dc6168"
             ]
         ]
     },
     {
-        "id": "14dca185.e1b46e",
+        "id": "1dfc0585.305702",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2671,
-        "y": 361,
-        "z": "4d37a11.42c136",
+        "x": 2655,
+        "y": 342,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "8a257359.8a7208"
+                "8622621b.5191"
             ]
         ]
     },
     {
-        "id": "e1ac55d9.d865b8",
+        "id": "7de95d04.4c5e84",
         "type": "outcome",
         "name": "logical-link",
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1601.0001220703125,
-        "y": 778.0001220703125,
-        "z": "4d37a11.42c136",
+        "x": 1585.0001220703125,
+        "y": 759.0001220703125,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "f6ec4c40.65362"
+                "38efe599.5c2462"
             ]
         ]
     },
     {
-        "id": "14b8fde.fcc1702",
+        "id": "a0ff94f7.a05cd8",
         "type": "switchNode",
         "name": "switch allotted-resource.relationship-list not empty",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2339,
-        "y": 484,
-        "z": "4d37a11.42c136",
+        "x": 2323,
+        "y": 465,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "e65ebebd.579d6",
-                "32fc4868.fa2b8"
+                "8055d128.93cf8",
+                "a4e55956.340f1"
             ]
         ]
     },
     {
-        "id": "32fc4868.fa2b8",
+        "id": "a4e55956.340f1",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2649,
-        "y": 491,
-        "z": "4d37a11.42c136",
+        "x": 2633,
+        "y": 472,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "e65ebebd.579d6",
+        "id": "8055d128.93cf8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2648,
-        "y": 545,
-        "z": "4d37a11.42c136",
+        "x": 2632,
+        "y": 526,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "c14b8719.903d8"
+                "33bd7ebe.34c502"
             ]
         ]
     },
     {
-        "id": "badc6972.d68008",
+        "id": "2ecd1033.1e79d8",
         "type": "set",
         "name": "set the current logical-link-name",
         "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
-        "x": 2021,
-        "y": 728,
-        "z": "4d37a11.42c136",
+        "x": 2005,
+        "y": 709,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "f6ec4c40.65362",
+        "id": "38efe599.5c2462",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1778,
-        "y": 771,
-        "z": "4d37a11.42c136",
+        "x": 1762,
+        "y": 752,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "badc6972.d68008",
-                "6e843ab.3582ec4"
+                "2ecd1033.1e79d8",
+                "e459bf6d.9da9d8"
             ]
         ]
     },
     {
-        "id": "76aa64b6.332a54",
+        "id": "f61b9c.2378ec68",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3207,
-        "y": 957,
-        "z": "4d37a11.42c136",
+        "x": 3191,
+        "y": 938,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "62113903.77ec78",
+        "id": "4914fb6.031ad84",
         "type": "save",
         "name": "get p-interface-src from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3250,
-        "y": 1022,
-        "z": "4d37a11.42c136",
+        "x": 3234,
+        "y": 1003,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "b7824d8a.d2e4f8",
-                "5d5b9681.b7598",
-                "6e8be76c.59d528"
+                "669f51ab.4dcf7",
+                "bfa60b88.954ac8",
+                "83a912b8.5c33b"
             ]
         ]
     },
     {
-        "id": "4ecc6dae.def654",
+        "id": "33a198b5.ec1ae",
         "type": "save",
         "name": "get p-interface-dst from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3247,
-        "y": 1866,
-        "z": "4d37a11.42c136",
+        "x": 3231,
+        "y": 1847,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "c9dbe459.2e8d58",
-                "dab2f9a8.cea26",
-                "f5d094cc.fe5d68"
+                "cc45c64e.73066",
+                "33759aa.996c566",
+                "fff61c46.59cf58"
             ]
         ]
     },
     {
-        "id": "6f6e53ed.b087ec",
+        "id": "13eb2671.9e12f2",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3208,
-        "y": 1810,
-        "z": "4d37a11.42c136",
+        "x": 3192,
+        "y": 1791,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "8a257359.8a7208",
+        "id": "8622621b.5191",
         "type": "save",
         "name": "get allotted-resource relationship from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2964,
-        "y": 308,
-        "z": "4d37a11.42c136",
+        "x": 2948,
+        "y": 289,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "8ea1434f.746858",
-                "f2d8ff7.3c8d5",
-                "a6d32e01.02e81"
+                "774c27b3.d5b958",
+                "314f18ee.d0e28",
+                "177a6858.e45f48"
             ]
         ]
     },
     {
-        "id": "f2d8ff7.3c8d5",
+        "id": "314f18ee.d0e28",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3237.490966796875,
-        "y": 200.573974609375,
-        "z": "4d37a11.42c136",
+        "x": 3221.490966796875,
+        "y": 181.573974609375,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "b85ff289.1649f"
+                "bf0d979c.0d6a2"
             ]
         ]
     },
     {
-        "id": "b85ff289.1649f",
+        "id": "bf0d979c.0d6a2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3415.0625,
-        "y": 200.8597412109375,
-        "z": "4d37a11.42c136",
+        "x": 3399.0625,
+        "y": 181.8597412109375,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "a6d32e01.02e81",
+        "id": "177a6858.e45f48",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3233,
-        "y": 250,
-        "z": "4d37a11.42c136",
+        "x": 3217,
+        "y": 231,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "381f7f5a.80d3f8"
+                "69e0c103.73f7e"
             ]
         ]
     },
     {
-        "id": "381f7f5a.80d3f8",
+        "id": "69e0c103.73f7e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3415,
-        "y": 250,
-        "z": "4d37a11.42c136",
+        "x": 3399,
+        "y": 231,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "8ea1434f.746858",
+        "id": "774c27b3.d5b958",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3237,
-        "y": 301,
-        "z": "4d37a11.42c136",
+        "x": 3221,
+        "y": 282,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "6ca45b0b.848dec"
+                "8d4f11e6.7da04"
             ]
         ]
     },
     {
-        "id": "6ca45b0b.848dec",
+        "id": "8d4f11e6.7da04",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3417,
-        "y": 301,
-        "z": "4d37a11.42c136",
+        "x": 3401,
+        "y": 282,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "14b8fde.fcc1702"
+                "a0ff94f7.a05cd8"
             ]
         ]
     },
     {
-        "id": "40603cb7.607bc4",
+        "id": "fe8ff063.6863b8",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2908,
-        "y": 525,
-        "z": "4d37a11.42c136",
+        "x": 2892,
+        "y": 506,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "4e667cbe.69222c"
+                "7f3884a8.055b2c"
             ]
         ]
     },
     {
-        "id": "4e667cbe.69222c",
+        "id": "7f3884a8.055b2c",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3188,
-        "y": 525,
-        "z": "4d37a11.42c136",
+        "x": 3172,
+        "y": 506,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "e1ac55d9.d865b8"
+                "7de95d04.4c5e84"
             ]
         ]
     },
     {
-        "id": "13452ae4.22e4ad",
+        "id": "5050eb58.e00ed4",
         "type": "outcome",
         "name": "network-policy",
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3393,
-        "y": 499,
-        "z": "4d37a11.42c136",
+        "x": 3377,
+        "y": 480,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "245f45af.4ae9da"
+                "9ce29b77.ad6fe8"
             ]
         ]
     },
     {
-        "id": "245f45af.4ae9da",
+        "id": "9ce29b77.ad6fe8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3569.9998779296875,
-        "y": 491.9998779296875,
-        "z": "4d37a11.42c136",
+        "x": 3553.9998779296875,
+        "y": 472.9998779296875,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "868607a4.e796b",
-                "3bdb9c7c.d6977c"
+                "e7ee0b09.87c5d8",
+                "7fe89152.e612e8"
             ]
         ]
     },
     {
-        "id": "868607a4.e796b",
+        "id": "e7ee0b09.87c5d8",
         "type": "set",
         "name": "set the 1st network-policy-id",
         "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
-        "x": 3812.9998779296875,
-        "y": 448.9998779296875,
-        "z": "4d37a11.42c136",
+        "x": 3796.9998779296875,
+        "y": 429.9998779296875,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "3bdb9c7c.d6977c",
+        "id": "7fe89152.e612e8",
         "type": "save",
         "name": "get network-policy from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",
         "comments": "",
         "outputs": 1,
-        "x": 3801.9998779296875,
-        "y": 503.9998779296875,
-        "z": "4d37a11.42c136",
+        "x": 3785.9998779296875,
+        "y": 484.9998779296875,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "11d90691.38b7b1",
-                "e5aaddec.aca59",
-                "6698da7a.77b3bc"
+                "64fb2208.a0a974",
+                "c3b9f4d3.aab1b8",
+                "f6aa84f.18621f8"
             ]
         ]
     },
     {
-        "id": "6698da7a.77b3bc",
+        "id": "f6aa84f.18621f8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4055,
-        "y": 390,
-        "z": "4d37a11.42c136",
+        "x": 4039,
+        "y": 371,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "e904e6fc.1061a"
+                "c20366f5.78311"
             ]
         ]
     },
     {
-        "id": "e904e6fc.1061a",
+        "id": "c20366f5.78311",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 4203.571533203125,
-        "y": 390.2857666015625,
-        "z": "4d37a11.42c136",
+        "x": 4187.571533203125,
+        "y": 371.2857666015625,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "4975bc8f.93ecdc",
+        "id": "a9aadb9.f22de28",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4202.509033203125,
-        "y": 434.426025390625,
-        "z": "4d37a11.42c136",
+        "x": 4186.509033203125,
+        "y": 415.426025390625,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "e5aaddec.aca59",
+        "id": "c3b9f4d3.aab1b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4043.509033203125,
-        "y": 434.426025390625,
-        "z": "4d37a11.42c136",
+        "x": 4027.509033203125,
+        "y": 415.426025390625,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "4975bc8f.93ecdc"
+                "a9aadb9.f22de28"
             ]
         ]
     },
     {
-        "id": "11d90691.38b7b1",
+        "id": "64fb2208.a0a974",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4050.509033203125,
-        "y": 513.426025390625,
-        "z": "4d37a11.42c136",
+        "x": 4034.509033203125,
+        "y": 494.426025390625,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "3b14af19.ae1128"
+                "7a83723d.cc96f4"
             ]
         ]
     },
     {
-        "id": "3b14af19.ae1128",
+        "id": "7a83723d.cc96f4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4189.509033203125,
-        "y": 513.426025390625,
-        "z": "4d37a11.42c136",
+        "x": 4173.509033203125,
+        "y": 494.426025390625,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "70ed97b5.dc1c9",
-                "c2e43483.a12bd"
+                "1f8d33e3.a771dc",
+                "420f3616.2f701"
             ]
         ]
     },
     {
-        "id": "70ed97b5.dc1c9",
+        "id": "1f8d33e3.a771dc",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
-        "x": 4395,
-        "y": 511,
-        "z": "4d37a11.42c136",
+        "x": 4379,
+        "y": 492,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "c9fe9947.c06348",
+        "id": "4835023e.e8e8cc",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3251,
-        "y": 692,
-        "z": "4d37a11.42c136",
+        "x": 3235,
+        "y": 673,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "78baed3e.c501f4",
-                "120f1ac.ca76ae5"
+                "eafc912d.cb0fe",
+                "14b2df73.02d4e1"
             ]
         ]
     },
     {
-        "id": "120f1ac.ca76ae5",
+        "id": "14b2df73.02d4e1",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3474,
-        "y": 678,
-        "z": "4d37a11.42c136",
+        "x": 3458,
+        "y": 659,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "40ab4c81.445cd4"
+                "bb352d17.34137"
             ]
         ]
     },
     {
-        "id": "78baed3e.c501f4",
+        "id": "eafc912d.cb0fe",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3476,
-        "y": 711,
-        "z": "4d37a11.42c136",
+        "x": 3460,
+        "y": 692,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "9d068c67.4598d"
+                "4040c9e2.8e3008"
             ]
         ]
     },
     {
-        "id": "9d068c67.4598d",
+        "id": "4040c9e2.8e3008",
         "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": 3619,
-        "y": 708,
-        "z": "4d37a11.42c136",
+        "x": 3603,
+        "y": 689,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "40ab4c81.445cd4",
+        "id": "bb352d17.34137",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3622,
-        "y": 671,
-        "z": "4d37a11.42c136",
+        "x": 3606,
+        "y": 652,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "e718de2c.ab002",
-                "68fbd6c1.ad0448"
+                "8f0d5ee9.6635d",
+                "300f312a.b253d6"
             ]
         ]
     },
     {
-        "id": "e718de2c.ab002",
+        "id": "8f0d5ee9.6635d",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 3784,
-        "y": 666,
-        "z": "4d37a11.42c136",
+        "x": 3768,
+        "y": 647,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "669a0eda.d8f578",
+        "id": "684cf1ab.a79f48",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3265,
-        "y": 1528.9998779296875,
-        "z": "4d37a11.42c136",
+        "x": 3249,
+        "y": 1509.9998779296875,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "3eeffc60.cab244",
-                "163d6add.444455"
+                "10ff0da4.16d4ea",
+                "55c5195b.3875c8"
             ]
         ]
     },
     {
-        "id": "163d6add.444455",
+        "id": "55c5195b.3875c8",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3488,
-        "y": 1514.9998779296875,
-        "z": "4d37a11.42c136",
+        "x": 3472,
+        "y": 1495.9998779296875,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "2e1531f5.2b244e"
+                "7202d26b.6dffec"
             ]
         ]
     },
     {
-        "id": "3eeffc60.cab244",
+        "id": "10ff0da4.16d4ea",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3490,
-        "y": 1547.9998779296875,
-        "z": "4d37a11.42c136",
+        "x": 3474,
+        "y": 1528.9998779296875,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "bb0d91d9.020e4"
+                "30474e74.e5639a"
             ]
         ]
     },
     {
-        "id": "bb0d91d9.020e4",
+        "id": "30474e74.e5639a",
         "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": 3633,
-        "y": 1544.9998779296875,
-        "z": "4d37a11.42c136",
+        "x": 3617,
+        "y": 1525.9998779296875,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "2e1531f5.2b244e",
+        "id": "7202d26b.6dffec",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3636,
-        "y": 1507.9998779296875,
-        "z": "4d37a11.42c136",
+        "x": 3620,
+        "y": 1488.9998779296875,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "dd9519ef.d4213",
-                "54817df4.67d484"
+                "885f2609.7cba58",
+                "e1d06713.adb0c8"
             ]
         ]
     },
     {
-        "id": "dd9519ef.d4213",
+        "id": "885f2609.7cba58",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 3830,
-        "y": 1511,
-        "z": "4d37a11.42c136",
+        "x": 3814,
+        "y": 1492,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "ac58016f.1c2c1",
+        "id": "d352d101.d008a8",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 1094,
-        "y": 216,
-        "z": "4d37a11.42c136",
+        "x": 1078,
+        "y": 197,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "260f00b5.585908",
+        "id": "5f8f79a5.68d88",
         "type": "execute",
         "name": "execute UUID generator for vpn-binding domainA",
         "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": 2727,
-        "y": 2149,
-        "z": "4d37a11.42c136",
+        "x": 2771,
+        "y": 2745,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "134248ca.e0fa77",
+        "id": "9fa3320.fe9395",
         "type": "execute",
         "name": "execute UUID generator for vpn-binding domainB",
         "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": 2725,
-        "y": 2437,
-        "z": "4d37a11.42c136",
+        "x": 2764,
+        "y": 3038,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "c830d981.aee038",
+        "id": "bb95643a.1dafd8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3898,
-        "y": 1262,
-        "z": "4d37a11.42c136",
+        "x": 3882,
+        "y": 1243,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "4f78d00a.39ba68"
+                "232e8f32.739b48"
             ]
         ]
     },
     {
-        "id": "4f78d00a.39ba68",
+        "id": "232e8f32.739b48",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4104,
-        "y": 1262,
-        "z": "4d37a11.42c136",
+        "x": 4088,
+        "y": 1243,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "489cbbcb.77186c"
+                "8bbe738e.7fafb"
             ]
         ]
     },
     {
-        "id": "489cbbcb.77186c",
+        "id": "8bbe738e.7fafb",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4319.28564453125,
-        "y": 1261.82177734375,
-        "z": "4d37a11.42c136",
+        "x": 4303.28564453125,
+        "y": 1242.82177734375,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "3bbad5a.8ec85aa"
+                "c3ad3464.e3237"
             ]
         ]
     },
     {
-        "id": "3bbad5a.8ec85aa",
+        "id": "c3ad3464.e3237",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4526.1171875,
-        "y": 1262.34033203125,
-        "z": "4d37a11.42c136",
+        "x": 4510.1171875,
+        "y": 1243.34033203125,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "cf0eeee3.8d6188",
-                "80da6c7c.bf9bc",
-                "4327bba4.ea16c4"
+                "f0158859.e44c4",
+                "1be7b379.0a0a35",
+                "bee0e07a.660808"
             ]
         ]
     },
     {
-        "id": "cf0eeee3.8d6188",
+        "id": "f0158859.e44c4",
         "type": "set",
         "name": "set source ttp-id",
         "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4741.1171875,
-        "y": 1224.34033203125,
-        "z": "4d37a11.42c136",
+        "x": 4725.1171875,
+        "y": 1205.34033203125,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "80da6c7c.bf9bc",
+        "id": "1be7b379.0a0a35",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4738.1171875,
-        "y": 1263.34033203125,
-        "z": "4d37a11.42c136",
+        "x": 4722.1171875,
+        "y": 1244.34033203125,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "54d57ef.0aa16"
+                "5d7ec3ca.e9fe2c"
             ]
         ]
     },
     {
-        "id": "4327bba4.ea16c4",
+        "id": "bee0e07a.660808",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4693.6171875,
-        "y": 1305.34033203125,
-        "z": "4d37a11.42c136",
+        "x": 4677.6171875,
+        "y": 1286.34033203125,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "54d57ef.0aa16",
+        "id": "5d7ec3ca.e9fe2c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4918.6171875,
-        "y": 1262.34033203125,
-        "z": "4d37a11.42c136",
+        "x": 4902.6171875,
+        "y": 1243.34033203125,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "136083ca.f8ed24"
+                "5c631dd4.8f5fbc"
             ]
         ]
     },
     {
-        "id": "136083ca.f8ed24",
+        "id": "5c631dd4.8f5fbc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5076.6171875,
-        "y": 1262.34033203125,
-        "z": "4d37a11.42c136",
+        "x": 5060.6171875,
+        "y": 1243.34033203125,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "43a5fa3.d0c2504"
+                "d5d5e908.7a8eb8"
             ]
         ]
     },
     {
-        "id": "43a5fa3.d0c2504",
+        "id": "d5d5e908.7a8eb8",
         "type": "set",
         "name": "set source tunnel tp ip",
         "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 5283.6171875,
-        "y": 1262.34033203125,
-        "z": "4d37a11.42c136",
+        "x": 5267.6171875,
+        "y": 1243.34033203125,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "d281a70f.336618",
+        "id": "60f3b421.08732c",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3895,
-        "y": 2131.0001220703125,
-        "z": "4d37a11.42c136",
+        "x": 3879,
+        "y": 2112.0001220703125,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "21553f06.14bad"
+                "715a89d.cfea178"
             ]
         ]
     },
     {
-        "id": "21553f06.14bad",
+        "id": "715a89d.cfea178",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4101,
-        "y": 2131.0001220703125,
-        "z": "4d37a11.42c136",
+        "x": 4085,
+        "y": 2112.0001220703125,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "d5a45fe2.8cbaf"
+                "977e3712.429b18"
             ]
         ]
     },
     {
-        "id": "d5a45fe2.8cbaf",
+        "id": "977e3712.429b18",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4316.28564453125,
-        "y": 2130.8218994140625,
-        "z": "4d37a11.42c136",
+        "x": 4300.28564453125,
+        "y": 2111.8218994140625,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "3432450f.73fd1a"
+                "2113d9ff.cdd31e"
             ]
         ]
     },
     {
-        "id": "3432450f.73fd1a",
+        "id": "2113d9ff.cdd31e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4523.1171875,
-        "y": 2131.3404541015625,
-        "z": "4d37a11.42c136",
+        "x": 4507.1171875,
+        "y": 2112.3404541015625,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "4d1b045c.8befb4",
-                "ff4bcdcd.b592",
-                "82369db7.8fbd4"
+                "3c92c59b.613ca2",
+                "193b4238.409d8e",
+                "b71c718.f135e1"
             ]
         ]
     },
     {
-        "id": "4d1b045c.8befb4",
+        "id": "3c92c59b.613ca2",
         "type": "set",
         "name": "set destination ttp-id",
         "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4738.1171875,
-        "y": 2093.3404541015625,
-        "z": "4d37a11.42c136",
+        "x": 4722.1171875,
+        "y": 2074.3404541015625,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "ff4bcdcd.b592",
+        "id": "193b4238.409d8e",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4735.1171875,
-        "y": 2132.3404541015625,
-        "z": "4d37a11.42c136",
+        "x": 4719.1171875,
+        "y": 2113.3404541015625,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "a8f23d1f.d221e8"
+                "df85928.81de67"
             ]
         ]
     },
     {
-        "id": "82369db7.8fbd4",
+        "id": "b71c718.f135e1",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4690.6171875,
-        "y": 2174.3404541015625,
-        "z": "4d37a11.42c136",
+        "x": 4674.6171875,
+        "y": 2155.3404541015625,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "a8f23d1f.d221e8",
+        "id": "df85928.81de67",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4915.6171875,
-        "y": 2131.3404541015625,
-        "z": "4d37a11.42c136",
+        "x": 4899.6171875,
+        "y": 2112.3404541015625,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "403d184.8f53468"
+                "8b1f9fde.337d98"
             ]
         ]
     },
     {
-        "id": "403d184.8f53468",
+        "id": "8b1f9fde.337d98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5073.6171875,
-        "y": 2131.3404541015625,
-        "z": "4d37a11.42c136",
+        "x": 5057.6171875,
+        "y": 2112.3404541015625,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "c7d0f697.2aea68"
+                "20d9b129.b72206"
             ]
         ]
     },
     {
-        "id": "c7d0f697.2aea68",
+        "id": "20d9b129.b72206",
         "type": "set",
         "name": "set destination tunnel tp ip",
         "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 5280.6171875,
-        "y": 2131.3404541015625,
-        "z": "4d37a11.42c136",
+        "x": 5264.6171875,
+        "y": 2112.3404541015625,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "84749d0f.3038c8",
+        "id": "e6402796.6c8a4",
         "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=\"`'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",
+        "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<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": 2656,
-        "y": 3058,
-        "z": "4d37a11.42c136",
+        "x": 2653,
+        "y": 3661,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "68fbd6c1.ad0448",
+        "id": "300f312a.b253d6",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3811,
-        "y": 738,
-        "z": "4d37a11.42c136",
+        "x": 3795,
+        "y": 719,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "69417d44.afb3fc",
-                "a15ac77e.798db8",
-                "3a89038d.704134"
+                "1c354309.a76ffd",
+                "950deba8.cc3e4",
+                "c2c16051.a906d8"
             ]
         ]
     },
     {
-        "id": "69417d44.afb3fc",
+        "id": "1c354309.a76ffd",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4006.5001220703125,
-        "y": 690,
-        "z": "4d37a11.42c136",
+        "x": 3990.5001220703125,
+        "y": 671,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "138b37c3.968d8"
+                "d41af0c3.594838"
             ]
         ]
     },
     {
-        "id": "a15ac77e.798db8",
+        "id": "950deba8.cc3e4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3998.5001220703125,
-        "y": 745,
-        "z": "4d37a11.42c136",
+        "x": 3982.5001220703125,
+        "y": 726,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "5742f10e.dadab8"
+                "3d15fff1.053cf"
             ]
         ]
     },
     {
-        "id": "3a89038d.704134",
+        "id": "c2c16051.a906d8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4003.5001220703125,
-        "y": 802,
-        "z": "4d37a11.42c136",
+        "x": 3987.5001220703125,
+        "y": 783,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "56dfcb3e.f8e3ac"
+                "d7ef8f23.d036"
             ]
         ]
     },
     {
-        "id": "56dfcb3e.f8e3ac",
+        "id": "d7ef8f23.d036",
         "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": 4155.5001220703125,
-        "y": 803,
-        "z": "4d37a11.42c136",
+        "x": 4139.5001220703125,
+        "y": 784,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "5742f10e.dadab8",
+        "id": "3d15fff1.053cf",
         "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": 4166.5001220703125,
-        "y": 748,
-        "z": "4d37a11.42c136",
+        "x": 4150.5001220703125,
+        "y": 729,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "138b37c3.968d8",
+        "id": "d41af0c3.594838",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4150.8824462890625,
-        "y": 687.6556701660156,
-        "z": "4d37a11.42c136",
+        "x": 4134.8824462890625,
+        "y": 668.6556701660156,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "b4d80ee.d93167"
+                "b45d0128.680c8"
             ]
         ]
     },
     {
-        "id": "40dc3d01.0cfddc",
+        "id": "7cb8afd4.8d20b8",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4733,
-        "y": 706,
-        "z": "4d37a11.42c136",
+        "x": 4717,
+        "y": 687,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "ce5ec787.25a25"
+                "47edc84c.808f88"
             ]
         ]
     },
     {
-        "id": "ce5ec787.25a25",
+        "id": "47edc84c.808f88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4910,
-        "y": 698,
-        "z": "4d37a11.42c136",
+        "x": 4894,
+        "y": 679,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "deda36.39eb45c8",
-                "2c916faf.da498"
+                "266ac25a.ea33a6",
+                "2d08c6.2cc1e73a"
             ]
         ]
     },
     {
-        "id": "b4d80ee.d93167",
+        "id": "b45d0128.680c8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4335,
-        "y": 702,
-        "z": "4d37a11.42c136",
+        "x": 4319,
+        "y": 683,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "83a731e6.aee9d8"
+                "4f9ef890.59c338"
             ]
         ]
     },
     {
-        "id": "83a731e6.aee9d8",
+        "id": "4f9ef890.59c338",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4530,
-        "y": 702,
-        "z": "4d37a11.42c136",
+        "x": 4514,
+        "y": 683,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "40dc3d01.0cfddc",
-                "556c2535.2cf6f4"
+                "7cb8afd4.8d20b8",
+                "212f425.c6d5fbe"
             ]
         ]
     },
     {
-        "id": "deda36.39eb45c8",
+        "id": "266ac25a.ea33a6",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainA id",
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5148,
-        "y": 653,
-        "z": "4d37a11.42c136",
+        "x": 5132,
+        "y": 634,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "883ac008.74f89",
+        "id": "fe7f5526.b757d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5328,
-        "y": 696,
-        "z": "4d37a11.42c136",
+        "x": 5312,
+        "y": 677,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "5bb6445.b0cb1bc"
+                "c4631195.e5511"
             ]
         ]
     },
     {
-        "id": "6cf958ca.c3e4a8",
+        "id": "ace94fc7.113e6",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5320,
-        "y": 751,
-        "z": "4d37a11.42c136",
+        "x": 5304,
+        "y": 732,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "f6420bc8.c6108"
+                "af8bf071.82c85"
             ]
         ]
     },
     {
-        "id": "e70b241a.97d7e8",
+        "id": "42739782.dc6168",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5325,
-        "y": 808,
-        "z": "4d37a11.42c136",
+        "x": 5309,
+        "y": 789,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "e90b6e53.2dc61"
+                "b1e33e76.6db9b"
             ]
         ]
     },
     {
-        "id": "e90b6e53.2dc61",
+        "id": "b1e33e76.6db9b",
         "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": 5477,
-        "y": 809,
-        "z": "4d37a11.42c136",
+        "x": 5461,
+        "y": 790,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "f6420bc8.c6108",
+        "id": "af8bf071.82c85",
         "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": 5488,
-        "y": 754,
-        "z": "4d37a11.42c136",
+        "x": 5472,
+        "y": 735,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "5bb6445.b0cb1bc",
+        "id": "c4631195.e5511",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5472.38232421875,
-        "y": 693.6556701660156,
-        "z": "4d37a11.42c136",
+        "x": 5456.38232421875,
+        "y": 674.6556701660156,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "36dcfa67.508606"
+                "4dcc9c46.887914"
             ]
         ]
     },
     {
-        "id": "36dcfa67.508606",
+        "id": "4dcc9c46.887914",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5687,
-        "y": 690,
-        "z": "4d37a11.42c136",
+        "x": 5671,
+        "y": 671,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "54817df4.67d484",
+        "id": "e1d06713.adb0c8",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3852,
-        "y": 1579,
-        "z": "4d37a11.42c136",
+        "x": 3836,
+        "y": 1560,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "12332a8b.1f458d",
-                "e70d4463.7fed78",
-                "9e28dd86.32b368"
+                "34f7d7e6.e7fa8",
+                "cb710953.72942",
+                "4c788e8d.e93588"
             ]
         ]
     },
     {
-        "id": "12332a8b.1f458d",
+        "id": "34f7d7e6.e7fa8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4047.5001220703125,
-        "y": 1531,
-        "z": "4d37a11.42c136",
+        "x": 4031.5001220703125,
+        "y": 1512,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "97851436.c0f798"
+                "fd0d1ee5.65b0f"
             ]
         ]
     },
     {
-        "id": "e70d4463.7fed78",
+        "id": "cb710953.72942",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4039.5001220703125,
-        "y": 1586,
-        "z": "4d37a11.42c136",
+        "x": 4023.5001220703125,
+        "y": 1567,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "9865196d.c10828"
+                "68639fde.fb4de8"
             ]
         ]
     },
     {
-        "id": "9e28dd86.32b368",
+        "id": "4c788e8d.e93588",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4044.5001220703125,
-        "y": 1643,
-        "z": "4d37a11.42c136",
+        "x": 4028.5001220703125,
+        "y": 1624,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "1636bf8.c7b9e41"
+                "ed57c904.1da5b"
             ]
         ]
     },
     {
-        "id": "1636bf8.c7b9e41",
+        "id": "ed57c904.1da5b",
         "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": 4196.5001220703125,
-        "y": 1644,
-        "z": "4d37a11.42c136",
+        "x": 4180.5001220703125,
+        "y": 1625,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "9865196d.c10828",
+        "id": "68639fde.fb4de8",
         "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": 4207.5001220703125,
-        "y": 1589,
-        "z": "4d37a11.42c136",
+        "x": 4191.5001220703125,
+        "y": 1570,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "97851436.c0f798",
+        "id": "fd0d1ee5.65b0f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4191.8824462890625,
-        "y": 1528.6556701660156,
-        "z": "4d37a11.42c136",
+        "x": 4175.8824462890625,
+        "y": 1509.6556701660156,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "601870d2.2269c8"
+                "2c890085.25e4f8"
             ]
         ]
     },
     {
-        "id": "358b8a93.9adabe",
+        "id": "b16b2c11.a7e9e",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4774,
-        "y": 1547,
-        "z": "4d37a11.42c136",
+        "x": 4758,
+        "y": 1528,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "f1454db6.8dcaf8"
+                "e2c7b2a2.534808"
             ]
         ]
     },
     {
-        "id": "f1454db6.8dcaf8",
+        "id": "e2c7b2a2.534808",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4951,
-        "y": 1539,
-        "z": "4d37a11.42c136",
+        "x": 4935,
+        "y": 1520,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "1806e2c2.14485d",
-                "8cb20d6f.760bf"
+                "8256d13e.acb508",
+                "e33af2d.2ed629"
             ]
         ]
     },
     {
-        "id": "601870d2.2269c8",
+        "id": "2c890085.25e4f8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4376,
-        "y": 1543,
-        "z": "4d37a11.42c136",
+        "x": 4360,
+        "y": 1524,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "4732f224.c95254"
+                "7ad873b6.5b0624"
             ]
         ]
     },
     {
-        "id": "4732f224.c95254",
+        "id": "7ad873b6.5b0624",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4571,
-        "y": 1543,
-        "z": "4d37a11.42c136",
+        "x": 4555,
+        "y": 1524,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "358b8a93.9adabe",
-                "3beefc43.434434"
+                "b16b2c11.a7e9e",
+                "ba30acec.499f9"
             ]
         ]
     },
     {
-        "id": "8cb20d6f.760bf",
+        "id": "e33af2d.2ed629",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5159,
-        "y": 1546,
-        "z": "4d37a11.42c136",
+        "x": 5143,
+        "y": 1527,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "c4071110.82806",
-                "ce108d7.ad4977",
-                "c040099f.13bbf8"
+                "dd2f9c6b.57f548",
+                "3b879379.c9bf84",
+                "13b1398c.3c465e"
             ]
         ]
     },
     {
-        "id": "1806e2c2.14485d",
+        "id": "8256d13e.acb508",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainB id",
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5189,
-        "y": 1494,
-        "z": "4d37a11.42c136",
+        "x": 5173,
+        "y": 1475,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "c4071110.82806",
+        "id": "dd2f9c6b.57f548",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5369,
-        "y": 1537,
-        "z": "4d37a11.42c136",
+        "x": 5353,
+        "y": 1518,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "c3f3513e.3d36c"
+                "56d2c260.edc91c"
             ]
         ]
     },
     {
-        "id": "ce108d7.ad4977",
+        "id": "3b879379.c9bf84",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5361,
-        "y": 1592,
-        "z": "4d37a11.42c136",
+        "x": 5345,
+        "y": 1573,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "98979539.818688"
+                "7449bea.eaa7fc"
             ]
         ]
     },
     {
-        "id": "c040099f.13bbf8",
+        "id": "13b1398c.3c465e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5366,
-        "y": 1649,
-        "z": "4d37a11.42c136",
+        "x": 5350,
+        "y": 1630,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "45d3d695.c0cf2"
+                "232c7315.841b1c"
             ]
         ]
     },
     {
-        "id": "45d3d695.c0cf2",
+        "id": "232c7315.841b1c",
         "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": 5518,
-        "y": 1650,
-        "z": "4d37a11.42c136",
+        "x": 5502,
+        "y": 1631,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "98979539.818688",
+        "id": "7449bea.eaa7fc",
         "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": 5529,
-        "y": 1595,
-        "z": "4d37a11.42c136",
+        "x": 5513,
+        "y": 1576,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "c3f3513e.3d36c",
+        "id": "56d2c260.edc91c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5513.38232421875,
-        "y": 1534.6556701660156,
-        "z": "4d37a11.42c136",
+        "x": 5497.38232421875,
+        "y": 1515.6556701660156,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "90464df.06ab9b"
+                "49d0cb53.31a39c"
             ]
         ]
     },
     {
-        "id": "90464df.06ab9b",
+        "id": "49d0cb53.31a39c",
         "type": "set",
         "name": "set controller domainB data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5728,
-        "y": 1531,
-        "z": "4d37a11.42c136",
+        "x": 5712,
+        "y": 1512,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "a5814717.4b953",
+        "id": "4197c53b.8564cc",
         "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-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": 1959,
-        "y": 2744,
-        "z": "4d37a11.42c136",
+        "x": 2006,
+        "y": 4699,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "2242c3cc.13b1dc",
-                "2c8586d6.b70122"
+                "70c04755.d69dd8",
+                "d409404c.9b0598"
             ]
         ]
     },
     {
-        "id": "2c8586d6.b70122",
+        "id": "d409404c.9b0598",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2242,
-        "y": 2724,
-        "z": "4d37a11.42c136",
+        "x": 2289,
+        "y": 4679,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "8e14b997.54e1b8"
+                "b37528b2.115b48"
             ]
         ]
     },
     {
-        "id": "2242c3cc.13b1dc",
+        "id": "70c04755.d69dd8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2243.000213623047,
-        "y": 2774.99990940094,
-        "z": "4d37a11.42c136",
+        "x": 2290.000213623047,
+        "y": 4729.99990940094,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "72bda37b.1b4f84"
+                "31bb8bbe.1ece2c"
             ]
         ]
     },
     {
-        "id": "8e14b997.54e1b8",
+        "id": "b37528b2.115b48",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing slice creation api for domain A\" />\n",
         "comments": "",
-        "x": 2382.0002479553223,
-        "y": 2724.0000009536743,
-        "z": "4d37a11.42c136",
+        "x": 2429.0002479553223,
+        "y": 4679.000000953674,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "72bda37b.1b4f84",
+        "id": "31bb8bbe.1ece2c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2388.02725982666,
-        "y": 2772.745394706726,
-        "z": "4d37a11.42c136",
+        "x": 2435.02725982666,
+        "y": 4727.745394706726,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "39b144a2.fc3a7c",
+        "id": "c751bc62.d2e9d8",
         "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-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": 1959,
-        "y": 3110,
-        "z": "4d37a11.42c136",
+        "x": 2002,
+        "y": 4868,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "23f4f16e.f2ab6e",
-                "8c667512.e5492"
+                "9cb98bdf.eb0c38",
+                "32bfa672.12903a"
             ]
         ]
     },
     {
-        "id": "8c667512.e5492",
+        "id": "32bfa672.12903a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2233,
-        "y": 3090,
-        "z": "4d37a11.42c136",
+        "x": 2276,
+        "y": 4848,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "1089012f.df48c7"
+                "b28dd680.86b978"
             ]
         ]
     },
     {
-        "id": "23f4f16e.f2ab6e",
+        "id": "9cb98bdf.eb0c38",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2234.000213623047,
-        "y": 3140.99990940094,
-        "z": "4d37a11.42c136",
+        "x": 2277.000213623047,
+        "y": 4898.99990940094,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "199cfc4b.ed097c"
+                "2765f5a8.5ab652"
             ]
         ]
     },
     {
-        "id": "1089012f.df48c7",
+        "id": "b28dd680.86b978",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing slice creation api for domain B\" />\n",
         "comments": "",
-        "x": 2373.0002479553223,
-        "y": 3090.0000009536743,
-        "z": "4d37a11.42c136",
+        "x": 2416.0002479553223,
+        "y": 4848.000000953674,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "199cfc4b.ed097c",
+        "id": "2765f5a8.5ab652",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2379.02725982666,
-        "y": 3138.745394706726,
-        "z": "4d37a11.42c136",
+        "x": 2422.02725982666,
+        "y": 4896.745394706726,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "c14b8719.903d8",
+        "id": "33bd7ebe.34c502",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2812,
-        "y": 471,
-        "z": "4d37a11.42c136",
+        "x": 2796,
+        "y": 452,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "40603cb7.607bc4",
-                "7f3f76ad.e04ac8"
+                "fe8ff063.6863b8",
+                "4e85bccf.c8cf0c"
             ]
         ]
     },
     {
-        "id": "7f3f76ad.e04ac8",
+        "id": "4e85bccf.c8cf0c",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3093,
-        "y": 427,
-        "z": "4d37a11.42c136",
+        "x": 3077,
+        "y": 408,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "31eeaed6.c9c2d2"
+                "badd7dbd.ce16"
             ]
         ]
     },
     {
-        "id": "31eeaed6.c9c2d2",
+        "id": "badd7dbd.ce16",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3355,
-        "y": 427,
-        "z": "4d37a11.42c136",
+        "x": 3339,
+        "y": 408,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "13452ae4.22e4ad"
+                "5050eb58.e00ed4"
             ]
         ]
     },
     {
-        "id": "556c2535.2cf6f4",
+        "id": "212f425.c6d5fbe",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4736,
-        "y": 780,
-        "z": "4d37a11.42c136",
+        "x": 4720,
+        "y": 761,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "8b677154.0c28b8"
+                "656d86d7.e1bb3"
             ]
         ]
     },
     {
-        "id": "8b677154.0c28b8",
+        "id": "656d86d7.e1bb3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4913,
-        "y": 772,
-        "z": "4d37a11.42c136",
+        "x": 4897,
+        "y": 753,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "dbe05c47.574588"
+                "4f5b4545.d432fc"
             ]
         ]
     },
     {
-        "id": "dbe05c47.574588",
+        "id": "4f5b4545.d432fc",
         "type": "set",
         "name": "set domainA ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5148,
-        "y": 896,
-        "z": "4d37a11.42c136",
+        "x": 5132,
+        "y": 877,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "e5346606.e9d9f",
+        "id": "5e5727f6.ce94f",
         "type": "set",
         "name": "set domainB ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5188,
-        "y": 1736,
-        "z": "4d37a11.42c136",
+        "x": 5172,
+        "y": 1717,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "279e5fe1.a8b868",
+        "id": "33761656.d7dc5a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4953,
-        "y": 1612,
-        "z": "4d37a11.42c136",
+        "x": 4937,
+        "y": 1593,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "e5346606.e9d9f"
+                "5e5727f6.ce94f"
             ]
         ]
     },
     {
-        "id": "3beefc43.434434",
+        "id": "ba30acec.499f9",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4776,
-        "y": 1620,
-        "z": "4d37a11.42c136",
+        "x": 4760,
+        "y": 1601,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "279e5fe1.a8b868"
+                "33761656.d7dc5a"
             ]
         ]
     },
     {
-        "id": "21292318.735edc",
+        "id": "6b9897c8.516f28",
         "type": "execute",
         "name": "execute RestApiCallNode domainA UNI Coloring",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2721,
-        "y": 2870,
-        "z": "4d37a11.42c136",
+        "x": 2718,
+        "y": 3473,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "aa98c0a5.978718",
-                "47316c0a.b315dc"
+                "423bbf1a.980188",
+                "5a878bc1.0c7c24"
             ]
         ]
     },
     {
-        "id": "47316c0a.b315dc",
+        "id": "5a878bc1.0c7c24",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2987,
-        "y": 2850,
-        "z": "4d37a11.42c136",
+        "x": 2984,
+        "y": 3453,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "a7504bbe.eb60e"
+                "857ed73a.517d58"
             ]
         ]
     },
     {
-        "id": "aa98c0a5.978718",
+        "id": "423bbf1a.980188",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2988.000213623047,
-        "y": 2900.99990940094,
-        "z": "4d37a11.42c136",
+        "x": 2985.000213623047,
+        "y": 3503.99990940094,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "98c604c1.7b11b8"
+                "c8157b69.44d2d"
             ]
         ]
     },
     {
-        "id": "a7504bbe.eb60e",
+        "id": "857ed73a.517d58",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI Coloring for domain A\" />\n",
         "comments": "",
-        "x": 3127.0002479553223,
-        "y": 2850.0000009536743,
-        "z": "4d37a11.42c136",
+        "x": 3124.0002479553223,
+        "y": 3453.0000009536743,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "98c604c1.7b11b8",
+        "id": "c8157b69.44d2d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3133.02725982666,
-        "y": 2898.745394706726,
-        "z": "4d37a11.42c136",
+        "x": 3130.02725982666,
+        "y": 3501.745394706726,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "ce066c5d.e7734",
+        "id": "1473b1fb.f66ede",
         "type": "execute",
         "name": "execute RestApiCallNode domainB UNI Coloring",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2721,
-        "y": 3236,
-        "z": "4d37a11.42c136",
+        "x": 2718,
+        "y": 3839,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "77909c9d.223f24",
-                "d69f9ea8.7be4"
+                "8f6a2d0c.d8e1f8",
+                "9fe0565f.7886"
             ]
         ]
     },
     {
-        "id": "d69f9ea8.7be4",
+        "id": "9fe0565f.7886",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2987,
-        "y": 3216,
-        "z": "4d37a11.42c136",
+        "x": 2984,
+        "y": 3819,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "f7f9f969.a37708"
+                "9f93d2ab.f5b508"
             ]
         ]
     },
     {
-        "id": "77909c9d.223f24",
+        "id": "8f6a2d0c.d8e1f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2988.000213623047,
-        "y": 3266.99990940094,
-        "z": "4d37a11.42c136",
+        "x": 2985.000213623047,
+        "y": 3869.99990940094,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "cf24be41.03bc48"
+                "c9ec128c.8a9e98"
             ]
         ]
     },
     {
-        "id": "f7f9f969.a37708",
+        "id": "9f93d2ab.f5b508",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI coloring for domain B\" />\n",
         "comments": "",
-        "x": 3127.0002479553223,
-        "y": 3216.0000009536743,
-        "z": "4d37a11.42c136",
+        "x": 3124.0002479553223,
+        "y": 3819.0000009536743,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "cf24be41.03bc48",
+        "id": "c9ec128c.8a9e98",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3133.02725982666,
-        "y": 3264.745394706726,
-        "z": "4d37a11.42c136",
+        "x": 3130.02725982666,
+        "y": 3867.745394706726,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "c2e43483.a12bd",
+        "id": "420f3616.2f701",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
-        "x": 4394,
-        "y": 557,
-        "z": "4d37a11.42c136",
+        "x": 4378,
+        "y": 538,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "303c5717.c426f",
+        "id": "b1349530.c53cc",
         "type": "execute",
         "name": "execute UUID generator for ethernet-service-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2750,
-        "y": 691,
-        "z": "4d37a11.42c136",
+        "x": 2734,
+        "y": 672,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "c19c2198.0de5c",
+        "id": "84b0870f.4db1e",
         "type": "execute",
         "name": "execute UUID generator for otn-tunnel-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2731,
-        "y": 741,
-        "z": "4d37a11.42c136",
+        "x": 2715,
+        "y": 722,
+        "z": "b31344e1.6b9228",
         "wires": [
             []
         ]
     },
     {
-        "id": "23c06925.0d2eb6",
+        "id": "2dfd81e1.a251ae",
         "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",
+        "x": 1972,
+        "y": 224,
+        "z": "b31344e1.6b9228",
         "wires": [
             [
-                "f805b6b.c60f548",
-                "78e29884.225c08"
+                "3ffb610e.7895d6",
+                "1fed210d.6adb97"
             ]
         ]
     },
     {
-        "id": "f805b6b.c60f548",
+        "id": "3ffb610e.7895d6",
         "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",
+        "x": 2256,
+        "y": 194,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "e927f664.5c872",
+        "id": "1f03402a.5db7",
         "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",
+        "x": 2631,
+        "y": 2231,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "29397b6c.248454",
+        "id": "56710693.e24068",
         "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",
+        "x": 2615,
+        "y": 3930,
+        "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "488403ee.0379ac",
+        "id": "3323f682.f60c3a",
         "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",
+        "x": 2672,
+        "y": 767,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "13ac3dbd.1f366a",
+        "type": "for",
+        "name": "for vidx..tmp.otninfo_length[]",
+        "xml": "<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 2666,
+        "y": 2351,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "f2924301.397558"
+            ]
+        ]
+    },
+    {
+        "id": "1e2e68c3.addf6f",
+        "type": "switchNode",
+        "name": "switch srcPort == NULL",
+        "xml": "<switch test='`length($tmp.otninfo[$otnidx].srcPort) == 0`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2936,
+        "y": 2353,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "2e3585b0.01a1f2",
+                "eadfc48d.7db62"
+            ]
+        ]
+    },
+    {
+        "id": "2e3585b0.01a1f2",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3153,
+        "y": 2330,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "eadfc48d.7db62",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3153,
+        "y": 2377,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "91bb64fe.b40488"
+            ]
+        ]
+    },
+    {
+        "id": "91bb64fe.b40488",
+        "type": "switchNode",
+        "name": "switch srcPort == NULL",
+        "xml": "<switch test='`length($tmp.otninfo[$otnidx].dstPort) == 0`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3356,
+        "y": 2376,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "ecd0f109.dbad88",
+                "fd54750b.bb4c08"
+            ]
+        ]
+    },
+    {
+        "id": "fd54750b.bb4c08",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3551,
+        "y": 2330,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ecd0f109.dbad88",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3549,
+        "y": 2370,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "647d2436.140504",
+        "type": "save",
+        "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='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\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3788,
+        "y": 2951,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "810630b1.0e1b6"
+            ]
+        ]
+    },
+    {
+        "id": "fdfa6fb7.1a35f",
+        "type": "save",
+        "name": "save connectivity-A relationship to vpn-binding-A, in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 4361.5,
+        "y": 3023,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "810630b1.0e1b6",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4094,
+        "y": 2950,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "a594830d.53acd8"
+            ]
+        ]
+    },
+    {
+        "id": "a594830d.53acd8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4303.5,
+        "y": 2950.25390625,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4c295920.4b5da",
+        "type": "execute",
+        "name": "execute UUID generator for vpn-binding $otnidx",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-otnidx-uuid\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3825,
+        "y": 2383,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "19452741.32e4c1",
+        "type": "switchNode",
+        "name": "switch otnidx == 0",
+        "xml": "<switch test='`$otnidx == 0`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3698,
+        "y": 3036,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "9c40fb98.e1f61",
+                "20acba8d.85a5f6"
+            ]
+        ]
+    },
+    {
+        "id": "9c40fb98.e1f61",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3881,
+        "y": 3036,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "a42fc89d.d0c4a"
+            ]
+        ]
+    },
+    {
+        "id": "20acba8d.85a5f6",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3706,
+        "y": 3183,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "332942c6.7f663e"
+            ]
+        ]
+    },
+    {
+        "id": "f5749296.6a691",
+        "type": "switchNode",
+        "name": "switch otnidx == last",
+        "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4047,
+        "y": 3264,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "2103be8f.1fc842",
+                "1554c822.b8c828"
+            ]
+        ]
+    },
+    {
+        "id": "2103be8f.1fc842",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4232,
+        "y": 3265,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "a1250da6.1c6"
+            ]
+        ]
+    },
+    {
+        "id": "1554c822.b8c828",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4251,
+        "y": 3531,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "99adbaff.3e741"
+            ]
+        ]
+    },
+    {
+        "id": "f416ea28.cb6ab",
+        "type": "save",
+        "name": "save connectivity-B relationship to vpn-binding-B, in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 4662,
+        "y": 3266,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e6548b2c.2addd8",
+        "type": "execute",
+        "name": "execute UUID generator for connectivity domain otnidx",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-otnidx-uuid\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4736,
+        "y": 3564,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ddd52155.f542e8",
+        "type": "save",
+        "name": "save connectivity resource in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->\n\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='dummy' />\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": 4672,
+        "y": 3615,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a14f6e93.1adaf8",
+        "type": "save",
+        "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
+        "comments": "",
+        "outputs": 1,
+        "x": 4801,
+        "y": 3665,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "16a831c0.877516",
+        "type": "comment",
+        "name": "connectivity has not been created for middle domains, so we have to create one",
+        "info": "",
+        "comments": "",
+        "x": 4811,
+        "y": 3508,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "2e301756.38a228",
+        "type": "save",
+        "name": "save connectivity-otnidx relationship to vpn-binding-otnidx, in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 4769,
+        "y": 3724,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "99adbaff.3e741",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 4408,
+        "y": 3532,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "e6548b2c.2addd8",
+                "ddd52155.f542e8",
+                "a14f6e93.1adaf8",
+                "2e301756.38a228",
+                "ebae712b.9f6bf8"
+            ]
+        ]
+    },
+    {
+        "id": "f2924301.397558",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2918,
+        "y": 2412,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "4c295920.4b5da",
+                "647d2436.140504",
+                "19452741.32e4c1",
+                "1d59f70d.1ee6c9",
+                "b15a67ed.f1cb18",
+                "e4fb52b5.f04798",
+                "f5263d8c.0dd66"
+            ]
+        ]
+    },
+    {
+        "id": "2e1edee2.ee8112",
+        "type": "set",
+        "name": "set attachment_param domain A",
+        "xml": "<set>\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].otn-dest-node`' value='`$tmp.otninfo[0].dstPort.dst-access-node-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].src-ttp-id`' value='' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].dst-ttp-id`' value='`$tmp.otninfo[0].dstPort.dst-tunnel-tp-id`' />-->\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list_length`' value='`$idx + 1`' />-->\n\n\n",
+        "comments": "",
+        "x": 4286,
+        "y": 3080,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "ba046748.bfe1b",
+        "type": "execute",
+        "name": "execute RestApiCallNode domainA UNI Coloring",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 4339,
+        "y": 3124,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "b63ee960.cee2c",
+                "1b1f60e5.7a7c9f"
+            ]
+        ]
+    },
+    {
+        "id": "1b1f60e5.7a7c9f",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4610,
+        "y": 3109,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "e9f5d50.e9a0928"
+            ]
+        ]
+    },
+    {
+        "id": "b63ee960.cee2c",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4608.000213623047,
+        "y": 3166.99990940094,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "c9e53751.966bb8"
+            ]
+        ]
+    },
+    {
+        "id": "e9f5d50.e9a0928",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI Coloring for domain A\" />\n",
+        "comments": "",
+        "x": 4750.000247955322,
+        "y": 3109.0000009536743,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "c9e53751.966bb8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4756.02725982666,
+        "y": 3157.745394706726,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a42fc89d.d0c4a",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4022,
+        "y": 3026,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "fdfa6fb7.1a35f",
+                "ba046748.bfe1b",
+                "2e1edee2.ee8112"
+            ]
+        ]
+    },
+    {
+        "id": "a1250da6.1c6",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4366,
+        "y": 3266,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "f416ea28.cb6ab",
+                "6f1cb48c.6026e4",
+                "1cf9708b.795d07"
+            ]
+        ]
+    },
+    {
+        "id": "1cf9708b.795d07",
+        "type": "set",
+        "name": "set attachment_param domain B",
+        "xml": "<set>\n\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].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-slice_length`' value='`$otnidx + 1`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />-->\n\n",
+        "comments": "",
+        "x": 4586,
+        "y": 3310,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "6f1cb48c.6026e4",
+        "type": "execute",
+        "name": "execute RestApiCallNode domainB UNI Coloring",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 4637,
+        "y": 3354,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "6e1323b5.c04ce4",
+                "1555b51f.0ca46b"
+            ]
+        ]
+    },
+    {
+        "id": "1555b51f.0ca46b",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4900,
+        "y": 3334,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "7a3f18c.e7bf268"
+            ]
+        ]
+    },
+    {
+        "id": "6e1323b5.c04ce4",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4901.000213623047,
+        "y": 3384.99990940094,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "c1d2c5de.5e2688"
+            ]
+        ]
+    },
+    {
+        "id": "7a3f18c.e7bf268",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI coloring for domain B\" />\n",
+        "comments": "",
+        "x": 5040.000247955322,
+        "y": 3334.0000009536743,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "c1d2c5de.5e2688",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5046.02725982666,
+        "y": 3382.745394706726,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ebae712b.9f6bf8",
+        "type": "set",
+        "name": "set attachment_param domain otnidx",
+        "xml": "<set>\n\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-dest-node`' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].dst-ttp-id`' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />-->\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />-->\n",
+        "comments": "",
+        "x": 4683,
+        "y": 3784,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "b29e7a1b.0bb9",
+        "type": "execute",
+        "name": "execute RestApiCallNode domainB UNI Coloring",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 4727,
+        "y": 3902,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "b649c2ac.1863c8",
+                "5df7a032.7812b8"
+            ]
+        ]
+    },
+    {
+        "id": "5df7a032.7812b8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4971,
+        "y": 3881,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "5f52118f.5992f"
+            ]
+        ]
+    },
+    {
+        "id": "b649c2ac.1863c8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4976,
+        "y": 3938,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "d6363d68.6bc1d"
+            ]
+        ]
+    },
+    {
+        "id": "5f52118f.5992f",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI coloring for domain B\" />\n",
+        "comments": "",
+        "x": 5111.000247955322,
+        "y": 3881.0000009536743,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "d6363d68.6bc1d",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5121.027046203613,
+        "y": 3935.745485305786,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ff94df56.8391f8",
+        "type": "comment",
+        "name": "find domain-otnidx URL info from either src or dst pnf (src-access-node-id). However, eth network id is hard to find, unless hard code topology id 2",
+        "info": "",
+        "comments": "",
+        "x": 4931,
+        "y": 3844,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "bc1d9c19.8a817",
+        "type": "save",
+        "name": "get all-vpn-bindings from aai",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1986,
+        "y": 4143,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "3b12d36f.6d8234",
+                "89a53740.4d3c98",
+                "a61d86b5.6c70f"
+            ]
+        ]
+    },
+    {
+        "id": "3b12d36f.6d8234",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2197,
+        "y": 4145,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "3ced61cb.b2d7fe"
+            ]
+        ]
+    },
+    {
+        "id": "89a53740.4d3c98",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2197.490966796875,
+        "y": 4190.574035644531,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "3eafcbaf.f2f56c"
+            ]
+        ]
+    },
+    {
+        "id": "a61d86b5.6c70f",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2195,
+        "y": 4234,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "170e04a2.1b39fb"
+            ]
+        ]
+    },
+    {
+        "id": "3ced61cb.b2d7fe",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2370,
+        "y": 4143,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "ef9d0591.fefb08"
+            ]
+        ]
+    },
+    {
+        "id": "3eafcbaf.f2f56c",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
+        "comments": "",
+        "x": 2360.0623779296875,
+        "y": 4190.859771728516,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "170e04a2.1b39fb",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "comments": "",
+        "x": 2362,
+        "y": 4233,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "bf30e0be.23b998",
+        "type": "for",
+        "name": "for vidx..tmp.otninfo_length[]",
+        "xml": "<for index='dmnsidx' start='0' end='`$otn-tunnel-slice_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1991,
+        "y": 4322,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "557999e1.77dcb"
+            ]
+        ]
+    },
+    {
+        "id": "d613988a.0c40c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2801,
+        "y": 4322,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "e4afc290.74f038"
+            ]
+        ]
+    },
+    {
+        "id": "f7f46916.4f1ee",
+        "type": "for",
+        "name": "for vidx..tmp.otninfo_length[]",
+        "xml": "<for index='stunidx' start='0' end='`$otn-tunnel-slice[$dmnsidx].list_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2573,
+        "y": 4322,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "d613988a.0c40c"
+            ]
+        ]
+    },
+    {
+        "id": "ce29a297.cf1cb8",
+        "type": "set",
+        "name": "set providerValue",
+        "xml": "<set>\n<parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />\n<parameter name='found' value='false' />\n\n\n",
+        "comments": "",
+        "x": 3003,
+        "y": 4085,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "90828ea.8f9357",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='testingvalue' value='$tmp.otninfo_length -1' />\n",
+        "comments": "",
+        "x": 3995,
+        "y": 3215,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "332942c6.7f663e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3830,
+        "y": 3190,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "90828ea.8f9357",
+                "f5749296.6a691"
+            ]
+        ]
+    },
+    {
+        "id": "d0adb7e4.435f98",
+        "type": "set",
+        "name": "set tmp.arr",
+        "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n\n\n",
+        "comments": "",
+        "x": 1954,
+        "y": 170,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "ef9d0591.fefb08",
+        "type": "for",
+        "name": "for vpnidx in all-vpn-bindings",
+        "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2611,
+        "y": 4145,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "2fbee9b.ff76316"
+            ]
+        ]
+    },
+    {
+        "id": "2fbee9b.ff76316",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2823,
+        "y": 4143,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "ce29a297.cf1cb8",
+                "72392f69.a40338"
+            ]
+        ]
+    },
+    {
+        "id": "49f4d5cd.eba3ac",
+        "type": "for",
+        "name": "for arridx in tmp.arr",
+        "xml": "<for index='arridx' start='0' end='`$tmp.arr_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3588,
+        "y": 4060,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "a296aaec.6a9f7"
+            ]
+        ]
+    },
+    {
+        "id": "72392f69.a40338",
+        "type": "switchNode",
+        "name": "switch $tmp.arr_length != 0",
+        "xml": "<switch test='`$tmp.arr_length != 0`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3054,
+        "y": 4140,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "1e30cbc6.5b29c4",
+                "73a572c0.fcdcfc"
+            ]
+        ]
+    },
+    {
+        "id": "1e30cbc6.5b29c4",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3250,
+        "y": 4110,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "79192fda.22a8a8"
+            ]
+        ]
+    },
+    {
+        "id": "73a572c0.fcdcfc",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3251,
+        "y": 4181,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "e5b5d449.e95738"
+            ]
+        ]
+    },
+    {
+        "id": "79192fda.22a8a8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 3401,
+        "y": 4108,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "49f4d5cd.eba3ac",
+                "ee34549a.68661"
+            ]
+        ]
+    },
+    {
+        "id": "a296aaec.6a9f7",
+        "type": "switchNode",
+        "name": "switch tmp.arr[$arridx] == $providerValue",
+        "xml": "<switch test='`$tmp.arr[$arridx] == $providerValue`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3879,
+        "y": 4060,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "f6a570fa.8c3e18",
+                "f096fdfa.51af18"
+            ]
+        ]
+    },
+    {
+        "id": "f6a570fa.8c3e18",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4154,
+        "y": 4029,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "7e64bb9a.5c5954"
+            ]
+        ]
+    },
+    {
+        "id": "f096fdfa.51af18",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4155,
+        "y": 4100,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "2ae9b410.b8e274"
+            ]
+        ]
+    },
+    {
+        "id": "7e64bb9a.5c5954",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 4305,
+        "y": 4027,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "883ad39b.46747",
+                "3d5cad7b.78211a",
+                "ac8bc417.7b82a",
+                "6ea95490.220544",
+                "6a39b9a6.2592"
+            ]
+        ]
+    },
+    {
+        "id": "883ad39b.46747",
+        "type": "set",
+        "name": "set found to true",
+        "xml": "<set>\n<parameter name='found' value='true' />\n\n\n",
+        "comments": "",
+        "x": 4486,
+        "y": 3988,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "3d5cad7b.78211a",
+        "type": "save",
+        "name": "store $arridx somewhere in vpn-binding",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx`' />\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4565,
+        "y": 4032,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "6a39b9a6.2592",
+        "type": "set",
+        "name": "set twoD arr",
+        "xml": "<set>\n\n<!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->\n<!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->\n<parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />\n\n",
+        "comments": "",
+        "x": 4489,
+        "y": 4188,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "6ea95490.220544",
+        "type": "set",
+        "name": "set sizeOfSliceList",
+        "xml": "<set>\n<parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />\n\n\n",
+        "comments": "",
+        "x": 4510,
+        "y": 4124,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "171513de.343584",
+        "type": "switchNode",
+        "name": "switch $otn-tunnel-slice_length == 0",
+        "xml": "<switch test='`$otn-tunnel-slice_length == 0`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4668,
+        "y": 4078,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "e6552b83.2df3a",
+                "b95e5493.31a9b"
+            ]
+        ]
+    },
+    {
+        "id": "e6552b83.2df3a",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4900,
+        "y": 4041,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "9402566e.5ec598"
+            ]
+        ]
+    },
+    {
+        "id": "b95e5493.31a9b",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4901,
+        "y": 4089,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9402566e.5ec598",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 5051,
+        "y": 4039,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "b29e36f1.f6f35"
+            ]
+        ]
+    },
+    {
+        "id": "b29e36f1.f6f35",
+        "type": "set",
+        "name": "set sizeOfSliceList",
+        "xml": "<set>\n<!--<parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />-->\n\n<parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />\n<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />\n\n<parameter name='otn-tunnel-slice_length' value='1' />\n<parameter name='otn-tunnel-slice[$arridx].list_length' value='1' />",
+        "comments": "",
+        "x": 5253,
+        "y": 4035,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "e5b5d449.e95738",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 3403,
+        "y": 4181,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "b867d047.fac",
+                "3788e630.590d72"
+            ]
+        ]
+    },
+    {
+        "id": "b867d047.fac",
+        "type": "save",
+        "name": "store $arridx somewhere in vpn-binding",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='0' />\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3658,
+        "y": 4174,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3788e630.590d72",
+        "type": "set",
+        "name": "set twoD array",
+        "xml": "<set>\n<parameter name='tmp.arr[0]' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='1' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='1' />\n<parameter name='otn-tunnel-slice[0].list_length' value='1' />\n\n",
+        "comments": "",
+        "x": 3586,
+        "y": 4221,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "ee34549a.68661",
+        "type": "switchNode",
+        "name": "switch found?",
+        "xml": "<switch test='`$found`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3579,
+        "y": 4105,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "d1f76975.e11b9",
+                "3421ae07.ec9d62"
+            ]
+        ]
+    },
+    {
+        "id": "d1f76975.e11b9",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3739,
+        "y": 4097,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "2d9d0080.4d96d"
+            ]
+        ]
+    },
+    {
+        "id": "3421ae07.ec9d62",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3737,
+        "y": 4134,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "91314308.ab84d"
+            ]
+        ]
+    },
+    {
+        "id": "2d9d0080.4d96d",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3864,
+        "y": 4097,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fd3f24a6.bbbfb8",
+        "type": "save",
+        "name": "store $arridx+1 somewhere in vpn-binding",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx + 1`' />\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4171,
+        "y": 4155,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "91314308.ab84d",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 3897,
+        "y": 4142,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "fd3f24a6.bbbfb8",
+                "3fbaf181.1ff88e"
+            ]
+        ]
+    },
+    {
+        "id": "3fbaf181.1ff88e",
+        "type": "set",
+        "name": "set twoD array",
+        "xml": "<set>\n<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />\n\n",
+        "comments": "",
+        "x": 4088,
+        "y": 4201,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "2ae9b410.b8e274",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4288,
+        "y": 4099,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ac8bc417.7b82a",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 4468,
+        "y": 4255,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "1d59f70d.1ee6c9",
+        "type": "switchNode",
+        "name": "switch dstPort == NULL",
+        "xml": "<switch test=\"`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3528,
+        "y": 2442,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "13d01e4b.11cf72",
+                "f41dda2a.86b79"
+            ]
+        ]
+    },
+    {
+        "id": "13d01e4b.11cf72",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3917,
+        "y": 2420,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "a63400f9.70b798"
+            ]
+        ]
+    },
+    {
+        "id": "f41dda2a.86b79",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3918,
+        "y": 2466,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "201cd4b0.391f6c"
+            ]
+        ]
+    },
+    {
+        "id": "a63400f9.70b798",
+        "type": "set",
+        "name": "set access-provider-id and client-id",
+        "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n",
+        "comments": "",
+        "x": 4131,
+        "y": 2419,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "201cd4b0.391f6c",
+        "type": "set",
+        "name": "set access-provider-id and client-id",
+        "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\n",
+        "comments": "",
+        "x": 4129,
+        "y": 2464,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "e4afc290.74f038",
+        "type": "set",
+        "name": "set attachment_param sliceG",
+        "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].request-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].request-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].bw-odu`' value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].bw-odu`\" />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].src-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].src-ttp-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].dst-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].dst-ttp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='otn-tunnel-sliceG-list_length' value='`$stunidx + 1`' />\n\n\n<parameter name=\"tmp.domainG.restapiUrl\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainurl`\" />\n<parameter name=\"tmp.domainG.restapiUser\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainuser`\" />\n<parameter name=\"tmp.domainG.restapiPassword\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainpassword`\" />",
+        "comments": "",
+        "x": 3128,
+        "y": 4440,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "5a129ea2.020ec",
+        "type": "execute",
+        "name": "execute RestApiCallNode sliceG creation domainG",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceG-list-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$tmp.domainG.restapiUrl + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$tmp.domainG.restapiUser`\" />\n<parameter name=\"restapiPassword\" value=\"`tmp.domainG.restapiPassword`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2714,
+        "y": 4534,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "235df5b8.967b5a",
+                "2fcb7bfa.e794ec"
+            ]
+        ]
+    },
+    {
+        "id": "2fcb7bfa.e794ec",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2997,
+        "y": 4514,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "ec27b172.f3b03"
+            ]
+        ]
+    },
+    {
+        "id": "235df5b8.967b5a",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2998.000213623047,
+        "y": 4564.99990940094,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "afac7d54.5ea3c8"
+            ]
+        ]
+    },
+    {
+        "id": "ec27b172.f3b03",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing slice creation api for domain A\" />\n",
+        "comments": "",
+        "x": 3137.0002479553223,
+        "y": 4514.000000953674,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "afac7d54.5ea3c8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3143.02725982666,
+        "y": 4562.745394706726,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b15a67ed.f1cb18",
+        "type": "set",
+        "name": "set srcdstpnf-name",
+        "xml": "<set>\n<parameter name='tmp.srcdstpnf-name' value=\"`'networkId-providerId-' + \n                                             $tmp.access-provider-id + '-clientId-' +\n                                             $tmp.access-client-id + '-topologyId-' + \n                                             $tmp.access-topology-id + '-nodeId-' + \n                                             $tmp.srcdstpnf-id`\" />\n\n",
+        "comments": "",
+        "x": 3712,
+        "y": 2562,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "e4fb52b5.f04798",
+        "type": "get-resource",
+        "name": "get-resource tmp.srcdstpnf-name",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.srcdstpnf-name\"\n        pfx='tmp.aai.srcdst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3756,
+        "y": 2610,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "38280842.8f481",
+                "762394a6.8c9edc",
+                "bf6967d.9863518"
+            ]
+        ]
+    },
+    {
+        "id": "38280842.8f481",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3968.5,
+        "y": 2557,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "7c3bab6c.40727c"
+            ]
+        ]
+    },
+    {
+        "id": "762394a6.8c9edc",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3980.5,
+        "y": 2607,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "9fa14d44.80429"
+            ]
+        ]
+    },
+    {
+        "id": "bf6967d.9863518",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3971.5,
+        "y": 2662,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "e6f16a7e.5e034"
+            ]
+        ]
+    },
+    {
+        "id": "e6f16a7e.5e034",
+        "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": 4116.5,
+        "y": 2661,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "9fa14d44.80429",
+        "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": 4127.5,
+        "y": 2604,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "7c3bab6c.40727c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4093.8824462890625,
+        "y": 2550.6556701660156,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "3ada39cb.077d7e"
+            ]
+        ]
+    },
+    {
+        "id": "79f49c03.b31834",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4653,
+        "y": 2569,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "b38ec96c.50bcb"
+            ]
+        ]
+    },
+    {
+        "id": "b38ec96c.50bcb",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4830,
+        "y": 2561,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "b25407c2.fe4e9",
+                "76abd2d6.8cf2bc"
+            ]
+        ]
+    },
+    {
+        "id": "3ada39cb.077d7e",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4255,
+        "y": 2565,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "631c6ac2.9b4684"
+            ]
+        ]
+    },
+    {
+        "id": "631c6ac2.9b4684",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4450,
+        "y": 2565,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "79f49c03.b31834"
+            ]
+        ]
+    },
+    {
+        "id": "76abd2d6.8cf2bc",
+        "type": "execute",
+        "name": "get esr-thirdparty-sdnc",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 5038,
+        "y": 2568,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "b500a3b6.711188",
+                "e4ff3e60.96d148",
+                "ef9c5a3.20232a8"
+            ]
+        ]
+    },
+    {
+        "id": "b25407c2.fe4e9",
+        "type": "set",
+        "name": "set esr-thirdparty-sdnc domainG id",
+        "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 5068,
+        "y": 2516,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "b500a3b6.711188",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5248,
+        "y": 2559,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "8c9a0f1.a2e9b7"
+            ]
+        ]
+    },
+    {
+        "id": "e4ff3e60.96d148",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5240,
+        "y": 2614,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "7d5ba752.0bac28"
+            ]
+        ]
+    },
+    {
+        "id": "ef9c5a3.20232a8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5245,
+        "y": 2671,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "5979580a.e6b1f8"
+            ]
+        ]
+    },
+    {
+        "id": "5979580a.e6b1f8",
+        "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": 5397,
+        "y": 2672,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "7d5ba752.0bac28",
+        "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": 5408,
+        "y": 2617,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "8c9a0f1.a2e9b7",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5392.38232421875,
+        "y": 2556.6556701660156,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "b4fe40f1.fee308"
+            ]
+        ]
+    },
+    {
+        "id": "b4fe40f1.fee308",
+        "type": "set",
+        "name": "set controller domainA data",
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
+        "comments": "",
+        "x": 5607,
+        "y": 2553,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "557999e1.77dcb",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2223,
+        "y": 4320,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "f7f46916.4f1ee",
+                "5a129ea2.020ec"
+            ]
+        ]
+    },
+    {
+        "id": "4ba5097d.b20fe",
+        "type": "switchNode",
+        "name": "switch dmnsidx == 0 (domainA)",
+        "xml": "<switch test='`$dmnsidx == 0`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3112,
+        "y": 4307,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "dbd9c4f1.fac738",
+                "119d0f31.7b8509"
+            ]
+        ]
+    },
+    {
+        "id": "dbd9c4f1.fac738",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3313,
+        "y": 4305,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "4fe6e9a2.ce8d7"
+            ]
+        ]
+    },
+    {
+        "id": "4fe6e9a2.ce8d7",
+        "type": "set",
+        "name": "set attachment_param domain A",
+        "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />",
+        "comments": "",
+        "x": 3527,
+        "y": 4307,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "fd470af3.59fcc",
+        "type": "switchNode",
+        "name": "switch dmnsidx == last (domainB)",
+        "xml": "<switch test='`$dmnsidx == $otn-tunnel-slice_length - 1`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3530,
+        "y": 4356,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "ddf1f941.709858",
+                "2f7e38f0.34a468"
+            ]
+        ]
+    },
+    {
+        "id": "ddf1f941.709858",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3731,
+        "y": 4354,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "5c127cf0.9c2d34"
+            ]
+        ]
+    },
+    {
+        "id": "5c127cf0.9c2d34",
+        "type": "set",
+        "name": "set attachment_param domain B",
+        "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\n",
+        "comments": "",
+        "x": 3945,
+        "y": 4356,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "119d0f31.7b8509",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3313,
+        "y": 4354,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "fd470af3.59fcc"
+            ]
+        ]
+    },
+    {
+        "id": "2f7e38f0.34a468",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3732,
+        "y": 4400,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "4e4fdb4.a02e5a4"
+            ]
+        ]
+    },
+    {
+        "id": "4e4fdb4.a02e5a4",
+        "type": "set",
+        "name": "set attachment_param domain G",
+        "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />\n",
+        "comments": "",
+        "x": 3946,
+        "y": 4399,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "f5263d8c.0dd66",
+        "type": "switchNode",
+        "name": "switch dmnsidx == 0 (domainA)",
+        "xml": "<switch test='`$otnidx == 0`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3726,
+        "y": 2779,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "cb45f40e.c4e9f",
+                "686c2e71.b364f8"
+            ]
+        ]
+    },
+    {
+        "id": "cb45f40e.c4e9f",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3927,
+        "y": 2777,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "906b7761.ec3cf"
+            ]
+        ]
+    },
+    {
+        "id": "906b7761.ec3cf",
+        "type": "set",
+        "name": "set attachment_param domain A",
+        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
+        "comments": "",
+        "x": 4141,
+        "y": 2779,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "bb50949c.2c4e68",
+        "type": "switchNode",
+        "name": "switch dmnsidx == last (domainB)",
+        "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4144,
+        "y": 2828,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "f9f184f6.8f0c58",
+                "b1eb5cf.84b33a"
+            ]
+        ]
+    },
+    {
+        "id": "f9f184f6.8f0c58",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4374,
+        "y": 2824,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "ea46128e.0ba028"
+            ]
+        ]
+    },
+    {
+        "id": "ea46128e.0ba028",
+        "type": "set",
+        "name": "set attachment_param domain B",
+        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />",
+        "comments": "",
+        "x": 4588,
+        "y": 2827,
+        "z": "b31344e1.6b9228",
+        "wires": []
+    },
+    {
+        "id": "686c2e71.b364f8",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3927,
+        "y": 2826,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "bb50949c.2c4e68"
+            ]
+        ]
+    },
+    {
+        "id": "b1eb5cf.84b33a",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4375,
+        "y": 2870,
+        "z": "b31344e1.6b9228",
+        "wires": [
+            [
+                "591dd2d5.72937c"
+            ]
+        ]
+    },
+    {
+        "id": "591dd2d5.72937c",
+        "type": "set",
+        "name": "set attachment_param domain G",
+        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
+        "comments": "",
+        "x": 4589,
+        "y": 2870,
+        "z": "b31344e1.6b9228",
         "wires": []
     }
 ]
\ 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-deactivate.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.json
index ff94831f..594c3815 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "9eb0ec9b.ca633",
+        "id": "35adbdc5.188712",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 136,
-        "y": 74,
-        "z": "b39eb7ec.28f1a8",
+        "x": 151,
+        "y": 71,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "a6f9d5f0.04d6"
+                "4297efa6.c41f88"
             ]
         ]
     },
     {
-        "id": "a6f9d5f0.04d6",
+        "id": "4297efa6.c41f88",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,977 +22,1024 @@
         "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": 267.2856903076172,
-        "y": 123.23810863494873,
-        "z": "b39eb7ec.28f1a8",
+        "x": 282.2856903076172,
+        "y": 120.23810863494873,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "3b0030c5.3e837"
+                "2ad96203.21cf3e"
             ]
         ]
     },
     {
-        "id": "3b0030c5.3e837",
+        "id": "2ad96203.21cf3e",
         "type": "method",
         "name": "method tsli-vnf-topology-operation-trans-slice-deactivate",
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-deactivate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 270.4286193847656,
-        "y": 208.00003242492676,
-        "z": "b39eb7ec.28f1a8",
+        "x": 285.4286193847656,
+        "y": 205.00003242492676,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "4b63b8a8.77bb4"
+                "c5e49e9b.1b684"
             ]
         ]
     },
     {
-        "id": "4b63b8a8.77bb4",
+        "id": "c5e49e9b.1b684",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 420.238037109375,
-        "y": 337.6666564941406,
-        "z": "b39eb7ec.28f1a8",
+        "x": 435.238037109375,
+        "y": 334.6666564941406,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "33834047.03c2f8",
-                "eaadc174.02e71",
-                "ce0777fc.b60f2"
+                "10e90581.65923a",
+                "8d427e09.40c998",
+                "2dc96b18.12e1c4"
             ]
         ]
     },
     {
-        "id": "33834047.03c2f8",
+        "id": "10e90581.65923a",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 694.5716552734375,
-        "y": 604.59716796875,
-        "z": "b39eb7ec.28f1a8",
+        "x": 709.5716552734375,
+        "y": 601.59716796875,
+        "z": "429f9ba7.310ba4",
         "wires": []
     },
     {
-        "id": "39c1d7dd.5e2018",
+        "id": "dce41eb4.903f08",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 726,
-        "y": 279,
-        "z": "b39eb7ec.28f1a8",
+        "x": 741,
+        "y": 276,
+        "z": "429f9ba7.310ba4",
         "wires": []
     },
     {
-        "id": "eaadc174.02e71",
+        "id": "8d427e09.40c998",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--vnf-topology-operation-input.service-information.service-instance-id-->",
         "comments": "",
         "outputs": 1,
-        "x": 746,
-        "y": 375,
-        "z": "b39eb7ec.28f1a8",
+        "x": 761,
+        "y": 372,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "def73660.f1599",
-                "7ca16f67.a19498",
-                "6d28513b.423be8"
+                "97ab3694.d0f87",
+                "60789fd.ed86ae",
+                "353d8e4b.1a199a"
             ]
         ]
     },
     {
-        "id": "def73660.f1599",
+        "id": "97ab3694.d0f87",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 965,
-        "y": 313,
-        "z": "b39eb7ec.28f1a8",
+        "x": 980,
+        "y": 310,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "5c5bc497.c1130c"
+                "8832c029.be5808"
             ]
         ]
     },
     {
-        "id": "7ca16f67.a19498",
+        "id": "60789fd.ed86ae",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 974.490966796875,
-        "y": 355.57403564453125,
-        "z": "b39eb7ec.28f1a8",
+        "x": 989.490966796875,
+        "y": 352.57403564453125,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "3202281d.474eb8"
+                "2dd666f1.60f502"
             ]
         ]
     },
     {
-        "id": "6d28513b.423be8",
+        "id": "353d8e4b.1a199a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 963,
-        "y": 402,
-        "z": "b39eb7ec.28f1a8",
+        "x": 978,
+        "y": 399,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "a1d5aff9.d75b68"
+                "2d743c83.0345fc"
             ]
         ]
     },
     {
-        "id": "3202281d.474eb8",
+        "id": "2dd666f1.60f502",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1128.0623779296875,
-        "y": 358.8597717285156,
-        "z": "b39eb7ec.28f1a8",
+        "x": 1143.0623779296875,
+        "y": 355.8597717285156,
+        "z": "429f9ba7.310ba4",
         "wires": []
     },
     {
-        "id": "a1d5aff9.d75b68",
+        "id": "2d743c83.0345fc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1132,
-        "y": 403,
-        "z": "b39eb7ec.28f1a8",
+        "x": 1147,
+        "y": 400,
+        "z": "429f9ba7.310ba4",
         "wires": []
     },
     {
-        "id": "5c5bc497.c1130c",
+        "id": "8832c029.be5808",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1162,
-        "y": 309,
-        "z": "b39eb7ec.28f1a8",
+        "x": 1177,
+        "y": 306,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "b3c4b504.2321f"
+                "16acb367.7a1ddd"
             ]
         ]
     },
     {
-        "id": "b3c4b504.2321f",
+        "id": "16acb367.7a1ddd",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1385.33349609375,
-        "y": 308.99993896484375,
-        "z": "b39eb7ec.28f1a8",
+        "x": 1400.33349609375,
+        "y": 305.99993896484375,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "2c61dbe.2d462a4"
+                "a7a6102a.ba70f"
             ]
         ]
     },
     {
-        "id": "2c61dbe.2d462a4",
+        "id": "a7a6102a.ba70f",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1586.0001335144043,
-        "y": 310.00002098083496,
-        "z": "b39eb7ec.28f1a8",
+        "x": 1601.0001335144043,
+        "y": 307.00002098083496,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "8cb99e8e.6d2cc"
+                "792a8c98.1e353c"
             ]
         ]
     },
     {
-        "id": "ce0777fc.b60f2",
+        "id": "2dc96b18.12e1c4",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 712,
-        "y": 323,
-        "z": "b39eb7ec.28f1a8",
+        "x": 727,
+        "y": 320,
+        "z": "429f9ba7.310ba4",
         "wires": [
             []
         ]
     },
     {
-        "id": "8cb99e8e.6d2cc",
+        "id": "792a8c98.1e353c",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1824,
-        "y": 312,
-        "z": "b39eb7ec.28f1a8",
+        "x": 1839,
+        "y": 309,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "e48909d7.1167",
-                "9d9cf2b9.138cc",
-                "c57bdede.c607a8"
+                "e0088aed.90cab8",
+                "1c511732.20d971",
+                "948f74b1.a9b47"
             ]
         ]
     },
     {
-        "id": "e48909d7.1167",
+        "id": "e0088aed.90cab8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2032,
-        "y": 276,
-        "z": "b39eb7ec.28f1a8",
+        "x": 2047,
+        "y": 273,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "7447d3b7.3d9674"
+                "a90c3215.92b4f8"
             ]
         ]
     },
     {
-        "id": "9d9cf2b9.138cc",
+        "id": "1c511732.20d971",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2032.490966796875,
-        "y": 321.57403564453125,
-        "z": "b39eb7ec.28f1a8",
+        "x": 2047.490966796875,
+        "y": 318.57403564453125,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "c3f91382.355d78"
+                "4591cc1.5281eb4"
             ]
         ]
     },
     {
-        "id": "c57bdede.c607a8",
+        "id": "948f74b1.a9b47",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2030,
-        "y": 365,
-        "z": "b39eb7ec.28f1a8",
+        "x": 2045,
+        "y": 362,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "8f45128e.10469"
+                "1ba65af4.0c86f5"
             ]
         ]
     },
     {
-        "id": "c3f91382.355d78",
+        "id": "4591cc1.5281eb4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2195.0623779296875,
-        "y": 321.8597717285156,
-        "z": "b39eb7ec.28f1a8",
+        "x": 2210.0623779296875,
+        "y": 318.8597717285156,
+        "z": "429f9ba7.310ba4",
         "wires": []
     },
     {
-        "id": "8f45128e.10469",
+        "id": "1ba65af4.0c86f5",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2199,
-        "y": 366,
-        "z": "b39eb7ec.28f1a8",
+        "x": 2214,
+        "y": 363,
+        "z": "429f9ba7.310ba4",
         "wires": []
     },
     {
-        "id": "eaa455f.69afea8",
+        "id": "782d486c.7b38a",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2505,
-        "y": 365,
-        "z": "b39eb7ec.28f1a8",
+        "x": 2520,
+        "y": 362,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "754a3f5.4e5d3c",
-                "563654a8.f8269c",
-                "49966192.933e3"
+                "15707889.fb5fe7",
+                "3ccb184b.88e97",
+                "5e6c2e34.e2f08"
             ]
         ]
     },
     {
-        "id": "44a58adf.5965ac",
+        "id": "d4d2edf0.a9661",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2889,
-        "y": 365,
-        "z": "b39eb7ec.28f1a8",
+        "x": 2904,
+        "y": 362,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "c9dc240e.1f5cf8",
-                "2f80a99a.2436ee",
-                "eb52e479.fabdf8",
-                "e64ba97a.ab16f8"
+                "c5e1a2b5.98a7e",
+                "2ecd6ddc.b6312a",
+                "ac181d39.64071",
+                "31912d21.99f9da"
             ]
         ]
     },
     {
-        "id": "754a3f5.4e5d3c",
+        "id": "15707889.fb5fe7",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2716,
-        "y": 367,
-        "z": "b39eb7ec.28f1a8",
+        "x": 2731,
+        "y": 364,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "44a58adf.5965ac"
+                "d4d2edf0.a9661"
             ]
         ]
     },
     {
-        "id": "563654a8.f8269c",
+        "id": "3ccb184b.88e97",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2716.490966796875,
-        "y": 412.57403564453125,
-        "z": "b39eb7ec.28f1a8",
+        "x": 2731.490966796875,
+        "y": 409.57403564453125,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "8ffd54c7.1ceb58"
+                "3858d983.a7895e"
             ]
         ]
     },
     {
-        "id": "49966192.933e3",
+        "id": "5e6c2e34.e2f08",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2714,
-        "y": 456,
-        "z": "b39eb7ec.28f1a8",
+        "x": 2729,
+        "y": 453,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "1dfb3bfc.f80f24"
+                "399a5685.b9c2da"
             ]
         ]
     },
     {
-        "id": "1dfb3bfc.f80f24",
+        "id": "399a5685.b9c2da",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2881,
-        "y": 455,
-        "z": "b39eb7ec.28f1a8",
+        "x": 2896,
+        "y": 452,
+        "z": "429f9ba7.310ba4",
         "wires": []
     },
     {
-        "id": "8ffd54c7.1ceb58",
+        "id": "3858d983.a7895e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2879.0623779296875,
-        "y": 412.8597717285156,
-        "z": "b39eb7ec.28f1a8",
+        "x": 2894.0623779296875,
+        "y": 409.8597717285156,
+        "z": "429f9ba7.310ba4",
         "wires": []
     },
     {
-        "id": "7447d3b7.3d9674",
+        "id": "a90c3215.92b4f8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2233,
-        "y": 271,
-        "z": "b39eb7ec.28f1a8",
+        "x": 2248,
+        "y": 268,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "80b48506.a5c978"
+                "3cc76d7e.6842ea"
             ]
         ]
     },
     {
-        "id": "80b48506.a5c978",
+        "id": "3cc76d7e.6842ea",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2438,
-        "y": 271,
-        "z": "b39eb7ec.28f1a8",
+        "x": 2453,
+        "y": 268,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "36fdb5a2.702cb2"
+                "ff010487.c79c18"
             ]
         ]
     },
     {
-        "id": "36fdb5a2.702cb2",
+        "id": "ff010487.c79c18",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2604,
-        "y": 271,
-        "z": "b39eb7ec.28f1a8",
+        "x": 2619,
+        "y": 268,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "32e2ef12.2d28f8"
+                "157282a.839557d"
             ]
         ]
     },
     {
-        "id": "32e2ef12.2d28f8",
+        "id": "157282a.839557d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2767,
-        "y": 271,
-        "z": "b39eb7ec.28f1a8",
+        "x": 2782,
+        "y": 268,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "eaa455f.69afea8"
+                "782d486c.7b38a"
             ]
         ]
     },
     {
-        "id": "c9dc240e.1f5cf8",
+        "id": "c5e1a2b5.98a7e",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 3104,
-        "y": 75,
-        "z": "b39eb7ec.28f1a8",
+        "x": 3119,
+        "y": 72,
+        "z": "429f9ba7.310ba4",
         "wires": []
     },
     {
-        "id": "2f80a99a.2436ee",
+        "id": "2ecd6ddc.b6312a",
         "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.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3130,
-        "y": 192,
-        "z": "b39eb7ec.28f1a8",
+        "x": 3145,
+        "y": 189,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "5dad328f.715b34",
-                "e3a6748e.a712d",
-                "e35e866f.df6d4"
+                "ca0e4afa.297db8",
+                "cbb19a06.cce2d",
+                "10037902.a01617"
             ]
         ]
     },
     {
-        "id": "5dad328f.715b34",
+        "id": "ca0e4afa.297db8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3325.5001220703125,
-        "y": 144,
-        "z": "b39eb7ec.28f1a8",
+        "x": 3340.5001220703125,
+        "y": 141,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "4d0c253f.a81e74"
+                "82598cca.05691"
             ]
         ]
     },
     {
-        "id": "e3a6748e.a712d",
+        "id": "cbb19a06.cce2d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3317.5001220703125,
-        "y": 199,
-        "z": "b39eb7ec.28f1a8",
+        "x": 3332.5001220703125,
+        "y": 196,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "b2cddf9.b286da"
+                "3a772cbc.39a31c"
             ]
         ]
     },
     {
-        "id": "4d0c253f.a81e74",
+        "id": "82598cca.05691",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3469.8824462890625,
-        "y": 143.65567016601562,
-        "z": "b39eb7ec.28f1a8",
+        "x": 3484.8824462890625,
+        "y": 140.65567016601562,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "1f908e24.7ffb6a"
+                "b1b02bec.6d78a8"
             ]
         ]
     },
     {
-        "id": "1f908e24.7ffb6a",
+        "id": "b1b02bec.6d78a8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3654,
-        "y": 142,
-        "z": "b39eb7ec.28f1a8",
+        "x": 3669,
+        "y": 139,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "731e3134.cae0e8"
+                "cda97533.ab0b4"
             ]
         ]
     },
     {
-        "id": "731e3134.cae0e8",
+        "id": "cda97533.ab0b4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3849,
-        "y": 142,
-        "z": "b39eb7ec.28f1a8",
+        "x": 3864,
+        "y": 139,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "924b0e47.33623"
+                "60c8c7.3864ef38"
             ]
         ]
     },
     {
-        "id": "e35e866f.df6d4",
+        "id": "10037902.a01617",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3322.5001220703125,
-        "y": 256,
-        "z": "b39eb7ec.28f1a8",
+        "x": 3337.5001220703125,
+        "y": 253,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "96d892fb.bdb65"
+                "cae2235d.64e0e8"
             ]
         ]
     },
     {
-        "id": "96d892fb.bdb65",
+        "id": "cae2235d.64e0e8",
         "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": 3474.5001220703125,
-        "y": 257,
-        "z": "b39eb7ec.28f1a8",
+        "x": 3489.5001220703125,
+        "y": 254,
+        "z": "429f9ba7.310ba4",
         "wires": []
     },
     {
-        "id": "b2cddf9.b286da",
+        "id": "3a772cbc.39a31c",
         "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": 3485.5001220703125,
-        "y": 200,
-        "z": "b39eb7ec.28f1a8",
+        "x": 3500.5001220703125,
+        "y": 197,
+        "z": "429f9ba7.310ba4",
         "wires": []
     },
     {
-        "id": "f5b1ba3f.53f16",
+        "id": "3932cb1e.2bf12c",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 4437,
-        "y": 159,
-        "z": "b39eb7ec.28f1a8",
+        "x": 4452,
+        "y": 156,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "24a03be4.6f22dc",
-                "9afded7b.e0fd88",
-                "473aa7de.af209"
+                "df685905.e165b",
+                "98483c83.1f67f",
+                "34f5861b.c6c222"
             ]
         ]
     },
     {
-        "id": "e5beadfa.65d4b",
+        "id": "9b3be3e2.33ea88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4231,
-        "y": 146,
-        "z": "b39eb7ec.28f1a8",
+        "x": 4246,
+        "y": 143,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "c8e5909.1b608f",
-                "f5b1ba3f.53f16",
-                "f37bd9fd.aaa8a8"
+                "8f73936e.04261",
+                "3932cb1e.2bf12c",
+                "dea89443.748068"
             ]
         ]
     },
     {
-        "id": "c8e5909.1b608f",
+        "id": "8f73936e.04261",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4467,
-        "y": 107,
-        "z": "b39eb7ec.28f1a8",
+        "x": 4482,
+        "y": 104,
+        "z": "429f9ba7.310ba4",
         "wires": []
     },
     {
-        "id": "24a03be4.6f22dc",
+        "id": "df685905.e165b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4647,
-        "y": 150,
-        "z": "b39eb7ec.28f1a8",
+        "x": 4662,
+        "y": 147,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "d0a9d6e9.c56f4"
+                "6f3db9ae.c9f3c"
             ]
         ]
     },
     {
-        "id": "9afded7b.e0fd88",
+        "id": "98483c83.1f67f",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4639,
-        "y": 205,
-        "z": "b39eb7ec.28f1a8",
+        "x": 4654,
+        "y": 202,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "27cca76b.e2c508"
+                "deb93f9d.19a93"
             ]
         ]
     },
     {
-        "id": "473aa7de.af209",
+        "id": "34f5861b.c6c222",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4644,
-        "y": 262,
-        "z": "b39eb7ec.28f1a8",
+        "x": 4659,
+        "y": 259,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "61a0060a.f22c2"
+                "e2596edd.60dea"
             ]
         ]
     },
     {
-        "id": "61a0060a.f22c2",
+        "id": "e2596edd.60dea",
         "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": 4796,
-        "y": 263,
-        "z": "b39eb7ec.28f1a8",
+        "x": 4811,
+        "y": 260,
+        "z": "429f9ba7.310ba4",
         "wires": []
     },
     {
-        "id": "27cca76b.e2c508",
+        "id": "deb93f9d.19a93",
         "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": 4807,
-        "y": 208,
-        "z": "b39eb7ec.28f1a8",
+        "x": 4822,
+        "y": 205,
+        "z": "429f9ba7.310ba4",
         "wires": []
     },
     {
-        "id": "d0a9d6e9.c56f4",
+        "id": "6f3db9ae.c9f3c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4791.38232421875,
-        "y": 147.65567016601562,
-        "z": "b39eb7ec.28f1a8",
+        "x": 4806.38232421875,
+        "y": 144.65567016601562,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "67daf343.f6ee2c"
+                "ba0d3a6b.6f8058"
             ]
         ]
     },
     {
-        "id": "924b0e47.33623",
+        "id": "60c8c7.3864ef38",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4052,
-        "y": 146,
-        "z": "b39eb7ec.28f1a8",
+        "x": 4067,
+        "y": 143,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "e5beadfa.65d4b"
+                "9b3be3e2.33ea88"
             ]
         ]
     },
     {
-        "id": "67daf343.f6ee2c",
+        "id": "ba0d3a6b.6f8058",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.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": 5006,
-        "y": 144,
-        "z": "b39eb7ec.28f1a8",
+        "x": 5021,
+        "y": 141,
+        "z": "429f9ba7.310ba4",
         "wires": []
     },
     {
-        "id": "f37bd9fd.aaa8a8",
+        "id": "dea89443.748068",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4387,
-        "y": 223,
-        "z": "b39eb7ec.28f1a8",
+        "x": 4402,
+        "y": 220,
+        "z": "429f9ba7.310ba4",
         "wires": []
     },
     {
-        "id": "eb52e479.fabdf8",
+        "id": "ebf8dd2b.b4f9e8",
         "type": "execute",
         "name": "execute RestApiCallNode Delete ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3260,
-        "y": 587,
-        "z": "b39eb7ec.28f1a8",
+        "x": 3780,
+        "y": 569,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "f7e1f7cd.472128",
-                "cd5ebb71.771178"
+                "aec92995.7e9f5",
+                "4c597ddc.e2cc64"
             ]
         ]
     },
     {
-        "id": "f7e1f7cd.472128",
+        "id": "aec92995.7e9f5",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3606.5,
-        "y": 580,
-        "z": "b39eb7ec.28f1a8",
+        "x": 4126.5,
+        "y": 562,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "e8c999cc.b2fcc"
+                "1a195df1.8c796a"
             ]
         ]
     },
     {
-        "id": "cd5ebb71.771178",
+        "id": "4c597ddc.e2cc64",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3610.5,
-        "y": 620,
-        "z": "b39eb7ec.28f1a8",
+        "x": 4130.5,
+        "y": 602,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "fe0f592f.73096"
+                "5902bc86.ae718c"
             ]
         ]
     },
     {
-        "id": "fe0f592f.73096",
+        "id": "5902bc86.ae718c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3768,
-        "y": 620,
-        "z": "b39eb7ec.28f1a8",
+        "x": 4288,
+        "y": 602,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "a35fbdc3.ba44d8",
-                "25ddb449.839c14"
+                "a5eabc9d.2ead",
+                "845fd62d.b8a278"
             ]
         ]
     },
     {
-        "id": "e8c999cc.b2fcc",
+        "id": "1a195df1.8c796a",
         "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 delete ethernet service rest api\" />\n",
         "comments": "",
-        "x": 3764.5,
-        "y": 580,
-        "z": "b39eb7ec.28f1a8",
+        "x": 4284.5,
+        "y": 562,
+        "z": "429f9ba7.310ba4",
         "wires": []
     },
     {
-        "id": "a35fbdc3.ba44d8",
+        "id": "a5eabc9d.2ead",
         "type": "save",
         "name": "update vpn-binding resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Deactivated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4096.5,
-        "y": 620,
-        "z": "b39eb7ec.28f1a8",
+        "x": 4616.5,
+        "y": 602,
+        "z": "429f9ba7.310ba4",
         "wires": [
             []
         ]
     },
     {
-        "id": "25ddb449.839c14",
+        "id": "845fd62d.b8a278",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Deactivated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4023.5,
-        "y": 666,
-        "z": "b39eb7ec.28f1a8",
+        "x": 4543.5,
+        "y": 648,
+        "z": "429f9ba7.310ba4",
         "wires": [
             []
         ]
     },
     {
-        "id": "e64ba97a.ab16f8",
+        "id": "ac181d39.64071",
         "type": "execute",
         "name": "execute RestApiCallNode Delete OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\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": 3233,
-        "y": 459,
-        "z": "b39eb7ec.28f1a8",
+        "x": 3248,
+        "y": 456,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "e39876fb.5fed98",
-                "bba7f7ba.20df2"
+                "2d9a43b7.aafd44",
+                "70183a3.2a6c244"
             ]
         ]
     },
     {
-        "id": "e39876fb.5fed98",
+        "id": "2d9a43b7.aafd44",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3565.5,
-        "y": 429,
-        "z": "b39eb7ec.28f1a8",
+        "x": 3580.5,
+        "y": 426,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "577f2ccc.95a23c"
+                "2ca3b71b.283058"
             ]
         ]
     },
     {
-        "id": "bba7f7ba.20df2",
+        "id": "70183a3.2a6c244",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3570.5,
-        "y": 494,
-        "z": "b39eb7ec.28f1a8",
+        "x": 3585.5,
+        "y": 491,
+        "z": "429f9ba7.310ba4",
         "wires": [
             [
-                "f956764e.d59e5"
+                "7560af7d.2c0028"
             ]
         ]
     },
     {
-        "id": "577f2ccc.95a23c",
+        "id": "2ca3b71b.283058",
         "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 delete OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 3741.5,
-        "y": 429,
-        "z": "b39eb7ec.28f1a8",
+        "x": 3756.5,
+        "y": 426,
+        "z": "429f9ba7.310ba4",
         "wires": []
     },
     {
-        "id": "f956764e.d59e5",
+        "id": "7560af7d.2c0028",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3737,
-        "y": 494,
-        "z": "b39eb7ec.28f1a8",
+        "x": 3752,
+        "y": 491,
+        "z": "429f9ba7.310ba4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "31912d21.99f9da",
+        "type": "switchNode",
+        "name": "switch connectivity has ethernet service",
+        "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3186,
+        "y": 591,
+        "z": "429f9ba7.310ba4",
+        "wires": [
+            [
+                "8e1bec91.730a68",
+                "6d4b827f.139444"
+            ]
+        ]
+    },
+    {
+        "id": "6d4b827f.139444",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3439,
+        "y": 569,
+        "z": "429f9ba7.310ba4",
+        "wires": [
+            [
+                "ebf8dd2b.b4f9e8"
+            ]
+        ]
+    },
+    {
+        "id": "8e1bec91.730a68",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3439,
+        "y": 625,
+        "z": "429f9ba7.310ba4",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.json
index 58ab642f..fc756b8b 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "2b0ca809.8b9448",
+        "id": "5a4a886b.6438b8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 190,
-        "y": 84,
-        "z": "e001b214.9c4f88",
+        "x": 118,
+        "y": 82,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "d6cca48a.4b98c"
+                "2fc91b3e.7646fc"
             ]
         ]
     },
     {
-        "id": "d6cca48a.4b98c",
+        "id": "2fc91b3e.7646fc",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,988 +22,1035 @@
         "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": 321.2856903076172,
-        "y": 133.23810863494873,
-        "z": "e001b214.9c4f88",
+        "x": 249.2856903076172,
+        "y": 131.23810863494873,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "d504a218.d5b0f"
+                "1c977ea2.89d1e9"
             ]
         ]
     },
     {
-        "id": "d504a218.d5b0f",
+        "id": "1c977ea2.89d1e9",
         "type": "method",
         "name": "method tsli-vnf-topology-operation-trans-slice-delete",
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 324.4286193847656,
-        "y": 218.00003242492676,
-        "z": "e001b214.9c4f88",
+        "x": 252.42861938476562,
+        "y": 216.00003242492676,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "6927f12e.f495a8"
+                "8ce10b59.587f08"
             ]
         ]
     },
     {
-        "id": "6927f12e.f495a8",
+        "id": "8ce10b59.587f08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 474.238037109375,
-        "y": 347.6666564941406,
-        "z": "e001b214.9c4f88",
+        "x": 402.238037109375,
+        "y": 345.6666564941406,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "a03a6652.95082",
-                "5448151c.b0ab3c",
-                "926eb1f8.ec5de8"
+                "c14a5da1.726bc8",
+                "f7f11593.991128",
+                "fbeb2897.5d3ca"
             ]
         ]
     },
     {
-        "id": "a03a6652.95082",
+        "id": "c14a5da1.726bc8",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 770.5716552734375,
-        "y": 624.59716796875,
-        "z": "e001b214.9c4f88",
+        "x": 698.5716552734375,
+        "y": 622.59716796875,
+        "z": "d544e90d.c47ab8",
         "wires": []
     },
     {
-        "id": "de37ea5b.6e73f8",
+        "id": "86779e76.e7bc38",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 802,
-        "y": 299,
-        "z": "e001b214.9c4f88",
+        "x": 730,
+        "y": 297,
+        "z": "d544e90d.c47ab8",
         "wires": []
     },
     {
-        "id": "5448151c.b0ab3c",
+        "id": "f7f11593.991128",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n    \n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--vnf-topology-operation-input.service-information.service-instance-id-->",
         "comments": "",
         "outputs": 1,
-        "x": 822,
-        "y": 395,
-        "z": "e001b214.9c4f88",
+        "x": 750,
+        "y": 393,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "84d63f33.5d595",
-                "bc6def6f.91b498",
-                "9f25bb22.1bcb28"
+                "6ad861a9.030e08",
+                "37e2fd06.c6c79a",
+                "2beeb8ca.34f3f"
             ]
         ]
     },
     {
-        "id": "84d63f33.5d595",
+        "id": "6ad861a9.030e08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1041,
-        "y": 333,
-        "z": "e001b214.9c4f88",
+        "x": 969,
+        "y": 331,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "454b8601.544a2"
+                "c860abc6.0b576"
             ]
         ]
     },
     {
-        "id": "bc6def6f.91b498",
+        "id": "37e2fd06.c6c79a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1050.490966796875,
-        "y": 375.57403564453125,
-        "z": "e001b214.9c4f88",
+        "x": 978.490966796875,
+        "y": 373.57403564453125,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "6ae2b2ea.c01e64"
+                "7a133195.09b68"
             ]
         ]
     },
     {
-        "id": "9f25bb22.1bcb28",
+        "id": "2beeb8ca.34f3f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1039,
-        "y": 422,
-        "z": "e001b214.9c4f88",
+        "x": 967,
+        "y": 420,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "5abda4b4.ada70c"
+                "f9d75edb.c19d18"
             ]
         ]
     },
     {
-        "id": "6ae2b2ea.c01e64",
+        "id": "7a133195.09b68",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1204.0623779296875,
-        "y": 378.8597717285156,
-        "z": "e001b214.9c4f88",
+        "x": 1132.0623779296875,
+        "y": 376.8597717285156,
+        "z": "d544e90d.c47ab8",
         "wires": []
     },
     {
-        "id": "5abda4b4.ada70c",
+        "id": "f9d75edb.c19d18",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1208,
-        "y": 423,
-        "z": "e001b214.9c4f88",
+        "x": 1136,
+        "y": 421,
+        "z": "d544e90d.c47ab8",
         "wires": []
     },
     {
-        "id": "454b8601.544a2",
+        "id": "c860abc6.0b576",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1238,
-        "y": 329,
-        "z": "e001b214.9c4f88",
+        "x": 1166,
+        "y": 327,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "126fb5a4.b7562a"
+                "f376992c.11dc58"
             ]
         ]
     },
     {
-        "id": "126fb5a4.b7562a",
+        "id": "f376992c.11dc58",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1461.33349609375,
-        "y": 328.99993896484375,
-        "z": "e001b214.9c4f88",
+        "x": 1389.33349609375,
+        "y": 326.99993896484375,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "ceb59f97.b5ebc"
+                "8db70c24.1a1f5"
             ]
         ]
     },
     {
-        "id": "ceb59f97.b5ebc",
+        "id": "8db70c24.1a1f5",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1662.0001335144043,
-        "y": 330.00002098083496,
-        "z": "e001b214.9c4f88",
+        "x": 1590.0001335144043,
+        "y": 328.00002098083496,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "7a55fd6d.840e7c"
+                "5dc8f559.ac7c5c"
             ]
         ]
     },
     {
-        "id": "926eb1f8.ec5de8",
+        "id": "fbeb2897.5d3ca",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 788,
-        "y": 343,
-        "z": "e001b214.9c4f88",
+        "x": 716,
+        "y": 341,
+        "z": "d544e90d.c47ab8",
         "wires": [
             []
         ]
     },
     {
-        "id": "7a55fd6d.840e7c",
+        "id": "5dc8f559.ac7c5c",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1900,
-        "y": 332,
-        "z": "e001b214.9c4f88",
+        "x": 1828,
+        "y": 330,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "ffc75917.89fb6",
-                "cc16da88.4c197",
-                "59e9aa76.56f554"
+                "17e90170.66a2cf",
+                "46c095c4.314d14",
+                "64e3b5e2.26b114"
             ]
         ]
     },
     {
-        "id": "ffc75917.89fb6",
+        "id": "17e90170.66a2cf",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2108,
-        "y": 296,
-        "z": "e001b214.9c4f88",
+        "x": 2036,
+        "y": 294,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "f17f297f.55ca2"
+                "c90d8c84.a14a1"
             ]
         ]
     },
     {
-        "id": "cc16da88.4c197",
+        "id": "46c095c4.314d14",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2108.490966796875,
-        "y": 341.57403564453125,
-        "z": "e001b214.9c4f88",
+        "x": 2036.490966796875,
+        "y": 339.57403564453125,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "43ce3007.4fa548"
+                "3f9ff972.5c8816"
             ]
         ]
     },
     {
-        "id": "59e9aa76.56f554",
+        "id": "64e3b5e2.26b114",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2106,
-        "y": 385,
-        "z": "e001b214.9c4f88",
+        "x": 2034,
+        "y": 383,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "24973dde.e7929a"
+                "6b417e35.8fa86"
             ]
         ]
     },
     {
-        "id": "43ce3007.4fa548",
+        "id": "3f9ff972.5c8816",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2271.0623779296875,
-        "y": 341.8597717285156,
-        "z": "e001b214.9c4f88",
+        "x": 2199.0623779296875,
+        "y": 339.8597717285156,
+        "z": "d544e90d.c47ab8",
         "wires": []
     },
     {
-        "id": "24973dde.e7929a",
+        "id": "6b417e35.8fa86",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2275,
-        "y": 386,
-        "z": "e001b214.9c4f88",
+        "x": 2203,
+        "y": 384,
+        "z": "d544e90d.c47ab8",
         "wires": []
     },
     {
-        "id": "e4afb06c.970a38",
+        "id": "62f4640b.361d2c",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2581,
-        "y": 385,
-        "z": "e001b214.9c4f88",
+        "x": 2509,
+        "y": 383,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "70a3d3e9.7bf864",
-                "4cd17047.fe16a",
-                "c79d571c.0d07f8"
+                "41f800bd.97bbd8",
+                "3588ab7d.ccee3c",
+                "5014f1b1.a66d2"
             ]
         ]
     },
     {
-        "id": "8e239cd5.1b82f8",
+        "id": "9b1454f6.71587",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2965,
-        "y": 385,
-        "z": "e001b214.9c4f88",
+        "x": 2893,
+        "y": 383,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "4fff45e1.354a6c",
-                "7b5f3a76.40dbac",
-                "daa0af8a.c7da5",
-                "1aa21051.71e3e8",
-                "3724be1f.92f8ea",
-                "f7cc948a.349f48",
-                "41f2a122.089c2"
+                "3ec88632.a3afda",
+                "ef2eaf52.5162b",
+                "74648c00.009a34",
+                "176c3740.91c4e1",
+                "a43ffa2e.f43268",
+                "b74320f6.969fd8",
+                "2043f8a6.e6867"
             ]
         ]
     },
     {
-        "id": "70a3d3e9.7bf864",
+        "id": "41f800bd.97bbd8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2792,
-        "y": 387,
-        "z": "e001b214.9c4f88",
+        "x": 2720,
+        "y": 385,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "8e239cd5.1b82f8"
+                "9b1454f6.71587"
             ]
         ]
     },
     {
-        "id": "4cd17047.fe16a",
+        "id": "3588ab7d.ccee3c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2792.490966796875,
-        "y": 432.57403564453125,
-        "z": "e001b214.9c4f88",
+        "x": 2720.490966796875,
+        "y": 430.57403564453125,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "cc11f54d.5be868"
+                "f5b7e34a.e6a3a"
             ]
         ]
     },
     {
-        "id": "c79d571c.0d07f8",
+        "id": "5014f1b1.a66d2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2790,
-        "y": 476,
-        "z": "e001b214.9c4f88",
+        "x": 2718,
+        "y": 474,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "24a1d14c.bade0e"
+                "dad8e49f.e5f9b8"
             ]
         ]
     },
     {
-        "id": "24a1d14c.bade0e",
+        "id": "dad8e49f.e5f9b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2957,
-        "y": 475,
-        "z": "e001b214.9c4f88",
+        "x": 2885,
+        "y": 473,
+        "z": "d544e90d.c47ab8",
         "wires": []
     },
     {
-        "id": "cc11f54d.5be868",
+        "id": "f5b7e34a.e6a3a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2955.0623779296875,
-        "y": 432.8597717285156,
-        "z": "e001b214.9c4f88",
+        "x": 2883.0623779296875,
+        "y": 430.8597717285156,
+        "z": "d544e90d.c47ab8",
         "wires": []
     },
     {
-        "id": "f17f297f.55ca2",
+        "id": "c90d8c84.a14a1",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2309,
-        "y": 291,
-        "z": "e001b214.9c4f88",
+        "x": 2237,
+        "y": 289,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "9cf4adfb.1d5c9"
+                "304af23b.91e62e"
             ]
         ]
     },
     {
-        "id": "9cf4adfb.1d5c9",
+        "id": "304af23b.91e62e",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2514,
-        "y": 291,
-        "z": "e001b214.9c4f88",
+        "x": 2442,
+        "y": 289,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "6e0c0661.962a2"
+                "a73bd099.6c0378"
             ]
         ]
     },
     {
-        "id": "6e0c0661.962a2",
+        "id": "a73bd099.6c0378",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2680,
-        "y": 291,
-        "z": "e001b214.9c4f88",
+        "x": 2608,
+        "y": 289,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "cbe3f419.c9636"
+                "98e41266.eb692"
             ]
         ]
     },
     {
-        "id": "cbe3f419.c9636",
+        "id": "98e41266.eb692",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2843,
-        "y": 291,
-        "z": "e001b214.9c4f88",
+        "x": 2771,
+        "y": 289,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "e4afb06c.970a38"
+                "62f4640b.361d2c"
             ]
         ]
     },
     {
-        "id": "4fff45e1.354a6c",
+        "id": "3ec88632.a3afda",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 3180,
-        "y": 95,
-        "z": "e001b214.9c4f88",
+        "x": 3108,
+        "y": 93,
+        "z": "d544e90d.c47ab8",
         "wires": []
     },
     {
-        "id": "7b5f3a76.40dbac",
+        "id": "ef2eaf52.5162b",
         "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.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3206,
-        "y": 212,
-        "z": "e001b214.9c4f88",
+        "x": 3134,
+        "y": 210,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "38e8f6ad.20b942",
-                "30508f3.2b24cf",
-                "db6a4b33.6458e"
+                "d4d69c61.a67388",
+                "cc6ec5bd.14d058",
+                "7b98c47b.75268c"
             ]
         ]
     },
     {
-        "id": "38e8f6ad.20b942",
+        "id": "d4d69c61.a67388",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3401.5001220703125,
-        "y": 164,
-        "z": "e001b214.9c4f88",
+        "x": 3329.5001220703125,
+        "y": 162,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "740719b1.df8a7"
+                "6766d137.85bc78"
             ]
         ]
     },
     {
-        "id": "30508f3.2b24cf",
+        "id": "cc6ec5bd.14d058",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3393.5001220703125,
-        "y": 219,
-        "z": "e001b214.9c4f88",
+        "x": 3321.5001220703125,
+        "y": 217,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "dcbcbf80.f3d53"
+                "e5b8c6a7.d0685"
             ]
         ]
     },
     {
-        "id": "740719b1.df8a7",
+        "id": "6766d137.85bc78",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3545.8824462890625,
-        "y": 163.65567016601562,
-        "z": "e001b214.9c4f88",
+        "x": 3473.8824462890625,
+        "y": 161.65567016601562,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "1c636e54.f15ca2"
+                "6ec2253c.e8e2fc"
             ]
         ]
     },
     {
-        "id": "1c636e54.f15ca2",
+        "id": "6ec2253c.e8e2fc",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3730,
-        "y": 162,
-        "z": "e001b214.9c4f88",
+        "x": 3658,
+        "y": 160,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "5fbdc63d.dd85c8"
+                "8bfd549d.ff7578"
             ]
         ]
     },
     {
-        "id": "5fbdc63d.dd85c8",
+        "id": "8bfd549d.ff7578",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3925,
-        "y": 162,
-        "z": "e001b214.9c4f88",
+        "x": 3853,
+        "y": 160,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "ea1a11a0.595418"
+                "e0432128.bf189"
             ]
         ]
     },
     {
-        "id": "db6a4b33.6458e",
+        "id": "7b98c47b.75268c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3398.5001220703125,
-        "y": 276,
-        "z": "e001b214.9c4f88",
+        "x": 3326.5001220703125,
+        "y": 274,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "1b105dc6.7eab4a"
+                "a0edf332.814bd"
             ]
         ]
     },
     {
-        "id": "1b105dc6.7eab4a",
+        "id": "a0edf332.814bd",
         "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": 3550.5001220703125,
-        "y": 277,
-        "z": "e001b214.9c4f88",
+        "x": 3478.5001220703125,
+        "y": 275,
+        "z": "d544e90d.c47ab8",
         "wires": []
     },
     {
-        "id": "dcbcbf80.f3d53",
+        "id": "e5b8c6a7.d0685",
         "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": 3561.5001220703125,
-        "y": 220,
-        "z": "e001b214.9c4f88",
+        "x": 3489.5001220703125,
+        "y": 218,
+        "z": "d544e90d.c47ab8",
         "wires": []
     },
     {
-        "id": "96600252.0c8c48",
+        "id": "e1454ec0.76085",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 4513,
-        "y": 179,
-        "z": "e001b214.9c4f88",
+        "x": 4441,
+        "y": 177,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "a696df4c.ceae58",
-                "fe810a19.c34a78",
-                "bbf2a8b1.f6a27"
+                "d8d8f637.323998",
+                "a47d1ee9.cdd92",
+                "e6ec849b.7b7268"
             ]
         ]
     },
     {
-        "id": "792a96dd.b5714",
+        "id": "682b00ad.3f22e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4307,
-        "y": 166,
-        "z": "e001b214.9c4f88",
+        "x": 4235,
+        "y": 164,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "ae074209.8ac108",
-                "96600252.0c8c48",
-                "17402644.74336a"
+                "e9dde318.2ce9c8",
+                "e1454ec0.76085",
+                "d1046ced.fbcef8"
             ]
         ]
     },
     {
-        "id": "ae074209.8ac108",
+        "id": "e9dde318.2ce9c8",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4543,
-        "y": 127,
-        "z": "e001b214.9c4f88",
+        "x": 4471,
+        "y": 125,
+        "z": "d544e90d.c47ab8",
         "wires": []
     },
     {
-        "id": "a696df4c.ceae58",
+        "id": "d8d8f637.323998",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4723,
-        "y": 170,
-        "z": "e001b214.9c4f88",
+        "x": 4651,
+        "y": 168,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "b9171802.93433"
+                "d20b8026.ed11d"
             ]
         ]
     },
     {
-        "id": "fe810a19.c34a78",
+        "id": "a47d1ee9.cdd92",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4715,
-        "y": 225,
-        "z": "e001b214.9c4f88",
+        "x": 4643,
+        "y": 223,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "4798e972.a0e21"
+                "8f556dc3.062b5"
             ]
         ]
     },
     {
-        "id": "bbf2a8b1.f6a27",
+        "id": "e6ec849b.7b7268",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4720,
-        "y": 282,
-        "z": "e001b214.9c4f88",
+        "x": 4648,
+        "y": 280,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "c94f16ac.1ba968"
+                "c00b4c05.8ab27"
             ]
         ]
     },
     {
-        "id": "c94f16ac.1ba968",
+        "id": "c00b4c05.8ab27",
         "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": 4872,
-        "y": 283,
-        "z": "e001b214.9c4f88",
+        "x": 4800,
+        "y": 281,
+        "z": "d544e90d.c47ab8",
         "wires": []
     },
     {
-        "id": "4798e972.a0e21",
+        "id": "8f556dc3.062b5",
         "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": 4883,
-        "y": 228,
-        "z": "e001b214.9c4f88",
+        "x": 4811,
+        "y": 226,
+        "z": "d544e90d.c47ab8",
         "wires": []
     },
     {
-        "id": "b9171802.93433",
+        "id": "d20b8026.ed11d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4867.38232421875,
-        "y": 167.65567016601562,
-        "z": "e001b214.9c4f88",
+        "x": 4795.38232421875,
+        "y": 165.65567016601562,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "300135e0.73329a"
+                "3c8da8b7.eb2a3"
             ]
         ]
     },
     {
-        "id": "ea1a11a0.595418",
+        "id": "e0432128.bf189",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4128,
-        "y": 166,
-        "z": "e001b214.9c4f88",
+        "x": 4056,
+        "y": 164,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "792a96dd.b5714"
+                "682b00ad.3f22e"
             ]
         ]
     },
     {
-        "id": "300135e0.73329a",
+        "id": "3c8da8b7.eb2a3",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.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": 5082,
-        "y": 164,
-        "z": "e001b214.9c4f88",
+        "x": 5010,
+        "y": 162,
+        "z": "d544e90d.c47ab8",
         "wires": []
     },
     {
-        "id": "17402644.74336a",
+        "id": "d1046ced.fbcef8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4463,
-        "y": 243,
-        "z": "e001b214.9c4f88",
+        "x": 4391,
+        "y": 241,
+        "z": "d544e90d.c47ab8",
         "wires": []
     },
     {
-        "id": "f7cc948a.349f48",
+        "id": "b74320f6.969fd8",
         "type": "execute",
         "name": "execute RestApiCallNode Delete transport slice without token",
         "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.domain.url +  '/restconf/operations/ietf-optical-slice:deallocate-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.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`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3330,
-        "y": 510,
-        "z": "e001b214.9c4f88",
+        "x": 3258,
+        "y": 508,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "c1188623.deee1",
-                "470e64d.379031c"
+                "5f11d071.d597d8",
+                "2c04f9a8.8e1bee"
             ]
         ]
     },
     {
-        "id": "c1188623.deee1",
+        "id": "5f11d071.d597d8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3673.5,
-        "y": 505,
-        "z": "e001b214.9c4f88",
+        "x": 3601.5,
+        "y": 503,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "d4cf9dc2.d5afd8"
+                "bc1a033f.a0f87"
             ]
         ]
     },
     {
-        "id": "470e64d.379031c",
+        "id": "2c04f9a8.8e1bee",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3677.5,
-        "y": 545,
-        "z": "e001b214.9c4f88",
+        "x": 3605.5,
+        "y": 543,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "3364bc79.06d9e4"
+                "14490b55.121775"
             ]
         ]
     },
     {
-        "id": "3364bc79.06d9e4",
+        "id": "14490b55.121775",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3835,
-        "y": 545,
-        "z": "e001b214.9c4f88",
+        "x": 3763,
+        "y": 543,
+        "z": "d544e90d.c47ab8",
         "wires": [
             []
         ]
     },
     {
-        "id": "d4cf9dc2.d5afd8",
+        "id": "bc1a033f.a0f87",
         "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 deallocate transport slice rest api\" />\n",
         "comments": "",
-        "x": 3831.5,
-        "y": 505,
-        "z": "e001b214.9c4f88",
+        "x": 3759.5,
+        "y": 503,
+        "z": "d544e90d.c47ab8",
         "wires": []
     },
     {
-        "id": "daa0af8a.c7da5",
+        "id": "74648c00.009a34",
         "type": "set",
         "name": "set attachment_param for TN NSSSI deleteion in PNC",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
         "comments": "",
-        "x": 3306,
-        "y": 385,
-        "z": "e001b214.9c4f88",
+        "x": 3234,
+        "y": 383,
+        "z": "d544e90d.c47ab8",
         "wires": []
     },
     {
-        "id": "1aa21051.71e3e8",
+        "id": "176c3740.91c4e1",
         "type": "save",
         "name": "delete connectivity resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3236,
-        "y": 820,
-        "z": "e001b214.9c4f88",
+        "x": 3164,
+        "y": 818,
+        "z": "d544e90d.c47ab8",
         "wires": [
             []
         ]
     },
     {
-        "id": "3724be1f.92f8ea",
+        "id": "a43ffa2e.f43268",
         "type": "save",
         "name": "delete vpn-binding resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3232,
-        "y": 864,
-        "z": "e001b214.9c4f88",
+        "x": 3160,
+        "y": 862,
+        "z": "d544e90d.c47ab8",
         "wires": [
             []
         ]
     },
     {
-        "id": "41f2a122.089c2",
+        "id": "2ee33a01.a56356",
         "type": "execute",
         "name": "execute RestApiCallNode domain UNI deColoring",
         "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.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id +  '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:slice-id-list=' + $slice-instance-id `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3293,
-        "y": 683,
-        "z": "e001b214.9c4f88",
+        "x": 3744,
+        "y": 682,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "293d42c2.e74426",
-                "f9376496.43cea8"
+                "708d25c4.9f039c",
+                "9fd83c73.a107c"
             ]
         ]
     },
     {
-        "id": "f9376496.43cea8",
+        "id": "9fd83c73.a107c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3559,
-        "y": 663,
-        "z": "e001b214.9c4f88",
+        "x": 4010,
+        "y": 662,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "7b775591.92e164"
+                "a8d157b0.ef0838"
             ]
         ]
     },
     {
-        "id": "293d42c2.e74426",
+        "id": "708d25c4.9f039c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3560.000213623047,
-        "y": 713.9999094009399,
-        "z": "e001b214.9c4f88",
+        "x": 4011.000213623047,
+        "y": 712.9999094009399,
+        "z": "d544e90d.c47ab8",
         "wires": [
             [
-                "f17d1b1f.2fc66"
+                "aa9d5dd.46a2da"
             ]
         ]
     },
     {
-        "id": "7b775591.92e164",
+        "id": "a8d157b0.ef0838",
         "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 decoloring UNI rest api\" />\n",
         "comments": "",
-        "x": 3699.0002479553223,
-        "y": 663.0000009536743,
-        "z": "e001b214.9c4f88",
+        "x": 4150.000247955322,
+        "y": 662.0000009536743,
+        "z": "d544e90d.c47ab8",
         "wires": []
     },
     {
-        "id": "f17d1b1f.2fc66",
+        "id": "aa9d5dd.46a2da",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3705.02725982666,
-        "y": 711.7453947067261,
-        "z": "e001b214.9c4f88",
+        "x": 4156.02725982666,
+        "y": 710.7453947067261,
+        "z": "d544e90d.c47ab8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2043f8a6.e6867",
+        "type": "switchNode",
+        "name": "switch connectivity has ethernet service",
+        "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3193,
+        "y": 699,
+        "z": "d544e90d.c47ab8",
+        "wires": [
+            [
+                "f28924af.d151d",
+                "b67c4790.638238"
+            ]
+        ]
+    },
+    {
+        "id": "b67c4790.638238",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3431,
+        "y": 682,
+        "z": "d544e90d.c47ab8",
+        "wires": [
+            [
+                "2ee33a01.a56356"
+            ]
+        ]
+    },
+    {
+        "id": "f28924af.d151d",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3443,
+        "y": 749,
+        "z": "d544e90d.c47ab8",
         "wires": [
             []
         ]
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 f6c1c6f8..9faaccd7 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
@@ -27,6 +27,10 @@
                     <block></block>
                 </outcome>
             </execute>
+            <set>
+                <parameter name='`tmp.otninfo.`' value='' />
+                <parameter name='`tmp.otninfo_length`' value='0' />
+            </set>
             <for index='vidx' start='0' end='`$otn-oof.solutions_length`' >
                 <block atomic="true">
                     <set>
@@ -60,6 +64,9 @@
                                                                         <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`" />
+                                                                            <!--<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-ltp-id`' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />-->
+                                                                            <!--<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-node-id`' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />-->
+                                                                            <!--<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />-->
                                                                         </set>
                                                                     </block>
                                                                 </outcome>
@@ -70,6 +77,9 @@
                                                                         <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`" />
+                                                                            <!--<parameter name='`tmp.otninfo[$vidx+1].srcPort.src-access-ltp-id`' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />-->
+                                                                            <!--<parameter name='`tmp.otninfo[$vidx+1].srcPort.src-access-node-id`' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />-->
+                                                                            <!--<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />-->
                                                                         </set>
                                                                     </block>
                                                                 </outcome>
@@ -99,6 +109,8 @@
                                                                                 <block atomic="true">
                                                                                     <set>
                                                                                         <parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />
+                                                                                        <parameter name='`tmp.otninfo[$vidx].dstPort.dst-ltp-id`' value="`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`" />
+                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />
                                                                                     </set>
                                                                                 </block>
                                                                             </outcome>
@@ -119,6 +131,8 @@
                                                                                     <set>
                                                                                         <parameter name='domain-A.node-id' value="`$tmp.aai.src-pnf.pnf-id`" />
                                                                                         <parameter name='domain-A.tpn' value='1' />
+                                                                                        <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-node-id`' value="`$tmp.aai.src-pnf.pnf-id`" />
+                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />
                                                                                     </set>
                                                                                     <for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >
                                                                                         <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>
@@ -139,6 +153,12 @@
                                                                                                                 <parameter name='domain-A.client-id' value="`$tmp.aai.src-network-resource.client-id`" />
                                                                                                                 <parameter name='domain-A.te-topo-id' value="`$tmp.aai.src-network-resource.te-topo-id`" />
                                                                                                                 <parameter name='domain-A.network-type' value="`$tmp.aai.src-network-resource.network-type`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-id`' value="`$tmp.aai.src-network-resource.network-id`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-provider-id`' value="`$tmp.aai.src-network-resource.provider-id`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-client-id`' value="`$tmp.aai.src-network-resource.client-id`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-topology-id`' value="`$tmp.aai.src-network-resource.te-topo-id`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-type`' value="`$tmp.aai.src-network-resource.network-type`" />
+                                                                                                                <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />
                                                                                                             </set>
                                                                                                         </outcome>
                                                                                                     </get-resource>
@@ -176,6 +196,8 @@
                                                                                 <block atomic="true">
                                                                                     <set>
                                                                                         <parameter name='domain-A.tunnel-tp-id' value="`$tmp.aai.src-ttp.tunnel-tp-id`" />
+                                                                                        <parameter name='`tmp.otninfo[$vidx].dstPort.dst-tunnel-tp-id`' value="`$tmp.aai.src-ttp.tunnel-tp-id`" />
+                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />
                                                                                     </set>
                                                                                 </block>
                                                                             </outcome>
@@ -223,6 +245,8 @@
                                                                                 <block atomic="true">
                                                                                     <set>
                                                                                         <parameter name='domain-B.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />
+                                                                                        <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-ltp-id`' value="`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`" />
+                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />
                                                                                     </set>
                                                                                 </block>
                                                                             </outcome>
@@ -243,6 +267,8 @@
                                                                                     <set>
                                                                                         <parameter name='domain-B.node-id' value="`$tmp.aai.dst-pnf.pnf-id`" />
                                                                                         <parameter name='domain-B.tpn' value='1' />
+                                                                                        <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-node-id`' value="`$tmp.aai.dst-pnf.pnf-id`" />
+                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />
                                                                                     </set>
                                                                                     <for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >
                                                                                         <switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>
@@ -263,6 +289,12 @@
                                                                                                                 <parameter name='domain-B.client-id' value="`$tmp.aai.dst-network-resource.client-id`" />
                                                                                                                 <parameter name='domain-B.te-topo-id' value="`$tmp.aai.dst-network-resource.te-topo-id`" />
                                                                                                                 <parameter name='domain-B.network-type' value="`$tmp.aai.dst-network-resource.network-type`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-id`' value="`$tmp.aai.dst-network-resource.network-id`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-provider-id`' value="`$tmp.aai.dst-network-resource.provider-id`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-client-id`' value="`$tmp.aai.dst-network-resource.client-id`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-topology-id`' value="`$tmp.aai.dst-network-resource.te-topo-id`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-type`' value="`$tmp.aai.dst-network-resource.network-type`" />
+                                                                                                                <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />
                                                                                                             </set>
                                                                                                         </outcome>
                                                                                                     </get-resource>
@@ -300,6 +332,8 @@
                                                                                 <block atomic="true">
                                                                                     <set>
                                                                                         <parameter name='domain-B.tunnel-tp-id' value="`$tmp.aai.dst-ttp.tunnel-tp-id`" />
+                                                                                        <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-tunnel-tp-id`' value="`$tmp.aai.dst-ttp.tunnel-tp-id`" />
+                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />
                                                                                     </set>
                                                                                 </block>
                                                                             </outcome>
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 40906dad..34a70490 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
@@ -51,183 +51,315 @@
                                                                     </set>
                                                                     <switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>
                                                                         <outcome value='Other'>
-                                                                            <block atomic="true">
-                                                                                <set>
-                                                                                    <parameter name='tmp.aai.vpn-bindingA.' value="`$tmp.aai.vpn-binding.`" />
-                                                                                    <parameter name='tmp.aai.connectivityA.' value="`$tmp.aai.connectivity.`" />
-                                                                                </set>
-                                                                                <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='`$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`' />
-                                                                                    <parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />
-                                                                                    <parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />
-                                                                                    <parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />
-                                                                                </set>
-                                                                                <set>
-                                                                                    <parameter name='tmp.src.domainA.pnf-name' value="`'networkId-providerId-' +
+                                                                            <switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>
+                                                                                <outcome value=''>
+                                                                                    <block atomic="true">
+                                                                                        <set>
+                                                                                            <parameter name='tmp.aai.vpn-bindingA.' value="`$tmp.aai.vpn-binding.`" />
+                                                                                            <parameter name='tmp.aai.connectivityA.' value="`$tmp.aai.connectivity.`" />
+                                                                                        </set>
+                                                                                        <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='`$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`' />
+                                                                                            <parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />
+                                                                                            <parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />
+                                                                                            <parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />
+                                                                                        </set>
+                                                                                        <set>
+                                                                                            <parameter name='tmp.src.domainA.pnf-name' value="`'networkId-providerId-' +
                                                    $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +
                                                    $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +
                                                    $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +
                                                    $tmp.aai.vpn-bindingA.src-access-node-id`" />
-                                                                                </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>
+                                                                                                        </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>
+                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />
+                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te: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 Create OTN tunnel rest api" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='success'>
+                                                                                                <block atomic="true"></block>
+                                                                                            </outcome>
+                                                                                        </execute>
+                                                                                        <set>
+                                                                                            <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
+                                                                                            <parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />
+                                                                                            <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
+                                                                                            <parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />
+                                                                                            <parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />
+                                                                                            <parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />
+                                                                                            <parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
+                                                                                            <parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />
+                                                                                            <parameter name='index-number' value='0' />
+                                                                                            <parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />
+                                                                                            <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />
+                                                                                            <parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
+                                                                                            <parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
+                                                                                            <parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />
+                                                                                        </set>
+                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />
+                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                                                                            <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                            <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='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                            <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                            <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"/>
+                                                                                            <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 Create ethernet service rest api" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='success'>
+                                                                                                <block atomic="true">
+                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                            key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >
+                                                                                                        <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />
+                                                                                                        <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
+                                                                                                        <parameter name='operational-status' value='Activated' />
+                                                                                                    </update>
+                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                            key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>
+                                                                                                        <parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />
+                                                                                                        <parameter name='operational-status' value='Activated' />
+                                                                                                    </update>
+                                                                                                </block>
+                                                                                            </outcome>
+                                                                                        </execute>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                                <outcome value='Other'>
+                                                                                    <block atomic="true">
+                                                                                        <set>
+                                                                                            <parameter name='tmp.aai.vpn-bindingG.' value="`$tmp.aai.vpn-binding.`" />
+                                                                                            <parameter name='tmp.aai.connectivityG.' value="`$tmp.aai.connectivity.`" />
+                                                                                        </set>
+                                                                                        <set>
+                                                                                            <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />
+                                                                                            <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />
+                                                                                            <!--<parameter name='dst-tpn-id' value='1' />-->
+                                                                                            <parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />
+                                                                                            <parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />
+                                                                                            <parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />
+                                                                                            <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />
+                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                            <parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />
+                                                                                            <parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />
+                                                                                            <parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />
+                                                                                            <parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />
+                                                                                        </set>
+                                                                                        <set>
+                                                                                            <parameter name='tmp.domainG.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +
+                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +
+                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +
+                                                   $tmp.aai.vpn-bindingG.src-access-node-id`" />
+                                                                                        </set>
+                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                      resource="pnf"
+                                                                                                      key="pnf.pnf-name = $tmp.domainG.pnf-name"
+                                                                                                      pfx='tmp.aai.domainG-pnf' local-only='false' >
+                                                                                            <!--AND depth = '0'"-->
+                                                                                            <outcome value='success'>
+                                                                                                <block>
+                                                                                                    <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >
+                                                                                                        <switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                                            <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                <block atomic="true">
+                                                                                                                    <set>
+                                                                                                                        <parameter name='tmp.domainG.esr-thirdparty-id' value="`$tmp.aai.domainG-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.domainG.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>
-                                                                                                </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>
-                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />
-                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te: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 Create OTN tunnel rest api" />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                    <outcome value='success'>
-                                                                                        <block atomic="true"></block>
-                                                                                    </outcome>
-                                                                                </execute>
-                                                                                <set>
-                                                                                    <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
-                                                                                    <parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />
-                                                                                    <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
-                                                                                    <parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />
-                                                                                    <parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />
-                                                                                    <parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />
-                                                                                    <parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
-                                                                                    <parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />
-                                                                                    <parameter name='index-number' value='0' />
-                                                                                    <parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />
-                                                                                    <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />
-                                                                                    <parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
-                                                                                    <parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
-                                                                                    <parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />
-                                                                                </set>
-                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />
-                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
-                                                                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
-                                                                                    <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='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                                                    <parameter name="responsePrefix" value="vpn-result"/>
-                                                                                    <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"/>
-                                                                                    <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 Create ethernet service rest api" />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                    <outcome value='success'>
-                                                                                        <block atomic="true">
-                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >
-                                                                                                <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />
-                                                                                                <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
-                                                                                                <parameter name='operational-status' value='Activated' />
-                                                                                            </update>
-                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                    key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>
-                                                                                                <parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />
-                                                                                                <parameter name='operational-status' value='Activated' />
-                                                                                            </update>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                </execute>
-                                                                            </block>
+                                                                                                                                  pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                        <outcome value='success'>
+                                                                                                                            <block>
+                                                                                                                                <set>
+                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value="`$tmp.aai.domainG.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>
+                                                                                                        </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>
+                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-domainG-creation.templatefile`" />
+                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`" />
+                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.user`" />
+                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.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 Create OTN tunnel rest api" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='success'>
+                                                                                                <block atomic="true"></block>
+                                                                                            </outcome>
+                                                                                        </execute>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                            </switch>
                                                                         </outcome>
                                                                         <outcome value=''>
                                                                             <switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>
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 88b7ddba..2cd9b56e 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
@@ -33,6 +33,13 @@
                         <outcome value='false'></outcome>
                         <outcome value='true'>
                             <block>
+                                <set>
+                                    <parameter name='tmp.arr' value='' />
+                                    <parameter name='tmp.arridx' value='0' />
+                                    <parameter name='tmp.arr_length' value='0' />
+                                    <parameter name='otn-tunnel-slice' value='' />
+                                    <parameter name='otn-tunnel-slice_length' value='0' />
+                                </set>
                                 <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`" />
@@ -709,80 +716,342 @@
                                                                                                         <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>
+                                                                                                    <for index='otnidx' start='0' end='`$tmp.otninfo_length`' >
+                                                                                                        <block atomic='true'>
+                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                                <parameter name="ctx-destination" value="prop.vpn-binding-otnidx-uuid"/>
+                                                                                                            </execute>
+                                                                                                            <switch test="`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`">
+                                                                                                                <outcome value='true'>
+                                                                                                                    <set>
+                                                                                                                        <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />
+                                                                                                                        <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />
+                                                                                                                        <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />
+                                                                                                                        <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />
+                                                                                                                    </set>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='false'>
+                                                                                                                    <set>
+                                                                                                                        <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />
+                                                                                                                        <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />
+                                                                                                                        <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />
+                                                                                                                        <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />
+                                                                                                                    </set>
+                                                                                                                </outcome>
+                                                                                                            </switch>
+                                                                                                            <set>
+                                                                                                                <parameter name='tmp.srcdstpnf-name' value="`'networkId-providerId-' +
+                                             $tmp.access-provider-id + '-clientId-' +
+                                             $tmp.access-client-id + '-topologyId-' +
+                                             $tmp.access-topology-id + '-nodeId-' +
+                                             $tmp.srcdstpnf-id`" />
+                                                                                                            </set>
+                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                          resource="pnf"
+                                                                                                                          key="pnf.pnf-name = $tmp.srcdstpnf-name"
+                                                                                                                          pfx='tmp.aai.srcdst-pnf' local-only='false' >
+                                                                                                                <!--AND depth = '0'"-->
+                                                                                                                <outcome value='success'>
+                                                                                                                    <block>
+                                                                                                                        <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >
+                                                                                                                            <switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                                                                <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                                    <block atomic="true">
+                                                                                                                                        <set>
+                                                                                                                                            <parameter name='tmp.domainG.esr-thirdparty-id' value="`$tmp.aai.srcdst-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.domainG.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                                                                      pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                            <outcome value='success'>
+                                                                                                                                                <block>
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value="`$tmp.aai.domainG.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>
+                                                                                                                            </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>
+                                                                                                            <switch test='`$otnidx == 0`'>
+                                                                                                                <outcome value='true'>
+                                                                                                                    <set>
+                                                                                                                        <parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                                        <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />
+                                                                                                                    </set>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='false'>
+                                                                                                                    <switch test='`$otnidx == $tmp.otninfo_length - 1`'>
+                                                                                                                        <outcome value='true'>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />
+                                                                                                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                                            </set>
+                                                                                                                        </outcome>
+                                                                                                                        <outcome value='false'>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />
+                                                                                                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />
+                                                                                                                            </set>
+                                                                                                                        </outcome>
+                                                                                                                    </switch>
+                                                                                                                </outcome>
+                                                                                                            </switch>
+                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                  key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >
+                                                                                                                <parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-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='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->
+                                                                                                                <parameter name='access-provider-id' value='`$tmp.access-provider-id`' />
+                                                                                                                <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->
+                                                                                                                <parameter name='access-client-id' value='`$tmp.access-client-id`' />
+                                                                                                                <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->
+                                                                                                                <parameter name='access-topology-id' value='`$tmp.access-topology-id`' />
+                                                                                                                <!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
+                                                                                                                <parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />
+                                                                                                                <parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />
+                                                                                                                <!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->
+                                                                                                                <parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />
+                                                                                                                <parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-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`' />
+                                                                                                                <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
+                                                                                                                <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
+                                                                                                                <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
+                                                                                                                <outcome value='success'>
+                                                                                                                    <block></block>
+                                                                                                                </outcome>
+                                                                                                            </save>
+                                                                                                            <switch test='`$otnidx == 0`'>
+                                                                                                                <outcome value='true'>
+                                                                                                                    <block>
+                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
+                                                                                                                              key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-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>
+                                                                                                                        <set>
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].otn-dest-node`' value='`$tmp.otninfo[0].dstPort.dst-access-node-id`' />-->
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].bw-odu`' value="`'0,' + $gfp`" />-->
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].src-ttp-id`' value='' />-->
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].dst-ttp-id`' value='`$tmp.otninfo[0].dstPort.dst-tunnel-tp-id`' />-->
+                                                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].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.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>
+                                                                                                                    </block>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='false'>
+                                                                                                                    <block>
+                                                                                                                        <set>
+                                                                                                                            <parameter name='testingvalue' value='$tmp.otninfo_length -1' />
+                                                                                                                        </set>
+                                                                                                                        <switch test='`$otnidx == $tmp.otninfo_length - 1`'>
+                                                                                                                            <outcome value='true'>
+                                                                                                                                <block>
+                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
+                                                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-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='`otn-tunnel-slice[$otnidx].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].bw-odu`' value="`'0,' + $gfp`" />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].dst-ttp-id`' value='' />-->
+                                                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].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>
+                                                                                                                                </block>
+                                                                                                                            </outcome>
+                                                                                                                            <outcome value='false'>
+                                                                                                                                <block atomic='true'>
+                                                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                                                        <parameter name="ctx-destination" value="uuid.connectivity-otnidx-uuid"/>
+                                                                                                                                    </execute>
+                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                          key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>
+                                                                                                                                        <parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />
+                                                                                                                                        <!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->
+                                                                                                                                        <parameter name='operational-status' value='Created' />
+                                                                                                                                        <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->
+                                                                                                                                        <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->
+                                                                                                                                        <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->
+                                                                                                                                        <!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
+                                                                                                                                        <!--<parameter name='access-ltp-id' value='``' />-->
+                                                                                                                                        <!--<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='dummy' />
+                                                                                                                                        <!--<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-otnidx-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-otnidx-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>
+                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
+                                                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-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-otnidx-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-otnidx-uuid`" />
+                                                                                                                                    </save>
+                                                                                                                                    <set>
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-dest-node`' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].bw-odu`' value="`'0,' + $gfp`" />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].dst-ttp-id`' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />-->
+                                                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />-->
+                                                                                                                                    </set>
+                                                                                                                                </block>
+                                                                                                                            </outcome>
+                                                                                                                        </switch>
+                                                                                                                    </block>
+                                                                                                                </outcome>
+                                                                                                            </switch>
+                                                                                                        </block>
+                                                                                                    </for>
                                                                                                     <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]`' />-->
@@ -800,30 +1069,6 @@
                                                                                                         <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`' />-->
@@ -841,30 +1086,6 @@
                                                                                                         <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='' />
@@ -914,55 +1135,182 @@
                                         </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'>
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="vpn-bindings"
+                                              key="selflink = 'https://aai.onap:8443/aai/v21/network/vpn-bindings"
+                                              local-only="false"
+                                              pfx="tmp.aai.all-vpn-bindings" >
+                                    <outcome value='success'>
+                                        <block atomic="true">
+                                            <for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >
+                                                <block atomic='true'>
+                                                    <set>
+                                                        <parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />
+                                                        <parameter name='found' value='false' />
+                                                    </set>
+                                                    <switch test='`$tmp.arr_length != 0`'>
+                                                        <outcome value='true'>
+                                                            <block atomic='true'>
+                                                                <for index='arridx' start='0' end='`$tmp.arr_length`' >
+                                                                    <switch test='`$tmp.arr[$arridx] == $providerValue`'>
+                                                                        <outcome value='true'>
+                                                                            <block atomic='true'>
+                                                                                <set>
+                                                                                    <parameter name='found' value='true' />
+                                                                                </set>
+                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                        key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >
+                                                                                    <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
+                                                                                    <parameter name='vpn-type' value='`$arridx`' />
+                                                                                </update>
+                                                                                <set>
+                                                                                    <parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />
+                                                                                </set>
+                                                                                <set>
+                                                                                    <!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->
+                                                                                    <!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value="`'0,' + $gfp`" />
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />
+                                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />
+                                                                                    <!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />
+                                                                                </set>
+                                                                                <break/>
+                                                                            </block>
+                                                                        </outcome>
+                                                                        <outcome value='false'>
+                                                                            <block></block>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </for>
+                                                                <switch test='`$found`'>
+                                                                    <outcome value='true'>
+                                                                        <block></block>
+                                                                    </outcome>
+                                                                    <outcome value='false'>
+                                                                        <block atomic='true'>
+                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                    key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >
+                                                                                <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
+                                                                                <parameter name='vpn-type' value='`$arridx + 1`' />
+                                                                            </update>
+                                                                            <set>
+                                                                                <parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />
+                                                                                <parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value="`'0,' + $gfp`" />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />
+                                                                                <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />
+                                                                                <parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />
+                                                                            </set>
+                                                                        </block>
+                                                                    </outcome>
+                                                                </switch>
+                                                            </block>
+                                                        </outcome>
+                                                        <outcome value='false'>
+                                                            <block atomic='true'>
+                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                        key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >
+                                                                    <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
+                                                                    <parameter name='vpn-type' value='0' />
+                                                                </update>
+                                                                <set>
+                                                                    <parameter name='tmp.arr[0]' value='`$providerValue`' />
+                                                                    <parameter name='tmp.arr_length' value='1' />
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value="`'0,' + $gfp`" />
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />
+                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />
+                                                                    <parameter name='otn-tunnel-slice_length' value='1' />
+                                                                    <parameter name='otn-tunnel-slice[0].list_length' value='1' />
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                    </switch>
+                                                </block>
+                                            </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="Error executing slice creation api for domain A" />
+                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
                                         </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" />
+                                            <parameter name='error-code' value='' />
+                                            <parameter name='error-message' value='' />
                                         </return>
                                     </outcome>
-                                    <outcome value='success'>
-                                        <block></block>
-                                    </outcome>
-                                </execute>
+                                </get-resource>
+                                <for index='dmnsidx' start='0' end='`$otn-tunnel-slice_length`' >
+                                    <block atomic='true'>
+                                        <for index='stunidx' start='0' end='`$otn-tunnel-slice[$dmnsidx].list_length`' >
+                                            <block atomic='true'>
+                                                <set>
+                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].request-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].request-id`' />
+                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />
+                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />
+                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].bw-odu`' value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].bw-odu`" />
+                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].src-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].src-ttp-id`' />
+                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].dst-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].dst-ttp-id`' />
+                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                    <parameter name='otn-tunnel-sliceG-list_length' value='`$stunidx + 1`' />
+                                                    <parameter name="tmp.domainG.restapiUrl" value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainurl`" />
+                                                    <parameter name="tmp.domainG.restapiUser" value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainuser`" />
+                                                    <parameter name="tmp.domainG.restapiPassword" value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainpassword`" />
+                                                </set>
+                                            </block>
+                                        </for>
+                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceG-list-creation.templatefile`" />
+                                            <parameter name="restapiUrl" value="`$tmp.domainG.restapiUrl + '/restconf/operations/ietf-optical-slice:create-optical-slice'`" />
+                                            <parameter name="restapiUser" value="`$tmp.domainG.restapiUser`" />
+                                            <parameter name="restapiPassword" value="`tmp.domainG.restapiPassword`" />
+                                            <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>
+                                    </block>
+                                </for>
                             </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-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
index 214debf8..6f263361 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
@@ -150,43 +150,48 @@
                                                                             <block atomic="true"></block>
                                                                         </outcome>
                                                                     </execute>
-                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`" />
-                                                                        <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
-                                                                        <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->
-                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
-                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
-                                                                        <parameter name="format" value="json"/>
-                                                                        <parameter name="httpMethod" value="delete"/>
-                                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                                        <parameter name="responsePrefix" value="vpn-result"/>
-                                                                        <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"/>
-                                                                        <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 delete ethernet service rest api" />
-                                                                            </return>
-                                                                        </outcome>
-                                                                        <outcome value='success'>
-                                                                            <block atomic="true">
-                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >
-                                                                                    <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />
-                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />
-                                                                                    <parameter name='operational-status' value='Deactivated' />
-                                                                                </update>
-                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                        key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>
-                                                                                    <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
-                                                                                    <parameter name='operational-status' value='Deactivated' />
-                                                                                </update>
-                                                                            </block>
+                                                                    <switch test='`$tmp.aai.connectivity.etht-svc-name`'>
+                                                                        <outcome value='Other'>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`" />
+                                                                                <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->
+                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                                <parameter name="format" value="json"/>
+                                                                                <parameter name="httpMethod" value="delete"/>
+                                                                                <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                <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"/>
+                                                                                <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 delete ethernet service rest api" />
+                                                                                    </return>
+                                                                                </outcome>
+                                                                                <outcome value='success'>
+                                                                                    <block atomic="true">
+                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >
+                                                                                            <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />
+                                                                                            <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />
+                                                                                            <parameter name='operational-status' value='Deactivated' />
+                                                                                        </update>
+                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>
+                                                                                            <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
+                                                                                            <parameter name='operational-status' value='Deactivated' />
+                                                                                        </update>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                            </execute>
                                                                         </outcome>
-                                                                    </execute>
+                                                                        <outcome value=''></outcome>
+                                                                    </switch>
                                                                 </block>
                                                             </outcome>
                                                             <outcome value='not-found'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.xml
index b6ddc9ad..7c6e65ff 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.xml
@@ -153,30 +153,35 @@
                                                                             <block atomic="true"></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.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id +  '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:slice-id-list=' + $slice-instance-id `" />
-                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
-                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
-                                                                        <parameter name="format" value="json"/>
-                                                                        <parameter name="httpMethod" value="delete"/>
-                                                                        <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 decoloring UNI rest api" />
-                                                                            </return>
-                                                                        </outcome>
-                                                                        <outcome value='success'>
-                                                                            <block></block>
+                                                                    <switch test='`$tmp.aai.connectivity.etht-svc-name`'>
+                                                                        <outcome value='Other'>
+                                                                            <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.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id +  '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:slice-id-list=' + $slice-instance-id `" />
+                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                                <parameter name="format" value="json"/>
+                                                                                <parameter name="httpMethod" value="delete"/>
+                                                                                <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 decoloring UNI rest api" />
+                                                                                    </return>
+                                                                                </outcome>
+                                                                                <outcome value='success'>
+                                                                                    <block></block>
+                                                                                </outcome>
+                                                                            </execute>
                                                                         </outcome>
-                                                                    </execute>
+                                                                        <outcome value=''></outcome>
+                                                                    </switch>
                                                                     <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
                                                                             key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'></delete>
                                                                     <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-- 
cgit 1.2.3-korg