From 97afd8c7495cf23e8819cb666be9ccbe4f968f68 Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Wed, 11 Nov 2020 16:01:57 +0000
Subject: [PATCH] - Changing POST operation to PATCH for OTN Tunnel creation. -
 Adding Transport Slicing DGs into graph.versions - Fixing template files for
 OTN tunnel creation

Issue-ID: SDNC-1413
Change-Id: I3ddabd4c0d361a4e0d5e98caf86e9bb361b41b63
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
---
 ...ogy-operation-get-otn-tunnel-path-from-oof.json |  888 ++++----
 ...nf-topology-operation-trans-slice-activate.json | 1196 +++++-----
 ...nf-topology-operation-trans-slice-allocate.json | 2388 ++++++++++----------
 ...-topology-operation-trans-slice-deactivate.json |  676 +++---
 ...-vnf-topology-operation-trans-slice-delete.json |  684 +++---
 .../src/main/resources/graph.versions              |    5 +
 ...vnf-topology-operation-trans-slice-activate.xml |   19 +-
 ...vnf-topology-operation-trans-slice-allocate.xml |   26 +-
 ...f-topology-operation-trans-slice-deactivate.xml |   12 +-
 ...i-vnf-topology-operation-trans-slice-delete.xml |    8 +-
 .../src/main/json/ts-coloring-uni-port.json        |    6 +-
 .../src/main/json/ts-otn-tunnel-dst-domain.json    |    3 +-
 .../src/main/json/ts-otn-tunnel-src-domain.json    |    3 +-
 13 files changed, 2979 insertions(+), 2935 deletions(-)

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 edc6aadf..5f057be1 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": "ffc612a5.7b0918",
+        "id": "785080f2.6936b8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
         "x": 183,
-        "y": 130,
-        "z": "59711e8e.29744",
+        "y": 123,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "6dda290e.27dad8"
+                "4da9bc1a.de21c4"
             ]
         ]
     },
     {
-        "id": "6dda290e.27dad8",
+        "id": "4da9bc1a.de21c4",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -23,257 +23,257 @@
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
         "x": 308,
-        "y": 456.00001525878906,
-        "z": "59711e8e.29744",
+        "y": 449.00001525878906,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "3ffa7f3f.e7e27"
+                "4d41d418.8146fc"
             ]
         ]
     },
     {
-        "id": "3ffa7f3f.e7e27",
+        "id": "4d41d418.8146fc",
         "type": "method",
         "name": "tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",
         "xml": "<method rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
         "x": 372.0001220703125,
-        "y": 549,
-        "z": "59711e8e.29744",
+        "y": 542,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "9aa7ba3c.52a7f"
+                "e5176e39.ab5f58"
             ]
         ]
     },
     {
-        "id": "4ab3abe1.e87adc",
+        "id": "8caf5150.39185",
         "type": "execute",
         "name": "execute RestApiCallNode getPath from OOF",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
         "x": 854.9730834960938,
-        "y": 207.99600219726562,
-        "z": "59711e8e.29744",
+        "y": 200.99600219726562,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "6b5ff944.5bf648",
-                "850f0c15.20d28"
+                "4d2dbd72.56d1c4",
+                "d1c68f83.41e85"
             ]
         ]
     },
     {
-        "id": "6b5ff944.5bf648",
+        "id": "4d2dbd72.56d1c4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1094.9732246398926,
-        "y": 231.9959716796875,
-        "z": "59711e8e.29744",
+        "y": 224.9959716796875,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "cd276ba.d3fc218"
+                "f83b56b9.c9b638"
             ]
         ]
     },
     {
-        "id": "905d3517.25cab8",
+        "id": "e8159436.f6c238",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing OOF api\" />\n",
         "comments": "",
         "x": 1233.973258972168,
-        "y": 180.99606323242188,
-        "z": "59711e8e.29744",
+        "y": 173.99606323242188,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "850f0c15.20d28",
+        "id": "d1c68f83.41e85",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1093.9730110168457,
-        "y": 180.99606227874756,
-        "z": "59711e8e.29744",
+        "y": 173.99606227874756,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "905d3517.25cab8"
+                "e8159436.f6c238"
             ]
         ]
     },
     {
-        "id": "6a5159e4.7418a",
+        "id": "820d1c3.af11fe",
         "type": "comment",
         "name": "OTN tunnel path computation",
         "info": "TODO: check input parameters -- they should be\nthe source and destination of ETH node+tp.",
         "comments": "",
         "x": 826.4768829345703,
-        "y": 164.00000190734863,
-        "z": "59711e8e.29744",
+        "y": 157.00000190734863,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "eda4482b.a18e38",
+        "id": "74bde20c.a7fc74",
         "type": "for",
         "name": "for vidx..otn-oof.solutions_length[]",
         "xml": "<for index='vidx' start='0' end='`$otn-oof.solutions_length`' >",
         "comments": "",
         "outputs": 1,
         "x": 845.972900390625,
-        "y": 517.2457275390625,
-        "z": "59711e8e.29744",
+        "y": 510.2457275390625,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "576c4b0b.248fb4"
+                "4106c3e4.394aa4"
             ]
         ]
     },
     {
-        "id": "735419f0.115878",
+        "id": "cd87cc44.8c15b8",
         "type": "comment",
         "name": "Loop through OTN links",
         "info": "",
         "comments": "",
         "x": 929.4732055664062,
-        "y": 596.74609375,
-        "z": "59711e8e.29744",
+        "y": 589.74609375,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "576c4b0b.248fb4",
+        "id": "4106c3e4.394aa4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 950.5001220703125,
-        "y": 708.2864990234375,
-        "z": "59711e8e.29744",
+        "y": 701.2864990234375,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "da160010.38d94",
-                "5b4dabd5.4d7054"
+                "ce760c47.cc25c",
+                "881e4d7c.ab39a8"
             ]
         ]
     },
     {
-        "id": "da160010.38d94",
+        "id": "ce760c47.cc25c",
         "type": "get-resource",
         "name": "get-resource cross-link",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"logical-link\" \n\t\tkey=\"logical-link.link-name = $otn-oof.link-name\"\n        pfx='tmp.aai.cross-link' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n\n\n",
         "comments": "",
         "outputs": 1,
         "x": 1217.5001220703125,
-        "y": 628.2864685058594,
-        "z": "59711e8e.29744",
+        "y": 621.2864685058594,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "38a6a5c5.3878b2",
-                "7911950a.d4f9bc",
-                "c37b490.2ec29b8"
+                "ad346b3e.ce4fa8",
+                "fc5baf89.e9e038",
+                "996489b0.d36438"
             ]
         ]
     },
     {
-        "id": "c37b490.2ec29b8",
+        "id": "996489b0.d36438",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1409.0001220703125,
-        "y": 573.2864685058594,
-        "z": "59711e8e.29744",
+        "y": 566.2864685058594,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "203a4a36.513986"
+                "3ceef7ce.6836e"
             ]
         ]
     },
     {
-        "id": "38a6a5c5.3878b2",
+        "id": "ad346b3e.ce4fa8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1445.0001220703125,
-        "y": 698.2864990234375,
-        "z": "59711e8e.29744",
+        "y": 691.2864990234375,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "21535143.0a939e"
+                "ac6169c7.f0845"
             ]
         ]
     },
     {
-        "id": "7911950a.d4f9bc",
+        "id": "fc5baf89.e9e038",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1439.0001220703125,
-        "y": 748.2864990234375,
-        "z": "59711e8e.29744",
+        "y": 741.2864990234375,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "21f78d15.02bd0a"
+                "63822e63.363e4"
             ]
         ]
     },
     {
-        "id": "21535143.0a939e",
+        "id": "ac6169c7.f0845",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 1606.0001220703125,
-        "y": 687.2864990234375,
-        "z": "59711e8e.29744",
+        "y": 680.2864990234375,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "21f78d15.02bd0a",
+        "id": "63822e63.363e4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 1604.0001220703125,
-        "y": 743.2864990234375,
-        "z": "59711e8e.29744",
+        "y": 736.2864990234375,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "875b8573.2757",
+        "id": "dd34e96e.f687",
         "type": "comment",
         "name": "get cross-domain-link information",
         "info": "",
         "comments": "",
         "x": 1218.5001220703125,
-        "y": 589.2864685058594,
-        "z": "59711e8e.29744",
+        "y": 582.2864685058594,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "5b4dabd5.4d7054",
+        "id": "881e4d7c.ab39a8",
         "type": "set",
         "name": "set otn-oof.link-name",
         "xml": "<set>\n<parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].link`' />",
         "comments": "",
         "x": 1200.0001220703125,
-        "y": 538.2864685058594,
-        "z": "59711e8e.29744",
+        "y": 531.2864685058594,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "cd276ba.d3fc218",
+        "id": "f83b56b9.c9b638",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -281,561 +281,561 @@
         "comments": "",
         "outputs": 1,
         "x": 1240.0002708435059,
-        "y": 229.74145698547363,
-        "z": "59711e8e.29744",
+        "y": 222.74145698547363,
+        "z": "f861838.07df98",
         "wires": [
             []
         ]
     },
     {
-        "id": "9aa7ba3c.52a7f",
+        "id": "e5176e39.ab5f58",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 612.9688835144043,
-        "y": 475.74163722991943,
-        "z": "59711e8e.29744",
+        "y": 468.74163722991943,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "eda4482b.a18e38",
-                "4ab3abe1.e87adc"
+                "74bde20c.a7fc74",
+                "8caf5150.39185"
             ]
         ]
     },
     {
-        "id": "edd38a6c.67c6b8",
+        "id": "26918861.79c318",
         "type": "switchNode",
         "name": "test cross-domain-link role",
         "xml": "<switch test='`$tmp.aai.cross-link.link-role`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1724.5001220703125,
-        "y": 573,
-        "z": "59711e8e.29744",
+        "y": 566,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "344b3505.db598a"
+                "3531deb1.d8e4aa"
             ]
         ]
     },
     {
-        "id": "344b3505.db598a",
+        "id": "3531deb1.d8e4aa",
         "type": "outcome",
         "name": "outcome cross-domain",
         "xml": "<outcome value='cross-domain'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1960.5001220703125,
-        "y": 574,
-        "z": "59711e8e.29744",
+        "y": 567,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "bdc2d141.60e88"
+                "eebcac2b.5130c8"
             ]
         ]
     },
     {
-        "id": "7c9a4f45.2dfb5",
+        "id": "7e986d4a.8efc2c",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 2279.5,
-        "y": 1051,
-        "z": "59711e8e.29744",
+        "y": 1044,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "bdc2d141.60e88",
+        "id": "eebcac2b.5130c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2163.5001220703125,
-        "y": 575,
-        "z": "59711e8e.29744",
+        "y": 568,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "7c9a4f45.2dfb5",
-                "54d54d35.c8ade4",
-                "965a7aea.98984",
-                "f57884fd.e852f"
+                "7e986d4a.8efc2c",
+                "ea827dd1.08ec5",
+                "baf2958a.4c4df8",
+                "fb366a0b.531b8"
             ]
         ]
     },
     {
-        "id": "7f48300c.649cc8",
+        "id": "a6afce7.6f2473",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2604,
-        "y": 542,
-        "z": "59711e8e.29744",
+        "y": 535,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "2a6040f8.29261"
+                "f8be66de.741848"
             ]
         ]
     },
     {
-        "id": "9cd22818.9c99c",
+        "id": "2f1a9902.061d36",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2637.0001220703125,
-        "y": 600,
-        "z": "59711e8e.29744",
+        "y": 593,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "8222994e.269fa"
+                "dbfe4fc5.e26958"
             ]
         ]
     },
     {
-        "id": "11e5f855.56b93",
+        "id": "9127ce8b.3def68",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2640.0001220703125,
-        "y": 652,
-        "z": "59711e8e.29744",
+        "y": 645,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "39b267f5.2906b8"
+                "c41edc57.5a3f3"
             ]
         ]
     },
     {
-        "id": "8222994e.269fa",
+        "id": "dbfe4fc5.e26958",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 2822.0001220703125,
-        "y": 604,
-        "z": "59711e8e.29744",
+        "y": 597,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "39b267f5.2906b8",
+        "id": "c41edc57.5a3f3",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 2810.0001220703125,
-        "y": 655,
-        "z": "59711e8e.29744",
+        "y": 648,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "6235283.bbe1f58",
+        "id": "ecb2deab.b51cf",
         "type": "set",
         "name": "set domain A node ttp-id",
         "xml": "<set>\n<parameter name='tmp.domain-A.ttp-id' value=\"`$tmp.aai.src-tp.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 3940.5,
-        "y": 457,
-        "z": "59711e8e.29744",
+        "y": 450,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "4dcc3c3f.b0f8dc",
+        "id": "d1cdcf8f.8a3938",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.domain-A.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3948.5,
-        "y": 509,
-        "z": "59711e8e.29744",
+        "y": 502,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "83dfda72.1dad78"
+                "5ec14125.845248"
             ]
         ]
     },
     {
-        "id": "83dfda72.1dad78",
+        "id": "5ec14125.845248",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4155,
-        "y": 487,
-        "z": "59711e8e.29744",
+        "y": 480,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "bd70272d.20274"
+                "ca7d08dc.2600e"
             ]
         ]
     },
     {
-        "id": "49b3daba.22ab04",
+        "id": "c49d7c6a.28c258",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3492.66845703125,
-        "y": 535.4815063476562,
-        "z": "59711e8e.29744",
+        "y": 528.4815063476562,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "2abdfdd6.de70da"
+                "dd92713b.0e1d48"
             ]
         ]
     },
     {
-        "id": "db5fdeca.64d9c8",
+        "id": "d42ddf1f.aa33b8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.src-tp.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 2955.3828125,
-        "y": 537.6597290039062,
-        "z": "59711e8e.29744",
+        "y": 530.6597290039062,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "7fedd7f6.218328"
+                "422b69de.73fa7"
             ]
         ]
     },
     {
-        "id": "7fedd7f6.218328",
+        "id": "422b69de.73fa7",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-tp.relationship-list.relationship[$vidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3207.3828125,
-        "y": 534.6597290039062,
-        "z": "59711e8e.29744",
+        "y": 527.6597290039062,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "49b3daba.22ab04"
+                "c49d7c6a.28c258"
             ]
         ]
     },
     {
-        "id": "2abdfdd6.de70da",
+        "id": "dd92713b.0e1d48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3719.5,
-        "y": 524,
-        "z": "59711e8e.29744",
+        "y": 517,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "6235283.bbe1f58",
-                "4dcc3c3f.b0f8dc",
-                "3af252ac.f5160e",
-                "b3928b44.45b93",
-                "6051cb19.bdbedc"
+                "ecb2deab.b51cf",
+                "d1cdcf8f.8a3938",
+                "971f1502.6917e",
+                "c7ca7420.72c18",
+                "8d70c942.44a4b"
             ]
         ]
     },
     {
-        "id": "54d54d35.c8ade4",
+        "id": "ea827dd1.08ec5",
         "type": "get-resource",
         "name": "get-resource dst tp",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.dst-ltpId\"\n        pfx='tmp.aai.dst-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
         "comments": "",
         "outputs": 1,
         "x": 2360.5001220703125,
-        "y": 947,
-        "z": "59711e8e.29744",
+        "y": 940,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "caa1180f.475d",
-                "4f60ddcb.06c464",
-                "99e66acf.ef78a8"
+                "6be782aa.b86974",
+                "6d662459.228964",
+                "898db702.b7dc98"
             ]
         ]
     },
     {
-        "id": "caa1180f.475d",
+        "id": "6be782aa.b86974",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2583,
-        "y": 1089,
-        "z": "59711e8e.29744",
+        "y": 1082,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "99dd61a2.0612b8"
+                "65a0fa24.29df6c"
             ]
         ]
     },
     {
-        "id": "4f60ddcb.06c464",
+        "id": "6d662459.228964",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2567,
-        "y": 1140,
-        "z": "59711e8e.29744",
+        "y": 1133,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "ecf71935.9fff1"
+                "b65b40fe.974c6"
             ]
         ]
     },
     {
-        "id": "99e66acf.ef78a8",
+        "id": "898db702.b7dc98",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2570,
-        "y": 1192,
-        "z": "59711e8e.29744",
+        "y": 1185,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "b029d176.ebc328"
+                "bfee6332.37f66"
             ]
         ]
     },
     {
-        "id": "b029d176.ebc328",
+        "id": "bfee6332.37f66",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 2740,
-        "y": 1195,
-        "z": "59711e8e.29744",
+        "y": 1188,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "ecf71935.9fff1",
+        "id": "b65b40fe.974c6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 2752,
-        "y": 1144,
-        "z": "59711e8e.29744",
+        "y": 1137,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "446999ee.737b88",
+        "id": "8d7d4d68.6b1788",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.dst-tp.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 2939.3828125,
-        "y": 1099.6597290039062,
-        "z": "59711e8e.29744",
+        "y": 1092.6597290039062,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "733247bb.4951e8"
+                "575ceb9c.cab194"
             ]
         ]
     },
     {
-        "id": "733247bb.4951e8",
+        "id": "575ceb9c.cab194",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.dst-tp.relationship-list.relationship[$vidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3182.3828125,
-        "y": 1098.6597290039062,
-        "z": "59711e8e.29744",
+        "y": 1091.6597290039062,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "551892cc.c334d4"
+                "b72d167f.fee4e"
             ]
         ]
     },
     {
-        "id": "d1ae1073.116fc8",
+        "id": "a539cf03.6d6808",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4948.5,
-        "y": 900,
-        "z": "59711e8e.29744",
+        "y": 893,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "e4453cc8.2d68",
-                "a58a5fab.4b9628",
-                "a3e0896b.517c78"
+                "d5068892.e23ae8",
+                "81d0dbc4.fd6ab8",
+                "7f9bc054.18256"
             ]
         ]
     },
     {
-        "id": "551892cc.c334d4",
+        "id": "b72d167f.fee4e",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3438.66845703125,
-        "y": 1098.4815063476562,
-        "z": "59711e8e.29744",
+        "y": 1091.4815063476562,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "167858f1.4d47ff"
+                "9c7f096e.2675b8"
             ]
         ]
     },
     {
-        "id": "c5e10d55.b93e8",
+        "id": "9378bfdf.c4bd08",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4735.5,
-        "y": 899,
-        "z": "59711e8e.29744",
+        "y": 892,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "d1ae1073.116fc8"
+                "a539cf03.6d6808"
             ]
         ]
     },
     {
-        "id": "167858f1.4d47ff",
+        "id": "9c7f096e.2675b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3738.5,
-        "y": 1096,
-        "z": "59711e8e.29744",
+        "y": 1089,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "b3d72c6d.8cf07",
-                "1624e4ba.2068eb",
-                "140c24f7.3b14f3",
-                "c25cb799.15c3f8",
-                "a035bf70.73a55"
+                "176fbec8.809f09",
+                "4808dba3.0d097c",
+                "a9a61e4c.61cea8",
+                "967b7a6e.29dcc",
+                "eb2816b.38b8868"
             ]
         ]
     },
     {
-        "id": "b3d72c6d.8cf07",
+        "id": "176fbec8.809f09",
         "type": "set",
         "name": "set domain B node ttp-id",
         "xml": "<set>\n<parameter name='tmp.domain-B.ttp-id' value=\"`$tmp.aai.dst-tp.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 3980.5,
-        "y": 1050,
-        "z": "59711e8e.29744",
+        "y": 1043,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "1624e4ba.2068eb",
+        "id": "4808dba3.0d097c",
         "type": "get-resource",
         "name": "get-resource dst TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.domain-B.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3970.5,
-        "y": 1101,
-        "z": "59711e8e.29744",
+        "y": 1094,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "58cdb5cc.380cfc"
+                "4a5731eb.8e0df8"
             ]
         ]
     },
     {
-        "id": "58cdb5cc.380cfc",
+        "id": "4a5731eb.8e0df8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4158,
-        "y": 1099,
-        "z": "59711e8e.29744",
+        "y": 1092,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "355115bb.2168d2"
+                "53c0541b.770fcc"
             ]
         ]
     },
     {
-        "id": "e4453cc8.2d68",
+        "id": "d5068892.e23ae8",
         "type": "set",
         "name": "set domain B network-id",
         "xml": "<set>\n<parameter name='tmp.domain-B.network-id' value=\"`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 5218.5,
-        "y": 876,
-        "z": "59711e8e.29744",
+        "y": 869,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "a58a5fab.4b9628",
+        "id": "81d0dbc4.fd6ab8",
         "type": "get-resource",
         "name": "get-resource dst network-resource",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-B.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-network-resource' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
         "x": 5228.5,
-        "y": 922,
-        "z": "59711e8e.29744",
+        "y": 915,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "a2d84f11.e4cb88"
+                "584862de.86be1c"
             ]
         ]
     },
     {
-        "id": "a2d84f11.e4cb88",
+        "id": "584862de.86be1c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5444,
-        "y": 913,
-        "z": "59711e8e.29744",
+        "y": 906,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "33f08d3a.c124c2"
+                "419ec6e9.6efd2"
             ]
         ]
     },
     {
-        "id": "33f08d3a.c124c2",
+        "id": "419ec6e9.6efd2",
         "type": "set",
         "name": "set domain B network-id, topo-id, client-id, etc",
         "xml": "<set>\n<parameter name='domain-B.network-id' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='domain-B.provider-id' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='domain-B.client-id' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='domain-B.te-topo-id' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='domain-B.network-type' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n\n\n",
         "comments": "",
         "x": 5698.5,
-        "y": 919,
-        "z": "59711e8e.29744",
+        "y": 912,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "2a6040f8.29261",
+        "id": "f8be66de.741848",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -843,16 +843,16 @@
         "comments": "",
         "outputs": 1,
         "x": 2738,
-        "y": 538,
-        "z": "59711e8e.29744",
+        "y": 531,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "db5fdeca.64d9c8"
+                "d42ddf1f.aa33b8"
             ]
         ]
     },
     {
-        "id": "99dd61a2.0612b8",
+        "id": "65a0fa24.29df6c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -860,16 +860,16 @@
         "comments": "",
         "outputs": 1,
         "x": 2729,
-        "y": 1080,
-        "z": "59711e8e.29744",
+        "y": 1073,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "446999ee.737b88"
+                "8d7d4d68.6b1788"
             ]
         ]
     },
     {
-        "id": "203a4a36.513986",
+        "id": "3ceef7ce.6836e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -877,86 +877,86 @@
         "comments": "",
         "outputs": 1,
         "x": 1543,
-        "y": 575,
-        "z": "59711e8e.29744",
+        "y": 568,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "edd38a6c.67c6b8"
+                "26918861.79c318"
             ]
         ]
     },
     {
-        "id": "965a7aea.98984",
+        "id": "baf2958a.4c4df8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='lridx' start='0' end='`$tmp.aai.cross-link.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 2313,
-        "y": 359,
-        "z": "59711e8e.29744",
+        "y": 352,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "3bc95abb.a9239e"
+                "98d39228.4f43c"
             ]
         ]
     },
     {
-        "id": "3bc95abb.a9239e",
+        "id": "98d39228.4f43c",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2512,
-        "y": 356,
-        "z": "59711e8e.29744",
+        "y": 349,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "3cce24fd.740654"
+                "1abf5c4f.924da4"
             ]
         ]
     },
     {
-        "id": "3cce24fd.740654",
+        "id": "1abf5c4f.924da4",
         "type": "outcome",
         "name": "p-interface",
         "xml": "<outcome value='p-interface'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2689.117431640625,
-        "y": 354.34027099609375,
-        "z": "59711e8e.29744",
+        "y": 347.34027099609375,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "6ac060c8.1a11e8"
+                "d47f9442.a83a08"
             ]
         ]
     },
     {
-        "id": "9ef5481b.bf4b48",
+        "id": "8b0d1bcd.9b2bf8",
         "type": "set",
         "name": "set src-ltpId and dst-ltpId",
         "xml": "<set>\n<parameter name='tmp.cross-link.src-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`\" />\n<parameter name='tmp.cross-link.dst-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[1].relationship-value`\" />\n\n<parameter name='tmp.src-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />\n<parameter name='tmp.dst-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
         "x": 3003,
-        "y": 298,
-        "z": "59711e8e.29744",
+        "y": 291,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "ddeb58ef.e40c3",
+        "id": "69b5dc47.c8bab4",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 2964,
-        "y": 361,
-        "z": "59711e8e.29744",
+        "y": 354,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "6ac060c8.1a11e8",
+        "id": "d47f9442.a83a08",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -964,155 +964,155 @@
         "comments": "",
         "outputs": 1,
         "x": 2829,
-        "y": 339,
-        "z": "59711e8e.29744",
+        "y": 332,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "9ef5481b.bf4b48",
-                "ddeb58ef.e40c3"
+                "8b0d1bcd.9b2bf8",
+                "69b5dc47.c8bab4"
             ]
         ]
     },
     {
-        "id": "bd70272d.20274",
+        "id": "ca7d08dc.2600e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4330,
-        "y": 483,
-        "z": "59711e8e.29744",
+        "y": 476,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "b2e7a790.6b1818"
+                "4e511808.615928"
             ]
         ]
     },
     {
-        "id": "355115bb.2168d2",
+        "id": "53c0541b.770fcc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4347,
-        "y": 1088,
-        "z": "59711e8e.29744",
+        "y": 1081,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "d4658a57.f78ed8"
+                "1d3fc9e2.e7e6d6"
             ]
         ]
     },
     {
-        "id": "f57884fd.e852f",
+        "id": "fb366a0b.531b8",
         "type": "get-resource",
         "name": "get-resource src tp",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.src-ltpId\"\n        pfx='tmp.aai.src-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
         "comments": "",
         "outputs": 1,
         "x": 2406.5001220703125,
-        "y": 581,
-        "z": "59711e8e.29744",
+        "y": 574,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "7f48300c.649cc8",
-                "9cd22818.9c99c",
-                "11e5f855.56b93"
+                "a6afce7.6f2473",
+                "2f1a9902.061d36",
+                "9127ce8b.3def68"
             ]
         ]
     },
     {
-        "id": "3af252ac.f5160e",
+        "id": "971f1502.6917e",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\"\n        pfx='tmp.aai.src-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 3810,
-        "y": 327,
-        "z": "59711e8e.29744",
+        "y": 320,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "fd4b75db.4422e8",
-                "650bdcdc.cfece4",
-                "72662c6f.14033c"
+                "806ba724.7c9cb",
+                "6ff47511.68ce04",
+                "3a2344e6.758334"
             ]
         ]
     },
     {
-        "id": "fd4b75db.4422e8",
+        "id": "806ba724.7c9cb",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4005.5001220703125,
-        "y": 279,
-        "z": "59711e8e.29744",
+        "y": 272,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "b45c7d99.22c22"
+                "198edc3a.f7e7a4"
             ]
         ]
     },
     {
-        "id": "650bdcdc.cfece4",
+        "id": "6ff47511.68ce04",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3997.5001220703125,
-        "y": 334,
-        "z": "59711e8e.29744",
+        "y": 327,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "cb3c1121.cbe778"
+                "658b18f7.6c229"
             ]
         ]
     },
     {
-        "id": "72662c6f.14033c",
+        "id": "3a2344e6.758334",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4002.5001220703125,
-        "y": 391,
-        "z": "59711e8e.29744",
+        "y": 384,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "789ed2a8.499b74"
+                "10fe2a63.edb7de"
             ]
         ]
     },
     {
-        "id": "789ed2a8.499b74",
+        "id": "10fe2a63.edb7de",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 4154.5001220703125,
-        "y": 392,
-        "z": "59711e8e.29744",
+        "y": 385,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "cb3c1121.cbe778",
+        "id": "658b18f7.6c229",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 4165.5001220703125,
-        "y": 337,
-        "z": "59711e8e.29744",
+        "y": 330,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "b45c7d99.22c22",
+        "id": "198edc3a.f7e7a4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -1120,116 +1120,116 @@
         "comments": "",
         "outputs": 1,
         "x": 4149.8824462890625,
-        "y": 276.6556701660156,
-        "z": "59711e8e.29744",
+        "y": 269.6556701660156,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "ba380e73.fe2bc8",
-                "65a7e039.6dcda8"
+                "3a3ab784.901e48",
+                "a97b2a05.9f73a"
             ]
         ]
     },
     {
-        "id": "ba380e73.fe2bc8",
+        "id": "3a3ab784.901e48",
         "type": "set",
         "name": "set domain A node-id and tpn",
         "xml": "<set>\n<parameter name='domain-A.node-id' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='domain-A.tpn' value='1' />\n",
         "comments": "",
         "x": 4375,
-        "y": 232,
-        "z": "59711e8e.29744",
+        "y": 225,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "b3928b44.45b93",
+        "id": "c7ca7420.72c18",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 3897,
-        "y": 574,
-        "z": "59711e8e.29744",
+        "y": 567,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "b2e7a790.6b1818",
+        "id": "4e511808.615928",
         "type": "set",
         "name": "set domain A tunnel tp ip",
         "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
         "x": 4591,
-        "y": 480,
-        "z": "59711e8e.29744",
+        "y": 473,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "c25cb799.15c3f8",
+        "id": "967b7a6e.29dcc",
         "type": "get-resource",
         "name": "get-resource dst pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\"\n        pfx='tmp.aai.dst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 3807,
-        "y": 930,
-        "z": "59711e8e.29744",
+        "y": 923,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "c37473f2.19f208",
-                "c644027c.70c3f8",
-                "98fb79a9.84cdc8"
+                "e327bfa4.a9a3a8",
+                "d6f6e8cf.638658",
+                "370c2654.35ab6a"
             ]
         ]
     },
     {
-        "id": "98fb79a9.84cdc8",
+        "id": "370c2654.35ab6a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4002.5001220703125,
-        "y": 882,
-        "z": "59711e8e.29744",
+        "y": 875,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "3c4a5895.c63a"
+                "750d9871.e65c38"
             ]
         ]
     },
     {
-        "id": "c644027c.70c3f8",
+        "id": "d6f6e8cf.638658",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3994.5001220703125,
-        "y": 937,
-        "z": "59711e8e.29744",
+        "y": 930,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "70fd1b7c.8d1aac"
+                "a22c9c14.dad95"
             ]
         ]
     },
     {
-        "id": "c37473f2.19f208",
+        "id": "e327bfa4.a9a3a8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3999.5001220703125,
-        "y": 994,
-        "z": "59711e8e.29744",
+        "y": 987,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "cd3e066f.324aa"
+                "68964b02.e7fefc"
             ]
         ]
     },
     {
-        "id": "3c4a5895.c63a",
+        "id": "750d9871.e65c38",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -1237,416 +1237,416 @@
         "comments": "",
         "outputs": 1,
         "x": 4146.8824462890625,
-        "y": 879.6556701660156,
-        "z": "59711e8e.29744",
+        "y": 872.6556701660156,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "a79b012a.c282e",
-                "469c63f2.54b414"
+                "93208213.553588",
+                "71258e68.5cbd58"
             ]
         ]
     },
     {
-        "id": "70fd1b7c.8d1aac",
+        "id": "a22c9c14.dad95",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 4162.5001220703125,
-        "y": 940,
-        "z": "59711e8e.29744",
+        "y": 933,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "cd3e066f.324aa",
+        "id": "68964b02.e7fefc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 4151.5001220703125,
-        "y": 995,
-        "z": "59711e8e.29744",
+        "y": 988,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "a79b012a.c282e",
+        "id": "93208213.553588",
         "type": "set",
         "name": "set domain B node-id and tpn",
         "xml": "<set>\n<parameter name='domain-B.node-id' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='domain-B.tpn' value='1' />\n",
         "comments": "",
         "x": 4356,
-        "y": 847,
-        "z": "59711e8e.29744",
+        "y": 840,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "140c24f7.3b14f3",
+        "id": "a9a61e4c.61cea8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 3926,
-        "y": 1142,
-        "z": "59711e8e.29744",
+        "y": 1135,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "d4658a57.f78ed8",
+        "id": "1d3fc9e2.e7e6d6",
         "type": "set",
         "name": "set domain B tunnel tp id",
         "xml": "<set>\n<parameter name='domain-B.tunnel-tp-id' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
         "x": 4580,
-        "y": 1087,
-        "z": "59711e8e.29744",
+        "y": 1080,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "4b900139.065478",
+        "id": "57d0de73.a03a68",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4732,
-        "y": 295,
-        "z": "59711e8e.29744",
+        "y": 288,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "c3283205.62573"
+                "ed098b6a.2cacf8"
             ]
         ]
     },
     {
-        "id": "c3283205.62573",
+        "id": "ed098b6a.2cacf8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4909,
-        "y": 287,
-        "z": "59711e8e.29744",
+        "y": 280,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "e3322f04.45bf9",
-                "201af2cb.ff685e",
-                "24c615e9.67af32"
+                "61d12009.69ae18",
+                "bb57da49.8f1178",
+                "85c9485f.31b9d8"
             ]
         ]
     },
     {
-        "id": "e3322f04.45bf9",
+        "id": "61d12009.69ae18",
         "type": "set",
         "name": "set domain A network-id",
         "xml": "<set>\n<parameter name='tmp.domain-A.network-id' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 5124,
-        "y": 268,
-        "z": "59711e8e.29744",
+        "y": 261,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "201af2cb.ff685e",
+        "id": "bb57da49.8f1178",
         "type": "get-resource",
         "name": "get-resource src network-resource",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-A.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-network-resource' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
         "x": 5141,
-        "y": 332,
-        "z": "59711e8e.29744",
+        "y": 325,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "ba151945.9e348"
+                "603dc665.e100a"
             ]
         ]
     },
     {
-        "id": "ba151945.9e348",
+        "id": "603dc665.e100a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5364.5,
-        "y": 333,
-        "z": "59711e8e.29744",
+        "y": 326,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "bf5ba977.146f8"
+                "bfe1407d.be933"
             ]
         ]
     },
     {
-        "id": "bf5ba977.146f8",
+        "id": "bfe1407d.be933",
         "type": "set",
         "name": "set domain A network-id, topo-id, client-id, etc",
         "xml": "<set>\n<parameter name='domain-A.network-id' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='domain-A.provider-id' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='domain-A.client-id' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='domain-A.te-topo-id' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='domain-A.network-type' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n\n\n",
         "comments": "",
         "x": 5629,
-        "y": 322,
-        "z": "59711e8e.29744",
+        "y": 315,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "65a7e039.6dcda8",
+        "id": "a97b2a05.9f73a",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 4334,
-        "y": 291,
-        "z": "59711e8e.29744",
+        "y": 284,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "ebc07ec5.500b48"
+                "2c83d3d0.5ba494"
             ]
         ]
     },
     {
-        "id": "ebc07ec5.500b48",
+        "id": "2c83d3d0.5ba494",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4529,
-        "y": 291,
-        "z": "59711e8e.29744",
+        "y": 284,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "4b900139.065478"
+                "57d0de73.a03a68"
             ]
         ]
     },
     {
-        "id": "24c615e9.67af32",
+        "id": "85c9485f.31b9d8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 5068,
-        "y": 385,
-        "z": "59711e8e.29744",
+        "y": 378,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "469c63f2.54b414",
+        "id": "71258e68.5cbd58",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 4335,
-        "y": 898,
-        "z": "59711e8e.29744",
+        "y": 891,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "a4a499c0.e7f04"
+                "1cdec3b0.3edecc"
             ]
         ]
     },
     {
-        "id": "a4a499c0.e7f04",
+        "id": "1cdec3b0.3edecc",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4530,
-        "y": 898,
-        "z": "59711e8e.29744",
+        "y": 891,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "c5e10d55.b93e8"
+                "9378bfdf.c4bd08"
             ]
         ]
     },
     {
-        "id": "a3e0896b.517c78",
+        "id": "7f9bc054.18256",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 5154,
-        "y": 978,
-        "z": "59711e8e.29744",
+        "y": 971,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "6051cb19.bdbedc",
+        "id": "8d70c942.44a4b",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.src-tp`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-src-tp\"/>\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3838,
-        "y": 121,
-        "z": "59711e8e.29744",
+        "y": 114,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "474c52a4.93fc74",
-                "2bdecc1b.43ff94"
+                "f6a321aa.4933d",
+                "d873be99.cdd6b8"
             ]
         ]
     },
     {
-        "id": "2bdecc1b.43ff94",
+        "id": "d873be99.cdd6b8",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4059,
-        "y": 89,
-        "z": "59711e8e.29744",
+        "y": 82,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "21520c33.eb9b1c"
+                "aee73e2c.22e008"
             ]
         ]
     },
     {
-        "id": "474c52a4.93fc74",
+        "id": "f6a321aa.4933d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4059,
-        "y": 136,
-        "z": "59711e8e.29744",
+        "y": 129,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "ff0936f5.25fc9"
+                "58dfd18f.2c2408"
             ]
         ]
     },
     {
-        "id": "21520c33.eb9b1c",
+        "id": "aee73e2c.22e008",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4224,
-        "y": 86,
-        "z": "59711e8e.29744",
+        "y": 79,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "47f81613.356b38"
+                "e00cc6b0.3f2b6"
             ]
         ]
     },
     {
-        "id": "47f81613.356b38",
+        "id": "e00cc6b0.3f2b6",
         "type": "set",
         "name": "set domain-A.ltpId",
         "xml": "<set>\n<parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />\n",
         "comments": "",
         "x": 4406,
-        "y": 90,
-        "z": "59711e8e.29744",
+        "y": 83,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "ff0936f5.25fc9",
+        "id": "58dfd18f.2c2408",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
         "x": 4226,
-        "y": 136,
-        "z": "59711e8e.29744",
+        "y": 129,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "a035bf70.73a55",
+        "id": "eb2816b.38b8868",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.dst-tp`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-dst-tp\"/>\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3846,
-        "y": 745,
-        "z": "59711e8e.29744",
+        "y": 738,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "310e01dd.c1a27e",
-                "976ae4f1.c35c1"
+                "4540307f.4c5428",
+                "da15be4.fdd654"
             ]
         ]
     },
     {
-        "id": "976ae4f1.c35c1",
+        "id": "da15be4.fdd654",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4067,
-        "y": 713,
-        "z": "59711e8e.29744",
+        "y": 706,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "20b670c9.8ae9c8"
+                "344ce354.79f65c"
             ]
         ]
     },
     {
-        "id": "310e01dd.c1a27e",
+        "id": "4540307f.4c5428",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4067,
-        "y": 760,
-        "z": "59711e8e.29744",
+        "y": 753,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "75ef28c6.5e31a"
+                "e36b8ad2.500998"
             ]
         ]
     },
     {
-        "id": "20b670c9.8ae9c8",
+        "id": "344ce354.79f65c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4232,
-        "y": 710,
-        "z": "59711e8e.29744",
+        "y": 703,
+        "z": "f861838.07df98",
         "wires": [
             [
-                "3c392a8.397b7d6"
+                "2f5cfc52.4cced4"
             ]
         ]
     },
     {
-        "id": "3c392a8.397b7d6",
+        "id": "2f5cfc52.4cced4",
         "type": "set",
         "name": "set domain-B.ltpId",
         "xml": "<set>\n<parameter name='domain-B.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />\n",
         "comments": "",
         "x": 4428,
-        "y": 707,
-        "z": "59711e8e.29744",
+        "y": 700,
+        "z": "f861838.07df98",
         "wires": []
     },
     {
-        "id": "75ef28c6.5e31a",
+        "id": "e36b8ad2.500998",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
         "x": 4234,
-        "y": 760,
-        "z": "59711e8e.29744",
+        "y": 753,
+        "z": "f861838.07df98",
         "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 9ffaaf75..3d894d5e 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": "d3bb30c4.60fa",
+        "id": "d5615e24.a00ab8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 130,
-        "y": 87,
-        "z": "bc9d969b.328b8",
+        "x": 156,
+        "y": 95,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "d58b4202.9cdb3"
+                "90741178.637a68"
             ]
         ]
     },
     {
-        "id": "d58b4202.9cdb3",
+        "id": "90741178.637a68",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1717 +22,1729 @@
         "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": 261.2856903076172,
-        "y": 136.23810863494873,
-        "z": "bc9d969b.328b8",
+        "x": 287.2856903076172,
+        "y": 144.23810863494873,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "617bde2e.1132b"
+                "e9aee376.235818"
             ]
         ]
     },
     {
-        "id": "617bde2e.1132b",
+        "id": "e9aee376.235818",
         "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": 264.4286193847656,
-        "y": 221.00003242492676,
-        "z": "bc9d969b.328b8",
+        "x": 290.4286193847656,
+        "y": 229.00003242492676,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "8ac7a60e.72d768"
+                "9c8b5d20.5b6ef8"
             ]
         ]
     },
     {
-        "id": "8ac7a60e.72d768",
+        "id": "9c8b5d20.5b6ef8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 414.238037109375,
-        "y": 350.6666564941406,
-        "z": "bc9d969b.328b8",
+        "x": 440.238037109375,
+        "y": 358.6666564941406,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "72b21bde.5e8f94",
-                "9fe7f5eb.e26c6",
-                "9bca10ea.41532"
+                "f1c1dc9b.59851",
+                "40fee6aa.417918",
+                "a3f28ac6.d30ed8"
             ]
         ]
     },
     {
-        "id": "72b21bde.5e8f94",
+        "id": "f1c1dc9b.59851",
         "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": 682.5716552734375,
-        "y": 737.59716796875,
-        "z": "bc9d969b.328b8",
+        "x": 708.5716552734375,
+        "y": 745.59716796875,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "441fc399.08ca9c",
+        "id": "e4fd4d94.2b8ec8",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 714,
-        "y": 412,
-        "z": "bc9d969b.328b8",
+        "x": 740,
+        "y": 420,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "9fe7f5eb.e26c6",
+        "id": "40fee6aa.417918",
         "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": 734,
-        "y": 508,
-        "z": "bc9d969b.328b8",
+        "x": 760,
+        "y": 516,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "926c12ae.af2a48",
-                "5deb4cbf.60b5f4",
-                "35c77549.8e65c2"
+                "15f2cda7.88709a",
+                "187b249d.3c85cb",
+                "c12e657e.e2c7f8"
             ]
         ]
     },
     {
-        "id": "926c12ae.af2a48",
+        "id": "15f2cda7.88709a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 953,
-        "y": 446,
-        "z": "bc9d969b.328b8",
+        "x": 979,
+        "y": 454,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "c296586e.046f08"
+                "56c6117d.ed7bc"
             ]
         ]
     },
     {
-        "id": "5deb4cbf.60b5f4",
+        "id": "187b249d.3c85cb",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 962.490966796875,
-        "y": 488.57403564453125,
-        "z": "bc9d969b.328b8",
+        "x": 988.490966796875,
+        "y": 496.57403564453125,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "bb46ff52.717af8"
+                "dd3e3cac.482ca8"
             ]
         ]
     },
     {
-        "id": "35c77549.8e65c2",
+        "id": "c12e657e.e2c7f8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 951,
-        "y": 535,
-        "z": "bc9d969b.328b8",
+        "x": 977,
+        "y": 543,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "236d61d5.47d9a6"
+                "d7bbbdd4.b85c7"
             ]
         ]
     },
     {
-        "id": "bb46ff52.717af8",
+        "id": "dd3e3cac.482ca8",
         "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": 1116.0623779296875,
-        "y": 491.8597717285156,
-        "z": "bc9d969b.328b8",
+        "x": 1142.0623779296875,
+        "y": 499.8597717285156,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "236d61d5.47d9a6",
+        "id": "d7bbbdd4.b85c7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1120,
-        "y": 536,
-        "z": "bc9d969b.328b8",
+        "x": 1146,
+        "y": 544,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "c296586e.046f08",
+        "id": "56c6117d.ed7bc",
         "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": 1150,
-        "y": 442,
-        "z": "bc9d969b.328b8",
+        "x": 1176,
+        "y": 450,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "b77b70ed.c591c"
+                "68f0da0a.13a494"
             ]
         ]
     },
     {
-        "id": "b77b70ed.c591c",
+        "id": "68f0da0a.13a494",
         "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": 1373.33349609375,
-        "y": 441.99993896484375,
-        "z": "bc9d969b.328b8",
+        "x": 1399.33349609375,
+        "y": 449.99993896484375,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "2fc295b4.0602da"
+                "a37a9810.801788"
             ]
         ]
     },
     {
-        "id": "2fc295b4.0602da",
+        "id": "a37a9810.801788",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1574.0001335144043,
-        "y": 443.00002098083496,
-        "z": "bc9d969b.328b8",
+        "x": 1600.0001335144043,
+        "y": 451.00002098083496,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "483259b4.af3e1"
+                "2d3714db.b7aad4"
             ]
         ]
     },
     {
-        "id": "cba9b813.e1b22",
+        "id": "3d56fd4f.8da4ea",
         "type": "set",
         "name": "set attachment_param for OTN A",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<parameter name='dst-tpn-id' value='1' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",
         "comments": "",
-        "x": 3835,
-        "y": 162,
-        "z": "bc9d969b.328b8",
+        "x": 3861,
+        "y": 170,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "c84632a9.494938",
+        "id": "119d7057.187e9",
         "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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.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": 3916,
-        "y": 477,
-        "z": "bc9d969b.328b8",
+        "x": 3942,
+        "y": 485,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "f012f442.27b7b8",
-                "961e7c8c.e8988"
+                "a078109.a1f9bf",
+                "c205f5c4.0bdb88"
             ]
         ]
     },
     {
-        "id": "f012f442.27b7b8",
+        "id": "a078109.a1f9bf",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4225.5,
-        "y": 446,
-        "z": "bc9d969b.328b8",
+        "x": 4251.5,
+        "y": 454,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "85de6f60.586588"
+                "3b38ca16.a7fb4e"
             ]
         ]
     },
     {
-        "id": "961e7c8c.e8988",
+        "id": "c205f5c4.0bdb88",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4230.5,
-        "y": 511,
-        "z": "bc9d969b.328b8",
+        "x": 4256.5,
+        "y": 519,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "b3e28f35.f331c"
+                "176e9242.258856"
             ]
         ]
     },
     {
-        "id": "85de6f60.586588",
+        "id": "3b38ca16.a7fb4e",
         "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 vpn rest api\" />\n",
+        "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": 4401.5,
-        "y": 446,
-        "z": "bc9d969b.328b8",
+        "x": 4427.5,
+        "y": 454,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "b3e28f35.f331c",
+        "id": "176e9242.258856",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4397,
-        "y": 511,
-        "z": "bc9d969b.328b8",
+        "x": 4423,
+        "y": 519,
+        "z": "8a9c455f.82beb8",
         "wires": [
             []
         ]
     },
     {
-        "id": "9e9578a4.5a4df",
+        "id": "ab834e.f483fcb",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-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",
         "comments": "",
-        "x": 3782.5,
-        "y": 665,
-        "z": "bc9d969b.328b8",
+        "x": 3808.5,
+        "y": 673,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "8d5f5723.afac28",
+        "id": "c9d60073.e2df48",
         "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=\"post\"/>\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",
+        "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": 3936.5,
-        "y": 713,
-        "z": "bc9d969b.328b8",
+        "x": 3962.5,
+        "y": 721,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "7efa3090.e1e078",
-                "602bb58a.eb8054"
+                "1e624148.f51b17",
+                "9b38443d.36a338"
             ]
         ]
     },
     {
-        "id": "7efa3090.e1e078",
+        "id": "1e624148.f51b17",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4282,
-        "y": 694,
-        "z": "bc9d969b.328b8",
+        "x": 4308,
+        "y": 702,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "d892eebe.cdbb5"
+                "20712318.8d32fc"
             ]
         ]
     },
     {
-        "id": "602bb58a.eb8054",
+        "id": "9b38443d.36a338",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4286,
-        "y": 734,
-        "z": "bc9d969b.328b8",
+        "x": 4312,
+        "y": 742,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "34660646.412fea"
+                "a4fdbce9.b1c4"
             ]
         ]
     },
     {
-        "id": "d892eebe.cdbb5",
+        "id": "20712318.8d32fc",
         "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 vpn rest api\" />\n",
+        "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": 4440,
-        "y": 694,
-        "z": "bc9d969b.328b8",
+        "x": 4466,
+        "y": 702,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "34660646.412fea",
+        "id": "a4fdbce9.b1c4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4443.5,
-        "y": 734,
-        "z": "bc9d969b.328b8",
+        "x": 4469.5,
+        "y": 742,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "63e48280.b2cb84",
-                "ffe3929d.a2fda"
+                "f9579fb7.928158",
+                "b5483433.ff3288"
             ]
         ]
     },
     {
-        "id": "bae980db.b9d408",
+        "id": "320ccbea.c02274",
         "type": "comment",
         "name": "TODO: FIXME:",
         "info": "put proper values based on connectivity resource retrieved from AAI",
         "comments": "",
-        "x": 3780,
-        "y": 621,
-        "z": "bc9d969b.328b8",
+        "x": 3806,
+        "y": 629,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "63e48280.b2cb84",
+        "id": "f9579fb7.928158",
         "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-id`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4774,
-        "y": 699,
-        "z": "bc9d969b.328b8",
+        "x": 4800,
+        "y": 707,
+        "z": "8a9c455f.82beb8",
         "wires": [
             []
         ]
     },
     {
-        "id": "2bc3079a.d7dde",
+        "id": "d3281524.0d8478",
         "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": 4638,
-        "y": 658,
-        "z": "bc9d969b.328b8",
+        "x": 4664,
+        "y": 666,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "ffe3929d.a2fda",
+        "id": "b5483433.ff3288",
         "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": 4701,
-        "y": 745,
-        "z": "bc9d969b.328b8",
+        "x": 4727,
+        "y": 753,
+        "z": "8a9c455f.82beb8",
         "wires": [
             []
         ]
     },
     {
-        "id": "f01334b4.1d8928",
+        "id": "5074df67.2ba988",
         "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": 3773,
-        "y": 210,
-        "z": "bc9d969b.328b8",
+        "x": 3799,
+        "y": 218,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "dbf99a2b.67c71",
+        "id": "9fd13730.014208",
         "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": 3799,
-        "y": 327,
-        "z": "bc9d969b.328b8",
+        "x": 3825,
+        "y": 335,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "27a62f4.f17ab5",
-                "1aa65c21.28f974",
-                "a732e62d.9d3f9"
+                "e11a5ea7.685f28",
+                "6cb0b7a8.80c24",
+                "a90c44f8.bdb148"
             ]
         ]
     },
     {
-        "id": "27a62f4.f17ab5",
+        "id": "e11a5ea7.685f28",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3994.5001220703125,
-        "y": 279,
-        "z": "bc9d969b.328b8",
+        "x": 4020.5001220703125,
+        "y": 287,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "b04b9242.14b66"
+                "dfb8903c.c1b1d8"
             ]
         ]
     },
     {
-        "id": "1aa65c21.28f974",
+        "id": "6cb0b7a8.80c24",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3986.5001220703125,
-        "y": 334,
-        "z": "bc9d969b.328b8",
+        "x": 4012.5001220703125,
+        "y": 342,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "5b188d77.8ffc8c"
+                "509847ff.264c58"
             ]
         ]
     },
     {
-        "id": "b04b9242.14b66",
+        "id": "dfb8903c.c1b1d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4138.8824462890625,
-        "y": 278.6556701660156,
-        "z": "bc9d969b.328b8",
+        "x": 4164.8824462890625,
+        "y": 286.6556701660156,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "14763204.df94c6"
+                "22c6d630.71326a"
             ]
         ]
     },
     {
-        "id": "a517ec9b.cf8fc8",
+        "id": "5e775dc4.42bfbc",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4721,
-        "y": 281,
-        "z": "bc9d969b.328b8",
+        "x": 4747,
+        "y": 289,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "37ce34d7.e5314c"
+                "f76a815f.36c178"
             ]
         ]
     },
     {
-        "id": "14763204.df94c6",
+        "id": "22c6d630.71326a",
         "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": 4323,
-        "y": 277,
-        "z": "bc9d969b.328b8",
+        "x": 4349,
+        "y": 285,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "bbbe4e04.e26da"
+                "a3e1c0eb.9f5f88"
             ]
         ]
     },
     {
-        "id": "bbbe4e04.e26da",
+        "id": "a3e1c0eb.9f5f88",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4518,
-        "y": 277,
-        "z": "bc9d969b.328b8",
+        "x": 4544,
+        "y": 285,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "a517ec9b.cf8fc8"
+                "5e775dc4.42bfbc"
             ]
         ]
     },
     {
-        "id": "a732e62d.9d3f9",
+        "id": "a90c44f8.bdb148",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3991.5001220703125,
-        "y": 391,
-        "z": "bc9d969b.328b8",
+        "x": 4017.5001220703125,
+        "y": 399,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "ebcd1e8f.a8cb18"
+                "7a5f3123.aad6e8"
             ]
         ]
     },
     {
-        "id": "ebcd1e8f.a8cb18",
+        "id": "7a5f3123.aad6e8",
         "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": 4143.5001220703125,
-        "y": 392,
-        "z": "bc9d969b.328b8",
+        "x": 4169.5001220703125,
+        "y": 400,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "5b188d77.8ffc8c",
+        "id": "509847ff.264c58",
         "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": 4154.5001220703125,
-        "y": 335,
-        "z": "bc9d969b.328b8",
+        "x": 4180.5001220703125,
+        "y": 343,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "d99536cb.cbc39",
+        "id": "4ab5c9a1.06e3f",
         "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": 5106,
-        "y": 294,
-        "z": "bc9d969b.328b8",
+        "x": 5132,
+        "y": 302,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "5f8e12fe.363034",
-                "3e541a04.379ece",
-                "5e7e63a7.7acdcc"
+                "73f9ea02.2fb1e4",
+                "f8008145.65a48",
+                "81ec8b7a.5856d8"
             ]
         ]
     },
     {
-        "id": "37ce34d7.e5314c",
+        "id": "f76a815f.36c178",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4900,
-        "y": 281,
-        "z": "bc9d969b.328b8",
+        "x": 4926,
+        "y": 289,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "17ccdbf.84352a4",
-                "d99536cb.cbc39"
+                "ba856b81.43ed78",
+                "4ab5c9a1.06e3f"
             ]
         ]
     },
     {
-        "id": "17ccdbf.84352a4",
+        "id": "ba856b81.43ed78",
         "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": 5136,
-        "y": 242,
-        "z": "bc9d969b.328b8",
+        "x": 5162,
+        "y": 250,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "5f8e12fe.363034",
+        "id": "73f9ea02.2fb1e4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5316,
-        "y": 285,
-        "z": "bc9d969b.328b8",
+        "x": 5342,
+        "y": 293,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "a674bdd4.cbe5f"
+                "5955dc9c.10f754"
             ]
         ]
     },
     {
-        "id": "3e541a04.379ece",
+        "id": "f8008145.65a48",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5308,
-        "y": 340,
-        "z": "bc9d969b.328b8",
+        "x": 5334,
+        "y": 348,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "b14ed6a2.e3874"
+                "e3286b6.68c7618"
             ]
         ]
     },
     {
-        "id": "5e7e63a7.7acdcc",
+        "id": "81ec8b7a.5856d8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5313,
-        "y": 397,
-        "z": "bc9d969b.328b8",
+        "x": 5339,
+        "y": 405,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "1ce96021.1d8b"
+                "ecd34f94.c447e"
             ]
         ]
     },
     {
-        "id": "1ce96021.1d8b",
+        "id": "ecd34f94.c447e",
         "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": 5465,
-        "y": 398,
-        "z": "bc9d969b.328b8",
+        "x": 5491,
+        "y": 406,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "b14ed6a2.e3874",
+        "id": "e3286b6.68c7618",
         "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": 5476,
-        "y": 343,
-        "z": "bc9d969b.328b8",
+        "x": 5502,
+        "y": 351,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "a674bdd4.cbe5f",
+        "id": "5955dc9c.10f754",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5460.38232421875,
-        "y": 282.6556701660156,
-        "z": "bc9d969b.328b8",
+        "x": 5486.38232421875,
+        "y": 290.6556701660156,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "67e87cc0.72543c"
+                "adf5d068.f7cc"
             ]
         ]
     },
     {
-        "id": "67e87cc0.72543c",
+        "id": "adf5d068.f7cc",
         "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": 5675,
-        "y": 279,
-        "z": "bc9d969b.328b8",
+        "x": 5701,
+        "y": 287,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "9bca10ea.41532",
+        "id": "a3f28ac6.d30ed8",
         "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": 700,
-        "y": 456,
-        "z": "bc9d969b.328b8",
+        "x": 726,
+        "y": 464,
+        "z": "8a9c455f.82beb8",
         "wires": [
             []
         ]
     },
     {
-        "id": "9469a92e.1082c",
+        "id": "b8f0eb5.a171218",
         "type": "set",
         "name": "set attachment_param for OTN B",
-        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<parameter name='src-tpn-id' value='1' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",
+        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<parameter name='src-tpn-id' value='1' />\n<parameter name='src-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": 3815,
-        "y": 966,
-        "z": "bc9d969b.328b8",
+        "x": 3841,
+        "y": 974,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "8e72aaca.f223b8",
+        "id": "d94b849.7fdac78",
         "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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.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": 3878,
-        "y": 1295,
-        "z": "bc9d969b.328b8",
+        "x": 3904,
+        "y": 1303,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "4967c60e.7eec88",
-                "d728c3b6.b72d4"
+                "bfb79ead.715e28",
+                "d50b4560.d85de8"
             ]
         ]
     },
     {
-        "id": "4967c60e.7eec88",
+        "id": "bfb79ead.715e28",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4173.5,
-        "y": 1262,
-        "z": "bc9d969b.328b8",
+        "x": 4199.5,
+        "y": 1270,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "957f3c62.36bab"
+                "3d3c3af3.12a3b6"
             ]
         ]
     },
     {
-        "id": "d728c3b6.b72d4",
+        "id": "d50b4560.d85de8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4178.5,
-        "y": 1327,
-        "z": "bc9d969b.328b8",
+        "x": 4204.5,
+        "y": 1335,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "9b37bb11.43c248"
+                "347f5539.8f6cd2"
             ]
         ]
     },
     {
-        "id": "957f3c62.36bab",
+        "id": "3d3c3af3.12a3b6",
         "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 vpn rest api\" />\n",
+        "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": 4341.5,
-        "y": 1262,
-        "z": "bc9d969b.328b8",
+        "x": 4367.5,
+        "y": 1270,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "9b37bb11.43c248",
+        "id": "347f5539.8f6cd2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4352,
-        "y": 1327,
-        "z": "bc9d969b.328b8",
+        "x": 4378,
+        "y": 1335,
+        "z": "8a9c455f.82beb8",
         "wires": [
             []
         ]
     },
     {
-        "id": "24fc86b.f179cfa",
+        "id": "7af2004a.23f66",
         "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": 3754,
-        "y": 1023,
-        "z": "bc9d969b.328b8",
+        "x": 3780,
+        "y": 1031,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "a4e80e5.b17c0f",
+        "id": "9e8fb92f.dc9c38",
         "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": 3774,
-        "y": 1120,
-        "z": "bc9d969b.328b8",
+        "x": 3800,
+        "y": 1128,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "d87e44a4.312df",
-                "c39adf70.78fbd",
-                "ae2b50d9.d9592"
+                "3defc723.7feba8",
+                "92e9e56.6323798",
+                "92430372.354f08"
             ]
         ]
     },
     {
-        "id": "d87e44a4.312df",
+        "id": "3defc723.7feba8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3976.5001220703125,
-        "y": 1073,
-        "z": "bc9d969b.328b8",
+        "x": 4002.5001220703125,
+        "y": 1081,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "1f01bb4d.6d662d"
+                "38216362.304eb4"
             ]
         ]
     },
     {
-        "id": "c39adf70.78fbd",
+        "id": "92e9e56.6323798",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3968.5001220703125,
-        "y": 1128,
-        "z": "bc9d969b.328b8",
+        "x": 3994.5001220703125,
+        "y": 1136,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "7e32fa48.cb95e4"
+                "48eafe9b.93564"
             ]
         ]
     },
     {
-        "id": "1f01bb4d.6d662d",
+        "id": "38216362.304eb4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4120.8824462890625,
-        "y": 1070.6556701660156,
-        "z": "bc9d969b.328b8",
+        "x": 4146.8824462890625,
+        "y": 1078.6556701660156,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "71c66ab3.44665c"
+                "5738b986.eff058"
             ]
         ]
     },
     {
-        "id": "71c66ab3.44665c",
+        "id": "5738b986.eff058",
         "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": 4305,
-        "y": 1085,
-        "z": "bc9d969b.328b8",
+        "x": 4331,
+        "y": 1093,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "7900c812.a2abd"
+                "424cd2de.fa894c"
             ]
         ]
     },
     {
-        "id": "ae2b50d9.d9592",
+        "id": "92430372.354f08",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3973.5001220703125,
-        "y": 1185,
-        "z": "bc9d969b.328b8",
+        "x": 3999.5001220703125,
+        "y": 1193,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "c7f28bc4.db74a"
+                "93dd1d01.b545d"
             ]
         ]
     },
     {
-        "id": "c7f28bc4.db74a",
+        "id": "93dd1d01.b545d",
         "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": 4125.5001220703125,
-        "y": 1186,
-        "z": "bc9d969b.328b8",
+        "x": 4151.5001220703125,
+        "y": 1194,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "7e32fa48.cb95e4",
+        "id": "48eafe9b.93564",
         "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": 4136.5001220703125,
-        "y": 1131,
-        "z": "bc9d969b.328b8",
+        "x": 4162.5001220703125,
+        "y": 1139,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "d3528946.ee7a88",
+        "id": "38af15c1.7d84ba",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4703,
-        "y": 1089,
-        "z": "bc9d969b.328b8",
+        "x": 4729,
+        "y": 1097,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "746ece73.5c4d48"
+                "d8eb3cd4.227208"
             ]
         ]
     },
     {
-        "id": "7900c812.a2abd",
+        "id": "424cd2de.fa894c",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4500,
-        "y": 1085,
-        "z": "bc9d969b.328b8",
+        "x": 4526,
+        "y": 1093,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "d3528946.ee7a88"
+                "38af15c1.7d84ba"
             ]
         ]
     },
     {
-        "id": "f8459d33.082c4",
+        "id": "a9c07a83.518f98",
         "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": 5088,
-        "y": 1088,
-        "z": "bc9d969b.328b8",
+        "x": 5114,
+        "y": 1096,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "652db70b.f69af",
-                "cd87b694.170a2",
-                "e10452ec.f851f"
+                "ef0c3c57.987338",
+                "56343453.6f0ce4",
+                "3b68871e.15bfe"
             ]
         ]
     },
     {
-        "id": "746ece73.5c4d48",
+        "id": "d8eb3cd4.227208",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4880,
-        "y": 1081,
-        "z": "bc9d969b.328b8",
+        "x": 4906,
+        "y": 1089,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "13e8c9be.60d2ee",
-                "f8459d33.082c4"
+                "f04e0884.6fcbb8",
+                "a9c07a83.518f98"
             ]
         ]
     },
     {
-        "id": "13e8c9be.60d2ee",
+        "id": "f04e0884.6fcbb8",
         "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": 5118,
-        "y": 1036,
-        "z": "bc9d969b.328b8",
+        "x": 5144,
+        "y": 1044,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "64b1d1df.af4928",
+        "id": "b02d57da.181518",
         "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": 5447,
-        "y": 1192,
-        "z": "bc9d969b.328b8",
+        "x": 5473,
+        "y": 1200,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "afae5d5f.cf8cd8",
+        "id": "fed20348.5bb418",
         "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": 5458,
-        "y": 1137,
-        "z": "bc9d969b.328b8",
+        "x": 5484,
+        "y": 1145,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "fe8767e6.75d1",
+        "id": "63aaed6a.7bdac4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5442.38232421875,
-        "y": 1076.6556701660156,
-        "z": "bc9d969b.328b8",
+        "x": 5468.38232421875,
+        "y": 1084.6556701660156,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "9e679808.748fd"
+                "75824df.2d8fab4"
             ]
         ]
     },
     {
-        "id": "9e679808.748fd",
+        "id": "75824df.2d8fab4",
         "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": 5657,
-        "y": 1073,
-        "z": "bc9d969b.328b8",
+        "x": 5683,
+        "y": 1081,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "652db70b.f69af",
+        "id": "ef0c3c57.987338",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5298,
-        "y": 1079,
-        "z": "bc9d969b.328b8",
+        "x": 5324,
+        "y": 1087,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "fe8767e6.75d1"
+                "63aaed6a.7bdac4"
             ]
         ]
     },
     {
-        "id": "cd87b694.170a2",
+        "id": "56343453.6f0ce4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5290,
-        "y": 1134,
-        "z": "bc9d969b.328b8",
+        "x": 5316,
+        "y": 1142,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "afae5d5f.cf8cd8"
+                "fed20348.5bb418"
             ]
         ]
     },
     {
-        "id": "e10452ec.f851f",
+        "id": "3b68871e.15bfe",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5295,
-        "y": 1191,
-        "z": "bc9d969b.328b8",
+        "x": 5321,
+        "y": 1199,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "64b1d1df.af4928"
+                "b02d57da.181518"
             ]
         ]
     },
     {
-        "id": "483259b4.af3e1",
+        "id": "2d3714db.b7aad4",
         "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": 1812,
-        "y": 445,
-        "z": "bc9d969b.328b8",
+        "x": 1838,
+        "y": 453,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "deb24009.8fcaa8",
-                "f99db731.cec29",
-                "20c66e63.50491a"
+                "ff6cd3bd.d426f",
+                "64ede831.c277d",
+                "c3e64c55.d790f8"
             ]
         ]
     },
     {
-        "id": "deb24009.8fcaa8",
+        "id": "ff6cd3bd.d426f",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2020,
-        "y": 409,
-        "z": "bc9d969b.328b8",
+        "x": 2046,
+        "y": 417,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "4730a3bd.f32424"
+                "ab398477.a58648"
             ]
         ]
     },
     {
-        "id": "f99db731.cec29",
+        "id": "64ede831.c277d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2020.490966796875,
-        "y": 454.57403564453125,
-        "z": "bc9d969b.328b8",
+        "x": 2046.490966796875,
+        "y": 462.57403564453125,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "5f621d7d.168d04"
+                "575d4e0a.5d761"
             ]
         ]
     },
     {
-        "id": "20c66e63.50491a",
+        "id": "c3e64c55.d790f8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2018,
-        "y": 498,
-        "z": "bc9d969b.328b8",
+        "x": 2044,
+        "y": 506,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "3d808fc9.409a"
+                "b99b7bb3.94d958"
             ]
         ]
     },
     {
-        "id": "5f621d7d.168d04",
+        "id": "575d4e0a.5d761",
         "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": 2183.0623779296875,
-        "y": 454.8597717285156,
-        "z": "bc9d969b.328b8",
+        "x": 2209.0623779296875,
+        "y": 462.8597717285156,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "3d808fc9.409a",
+        "id": "b99b7bb3.94d958",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2187,
-        "y": 499,
-        "z": "bc9d969b.328b8",
+        "x": 2213,
+        "y": 507,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "98bf7163.623b18",
+        "id": "684f9a1f.f6246c",
         "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": 2493,
-        "y": 498,
-        "z": "bc9d969b.328b8",
+        "x": 2519,
+        "y": 506,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "4a10f363.97f04c",
-                "75240e64.8364b",
-                "7a8b2677.1e3f6"
+                "7a997c1a.ca4d0c",
+                "5d76d89f.d221e",
+                "d47edd7.a73b9a"
             ]
         ]
     },
     {
-        "id": "262c25a6.ad70a2",
+        "id": "11f43428.ee3774",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2877,
-        "y": 498,
-        "z": "bc9d969b.328b8",
+        "x": 2903,
+        "y": 506,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "471d55bd.ad492c"
+                "9d8c4947.e731c",
+                "a3bb6162.8aa1a8"
             ]
         ]
     },
     {
-        "id": "4a10f363.97f04c",
+        "id": "7a997c1a.ca4d0c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2704,
-        "y": 500,
-        "z": "bc9d969b.328b8",
+        "x": 2730,
+        "y": 508,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "262c25a6.ad70a2"
+                "11f43428.ee3774"
             ]
         ]
     },
     {
-        "id": "75240e64.8364b",
+        "id": "5d76d89f.d221e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2704.490966796875,
-        "y": 545.5740356445312,
-        "z": "bc9d969b.328b8",
+        "x": 2730.490966796875,
+        "y": 553.5740356445312,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "1484cf74.c39e71"
+                "38cca479.139cac"
             ]
         ]
     },
     {
-        "id": "7a8b2677.1e3f6",
+        "id": "d47edd7.a73b9a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2702,
-        "y": 589,
-        "z": "bc9d969b.328b8",
+        "x": 2728,
+        "y": 597,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "d377f001.ff927"
+                "3c7730a0.80743"
             ]
         ]
     },
     {
-        "id": "d377f001.ff927",
+        "id": "3c7730a0.80743",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2869,
-        "y": 588,
-        "z": "bc9d969b.328b8",
+        "x": 2895,
+        "y": 596,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "1484cf74.c39e71",
+        "id": "38cca479.139cac",
         "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": 2867.0623779296875,
-        "y": 545.8597717285156,
-        "z": "bc9d969b.328b8",
+        "x": 2893.0623779296875,
+        "y": 553.8597717285156,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "4730a3bd.f32424",
+        "id": "ab398477.a58648",
         "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": 2221,
-        "y": 404,
-        "z": "bc9d969b.328b8",
+        "x": 2247,
+        "y": 412,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "ed79cbad.42008"
+                "32748804.ce58a"
             ]
         ]
     },
     {
-        "id": "ed79cbad.42008",
+        "id": "32748804.ce58a",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2426,
-        "y": 404,
-        "z": "bc9d969b.328b8",
+        "x": 2452,
+        "y": 412,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "87636f23.10a238"
+                "41c73b96.f41a84"
             ]
         ]
     },
     {
-        "id": "87636f23.10a238",
+        "id": "41c73b96.f41a84",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2592,
-        "y": 404,
-        "z": "bc9d969b.328b8",
+        "x": 2618,
+        "y": 412,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "f49319bb.999b88"
+                "cfeba90.49ffe58"
             ]
         ]
     },
     {
-        "id": "f49319bb.999b88",
+        "id": "cfeba90.49ffe58",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2755,
-        "y": 404,
-        "z": "bc9d969b.328b8",
+        "x": 2781,
+        "y": 412,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "98bf7163.623b18"
+                "684f9a1f.f6246c"
             ]
         ]
     },
     {
-        "id": "471d55bd.ad492c",
+        "id": "9d8c4947.e731c",
         "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": 3131,
-        "y": 497,
-        "z": "bc9d969b.328b8",
+        "x": 3157,
+        "y": 505,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "a6851b6e.131e78",
-                "f997812a.bb5bf"
+                "c705e3fd.e27bf",
+                "74e33b9a.6a3ba4"
             ]
         ]
     },
     {
-        "id": "a6851b6e.131e78",
+        "id": "c705e3fd.e27bf",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3384,
-        "y": 531,
-        "z": "bc9d969b.328b8",
+        "x": 3410,
+        "y": 539,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "9ec23d9e.f5fd3"
+                "ab5b6203.69a998"
             ]
         ]
     },
     {
-        "id": "f997812a.bb5bf",
+        "id": "74e33b9a.6a3ba4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3384,
-        "y": 475,
-        "z": "bc9d969b.328b8",
+        "x": 3410,
+        "y": 483,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "a48cbe42.98bbb"
+                "7b04fd35.ba570c"
             ]
         ]
     },
     {
-        "id": "9ec23d9e.f5fd3",
+        "id": "ab5b6203.69a998",
         "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": 3123,
-        "y": 1317,
-        "z": "bc9d969b.328b8",
+        "x": 3149,
+        "y": 1325,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "12733247.02817e",
-                "457dfc0a.58968c"
+                "15797e4.5eae102",
+                "55009f8b.9fdc5"
             ]
         ]
     },
     {
-        "id": "12733247.02817e",
+        "id": "15797e4.5eae102",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3376,
-        "y": 1351,
-        "z": "bc9d969b.328b8",
+        "x": 3402,
+        "y": 1359,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "13d35870.d79cf8"
+                "4151c132.8e3c28"
             ]
         ]
     },
     {
-        "id": "457dfc0a.58968c",
+        "id": "55009f8b.9fdc5",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3376,
-        "y": 1295,
-        "z": "bc9d969b.328b8",
+        "x": 3402,
+        "y": 1303,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "b272db0a.663f1"
+                "db74d7f2.74d0f8"
             ]
         ]
     },
     {
-        "id": "13d35870.d79cf8",
+        "id": "4151c132.8e3c28",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3527,
-        "y": 1351,
-        "z": "bc9d969b.328b8",
+        "x": 3553,
+        "y": 1359,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "d316857d.f41628",
+        "id": "ad6a538e.8b5998",
         "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": 3830,
-        "y": 102,
-        "z": "bc9d969b.328b8",
+        "x": 3856,
+        "y": 110,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "3accaf74.7f8a68",
+        "id": "51807068.f4c68",
         "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": 3811,
-        "y": 908,
-        "z": "bc9d969b.328b8",
+        "x": 3837,
+        "y": 916,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "a48cbe42.98bbb",
+        "id": "7b04fd35.ba570c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3552,
-        "y": 477,
-        "z": "bc9d969b.328b8",
+        "x": 3578,
+        "y": 485,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "d316857d.f41628",
-                "cba9b813.e1b22",
-                "f01334b4.1d8928",
-                "dbf99a2b.67c71",
-                "9e9578a4.5a4df",
-                "8d5f5723.afac28",
-                "c84632a9.494938"
+                "ad6a538e.8b5998",
+                "3d56fd4f.8da4ea",
+                "5074df67.2ba988",
+                "9fd13730.014208",
+                "ab834e.f483fcb",
+                "c9d60073.e2df48",
+                "119d7057.187e9"
             ]
         ]
     },
     {
-        "id": "b272db0a.663f1",
+        "id": "db74d7f2.74d0f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3527,
-        "y": 1294,
-        "z": "bc9d969b.328b8",
+        "x": 3553,
+        "y": 1302,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "3accaf74.7f8a68",
-                "9469a92e.1082c",
-                "24fc86b.f179cfa",
-                "a4e80e5.b17c0f",
-                "8e72aaca.f223b8",
-                "6e17b735.11933",
-                "35d8443b.290754"
+                "51807068.f4c68",
+                "b8f0eb5.a171218",
+                "7af2004a.23f66",
+                "9e8fb92f.dc9c38",
+                "d94b849.7fdac78",
+                "f91c20c6.244a28",
+                "158d95b4.dbf02a"
             ]
         ]
     },
     {
-        "id": "6e17b735.11933",
+        "id": "f91c20c6.244a28",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-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",
         "comments": "",
-        "x": 3756,
-        "y": 1437,
-        "z": "bc9d969b.328b8",
+        "x": 3782,
+        "y": 1445,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "35d8443b.290754",
+        "id": "158d95b4.dbf02a",
         "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": 3910,
-        "y": 1485,
-        "z": "bc9d969b.328b8",
+        "x": 3936,
+        "y": 1493,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "3ee71f70.cef2d8",
-                "ec28887e.13052"
+                "7e8ddb70.effbcc",
+                "8eaa1ef7.3644e"
             ]
         ]
     },
     {
-        "id": "3ee71f70.cef2d8",
+        "id": "7e8ddb70.effbcc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4255.5,
-        "y": 1466,
-        "z": "bc9d969b.328b8",
+        "x": 4281.5,
+        "y": 1474,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "146e8cbe.f1427b"
+                "596967d4.0f4de8"
             ]
         ]
     },
     {
-        "id": "ec28887e.13052",
+        "id": "8eaa1ef7.3644e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4259.5,
-        "y": 1506,
-        "z": "bc9d969b.328b8",
+        "x": 4285.5,
+        "y": 1514,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "6938dd8d.725ce4"
+                "4f294e9d.697c08"
             ]
         ]
     },
     {
-        "id": "146e8cbe.f1427b",
+        "id": "596967d4.0f4de8",
         "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 vpn rest api\" />\n",
+        "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": 4413.5,
-        "y": 1466,
-        "z": "bc9d969b.328b8",
+        "x": 4439.5,
+        "y": 1474,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "6938dd8d.725ce4",
+        "id": "4f294e9d.697c08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4417,
-        "y": 1506,
-        "z": "bc9d969b.328b8",
+        "x": 4443,
+        "y": 1514,
+        "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "3103adf.03ebdd2",
-                "abd5a958.8851"
+                "637a80dd.df05",
+                "d2c33ee2.7a3708"
             ]
         ]
     },
     {
-        "id": "b5e2d859.f89e48",
+        "id": "78a845.7bb187bc",
         "type": "comment",
         "name": "TODO: FIXME:",
         "info": "put proper values based on connectivity resource retrieved from AAI",
         "comments": "",
-        "x": 3753.5,
-        "y": 1393,
-        "z": "bc9d969b.328b8",
+        "x": 3779.5,
+        "y": 1401,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "3103adf.03ebdd2",
+        "id": "637a80dd.df05",
         "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-id`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4757,
-        "y": 1505,
-        "z": "bc9d969b.328b8",
+        "x": 4783,
+        "y": 1513,
+        "z": "8a9c455f.82beb8",
         "wires": [
             []
         ]
     },
     {
-        "id": "1ee5068c.50a041",
+        "id": "88ec2f6d.8d5da",
         "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": 4615,
-        "y": 1463,
-        "z": "bc9d969b.328b8",
+        "x": 4641,
+        "y": 1471,
+        "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "abd5a958.8851",
+        "id": "d2c33ee2.7a3708",
         "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": 4686,
-        "y": 1554,
-        "z": "bc9d969b.328b8",
+        "x": 4712,
+        "y": 1562,
+        "z": "8a9c455f.82beb8",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "a3bb6162.8aa1a8",
+        "type": "set",
+        "name": "set attachment_param for OTN",
+        "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",
+        "comments": "",
+        "x": 3144,
+        "y": 411,
+        "z": "8a9c455f.82beb8",
+        "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 41f969b0..7a6e77e8 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": "a3297c66.2e7f5",
+        "id": "8af466c4.459d38",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 142,
-        "y": 86,
-        "z": "a52db008.999ba",
+        "x": 123,
+        "y": 94,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "48923819.f8ff98"
+                "4f44bc11.1718bc"
             ]
         ]
     },
     {
-        "id": "48923819.f8ff98",
+        "id": "4f44bc11.1718bc",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,3476 +22,3488 @@
         "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": 426.2856903076172,
-        "y": 147.23810863494873,
-        "z": "a52db008.999ba",
+        "x": 407.2856903076172,
+        "y": 155.23810863494873,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "e1ba1fcc.8dbf6"
+                "25a99bf3.257e24"
             ]
         ]
     },
     {
-        "id": "e1ba1fcc.8dbf6",
+        "id": "25a99bf3.257e24",
         "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": 432.42860412597656,
-        "y": 232.00003051757812,
-        "z": "a52db008.999ba",
+        "x": 413.42860412597656,
+        "y": 240.00003051757812,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "8bc33ebc.b214a8"
+                "e0aece26.83282"
             ]
         ]
     },
     {
-        "id": "8bc33ebc.b214a8",
+        "id": "e0aece26.83282",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 802.238037109375,
-        "y": 256.66668701171875,
-        "z": "a52db008.999ba",
+        "x": 783.238037109375,
+        "y": 264.66668701171875,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "e456a6e6.bd0f",
-                "de4cd097.718578",
-                "7ac4d896.f266b8"
+                "19dfd83.33483a8",
+                "1050151b.02ec53",
+                "2f5068f1.5086e8"
             ]
         ]
     },
     {
-        "id": "e456a6e6.bd0f",
+        "id": "19dfd83.33483a8",
         "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": 1103.571533203125,
-        "y": 527.5969848632812,
-        "z": "a52db008.999ba",
+        "x": 1084.571533203125,
+        "y": 535.5969848632812,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "de4cd097.718578",
+        "id": "1050151b.02ec53",
         "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": 1125,
-        "y": 230,
-        "z": "a52db008.999ba",
+        "x": 1106,
+        "y": 238,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "2bb44cf2.b576bc",
-                "23a4fd03.4dc0a2",
-                "7fe07366.1d3c84"
+                "50a47283.15fbe4",
+                "b5bb871c.db338",
+                "a61c0811.039808"
             ]
         ]
     },
     {
-        "id": "2bb44cf2.b576bc",
+        "id": "50a47283.15fbe4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1350,
-        "y": 88,
-        "z": "a52db008.999ba",
+        "x": 1331,
+        "y": 96,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "de3469e6.1a5318"
+                "80a63fa0.68596"
             ]
         ]
     },
     {
-        "id": "23a4fd03.4dc0a2",
+        "id": "b5bb871c.db338",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1359.490966796875,
-        "y": 130.57403564453125,
-        "z": "a52db008.999ba",
+        "x": 1340.490966796875,
+        "y": 138.57403564453125,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "abc9c45c.0486d"
+                "d32b21e7.8cada8"
             ]
         ]
     },
     {
-        "id": "7fe07366.1d3c84",
+        "id": "a61c0811.039808",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1348,
-        "y": 177,
-        "z": "a52db008.999ba",
+        "x": 1329,
+        "y": 185,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "bf6c9630.da1718"
+                "229167e8.df6688"
             ]
         ]
     },
     {
-        "id": "de3469e6.1a5318",
+        "id": "80a63fa0.68596",
         "type": "switchNode",
         "name": "switch allotted-resources_length != 0",
         "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1589,
-        "y": 85,
-        "z": "a52db008.999ba",
+        "x": 1570,
+        "y": 93,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "3fe961c5.f65bb6",
-                "9b0ccc32.5daa98"
+                "d44d65ef.318f48",
+                "e1082721.453ff"
             ]
         ]
     },
     {
-        "id": "abc9c45c.0486d",
+        "id": "d32b21e7.8cada8",
         "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": 1513.0623779296875,
-        "y": 133.85977172851562,
-        "z": "a52db008.999ba",
+        "x": 1494.0623779296875,
+        "y": 141.85977172851562,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "bf6c9630.da1718",
+        "id": "229167e8.df6688",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1517,
-        "y": 178,
-        "z": "a52db008.999ba",
+        "x": 1498,
+        "y": 186,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "e72a9478.9558f",
+        "id": "a49b8769.572b48",
         "type": "set",
         "name": "set the 1st allotted-resource-id",
         "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[0].id`\" />\n\n\n",
         "comments": "",
-        "x": 1988,
-        "y": 152,
-        "z": "a52db008.999ba",
+        "x": 1969,
+        "y": 160,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "3fe961c5.f65bb6",
+        "id": "d44d65ef.318f48",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1802,
-        "y": 109,
-        "z": "a52db008.999ba",
+        "x": 1783,
+        "y": 117,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "7db53ef.cfaf2c"
+                "7234fca3.e71404"
             ]
         ]
     },
     {
-        "id": "9b0ccc32.5daa98",
+        "id": "e1082721.453ff",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1804,
-        "y": 49,
-        "z": "a52db008.999ba",
+        "x": 1785,
+        "y": 57,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "3b9d4f7a.e5b418",
+        "id": "e3f19b5a.145ff8",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 1104,
-        "y": 118,
-        "z": "a52db008.999ba",
+        "x": 1085,
+        "y": 126,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "7db53ef.cfaf2c",
+        "id": "7234fca3.e71404",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1787,
-        "y": 197,
-        "z": "a52db008.999ba",
+        "x": 1768,
+        "y": 205,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "e72a9478.9558f",
-                "f1da2bc3.8935b"
+                "a49b8769.572b48",
+                "bd4dde9a.1bdbc8"
             ]
         ]
     },
     {
-        "id": "fd1e5e1b.83e83",
+        "id": "fcc70311.f003c",
         "type": "set",
         "name": "set network-route-A",
         "xml": "<set>\n<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",
         "comments": "",
-        "x": 2349,
-        "y": 795,
-        "z": "a52db008.999ba",
+        "x": 2330,
+        "y": 803,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "ff342d97.b64c78",
+        "id": "409bbb6d.55b47c",
         "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": 2351,
-        "y": 846,
-        "z": "a52db008.999ba",
+        "x": 2332,
+        "y": 854,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "f1da2bc3.8935b",
+        "id": "bd4dde9a.1bdbc8",
         "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": 1991,
-        "y": 227,
-        "z": "a52db008.999ba",
+        "x": 1972,
+        "y": 235,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "24443c7d.51e17c",
-                "5466a6b1.99c71",
-                "6dbbe1dd.c8d2"
+                "4f2f09b0.4a4f9",
+                "a509e8e5.13e7a8",
+                "2d1dc418.c3457c"
             ]
         ]
     },
     {
-        "id": "24443c7d.51e17c",
+        "id": "4f2f09b0.4a4f9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2207,
-        "y": 294,
-        "z": "a52db008.999ba",
+        "x": 2188,
+        "y": 302,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "381969a5.e5019e"
+                "2c4c53ed.c92a04"
             ]
         ]
     },
     {
-        "id": "5466a6b1.99c71",
+        "id": "a509e8e5.13e7a8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2207.490966796875,
-        "y": 193.573974609375,
-        "z": "a52db008.999ba",
+        "x": 2188.490966796875,
+        "y": 201.573974609375,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "5f41762b.9fae3"
+                "b0eb4825.a76068"
             ]
         ]
     },
     {
-        "id": "6dbbe1dd.c8d2",
+        "id": "2d1dc418.c3457c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2203,
-        "y": 243,
-        "z": "a52db008.999ba",
+        "x": 2184,
+        "y": 251,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "35df5bd.60d91a4"
+                "8d5abfeb.01e9e"
             ]
         ]
     },
     {
-        "id": "5f41762b.9fae3",
+        "id": "b0eb4825.a76068",
         "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": 2385.0625,
-        "y": 193.8597412109375,
-        "z": "a52db008.999ba",
+        "x": 2366.0625,
+        "y": 201.8597412109375,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "35df5bd.60d91a4",
+        "id": "8d5abfeb.01e9e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2385,
-        "y": 243,
-        "z": "a52db008.999ba",
+        "x": 2366,
+        "y": 251,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "8c284458.c08ae8",
+        "id": "abb2414c.5ad6c8",
         "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": 1726,
-        "y": 716,
-        "z": "a52db008.999ba",
+        "x": 1707,
+        "y": 724,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "2b62ab10.ff50ec",
-                "a72426b1.68469",
-                "f1a9c962.2a68a8"
+                "adf5b844.beeba",
+                "12473ca6.c43deb",
+                "1c108294.607cad"
             ]
         ]
     },
     {
-        "id": "a72426b1.68469",
+        "id": "12473ca6.c43deb",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2017.490966796875,
-        "y": 694.573974609375,
-        "z": "a52db008.999ba",
+        "x": 1998.490966796875,
+        "y": 702.573974609375,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "b15724ee.fb934"
+                "bde422ea.a4cc28"
             ]
         ]
     },
     {
-        "id": "f1a9c962.2a68a8",
+        "id": "1c108294.607cad",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2006,
-        "y": 739,
-        "z": "a52db008.999ba",
+        "x": 1987,
+        "y": 747,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "71027f5f.6dfd2"
+                "da8d3db8.78e6c"
             ]
         ]
     },
     {
-        "id": "b15724ee.fb934",
+        "id": "bde422ea.a4cc28",
         "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": 2166.0625,
-        "y": 694.8597412109375,
-        "z": "a52db008.999ba",
+        "x": 2147.0625,
+        "y": 702.8597412109375,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "71027f5f.6dfd2",
+        "id": "da8d3db8.78e6c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2165,
-        "y": 739,
-        "z": "a52db008.999ba",
+        "x": 2146,
+        "y": 747,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "2b62ab10.ff50ec",
+        "id": "adf5b844.beeba",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2013,
-        "y": 818,
-        "z": "a52db008.999ba",
+        "x": 1994,
+        "y": 826,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "68ca5242.42eadc"
+                "b6fe1d93.64f5d8"
             ]
         ]
     },
     {
-        "id": "68ca5242.42eadc",
+        "id": "b6fe1d93.64f5d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2152,
-        "y": 818,
-        "z": "a52db008.999ba",
+        "x": 2133,
+        "y": 826,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "fd1e5e1b.83e83",
-                "ff342d97.b64c78",
-                "c6e4c4bb.cde228",
-                "beeca149.096358",
-                "b3a21500.4dc258",
-                "4a385582.c0497c",
-                "8ecd4f21.958f3",
-                "87e71c84.c17b98",
-                "b0430b3.4eee0f8",
-                "9e9e0741.eed478",
-                "41475eff.deafd",
-                "171af565.db9233",
-                "a0a45fd6.c31fe",
-                "fdbb72c5.61c228",
-                "62bd6081.059d7",
-                "3f4df906.b67d7e",
-                "fad5035b.7ee3a8",
-                "d037b0c3.f093c"
+                "fcc70311.f003c",
+                "409bbb6d.55b47c",
+                "34d7360f.96bb2a",
+                "48146421.80a074",
+                "31bc0e97.d1b352",
+                "c57c6aeb.0d49c",
+                "5ce97afb.25ecd4",
+                "1f2f2fca.dd946",
+                "fc0327f0.f229c8",
+                "7a9db702.f0e1b",
+                "1f17f018.71ce48",
+                "75da5f28.16fb78",
+                "15d01a88.67da65",
+                "8335f76.9af8388",
+                "47a3a765.16faa",
+                "5651ec55.50184c",
+                "edb297b0.c9f328",
+                "91eba2f3.844de"
             ]
         ]
     },
     {
-        "id": "c6e4c4bb.cde228",
+        "id": "34d7360f.96bb2a",
         "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": 2381,
-        "y": 899,
-        "z": "a52db008.999ba",
+        "x": 2362,
+        "y": 907,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "99527920.d104f",
-                "471613.ac9f61ec",
-                "d7106a2a.e2e008"
+                "1b983b4f.2c744d",
+                "83f9f068.59488",
+                "b0f14e34.bcfcc8"
             ]
         ]
     },
     {
-        "id": "beeca149.096358",
+        "id": "48146421.80a074",
         "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": 2360,
-        "y": 1500.9998779296875,
-        "z": "a52db008.999ba",
+        "x": 2341,
+        "y": 1508.9998779296875,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "f5b57d2.711fb8",
-                "ee69c7ed.d244a",
-                "b86b9154.d8271"
+                "191b0cc5.853723",
+                "bdfa4737.7997e",
+                "3dcbfde4.8fdb42"
             ]
         ]
     },
     {
-        "id": "99527920.d104f",
+        "id": "1b983b4f.2c744d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2582,
-        "y": 783,
-        "z": "a52db008.999ba",
+        "x": 2563,
+        "y": 791,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "dee03a78.25dd08"
+                "5a65addc.f9d584"
             ]
         ]
     },
     {
-        "id": "471613.ac9f61ec",
+        "id": "83f9f068.59488",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2577.509033203125,
-        "y": 832.426025390625,
-        "z": "a52db008.999ba",
+        "x": 2558.509033203125,
+        "y": 840.426025390625,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "afb5fd1c.14f968"
+                "60568789.b01d3"
             ]
         ]
     },
     {
-        "id": "d7106a2a.e2e008",
+        "id": "b0f14e34.bcfcc8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2581.509033203125,
-        "y": 883.426025390625,
-        "z": "a52db008.999ba",
+        "x": 2562.509033203125,
+        "y": 891.426025390625,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "b1e48bbc.9418f8"
+                "4d860946.d83b4"
             ]
         ]
     },
     {
-        "id": "dee03a78.25dd08",
+        "id": "5a65addc.f9d584",
         "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": 2730.571533203125,
-        "y": 782.2857666015625,
-        "z": "a52db008.999ba",
+        "x": 2711.571533203125,
+        "y": 790.2857666015625,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "afb5fd1c.14f968",
+        "id": "60568789.b01d3",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2720.509033203125,
-        "y": 832.426025390625,
-        "z": "a52db008.999ba",
+        "x": 2701.509033203125,
+        "y": 840.426025390625,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "f5b57d2.711fb8",
+        "id": "191b0cc5.853723",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2583,
-        "y": 1470.9998779296875,
-        "z": "a52db008.999ba",
+        "x": 2564,
+        "y": 1478.9998779296875,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "e4bc5398.587c9"
+                "63b24300.9bd254"
             ]
         ]
     },
     {
-        "id": "ee69c7ed.d244a",
+        "id": "bdfa4737.7997e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2578.509033203125,
-        "y": 1520.4259033203125,
-        "z": "a52db008.999ba",
+        "x": 2559.509033203125,
+        "y": 1528.4259033203125,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "7a22de95.f8d34"
+                "f56e5adb.9f7af8"
             ]
         ]
     },
     {
-        "id": "b86b9154.d8271",
+        "id": "3dcbfde4.8fdb42",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2582.509033203125,
-        "y": 1571.4259033203125,
-        "z": "a52db008.999ba",
+        "x": 2563.509033203125,
+        "y": 1579.4259033203125,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "706786f4.1c86"
+                "b596324f.8c351"
             ]
         ]
     },
     {
-        "id": "e4bc5398.587c9",
+        "id": "63b24300.9bd254",
         "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": 2731.571533203125,
-        "y": 1470.28564453125,
-        "z": "a52db008.999ba",
+        "x": 2712.571533203125,
+        "y": 1478.28564453125,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "7a22de95.f8d34",
+        "id": "f56e5adb.9f7af8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2721.509033203125,
-        "y": 1520.4259033203125,
-        "z": "a52db008.999ba",
+        "x": 2702.509033203125,
+        "y": 1528.4259033203125,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "6a5608a5.7646c8",
+        "id": "f08611d.e85e5f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3395.66650390625,
-        "y": 927,
-        "z": "a52db008.999ba",
+        "x": 3376.66650390625,
+        "y": 935,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "e59ae0d9.0b3bb8",
-                "b65b8a91.4e15",
-                "600bf3e5.b14284",
-                "af7a5358.49a49",
-                "a8e7dd16.944608"
+                "bcee177.eb94168",
+                "f75d67.7cccfa98",
+                "a4c22219.803cd8",
+                "d6e02ca6.c9a8c8",
+                "5b5222c9.d7a36c"
             ]
         ]
     },
     {
-        "id": "b8369203.6c1e7",
+        "id": "8b31e4a0.a10748",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3223,
-        "y": 928,
-        "z": "a52db008.999ba",
+        "x": 3204,
+        "y": 936,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "6a5608a5.7646c8"
+                "f08611d.e85e5f"
             ]
         ]
     },
     {
-        "id": "9feeef15.8800c",
+        "id": "c9553d7.4a532c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3232.490966796875,
-        "y": 970.5740356445312,
-        "z": "a52db008.999ba",
+        "x": 3213.490966796875,
+        "y": 978.5740356445312,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "cbf27e14.644ef8"
+                "b569fb01.0907f8"
             ]
         ]
     },
     {
-        "id": "e8e1bd1d.029dd",
+        "id": "cf1d45bd.26226",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3221,
-        "y": 1017,
-        "z": "a52db008.999ba",
+        "x": 3202,
+        "y": 1025,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "7478805e.d0dee8"
+                "8595bfe0.610eb"
             ]
         ]
     },
     {
-        "id": "cbf27e14.644ef8",
+        "id": "b569fb01.0907f8",
         "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": 3386.0623779296875,
-        "y": 973.8597717285156,
-        "z": "a52db008.999ba",
+        "x": 3367.0623779296875,
+        "y": 981.8597717285156,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "7478805e.d0dee8",
+        "id": "8595bfe0.610eb",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3390,
-        "y": 1018,
-        "z": "a52db008.999ba",
+        "x": 3371,
+        "y": 1026,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "b1e48bbc.9418f8",
+        "id": "4d860946.d83b4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2743,
-        "y": 885,
-        "z": "a52db008.999ba",
+        "x": 2724,
+        "y": 893,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "b8e4ab1b.5f9428",
-                "7b409cff.da197c"
+                "de6bae96.a20288",
+                "2546bd9f.525272"
             ]
         ]
     },
     {
-        "id": "706786f4.1c86",
+        "id": "b596324f.8c351",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2733,
-        "y": 1572.9998779296875,
-        "z": "a52db008.999ba",
+        "x": 2714,
+        "y": 1580.9998779296875,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "6545b277.ec5df4",
-                "e04c02f4.2f63f8"
+                "cc046399.813d8",
+                "94119745.c4be9"
             ]
         ]
     },
     {
-        "id": "a1cc2eec.aa7708",
+        "id": "d0ee2422.3da6b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3363.66650390625,
-        "y": 1763,
-        "z": "a52db008.999ba",
+        "x": 3344.66650390625,
+        "y": 1771,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "69afc187.c0c28",
-                "9c8c62ca.8659",
-                "72280e7f.000388",
-                "5d487f8.16a5d",
-                "34f70001.b13958"
+                "1c0836ef.f83329",
+                "4c626db2.041e5c",
+                "a8a1220c.849508",
+                "46fb3252.5c32c4",
+                "3da30ce3.e252e4"
             ]
         ]
     },
     {
-        "id": "a9223749.8519e8",
+        "id": "33a31a8c.e3b546",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3191,
-        "y": 1764,
-        "z": "a52db008.999ba",
+        "x": 3172,
+        "y": 1772,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "a1cc2eec.aa7708"
+                "d0ee2422.3da6b8"
             ]
         ]
     },
     {
-        "id": "8aac19ac.984638",
+        "id": "333e39a9.5e6146",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3200.490966796875,
-        "y": 1806.5740356445312,
-        "z": "a52db008.999ba",
+        "x": 3181.490966796875,
+        "y": 1814.5740356445312,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "e01c6b8b.6173d8"
+                "c1fc954e.de2348"
             ]
         ]
     },
     {
-        "id": "15568030.09492",
+        "id": "18c9eff6.77ede8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3189,
-        "y": 1853,
-        "z": "a52db008.999ba",
+        "x": 3170,
+        "y": 1861,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "f17ea401.42a54"
+                "a54283a5.d344c"
             ]
         ]
     },
     {
-        "id": "e01c6b8b.6173d8",
+        "id": "c1fc954e.de2348",
         "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": 3354.0623779296875,
-        "y": 1809.8597717285156,
-        "z": "a52db008.999ba",
+        "x": 3335.0623779296875,
+        "y": 1817.8597717285156,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "f17ea401.42a54",
+        "id": "a54283a5.d344c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3358,
-        "y": 1854,
-        "z": "a52db008.999ba",
+        "x": 3339,
+        "y": 1862,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "e59ae0d9.0b3bb8",
+        "id": "bcee177.eb94168",
         "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": 3660,
-        "y": 911,
-        "z": "a52db008.999ba",
+        "x": 3641,
+        "y": 919,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "b90f8b2c.3443f8",
-                "f2af84b7.f19e7"
+                "60be6e60.f9ecc8",
+                "ba14138e.5a08c8"
             ]
         ]
     },
     {
-        "id": "f2af84b7.f19e7",
+        "id": "ba14138e.5a08c8",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3883,
-        "y": 866,
-        "z": "a52db008.999ba",
+        "x": 3864,
+        "y": 874,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "af749f90.aea73"
+                "9427c16f.fe3b38"
             ]
         ]
     },
     {
-        "id": "b90f8b2c.3443f8",
+        "id": "60be6e60.f9ecc8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3885,
-        "y": 930,
-        "z": "a52db008.999ba",
+        "x": 3866,
+        "y": 938,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "37b87470.480804"
+                "8f5282b4.e9d138"
             ]
         ]
     },
     {
-        "id": "58adc121.da62b8",
+        "id": "9e9c487d.182678",
         "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": 4218,
-        "y": 824,
-        "z": "a52db008.999ba",
+        "x": 4199,
+        "y": 832,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "37b87470.480804",
+        "id": "8f5282b4.e9d138",
         "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": 4047,
-        "y": 926,
-        "z": "a52db008.999ba",
+        "x": 4028,
+        "y": 934,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "af749f90.aea73",
+        "id": "9427c16f.fe3b38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4048,
-        "y": 863,
-        "z": "a52db008.999ba",
+        "x": 4029,
+        "y": 871,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "a0d3646d.84d22",
-                "58adc121.da62b8"
+                "7be29fde.94965",
+                "9e9c487d.182678"
             ]
         ]
     },
     {
-        "id": "a0d3646d.84d22",
+        "id": "7be29fde.94965",
         "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": 4219,
-        "y": 929,
-        "z": "a52db008.999ba",
+        "x": 4200,
+        "y": 937,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "b948285d.fc6638",
+        "id": "305634db.acff34",
         "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": 4220,
-        "y": 878,
-        "z": "a52db008.999ba",
+        "x": 4201,
+        "y": 886,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "600bf3e5.b14284",
+        "id": "a4c22219.803cd8",
         "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='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='' />\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": 3662,
-        "y": 1070,
-        "z": "a52db008.999ba",
+        "x": 3643,
+        "y": 1078,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "b65b8a91.4e15",
+        "id": "f75d67.7cccfa98",
         "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": 3707,
-        "y": 980,
-        "z": "a52db008.999ba",
+        "x": 3688,
+        "y": 988,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "584061d2.7f676",
+        "id": "51860532.882634",
         "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": 3596,
-        "y": 1021,
-        "z": "a52db008.999ba",
+        "x": 3577,
+        "y": 1029,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "69afc187.c0c28",
+        "id": "1c0836ef.f83329",
         "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": 3650,
-        "y": 1767.0001220703125,
-        "z": "a52db008.999ba",
+        "x": 3631,
+        "y": 1775.0001220703125,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "73786f45.91fbd",
-                "a8286fc.413fb9"
+                "9b737b83.c6ca88",
+                "22a6cd9c.81b312"
             ]
         ]
     },
     {
-        "id": "a8286fc.413fb9",
+        "id": "22a6cd9c.81b312",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3873,
-        "y": 1722.0001220703125,
-        "z": "a52db008.999ba",
+        "x": 3854,
+        "y": 1730.0001220703125,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "6edaf2ce.ba97ac"
+                "f2364b58.93416"
             ]
         ]
     },
     {
-        "id": "73786f45.91fbd",
+        "id": "9b737b83.c6ca88",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3875,
-        "y": 1786.0001220703125,
-        "z": "a52db008.999ba",
+        "x": 3856,
+        "y": 1794.0001220703125,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "fcba834.c469f8"
+                "e81f51e1.476528"
             ]
         ]
     },
     {
-        "id": "e5ecf778.a4711",
+        "id": "c355fa60.d02f7",
         "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": 4208,
-        "y": 1680.0001220703125,
-        "z": "a52db008.999ba",
+        "x": 4189,
+        "y": 1688.0001220703125,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "fcba834.c469f8",
+        "id": "e81f51e1.476528",
         "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": 4034,
-        "y": 1805.0001220703125,
-        "z": "a52db008.999ba",
+        "x": 4015,
+        "y": 1813.0001220703125,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "6edaf2ce.ba97ac",
+        "id": "f2364b58.93416",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4038,
-        "y": 1719.0001220703125,
-        "z": "a52db008.999ba",
+        "x": 4019,
+        "y": 1727.0001220703125,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "e5ecf778.a4711",
-                "865f8e50.82a5c"
+                "c355fa60.d02f7",
+                "fbcef05a.30da7"
             ]
         ]
     },
     {
-        "id": "865f8e50.82a5c",
+        "id": "fbcef05a.30da7",
         "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": 4209,
-        "y": 1785.0001220703125,
-        "z": "a52db008.999ba",
+        "x": 4190,
+        "y": 1793.0001220703125,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "9e10e06d.c116e8",
+        "id": "5702bff2.1c714",
         "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": 4204,
-        "y": 1734.0001220703125,
-        "z": "a52db008.999ba",
+        "x": 4185,
+        "y": 1742.0001220703125,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "72280e7f.000388",
+        "id": "a8a1220c.849508",
         "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='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='' />\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": 3652,
-        "y": 1926.0001220703125,
-        "z": "a52db008.999ba",
+        "x": 3633,
+        "y": 1934.0001220703125,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "9c8c62ca.8659",
+        "id": "4c626db2.041e5c",
         "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": 3697,
-        "y": 1836.0001220703125,
-        "z": "a52db008.999ba",
+        "x": 3678,
+        "y": 1844.0001220703125,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "eb2e4b08.8488e",
+        "id": "a742fa6d.53c048",
         "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": 3586,
-        "y": 1874.0001220703125,
-        "z": "a52db008.999ba",
+        "x": 3567,
+        "y": 1882.0001220703125,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "b3a21500.4dc258",
+        "id": "31bc0e97.d1b352",
         "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": 2561,
-        "y": 2001,
-        "z": "a52db008.999ba",
+        "x": 2542,
+        "y": 2009,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "4a385582.c0497c",
+        "id": "c57c6aeb.0d49c",
         "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": 2355,
-        "y": 1941,
-        "z": "a52db008.999ba",
+        "x": 2336,
+        "y": 1949,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "1846dda4.ce84b2",
+        "id": "df325b41.3eb068",
         "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": 2329,
-        "y": 1894,
-        "z": "a52db008.999ba",
+        "x": 2310,
+        "y": 1902,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "8ecd4f21.958f3",
+        "id": "5ce97afb.25ecd4",
         "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.vpn-binding-domainA-uuid`' />\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='vpn-type' value='`$prop.global.sotn.vpnType`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='vpn-name' value='`$prop.vpn-binding-domainA-uuid`' />\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": 2437,
-        "y": 2160,
-        "z": "a52db008.999ba",
+        "x": 2418,
+        "y": 2168,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "9a891a89.705e9"
+                "265fc651.8685d2"
             ]
         ]
     },
     {
-        "id": "87e71c84.c17b98",
+        "id": "1f2f2fca.dd946",
         "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": 2440.5,
-        "y": 2230,
-        "z": "a52db008.999ba",
+        "x": 2421.5,
+        "y": 2238,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "65814f19.31d048",
+        "id": "47b16974.ba7ff8",
         "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": 3088.5,
-        "y": 2149,
-        "z": "a52db008.999ba",
+        "x": 3069.5,
+        "y": 2157,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "9a488056.fd463",
+        "id": "45a1ff6d.febe7",
         "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": 3090.5,
-        "y": 2188,
-        "z": "a52db008.999ba",
+        "x": 3071.5,
+        "y": 2196,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "af7a5358.49a49",
+        "id": "d6e02ca6.c9a8c8",
         "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": 3790,
-        "y": 1118,
-        "z": "a52db008.999ba",
+        "x": 3771,
+        "y": 1126,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "5d487f8.16a5d",
+        "id": "46fb3252.5c32c4",
         "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": 3779,
-        "y": 1991.0001220703125,
-        "z": "a52db008.999ba",
+        "x": 3760,
+        "y": 1999.0001220703125,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "9a891a89.705e9",
+        "id": "265fc651.8685d2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2737,
-        "y": 2167,
-        "z": "a52db008.999ba",
+        "x": 2718,
+        "y": 2175,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "a2095f6a.84829"
+                "adcdcd16.7b29a8"
             ]
         ]
     },
     {
-        "id": "a2095f6a.84829",
+        "id": "adcdcd16.7b29a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2877.500244140625,
-        "y": 2168.25390625,
-        "z": "a52db008.999ba",
+        "x": 2858.500244140625,
+        "y": 2176.25390625,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "421e8d3c.2d000c",
+        "id": "4042eea1.42325",
         "type": "comment",
         "name": "TODO: FIXME: do we need this relationship?",
         "info": "",
         "comments": "",
-        "x": 3125,
-        "y": 2108,
-        "z": "a52db008.999ba",
+        "x": 3106,
+        "y": 2116,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "ec5e7e31.de7c9",
+        "id": "8bb65fc7.c411f",
         "type": "comment",
         "name": "TODO: FIXME: put proper values",
         "info": "",
         "comments": "",
-        "x": 2404,
-        "y": 2120,
-        "z": "a52db008.999ba",
+        "x": 2385,
+        "y": 2128,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "b0430b3.4eee0f8",
+        "id": "fc0327f0.f229c8",
         "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.vpn-binding-domainB-uuid`' />\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='vpn-type' value='`$prop.global.sotn.vpnType`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='vpn-name' value='`$prop.vpn-binding-domainB-uuid`' />\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": 2440,
-        "y": 2448,
-        "z": "a52db008.999ba",
+        "x": 2421,
+        "y": 2456,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "ceffa653.90d39"
+                "a95bb5bd.f30938"
             ]
         ]
     },
     {
-        "id": "3a1d826b.1f953e",
+        "id": "54e84a72.0a1bec",
         "type": "comment",
         "name": "TODO: FIXME: do we need this relationship?",
         "info": "",
         "comments": "",
-        "x": 3128,
-        "y": 2388,
-        "z": "a52db008.999ba",
+        "x": 3109,
+        "y": 2396,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "4a53aeab.a2778",
+        "id": "5ffd7140.0fcf",
         "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": 3091.5,
-        "y": 2429,
-        "z": "a52db008.999ba",
+        "x": 3072.5,
+        "y": 2437,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "36a3debe.6aad72",
+        "id": "d209c7d6.5be38",
         "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": 3093.5,
-        "y": 2468,
-        "z": "a52db008.999ba",
+        "x": 3074.5,
+        "y": 2476,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "a45d9658.764968",
+        "id": "92281260.0bacb8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2880.500244140625,
-        "y": 2448.25390625,
-        "z": "a52db008.999ba",
+        "x": 2861.500244140625,
+        "y": 2456.25390625,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "ceffa653.90d39",
+        "id": "a95bb5bd.f30938",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2740,
-        "y": 2447,
-        "z": "a52db008.999ba",
+        "x": 2721,
+        "y": 2455,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "a45d9658.764968"
+                "92281260.0bacb8"
             ]
         ]
     },
     {
-        "id": "7449a31b.49a87c",
+        "id": "460ff82c.4ff7",
         "type": "comment",
         "name": "TODO: FIXME: put proper values",
         "info": "",
         "comments": "",
-        "x": 2420,
-        "y": 2408,
-        "z": "a52db008.999ba",
+        "x": 2401,
+        "y": 2416,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "9e9e0741.eed478",
+        "id": "7a9db702.f0e1b",
         "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": 2438.5,
-        "y": 2488,
-        "z": "a52db008.999ba",
+        "x": 2419.5,
+        "y": 2496,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "a04f201b.1fb08",
+        "id": "b765768.33e8008",
         "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": 2312,
-        "y": 2571,
-        "z": "a52db008.999ba",
+        "x": 2293,
+        "y": 2579,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "a0a45fd6.c31fe",
+        "id": "15d01a88.67da65",
         "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,' + $maximum-bandwidth /1000 *2 /3 `\" />\n<!--<parameter name='src-ttp-id' value='`$source.tunnel-tp-id`' />-->\n<parameter name='dst-ttp-id' value='`$domain-A.tunnel-tp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
+        "xml": "<set>\n<parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='otn-dest-node' value='`$domain-A.node-id`' />\n<parameter name='bw-odu' value=\"`'0,' + $gfp`\" />\n<!--<parameter name='src-ttp-id' value='`$source.tunnel-tp-id`' />-->\n<parameter name='dst-ttp-id' value='`$domain-A.tunnel-tp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
         "comments": "",
-        "x": 2377,
-        "y": 2616,
-        "z": "a52db008.999ba",
+        "x": 2358,
+        "y": 2624,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "32eb8024.15dcc8",
+        "id": "7c6d32ec.4900b4",
         "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": 4834,
-        "y": 638,
-        "z": "a52db008.999ba",
+        "x": 4815,
+        "y": 646,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "73d2c0a6.ca0098",
-                "2f388561.aeb472",
-                "c9248b9c.994ac"
+                "f99473bc.f6917",
+                "8ca213cb.13c578",
+                "73897c92.dacd5c"
             ]
         ]
     },
     {
-        "id": "381969a5.e5019e",
+        "id": "2c4c53ed.c92a04",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2387,
-        "y": 294,
-        "z": "a52db008.999ba",
+        "x": 2368,
+        "y": 302,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "2fa39853.fd6f7"
+                "df1d026f.c1c088"
             ]
         ]
     },
     {
-        "id": "93b21596.ec10e8",
+        "id": "4b086b8f.46122c",
         "type": "outcome",
         "name": "logical-link",
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1317.0001220703125,
-        "y": 711.0001220703125,
-        "z": "a52db008.999ba",
+        "x": 1298.0001220703125,
+        "y": 719.0001220703125,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "993cc770.3c90b"
+                "849b2fa9.e38c6"
             ]
         ]
     },
     {
-        "id": "8fdb5adc.4040d",
+        "id": "3637c149.a4c596",
         "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": 2055,
-        "y": 417,
-        "z": "a52db008.999ba",
+        "x": 2036,
+        "y": 425,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "332b207c.0fec28",
-                "310fb819.3e915"
+                "a6e3fac3.17782",
+                "36a75df5.accdba"
             ]
         ]
     },
     {
-        "id": "310fb819.3e915",
+        "id": "36a75df5.accdba",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2365,
-        "y": 424,
-        "z": "a52db008.999ba",
+        "x": 2346,
+        "y": 432,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "332b207c.0fec28",
+        "id": "a6e3fac3.17782",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2364,
-        "y": 478,
-        "z": "a52db008.999ba",
+        "x": 2345,
+        "y": 486,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "b6e0228b.bc6398"
+                "ccfe530c.696ee"
             ]
         ]
     },
     {
-        "id": "d9c8107.cbe1d7",
+        "id": "88e35dde.f9395",
         "type": "set",
         "name": "set the 1st 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": 1737,
-        "y": 661,
-        "z": "a52db008.999ba",
+        "x": 1718,
+        "y": 669,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "993cc770.3c90b",
+        "id": "849b2fa9.e38c6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1494,
-        "y": 704,
-        "z": "a52db008.999ba",
+        "x": 1475,
+        "y": 712,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "d9c8107.cbe1d7",
-                "8c284458.c08ae8"
+                "88e35dde.f9395",
+                "abb2414c.5ad6c8"
             ]
         ]
     },
     {
-        "id": "d4f8497.5d30938",
+        "id": "e4059fd.7caace",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 2923,
-        "y": 890,
-        "z": "a52db008.999ba",
+        "x": 2904,
+        "y": 898,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "b8e4ab1b.5f9428",
+        "id": "de6bae96.a20288",
         "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": 2966,
-        "y": 955,
-        "z": "a52db008.999ba",
+        "x": 2947,
+        "y": 963,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "b8369203.6c1e7",
-                "9feeef15.8800c",
-                "e8e1bd1d.029dd"
+                "8b31e4a0.a10748",
+                "c9553d7.4a532c",
+                "cf1d45bd.26226"
             ]
         ]
     },
     {
-        "id": "6545b277.ec5df4",
+        "id": "cc046399.813d8",
         "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": 2963,
-        "y": 1799,
-        "z": "a52db008.999ba",
+        "x": 2944,
+        "y": 1807,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "a9223749.8519e8",
-                "8aac19ac.984638",
-                "15568030.09492"
+                "33a31a8c.e3b546",
+                "333e39a9.5e6146",
+                "18c9eff6.77ede8"
             ]
         ]
     },
     {
-        "id": "4f7449aa.1cee1",
+        "id": "76191dd2.8fade4",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 2924,
-        "y": 1743,
-        "z": "a52db008.999ba",
+        "x": 2905,
+        "y": 1751,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "2fa39853.fd6f7",
+        "id": "df1d026f.c1c088",
         "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": 2680,
-        "y": 241,
-        "z": "a52db008.999ba",
+        "x": 2661,
+        "y": 249,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "e187deec.568f28",
-                "ca2e6451.404f78",
-                "42b58dd4.7191cc"
+                "adfd76db.6991",
+                "7a639d69.b5bebc",
+                "4943cdeb.ab6f2c"
             ]
         ]
     },
     {
-        "id": "ca2e6451.404f78",
+        "id": "7a639d69.b5bebc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2953.490966796875,
-        "y": 133.573974609375,
-        "z": "a52db008.999ba",
+        "x": 2934.490966796875,
+        "y": 141.573974609375,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "e5b0a6e5.509578"
+                "d0806055.3ff898"
             ]
         ]
     },
     {
-        "id": "e5b0a6e5.509578",
+        "id": "d0806055.3ff898",
         "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": 3131.0625,
-        "y": 133.8597412109375,
-        "z": "a52db008.999ba",
+        "x": 3112.0625,
+        "y": 141.8597412109375,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "42b58dd4.7191cc",
+        "id": "4943cdeb.ab6f2c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2949,
-        "y": 183,
-        "z": "a52db008.999ba",
+        "x": 2930,
+        "y": 191,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "ecd1ffcd.8fafe8"
+                "e3a044a2.8747b8"
             ]
         ]
     },
     {
-        "id": "ecd1ffcd.8fafe8",
+        "id": "e3a044a2.8747b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3131,
-        "y": 183,
-        "z": "a52db008.999ba",
+        "x": 3112,
+        "y": 191,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "e187deec.568f28",
+        "id": "adfd76db.6991",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2953,
-        "y": 234,
-        "z": "a52db008.999ba",
+        "x": 2934,
+        "y": 242,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "d246d860.a6b138"
+                "b8ee302f.a8ecc"
             ]
         ]
     },
     {
-        "id": "d246d860.a6b138",
+        "id": "b8ee302f.a8ecc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3133,
-        "y": 234,
-        "z": "a52db008.999ba",
+        "x": 3114,
+        "y": 242,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "8fdb5adc.4040d"
+                "3637c149.a4c596"
             ]
         ]
     },
     {
-        "id": "65e46dcd.9c5144",
+        "id": "7c0e5ba2.cb2954",
         "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": 2624,
-        "y": 458,
-        "z": "a52db008.999ba",
+        "x": 2605,
+        "y": 466,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "dd606d5c.9d70f"
+                "acd1414b.a58ab8"
             ]
         ]
     },
     {
-        "id": "dd606d5c.9d70f",
+        "id": "acd1414b.a58ab8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2904,
-        "y": 458,
-        "z": "a52db008.999ba",
+        "x": 2885,
+        "y": 466,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "93b21596.ec10e8"
+                "4b086b8f.46122c"
             ]
         ]
     },
     {
-        "id": "da58235b.ecd51",
+        "id": "ff4803af.9f0ab8",
         "type": "outcome",
         "name": "network-policy",
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3109,
-        "y": 432,
-        "z": "a52db008.999ba",
+        "x": 3090,
+        "y": 440,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "bae40be2.1a0898"
+                "ae60df75.bd38f"
             ]
         ]
     },
     {
-        "id": "bae40be2.1a0898",
+        "id": "ae60df75.bd38f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3285.9998779296875,
-        "y": 424.9998779296875,
-        "z": "a52db008.999ba",
+        "x": 3266.9998779296875,
+        "y": 432.9998779296875,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "26610962.4550fe",
-                "1b905535.187f13"
+                "7c4264ea.4ef2cc",
+                "16bdb614.ef254a"
             ]
         ]
     },
     {
-        "id": "26610962.4550fe",
+        "id": "7c4264ea.4ef2cc",
         "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": 3528.9998779296875,
-        "y": 381.9998779296875,
-        "z": "a52db008.999ba",
+        "x": 3509.9998779296875,
+        "y": 389.9998779296875,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "1b905535.187f13",
+        "id": "16bdb614.ef254a",
         "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": 3517.9998779296875,
-        "y": 436.9998779296875,
-        "z": "a52db008.999ba",
+        "x": 3498.9998779296875,
+        "y": 444.9998779296875,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "690d79a7.ec256",
-                "33a9cbc4.26d4ec",
-                "93a52247.c17dd8"
+                "589b81b9.57a1a",
+                "afdb690e.be2878",
+                "2f4f9888.a0047"
             ]
         ]
     },
     {
-        "id": "93a52247.c17dd8",
+        "id": "2f4f9888.a0047",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3771,
-        "y": 323,
-        "z": "a52db008.999ba",
+        "x": 3752,
+        "y": 331,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "2900fde3.f79c7a"
+                "10811a3b.3713ee"
             ]
         ]
     },
     {
-        "id": "2900fde3.f79c7a",
+        "id": "10811a3b.3713ee",
         "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": 3919.571533203125,
-        "y": 323.2857666015625,
-        "z": "a52db008.999ba",
+        "x": 3900.571533203125,
+        "y": 331.2857666015625,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "6f314ac7.786434",
+        "id": "a4b0529d.fb0728",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3918.509033203125,
-        "y": 367.426025390625,
-        "z": "a52db008.999ba",
+        "x": 3899.509033203125,
+        "y": 375.426025390625,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "33a9cbc4.26d4ec",
+        "id": "afdb690e.be2878",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3759.509033203125,
-        "y": 367.426025390625,
-        "z": "a52db008.999ba",
+        "x": 3740.509033203125,
+        "y": 375.426025390625,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "6f314ac7.786434"
+                "a4b0529d.fb0728"
             ]
         ]
     },
     {
-        "id": "690d79a7.ec256",
+        "id": "589b81b9.57a1a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3766.509033203125,
-        "y": 446.426025390625,
-        "z": "a52db008.999ba",
+        "x": 3747.509033203125,
+        "y": 454.426025390625,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "13407089.aa8267"
+                "2140264c.6d5f92"
             ]
         ]
     },
     {
-        "id": "13407089.aa8267",
+        "id": "2140264c.6d5f92",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3905.509033203125,
-        "y": 446.426025390625,
-        "z": "a52db008.999ba",
+        "x": 3886.509033203125,
+        "y": 454.426025390625,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "d0bc6aa5.e1fca8"
+                "22cd0794.035c48",
+                "fae49c49.31b99"
             ]
         ]
     },
     {
-        "id": "d0bc6aa5.e1fca8",
+        "id": "22cd0794.035c48",
         "type": "set",
         "name": "set the max bandwidth",
-        "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n\n\n",
+        "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": 4111,
-        "y": 444,
-        "z": "a52db008.999ba",
+        "x": 4092,
+        "y": 452,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "7b409cff.da197c",
+        "id": "2546bd9f.525272",
         "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": 2967,
-        "y": 625,
-        "z": "a52db008.999ba",
+        "x": 2948,
+        "y": 633,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "6c1cd175.73bac",
-                "685f5c8c.4102b4"
+                "536f807c.cf39f",
+                "47e593b9.b45a3c"
             ]
         ]
     },
     {
-        "id": "685f5c8c.4102b4",
+        "id": "47e593b9.b45a3c",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3190,
-        "y": 611,
-        "z": "a52db008.999ba",
+        "x": 3171,
+        "y": 619,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "1331c07a.407898"
+                "97a737cb.3ff9d8"
             ]
         ]
     },
     {
-        "id": "6c1cd175.73bac",
+        "id": "536f807c.cf39f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3192,
-        "y": 644,
-        "z": "a52db008.999ba",
+        "x": 3173,
+        "y": 652,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "c779d61e.1b8528"
+                "2752a0c2.80dc4"
             ]
         ]
     },
     {
-        "id": "c779d61e.1b8528",
+        "id": "2752a0c2.80dc4",
         "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": 3335,
-        "y": 641,
-        "z": "a52db008.999ba",
+        "x": 3316,
+        "y": 649,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "1331c07a.407898",
+        "id": "97a737cb.3ff9d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3338,
-        "y": 604,
-        "z": "a52db008.999ba",
+        "x": 3319,
+        "y": 612,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "59393385.2a7954",
-                "5055791b.75c5d"
+                "50707e3e.984ff",
+                "fca22b88.65f128"
             ]
         ]
     },
     {
-        "id": "59393385.2a7954",
+        "id": "50707e3e.984ff",
         "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": 3500,
-        "y": 599,
-        "z": "a52db008.999ba",
+        "x": 3481,
+        "y": 607,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "e04c02f4.2f63f8",
+        "id": "94119745.c4be9",
         "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": 2981,
-        "y": 1461.9998779296875,
-        "z": "a52db008.999ba",
+        "x": 2962,
+        "y": 1469.9998779296875,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "250eb2ce.721286",
-                "7ff4092b.9f4c3"
+                "754647f7.9e2b8",
+                "657955bd.91fb44"
             ]
         ]
     },
     {
-        "id": "7ff4092b.9f4c3",
+        "id": "657955bd.91fb44",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3204,
-        "y": 1447.9998779296875,
-        "z": "a52db008.999ba",
+        "x": 3185,
+        "y": 1455.9998779296875,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "4e15b8c4.ecfe8"
+                "80a7821a.19495"
             ]
         ]
     },
     {
-        "id": "250eb2ce.721286",
+        "id": "754647f7.9e2b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3206,
-        "y": 1480.9998779296875,
-        "z": "a52db008.999ba",
+        "x": 3187,
+        "y": 1488.9998779296875,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "d740a9b4.496fa"
+                "ee8e0ea1.9fea78"
             ]
         ]
     },
     {
-        "id": "d740a9b4.496fa",
+        "id": "ee8e0ea1.9fea78",
         "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": 3349,
-        "y": 1477.9998779296875,
-        "z": "a52db008.999ba",
+        "x": 3330,
+        "y": 1485.9998779296875,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "4e15b8c4.ecfe8",
+        "id": "80a7821a.19495",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3352,
-        "y": 1440.9998779296875,
-        "z": "a52db008.999ba",
+        "x": 3333,
+        "y": 1448.9998779296875,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "a09d9728.0836a8",
-                "a9ef3bf.dca6748"
+                "413b415f.4e9208",
+                "81398c99.8688f"
             ]
         ]
     },
     {
-        "id": "a09d9728.0836a8",
+        "id": "413b415f.4e9208",
         "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": 3546,
-        "y": 1444,
-        "z": "a52db008.999ba",
+        "x": 3527,
+        "y": 1452,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "7ac4d896.f266b8",
+        "id": "2f5068f1.5086e8",
         "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": 1092,
-        "y": 170,
-        "z": "a52db008.999ba",
+        "x": 1073,
+        "y": 178,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "41475eff.deafd",
+        "id": "1f17f018.71ce48",
         "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": 2443,
-        "y": 2082,
-        "z": "a52db008.999ba",
+        "x": 2424,
+        "y": 2090,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "171af565.db9233",
+        "id": "75da5f28.16fb78",
         "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": 2441,
-        "y": 2370,
-        "z": "a52db008.999ba",
+        "x": 2422,
+        "y": 2378,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "a8e7dd16.944608",
+        "id": "5b5222c9.d7a36c",
         "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": 3614,
-        "y": 1195,
-        "z": "a52db008.999ba",
+        "x": 3595,
+        "y": 1203,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "58871d7.533a164"
+                "57baeaf4.ebf064"
             ]
         ]
     },
     {
-        "id": "58871d7.533a164",
+        "id": "57baeaf4.ebf064",
         "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": 3820,
-        "y": 1195,
-        "z": "a52db008.999ba",
+        "x": 3801,
+        "y": 1203,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "e6111c32.d5195"
+                "645e8c5e.f65a7c"
             ]
         ]
     },
     {
-        "id": "e6111c32.d5195",
+        "id": "645e8c5e.f65a7c",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4035.28564453125,
-        "y": 1194.82177734375,
-        "z": "a52db008.999ba",
+        "x": 4016.28564453125,
+        "y": 1202.82177734375,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "4a0a1881.22b0b"
+                "894c9d7e.ee38"
             ]
         ]
     },
     {
-        "id": "4a0a1881.22b0b",
+        "id": "894c9d7e.ee38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4242.1171875,
-        "y": 1195.34033203125,
-        "z": "a52db008.999ba",
+        "x": 4223.1171875,
+        "y": 1203.34033203125,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "5e5dd832.1a8688",
-                "54bc0e63.9b6c2",
-                "21213693.b01ef2"
+                "d6f40c53.9a6bf",
+                "c910efe.c0a679",
+                "50a2016f.cc5d58"
             ]
         ]
     },
     {
-        "id": "5e5dd832.1a8688",
+        "id": "d6f40c53.9a6bf",
         "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": 4457.1171875,
-        "y": 1157.34033203125,
-        "z": "a52db008.999ba",
+        "x": 4438.1171875,
+        "y": 1165.34033203125,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "54bc0e63.9b6c2",
+        "id": "c910efe.c0a679",
         "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": 4454.1171875,
-        "y": 1196.34033203125,
-        "z": "a52db008.999ba",
+        "x": 4435.1171875,
+        "y": 1204.34033203125,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "de5f8f91.d806"
+                "ab61e075.552a9"
             ]
         ]
     },
     {
-        "id": "21213693.b01ef2",
+        "id": "50a2016f.cc5d58",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4409.6171875,
-        "y": 1238.34033203125,
-        "z": "a52db008.999ba",
+        "x": 4390.6171875,
+        "y": 1246.34033203125,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "de5f8f91.d806",
+        "id": "ab61e075.552a9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4634.6171875,
-        "y": 1195.34033203125,
-        "z": "a52db008.999ba",
+        "x": 4615.6171875,
+        "y": 1203.34033203125,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "f282b1a5.b5514"
+                "11eef788.e7252"
             ]
         ]
     },
     {
-        "id": "f282b1a5.b5514",
+        "id": "11eef788.e7252",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4792.6171875,
-        "y": 1195.34033203125,
-        "z": "a52db008.999ba",
+        "x": 4773.6171875,
+        "y": 1203.34033203125,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "5cf873ba.a6923c"
+                "ab0df37c.a4d9e"
             ]
         ]
     },
     {
-        "id": "5cf873ba.a6923c",
+        "id": "ab0df37c.a4d9e",
         "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": 4999.6171875,
-        "y": 1195.34033203125,
-        "z": "a52db008.999ba",
+        "x": 4980.6171875,
+        "y": 1203.34033203125,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "34f70001.b13958",
+        "id": "3da30ce3.e252e4",
         "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": 3611,
-        "y": 2064.0001220703125,
-        "z": "a52db008.999ba",
+        "x": 3592,
+        "y": 2072.0001220703125,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "a071673c.fc9a28"
+                "5324422e.146a4c"
             ]
         ]
     },
     {
-        "id": "a071673c.fc9a28",
+        "id": "5324422e.146a4c",
         "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": 3817,
-        "y": 2064.0001220703125,
-        "z": "a52db008.999ba",
+        "x": 3798,
+        "y": 2072.0001220703125,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "6adf0421.fc4f54"
+                "a66bf5f9.332a38"
             ]
         ]
     },
     {
-        "id": "6adf0421.fc4f54",
+        "id": "a66bf5f9.332a38",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4032.28564453125,
-        "y": 2063.8218994140625,
-        "z": "a52db008.999ba",
+        "x": 4013.28564453125,
+        "y": 2071.8218994140625,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "2bb1f1c3.65f2c6"
+                "68fca589.e390fc"
             ]
         ]
     },
     {
-        "id": "2bb1f1c3.65f2c6",
+        "id": "68fca589.e390fc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4239.1171875,
-        "y": 2064.3404541015625,
-        "z": "a52db008.999ba",
+        "x": 4220.1171875,
+        "y": 2072.3404541015625,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "11642463.fe6e2c",
-                "c588c96b.efcac",
-                "4df609a.395b578"
+                "c073bf38.974dd",
+                "108cc1af.4a86d6",
+                "f0b0cdee.26542"
             ]
         ]
     },
     {
-        "id": "11642463.fe6e2c",
+        "id": "c073bf38.974dd",
         "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": 4454.1171875,
-        "y": 2026.3404541015625,
-        "z": "a52db008.999ba",
+        "x": 4435.1171875,
+        "y": 2034.3404541015625,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "c588c96b.efcac",
+        "id": "108cc1af.4a86d6",
         "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": 4451.1171875,
-        "y": 2065.3404541015625,
-        "z": "a52db008.999ba",
+        "x": 4432.1171875,
+        "y": 2073.3404541015625,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "946398a2.3fdd3"
+                "b43fbaf.be38548"
             ]
         ]
     },
     {
-        "id": "4df609a.395b578",
+        "id": "f0b0cdee.26542",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4406.6171875,
-        "y": 2107.3404541015625,
-        "z": "a52db008.999ba",
+        "x": 4387.6171875,
+        "y": 2115.3404541015625,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "946398a2.3fdd3",
+        "id": "b43fbaf.be38548",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4631.6171875,
-        "y": 2064.3404541015625,
-        "z": "a52db008.999ba",
+        "x": 4612.6171875,
+        "y": 2072.3404541015625,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "4ada9462.92f41c"
+                "f843935.e7b9ef"
             ]
         ]
     },
     {
-        "id": "4ada9462.92f41c",
+        "id": "f843935.e7b9ef",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4789.6171875,
-        "y": 2064.3404541015625,
-        "z": "a52db008.999ba",
+        "x": 4770.6171875,
+        "y": 2072.3404541015625,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "85bbe5c.988a398"
+                "2905073f.78af38"
             ]
         ]
     },
     {
-        "id": "85bbe5c.988a398",
+        "id": "2905073f.78af38",
         "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": 4996.6171875,
-        "y": 2064.3404541015625,
-        "z": "a52db008.999ba",
+        "x": 4977.6171875,
+        "y": 2072.3404541015625,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "62bd6081.059d7",
+        "id": "47a3a765.16faa",
         "type": "set",
         "name": "set attachment_param domain B",
-        "xml": "<set>\n<parameter name='request-id' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='otn-source-node' value='`$domain-B.node-id`' />\n<parameter name='otn-dest-node' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<!--<parameter name='bw-odu' value='`$maximum-bandwidth /10`' />-->\n<parameter name='bw-odu' value=\"`'0,' + $maximum-bandwidth /1000 *2 /3 `\" />\n<parameter name='src-ttp-id' value='`$domain-B.tunnel-tp-id`' />\n<!--<parameter name='dst-ttp-id' value='`$destination.tunnel-tp-id`' />-->\n<parameter name='dst-ttp-id' value='' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
+        "xml": "<set>\n<parameter name='request-id' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='otn-source-node' value='`$domain-B.node-id`' />\n<parameter name='otn-dest-node' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<!--<parameter name='bw-odu' value='`$maximum-bandwidth /10`' />-->\n<parameter name='bw-odu' value=\"`'0,' + $gfp`\" />\n<parameter name='src-ttp-id' value='`$domain-B.tunnel-tp-id`' />\n<!--<parameter name='dst-ttp-id' value='`$destination.tunnel-tp-id`' />-->\n<parameter name='dst-ttp-id' value='' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
         "comments": "",
-        "x": 2372,
-        "y": 2991,
-        "z": "a52db008.999ba",
+        "x": 2353,
+        "y": 2999,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "5055791b.75c5d",
+        "id": "fca22b88.65f128",
         "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": 3527,
-        "y": 671,
-        "z": "a52db008.999ba",
+        "x": 3508,
+        "y": 679,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "b37ffca0.5536d8",
-                "f29e8ee3.6f68c8",
-                "12ff2066.526398"
+                "26e1e178.44c626",
+                "748c5faa.9b8fd",
+                "7a23584.42cb7a8"
             ]
         ]
     },
     {
-        "id": "b37ffca0.5536d8",
+        "id": "26e1e178.44c626",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3722.5001220703125,
-        "y": 623,
-        "z": "a52db008.999ba",
+        "x": 3703.5001220703125,
+        "y": 631,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "8d70b5c4.7732f8"
+                "4f3cfb5.bd9ae04"
             ]
         ]
     },
     {
-        "id": "f29e8ee3.6f68c8",
+        "id": "748c5faa.9b8fd",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3714.5001220703125,
-        "y": 678,
-        "z": "a52db008.999ba",
+        "x": 3695.5001220703125,
+        "y": 686,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "aea102ae.c04f58"
+                "7374c1c1.b3ba38"
             ]
         ]
     },
     {
-        "id": "12ff2066.526398",
+        "id": "7a23584.42cb7a8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3719.5001220703125,
-        "y": 735,
-        "z": "a52db008.999ba",
+        "x": 3700.5001220703125,
+        "y": 743,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "d2755963.27f41"
+                "bf06b166.7b1ab8"
             ]
         ]
     },
     {
-        "id": "d2755963.27f41",
+        "id": "bf06b166.7b1ab8",
         "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": 3871.5001220703125,
-        "y": 736,
-        "z": "a52db008.999ba",
+        "x": 3852.5001220703125,
+        "y": 744,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "aea102ae.c04f58",
+        "id": "7374c1c1.b3ba38",
         "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": 3882.5001220703125,
-        "y": 681,
-        "z": "a52db008.999ba",
+        "x": 3863.5001220703125,
+        "y": 689,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "8d70b5c4.7732f8",
+        "id": "4f3cfb5.bd9ae04",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3866.8824462890625,
-        "y": 620.6556701660156,
-        "z": "a52db008.999ba",
+        "x": 3847.8824462890625,
+        "y": 628.6556701660156,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "bbf0aa7e.e2119"
+                "cc5e035f.d2ea7"
             ]
         ]
     },
     {
-        "id": "f4395a66.200ea",
+        "id": "71b56e6f.bcf72",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4449,
-        "y": 639,
-        "z": "a52db008.999ba",
+        "x": 4430,
+        "y": 647,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "89965e9d.5bf73"
+                "894c8dc1.732e8"
             ]
         ]
     },
     {
-        "id": "89965e9d.5bf73",
+        "id": "894c8dc1.732e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4626,
-        "y": 631,
-        "z": "a52db008.999ba",
+        "x": 4607,
+        "y": 639,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "cf2b04e9.c7ece",
-                "32eb8024.15dcc8"
+                "47f97449.7cbbcc",
+                "7c6d32ec.4900b4"
             ]
         ]
     },
     {
-        "id": "bbf0aa7e.e2119",
+        "id": "cc5e035f.d2ea7",
         "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": 4051,
-        "y": 635,
-        "z": "a52db008.999ba",
+        "x": 4032,
+        "y": 643,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "5e8a47e5.344b2"
+                "611703bb.9151dc"
             ]
         ]
     },
     {
-        "id": "5e8a47e5.344b2",
+        "id": "611703bb.9151dc",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4246,
-        "y": 635,
-        "z": "a52db008.999ba",
+        "x": 4227,
+        "y": 643,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "f4395a66.200ea",
-                "cfe936cc.62cbd8"
+                "71b56e6f.bcf72",
+                "bf1946eb.ee80a8"
             ]
         ]
     },
     {
-        "id": "cf2b04e9.c7ece",
+        "id": "47f97449.7cbbcc",
         "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": 4864,
-        "y": 586,
-        "z": "a52db008.999ba",
+        "x": 4845,
+        "y": 594,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "73d2c0a6.ca0098",
+        "id": "f99473bc.f6917",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5044,
-        "y": 629,
-        "z": "a52db008.999ba",
+        "x": 5025,
+        "y": 637,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "c43ff31d.81e548"
+                "701e34ee.427b2c"
             ]
         ]
     },
     {
-        "id": "2f388561.aeb472",
+        "id": "8ca213cb.13c578",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5036,
-        "y": 684,
-        "z": "a52db008.999ba",
+        "x": 5017,
+        "y": 692,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "d2cf9090.58e4c8"
+                "2e4b614b.0c396e"
             ]
         ]
     },
     {
-        "id": "c9248b9c.994ac",
+        "id": "73897c92.dacd5c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5041,
-        "y": 741,
-        "z": "a52db008.999ba",
+        "x": 5022,
+        "y": 749,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "c9c36e85.c10ae8"
+                "ce57e89b.dcf4b"
             ]
         ]
     },
     {
-        "id": "c9c36e85.c10ae8",
+        "id": "ce57e89b.dcf4b",
         "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": 5193,
-        "y": 742,
-        "z": "a52db008.999ba",
+        "x": 5174,
+        "y": 750,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "d2cf9090.58e4c8",
+        "id": "2e4b614b.0c396e",
         "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": 5204,
-        "y": 687,
-        "z": "a52db008.999ba",
+        "x": 5185,
+        "y": 695,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "c43ff31d.81e548",
+        "id": "701e34ee.427b2c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5188.38232421875,
-        "y": 626.6556701660156,
-        "z": "a52db008.999ba",
+        "x": 5169.38232421875,
+        "y": 634.6556701660156,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "2aa1f89d.d99288"
+                "986be552.d67d4"
             ]
         ]
     },
     {
-        "id": "2aa1f89d.d99288",
+        "id": "986be552.d67d4",
         "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": 5403,
-        "y": 623,
-        "z": "a52db008.999ba",
+        "x": 5384,
+        "y": 631,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "a9ef3bf.dca6748",
+        "id": "81398c99.8688f",
         "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": 3568,
-        "y": 1512,
-        "z": "a52db008.999ba",
+        "x": 3549,
+        "y": 1520,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "4ce90a1d.60092c",
-                "60723c85.f84054",
-                "343ac8c.8b51638"
+                "4228d77e.297a48",
+                "f33d7dd3.e27df8",
+                "f25d8688.bde06"
             ]
         ]
     },
     {
-        "id": "4ce90a1d.60092c",
+        "id": "4228d77e.297a48",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3763.5001220703125,
-        "y": 1464,
-        "z": "a52db008.999ba",
+        "x": 3744.5001220703125,
+        "y": 1472,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "ce24a29a.e4d57"
+                "b81f1049.782548"
             ]
         ]
     },
     {
-        "id": "60723c85.f84054",
+        "id": "f33d7dd3.e27df8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3755.5001220703125,
-        "y": 1519,
-        "z": "a52db008.999ba",
+        "x": 3736.5001220703125,
+        "y": 1527,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "e9f57737.1a79b8"
+                "cb4038b7.689b5"
             ]
         ]
     },
     {
-        "id": "343ac8c.8b51638",
+        "id": "f25d8688.bde06",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3760.5001220703125,
-        "y": 1576,
-        "z": "a52db008.999ba",
+        "x": 3741.5001220703125,
+        "y": 1584,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "67449715.5406e8"
+                "9d53815.71bad"
             ]
         ]
     },
     {
-        "id": "67449715.5406e8",
+        "id": "9d53815.71bad",
         "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": 3912.5001220703125,
-        "y": 1577,
-        "z": "a52db008.999ba",
+        "x": 3893.5001220703125,
+        "y": 1585,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "e9f57737.1a79b8",
+        "id": "cb4038b7.689b5",
         "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": 3923.5001220703125,
-        "y": 1522,
-        "z": "a52db008.999ba",
+        "x": 3904.5001220703125,
+        "y": 1530,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "ce24a29a.e4d57",
+        "id": "b81f1049.782548",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3907.8824462890625,
-        "y": 1461.6556701660156,
-        "z": "a52db008.999ba",
+        "x": 3888.8824462890625,
+        "y": 1469.6556701660156,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "ed40a410.dc6fe8"
+                "3a1b087b.88796"
             ]
         ]
     },
     {
-        "id": "857c3216.12f558",
+        "id": "9eaf216b.504558",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4490,
-        "y": 1480,
-        "z": "a52db008.999ba",
+        "x": 4471,
+        "y": 1488,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "6bbf97a7.ebebb8"
+                "848ce8ba.8131a8"
             ]
         ]
     },
     {
-        "id": "6bbf97a7.ebebb8",
+        "id": "848ce8ba.8131a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4667,
-        "y": 1472,
-        "z": "a52db008.999ba",
+        "x": 4648,
+        "y": 1480,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "ee554955.44691",
-                "1c8432c4.e13b6d"
+                "91abee3d.323e5",
+                "a28d627d.aad29"
             ]
         ]
     },
     {
-        "id": "ed40a410.dc6fe8",
+        "id": "3a1b087b.88796",
         "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": 4092,
-        "y": 1476,
-        "z": "a52db008.999ba",
+        "x": 4073,
+        "y": 1484,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "70b35483.a830f4"
+                "75ba425.30354bc"
             ]
         ]
     },
     {
-        "id": "70b35483.a830f4",
+        "id": "75ba425.30354bc",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4287,
-        "y": 1476,
-        "z": "a52db008.999ba",
+        "x": 4268,
+        "y": 1484,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "857c3216.12f558",
-                "dc8e8812.fdd648"
+                "9eaf216b.504558",
+                "f41408f6.625698"
             ]
         ]
     },
     {
-        "id": "1c8432c4.e13b6d",
+        "id": "a28d627d.aad29",
         "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": 4875,
-        "y": 1479,
-        "z": "a52db008.999ba",
+        "x": 4856,
+        "y": 1487,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "6cc22b96.ba67f4",
-                "b08dfdd6.0852f8",
-                "4f7e6e24.1a4"
+                "2c1c230e.a8a514",
+                "77340ca1.3f4454",
+                "b69cbef8.164728"
             ]
         ]
     },
     {
-        "id": "ee554955.44691",
+        "id": "91abee3d.323e5",
         "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": 4905,
-        "y": 1427,
-        "z": "a52db008.999ba",
+        "x": 4886,
+        "y": 1435,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "6cc22b96.ba67f4",
+        "id": "2c1c230e.a8a514",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5085,
-        "y": 1470,
-        "z": "a52db008.999ba",
+        "x": 5066,
+        "y": 1478,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "19f4c2b.fd2d63d"
+                "ea8a7330.3c6eb"
             ]
         ]
     },
     {
-        "id": "b08dfdd6.0852f8",
+        "id": "77340ca1.3f4454",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5077,
-        "y": 1525,
-        "z": "a52db008.999ba",
+        "x": 5058,
+        "y": 1533,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "4d7c2f7b.855e48"
+                "5b6119be.e0e2e"
             ]
         ]
     },
     {
-        "id": "4f7e6e24.1a4",
+        "id": "b69cbef8.164728",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5082,
-        "y": 1582,
-        "z": "a52db008.999ba",
+        "x": 5063,
+        "y": 1590,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "92c87883.16eab"
+                "6e980a04.e6ca2c"
             ]
         ]
     },
     {
-        "id": "92c87883.16eab",
+        "id": "6e980a04.e6ca2c",
         "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": 5234,
-        "y": 1583,
-        "z": "a52db008.999ba",
+        "x": 5215,
+        "y": 1591,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "4d7c2f7b.855e48",
+        "id": "5b6119be.e0e2e",
         "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": 5245,
-        "y": 1528,
-        "z": "a52db008.999ba",
+        "x": 5226,
+        "y": 1536,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "19f4c2b.fd2d63d",
+        "id": "ea8a7330.3c6eb",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5229.38232421875,
-        "y": 1467.6556701660156,
-        "z": "a52db008.999ba",
+        "x": 5210.38232421875,
+        "y": 1475.6556701660156,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "f5fd6d7b.ccf568"
+                "6b04dce3.953014"
             ]
         ]
     },
     {
-        "id": "f5fd6d7b.ccf568",
+        "id": "6b04dce3.953014",
         "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": 5444,
-        "y": 1464,
-        "z": "a52db008.999ba",
+        "x": 5425,
+        "y": 1472,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "fdbb72c5.61c228",
+        "id": "8335f76.9af8388",
         "type": "execute",
         "name": "execute RestApiCallNode slice creation domainA",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2423,
-        "y": 2674,
-        "z": "a52db008.999ba",
+        "x": 2404,
+        "y": 2682,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "b62b791e.5db38",
-                "47c9af20.002648"
+                "f515c1e9.93c64",
+                "49a0370a.e5f21"
             ]
         ]
     },
     {
-        "id": "47c9af20.002648",
+        "id": "49a0370a.e5f21",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2689,
-        "y": 2654,
-        "z": "a52db008.999ba",
+        "x": 2670,
+        "y": 2662,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "e173211c.50ca1"
+                "30dceb43.a4b4ac"
             ]
         ]
     },
     {
-        "id": "b62b791e.5db38",
+        "id": "f515c1e9.93c64",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2690.000213623047,
-        "y": 2704.99990940094,
-        "z": "a52db008.999ba",
+        "x": 2671.000213623047,
+        "y": 2712.99990940094,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "9a481111.191d4"
+                "e7a629da.88d0d8"
             ]
         ]
     },
     {
-        "id": "e173211c.50ca1",
+        "id": "30dceb43.a4b4ac",
         "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",
+        "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": 2829.0002479553223,
-        "y": 2654.0000009536743,
-        "z": "a52db008.999ba",
+        "x": 2810.0002479553223,
+        "y": 2662.0000009536743,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "9a481111.191d4",
+        "id": "e7a629da.88d0d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2835.02725982666,
-        "y": 2702.745394706726,
-        "z": "a52db008.999ba",
+        "x": 2816.02725982666,
+        "y": 2710.745394706726,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "3f4df906.b67d7e",
+        "id": "5651ec55.50184c",
         "type": "execute",
         "name": "execute RestApiCallNode slice creation domainB",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2423,
-        "y": 3046,
-        "z": "a52db008.999ba",
+        "x": 2404,
+        "y": 3054,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "e8fdf08e.e8b0f8",
-                "a8718b8a.f404c8"
+                "55b8a548.7743b4",
+                "625f938a.695c34"
             ]
         ]
     },
     {
-        "id": "a8718b8a.f404c8",
+        "id": "625f938a.695c34",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2689,
-        "y": 3026,
-        "z": "a52db008.999ba",
+        "x": 2670,
+        "y": 3034,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "fcecbd56.8e1ac"
+                "bcc07e6e.d74a18"
             ]
         ]
     },
     {
-        "id": "e8fdf08e.e8b0f8",
+        "id": "55b8a548.7743b4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2690.000213623047,
-        "y": 3076.99990940094,
-        "z": "a52db008.999ba",
+        "x": 2671.000213623047,
+        "y": 3084.99990940094,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "ccb1984d.b4313"
+                "42c61fdb.9a2b6"
             ]
         ]
     },
     {
-        "id": "fcecbd56.8e1ac",
+        "id": "bcc07e6e.d74a18",
         "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",
+        "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": 2829.0002479553223,
-        "y": 3026.0000009536743,
-        "z": "a52db008.999ba",
+        "x": 2810.0002479553223,
+        "y": 3034.0000009536743,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "ccb1984d.b4313",
+        "id": "42c61fdb.9a2b6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2835.02725982666,
-        "y": 3074.745394706726,
-        "z": "a52db008.999ba",
+        "x": 2816.02725982666,
+        "y": 3082.745394706726,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "b6e0228b.bc6398",
+        "id": "ccfe530c.696ee",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2528,
-        "y": 404,
-        "z": "a52db008.999ba",
+        "x": 2509,
+        "y": 412,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "65e46dcd.9c5144",
-                "bb6c8a2e.a61878"
+                "7c0e5ba2.cb2954",
+                "338a39d3.a481ce"
             ]
         ]
     },
     {
-        "id": "bb6c8a2e.a61878",
+        "id": "338a39d3.a481ce",
         "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": 2809,
-        "y": 360,
-        "z": "a52db008.999ba",
+        "x": 2790,
+        "y": 368,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "475f2872.5fafd"
+                "e9d2da22.090e3"
             ]
         ]
     },
     {
-        "id": "475f2872.5fafd",
+        "id": "e9d2da22.090e3",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3071,
-        "y": 360,
-        "z": "a52db008.999ba",
+        "x": 3052,
+        "y": 368,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "da58235b.ecd51"
+                "ff4803af.9f0ab8"
             ]
         ]
     },
     {
-        "id": "cfe936cc.62cbd8",
+        "id": "bf1946eb.ee80a8",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4452,
-        "y": 713,
-        "z": "a52db008.999ba",
+        "x": 4433,
+        "y": 721,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "29038cb1.b59084"
+                "c3550750.f869a"
             ]
         ]
     },
     {
-        "id": "29038cb1.b59084",
+        "id": "c3550750.f869a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4629,
-        "y": 705,
-        "z": "a52db008.999ba",
+        "x": 4610,
+        "y": 713,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "c25692cd.684ce8"
+                "775fd622.bb73b"
             ]
         ]
     },
     {
-        "id": "c25692cd.684ce8",
+        "id": "775fd622.bb73b",
         "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": 4864,
-        "y": 829,
-        "z": "a52db008.999ba",
+        "x": 4845,
+        "y": 837,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "68f808b3.66b5",
+        "id": "fd89b518.9f0b6",
         "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": 4904,
-        "y": 1669,
-        "z": "a52db008.999ba",
+        "x": 4885,
+        "y": 1677,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "ad76d9b4.88b908",
+        "id": "73a6ccfa.9f80e4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4669,
-        "y": 1545,
-        "z": "a52db008.999ba",
+        "x": 4650,
+        "y": 1553,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "68f808b3.66b5"
+                "fd89b518.9f0b6"
             ]
         ]
     },
     {
-        "id": "dc8e8812.fdd648",
+        "id": "f41408f6.625698",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4492,
-        "y": 1553,
-        "z": "a52db008.999ba",
+        "x": 4473,
+        "y": 1561,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "ad76d9b4.88b908"
+                "73a6ccfa.9f80e4"
             ]
         ]
     },
     {
-        "id": "fad5035b.7ee3a8",
+        "id": "edb297b0.c9f328",
         "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/ietf-optical-slice:tp-slice-id' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.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": 2425,
-        "y": 2807,
-        "z": "a52db008.999ba",
+        "x": 2406,
+        "y": 2815,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "bc31fb8e.e87f08",
-                "8c5d2dc9.bdb42"
+                "cc44d1ea.6c2858",
+                "700c6956.d8abf8"
             ]
         ]
     },
     {
-        "id": "8c5d2dc9.bdb42",
+        "id": "700c6956.d8abf8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2691,
-        "y": 2787,
-        "z": "a52db008.999ba",
+        "x": 2672,
+        "y": 2795,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "536d6d82.f4f124"
+                "b7581f37.075ad"
             ]
         ]
     },
     {
-        "id": "bc31fb8e.e87f08",
+        "id": "cc44d1ea.6c2858",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2692.000213623047,
-        "y": 2837.99990940094,
-        "z": "a52db008.999ba",
+        "x": 2673.000213623047,
+        "y": 2845.99990940094,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "509489f1.58fe18"
+                "f67d237f.4b41c"
             ]
         ]
     },
     {
-        "id": "536d6d82.f4f124",
+        "id": "b7581f37.075ad",
         "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",
+        "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": 2831.0002479553223,
-        "y": 2787.0000009536743,
-        "z": "a52db008.999ba",
+        "x": 2812.0002479553223,
+        "y": 2795.0000009536743,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "509489f1.58fe18",
+        "id": "f67d237f.4b41c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2837.02725982666,
-        "y": 2835.745394706726,
-        "z": "a52db008.999ba",
+        "x": 2818.02725982666,
+        "y": 2843.745394706726,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "d037b0c3.f093c",
+        "id": "91eba2f3.844de",
         "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/ietf-optical-slice:tp-slice-id' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.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": 2425,
-        "y": 3173,
-        "z": "a52db008.999ba",
+        "x": 2406,
+        "y": 3181,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "8c8a801.d7272",
-                "b835a972.f48b7"
+                "cf85f70c.9ad7a",
+                "da777837.c4e49"
             ]
         ]
     },
     {
-        "id": "b835a972.f48b7",
+        "id": "da777837.c4e49",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2691,
-        "y": 3153,
-        "z": "a52db008.999ba",
+        "x": 2672,
+        "y": 3161,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "88a6a85e.9ed23"
+                "382ee7c9.8791c8"
             ]
         ]
     },
     {
-        "id": "8c8a801.d7272",
+        "id": "cf85f70c.9ad7a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2692.000213623047,
-        "y": 3203.99990940094,
-        "z": "a52db008.999ba",
+        "x": 2673.000213623047,
+        "y": 3211.99990940094,
+        "z": "4d37a11.42c136",
         "wires": [
             [
-                "7de5bd62.f4f62c"
+                "f2adb059.12803"
             ]
         ]
     },
     {
-        "id": "88a6a85e.9ed23",
+        "id": "382ee7c9.8791c8",
         "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",
+        "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": 2831.0002479553223,
-        "y": 3153.0000009536743,
-        "z": "a52db008.999ba",
+        "x": 2812.0002479553223,
+        "y": 3161.0000009536743,
+        "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "7de5bd62.f4f62c",
+        "id": "f2adb059.12803",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2837.02725982666,
-        "y": 3201.745394706726,
-        "z": "a52db008.999ba",
+        "x": 2818.02725982666,
+        "y": 3209.745394706726,
+        "z": "4d37a11.42c136",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "fae49c49.31b99",
+        "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": 4091,
+        "y": 498,
+        "z": "4d37a11.42c136",
+        "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 3584527b..56845844 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": "fed3eb51.781ac8",
+        "id": "5242e55f.2660bc",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 131,
-        "y": 81,
-        "z": "fdc94a5e.7c86f8",
+        "x": 165,
+        "y": 89,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "d2a4ea36.881b68"
+                "a94d71b7.2c2048"
             ]
         ]
     },
     {
-        "id": "d2a4ea36.881b68",
+        "id": "a94d71b7.2c2048",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,977 +22,977 @@
         "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": 262.2856903076172,
-        "y": 130.23810863494873,
-        "z": "fdc94a5e.7c86f8",
+        "x": 296.2856903076172,
+        "y": 138.23810863494873,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "7b1236d6.83c2c"
+                "aa153b53.66c418"
             ]
         ]
     },
     {
-        "id": "7b1236d6.83c2c",
+        "id": "aa153b53.66c418",
         "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": 265.4286193847656,
-        "y": 215.00003242492676,
-        "z": "fdc94a5e.7c86f8",
+        "x": 299.4286193847656,
+        "y": 223.00003242492676,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "8228a949.234f38"
+                "76657765.41a798"
             ]
         ]
     },
     {
-        "id": "8228a949.234f38",
+        "id": "76657765.41a798",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 415.238037109375,
-        "y": 344.6666564941406,
-        "z": "fdc94a5e.7c86f8",
+        "x": 449.238037109375,
+        "y": 352.6666564941406,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "341b32a3.25428e",
-                "1a6e5da0.98eb02",
-                "e5c8285b.2b695"
+                "72f9366e.3a99d8",
+                "680f29c8.59cd3",
+                "fc546f71.cb3e18"
             ]
         ]
     },
     {
-        "id": "341b32a3.25428e",
+        "id": "72f9366e.3a99d8",
         "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": 689.5716552734375,
-        "y": 611.59716796875,
-        "z": "fdc94a5e.7c86f8",
+        "x": 723.5716552734375,
+        "y": 619.59716796875,
+        "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "f743b3f1.72f9f",
+        "id": "af064a7b.44da3",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 721,
-        "y": 286,
-        "z": "fdc94a5e.7c86f8",
+        "x": 755,
+        "y": 294,
+        "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "1a6e5da0.98eb02",
+        "id": "680f29c8.59cd3",
         "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": 741,
-        "y": 382,
-        "z": "fdc94a5e.7c86f8",
+        "x": 775,
+        "y": 390,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "2976ce78.f07a42",
-                "de3912b8.6d67e",
-                "77b5fc18.2082a4"
+                "ea580b2d.a2b9d",
+                "677c974e.f259e8",
+                "13083344.02e945"
             ]
         ]
     },
     {
-        "id": "2976ce78.f07a42",
+        "id": "ea580b2d.a2b9d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 960,
-        "y": 320,
-        "z": "fdc94a5e.7c86f8",
+        "x": 994,
+        "y": 328,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "7ee13e19.7c1348"
+                "a02387a9.ce5868"
             ]
         ]
     },
     {
-        "id": "de3912b8.6d67e",
+        "id": "677c974e.f259e8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 969.490966796875,
-        "y": 362.57403564453125,
-        "z": "fdc94a5e.7c86f8",
+        "x": 1003.490966796875,
+        "y": 370.57403564453125,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "4a305009.90c32"
+                "620a8e19.7969b8"
             ]
         ]
     },
     {
-        "id": "77b5fc18.2082a4",
+        "id": "13083344.02e945",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 958,
-        "y": 409,
-        "z": "fdc94a5e.7c86f8",
+        "x": 992,
+        "y": 417,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "cd4775e4.2da96"
+                "ee25c1ac.70f318"
             ]
         ]
     },
     {
-        "id": "4a305009.90c32",
+        "id": "620a8e19.7969b8",
         "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": 1123.0623779296875,
-        "y": 365.8597717285156,
-        "z": "fdc94a5e.7c86f8",
+        "x": 1157.0623779296875,
+        "y": 373.8597717285156,
+        "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "cd4775e4.2da96",
+        "id": "ee25c1ac.70f318",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1127,
-        "y": 410,
-        "z": "fdc94a5e.7c86f8",
+        "x": 1161,
+        "y": 418,
+        "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "7ee13e19.7c1348",
+        "id": "a02387a9.ce5868",
         "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": 1157,
-        "y": 316,
-        "z": "fdc94a5e.7c86f8",
+        "x": 1191,
+        "y": 324,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "bc03982b.15ba78"
+                "17bf0063.d6585"
             ]
         ]
     },
     {
-        "id": "bc03982b.15ba78",
+        "id": "17bf0063.d6585",
         "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": 1380.33349609375,
-        "y": 315.99993896484375,
-        "z": "fdc94a5e.7c86f8",
+        "x": 1414.33349609375,
+        "y": 323.99993896484375,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "aca4b74a.cb3118"
+                "c3612b80.a84938"
             ]
         ]
     },
     {
-        "id": "aca4b74a.cb3118",
+        "id": "c3612b80.a84938",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1581.0001335144043,
-        "y": 317.00002098083496,
-        "z": "fdc94a5e.7c86f8",
+        "x": 1615.0001335144043,
+        "y": 325.00002098083496,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "2544f612.eeddca"
+                "7884e617.49647"
             ]
         ]
     },
     {
-        "id": "e5c8285b.2b695",
+        "id": "fc546f71.cb3e18",
         "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": 707,
-        "y": 330,
-        "z": "fdc94a5e.7c86f8",
+        "x": 741,
+        "y": 338,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "2544f612.eeddca",
+        "id": "7884e617.49647",
         "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": 1819,
-        "y": 319,
-        "z": "fdc94a5e.7c86f8",
+        "x": 1853,
+        "y": 327,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "75c7fde8.1d4a84",
-                "563ee44e.bd096c",
-                "bc425b5.1b1fba8"
+                "d6ce182b.31b988",
+                "aa98166f.4a5d48",
+                "6c3ef06d.2c8af8"
             ]
         ]
     },
     {
-        "id": "75c7fde8.1d4a84",
+        "id": "d6ce182b.31b988",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2027,
-        "y": 283,
-        "z": "fdc94a5e.7c86f8",
+        "x": 2061,
+        "y": 291,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "e6a3b8f2.9e7b38"
+                "f5ad0f9a.63e04"
             ]
         ]
     },
     {
-        "id": "563ee44e.bd096c",
+        "id": "aa98166f.4a5d48",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2027.490966796875,
-        "y": 328.57403564453125,
-        "z": "fdc94a5e.7c86f8",
+        "x": 2061.490966796875,
+        "y": 336.57403564453125,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "ad15182e.154a8"
+                "8c465bb9.ef2cc8"
             ]
         ]
     },
     {
-        "id": "bc425b5.1b1fba8",
+        "id": "6c3ef06d.2c8af8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2025,
-        "y": 372,
-        "z": "fdc94a5e.7c86f8",
+        "x": 2059,
+        "y": 380,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "8719a717.3cd9f8"
+                "63631469.f6833c"
             ]
         ]
     },
     {
-        "id": "ad15182e.154a8",
+        "id": "8c465bb9.ef2cc8",
         "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": 2190.0623779296875,
-        "y": 328.8597717285156,
-        "z": "fdc94a5e.7c86f8",
+        "x": 2224.0623779296875,
+        "y": 336.8597717285156,
+        "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "8719a717.3cd9f8",
+        "id": "63631469.f6833c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2194,
-        "y": 373,
-        "z": "fdc94a5e.7c86f8",
+        "x": 2228,
+        "y": 381,
+        "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "c776a79f.7f2db",
+        "id": "b3f0264f.4b3ab",
         "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": 2500,
-        "y": 372,
-        "z": "fdc94a5e.7c86f8",
+        "x": 2534,
+        "y": 380,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "b403a898.9fbc18",
-                "5d1a47a8.0dfe7",
-                "f3733135.d8a078"
+                "b834bb7a.d792e",
+                "1e7aae42.a3c8e2",
+                "2a5354ed.3760dc"
             ]
         ]
     },
     {
-        "id": "c765be65.0f488",
+        "id": "86694c65.1bab48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2884,
-        "y": 372,
-        "z": "fdc94a5e.7c86f8",
+        "x": 2918,
+        "y": 380,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "e9922fb9.764098",
-                "eef29d57.4c4228",
-                "952ea8f1.7bda",
-                "14a01812.a7d138"
+                "a6c81dc0.f9e978",
+                "23f1ef20.aa22c8",
+                "d80ddf6.5239ba",
+                "a14e9d29.27087"
             ]
         ]
     },
     {
-        "id": "b403a898.9fbc18",
+        "id": "b834bb7a.d792e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2711,
-        "y": 374,
-        "z": "fdc94a5e.7c86f8",
+        "x": 2745,
+        "y": 382,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "c765be65.0f488"
+                "86694c65.1bab48"
             ]
         ]
     },
     {
-        "id": "5d1a47a8.0dfe7",
+        "id": "1e7aae42.a3c8e2",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2711.490966796875,
-        "y": 419.57403564453125,
-        "z": "fdc94a5e.7c86f8",
+        "x": 2745.490966796875,
+        "y": 427.57403564453125,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "1295f1fa.69cac6"
+                "6a176f0f.10d98"
             ]
         ]
     },
     {
-        "id": "f3733135.d8a078",
+        "id": "2a5354ed.3760dc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2709,
-        "y": 463,
-        "z": "fdc94a5e.7c86f8",
+        "x": 2743,
+        "y": 471,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "6ac7a77b.f5232"
+                "2cad2870.f6f2f"
             ]
         ]
     },
     {
-        "id": "6ac7a77b.f5232",
+        "id": "2cad2870.f6f2f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2876,
-        "y": 462,
-        "z": "fdc94a5e.7c86f8",
+        "x": 2910,
+        "y": 470,
+        "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "1295f1fa.69cac6",
+        "id": "6a176f0f.10d98",
         "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": 2874.0623779296875,
-        "y": 419.8597717285156,
-        "z": "fdc94a5e.7c86f8",
+        "x": 2908.0623779296875,
+        "y": 427.8597717285156,
+        "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "e6a3b8f2.9e7b38",
+        "id": "f5ad0f9a.63e04",
         "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": 2228,
-        "y": 278,
-        "z": "fdc94a5e.7c86f8",
+        "x": 2262,
+        "y": 286,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "d8c7aa6c.9474d"
+                "1569ccc.fe523b3"
             ]
         ]
     },
     {
-        "id": "d8c7aa6c.9474d",
+        "id": "1569ccc.fe523b3",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2433,
-        "y": 278,
-        "z": "fdc94a5e.7c86f8",
+        "x": 2467,
+        "y": 286,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "6afd9b1f.24ad3c"
+                "419949a6.57988"
             ]
         ]
     },
     {
-        "id": "6afd9b1f.24ad3c",
+        "id": "419949a6.57988",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2599,
-        "y": 278,
-        "z": "fdc94a5e.7c86f8",
+        "x": 2633,
+        "y": 286,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "489d615f.74d2b8"
+                "da248b6f.863148"
             ]
         ]
     },
     {
-        "id": "489d615f.74d2b8",
+        "id": "da248b6f.863148",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2762,
-        "y": 278,
-        "z": "fdc94a5e.7c86f8",
+        "x": 2796,
+        "y": 286,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "c776a79f.7f2db"
+                "b3f0264f.4b3ab"
             ]
         ]
     },
     {
-        "id": "e9922fb9.764098",
+        "id": "a6c81dc0.f9e978",
         "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": 3099,
-        "y": 82,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3133,
+        "y": 90,
+        "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "eef29d57.4c4228",
+        "id": "23f1ef20.aa22c8",
         "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": 3125,
-        "y": 199,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3159,
+        "y": 207,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "e1caf9b0.f16ef",
-                "8ba822ff.3c855",
-                "3e54396e.89bb66"
+                "de4bc6aa.088c5",
+                "2b53e15d.dd21ae",
+                "ae35d78c.86b8"
             ]
         ]
     },
     {
-        "id": "e1caf9b0.f16ef",
+        "id": "de4bc6aa.088c5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3320.5001220703125,
-        "y": 151,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3354.5001220703125,
+        "y": 159,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "12b4a6a1.bdd529"
+                "9db55161.c57488"
             ]
         ]
     },
     {
-        "id": "8ba822ff.3c855",
+        "id": "2b53e15d.dd21ae",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3312.5001220703125,
-        "y": 206,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3346.5001220703125,
+        "y": 214,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "6aa3fcb.c3a6c84"
+                "577df12f.4d35a8"
             ]
         ]
     },
     {
-        "id": "12b4a6a1.bdd529",
+        "id": "9db55161.c57488",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3464.8824462890625,
-        "y": 150.65567016601562,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3498.8824462890625,
+        "y": 158.65567016601562,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "8559d2a.befa2b"
+                "5d329fe.f531fe"
             ]
         ]
     },
     {
-        "id": "8559d2a.befa2b",
+        "id": "5d329fe.f531fe",
         "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": 3649,
-        "y": 149,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3683,
+        "y": 157,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "a2c1ad39.50b17"
+                "b71d5fcd.e9cea"
             ]
         ]
     },
     {
-        "id": "a2c1ad39.50b17",
+        "id": "b71d5fcd.e9cea",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3844,
-        "y": 149,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3878,
+        "y": 157,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "f7ee255a.8640e"
+                "e408bf35.72655"
             ]
         ]
     },
     {
-        "id": "3e54396e.89bb66",
+        "id": "ae35d78c.86b8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3317.5001220703125,
-        "y": 263,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3351.5001220703125,
+        "y": 271,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "ff13ab9d.2deb7"
+                "ee316bbc.ab53b8"
             ]
         ]
     },
     {
-        "id": "ff13ab9d.2deb7",
+        "id": "ee316bbc.ab53b8",
         "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": 3469.5001220703125,
-        "y": 264,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3503.5001220703125,
+        "y": 272,
+        "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "6aa3fcb.c3a6c84",
+        "id": "577df12f.4d35a8",
         "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": 3480.5001220703125,
-        "y": 207,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3514.5001220703125,
+        "y": 215,
+        "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "d85cad49.e7fe3",
+        "id": "c9c3e28f.63609",
         "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": 4432,
-        "y": 166,
-        "z": "fdc94a5e.7c86f8",
+        "x": 4466,
+        "y": 174,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "5b32aba.7fc39d4",
-                "43d71291.c727fc",
-                "6b05861c.156668"
+                "3dd076cd.5c231a",
+                "c9f64ae8.35669",
+                "7381c16f.b370e"
             ]
         ]
     },
     {
-        "id": "98badb93.a08c9",
+        "id": "e8fac782.8b4fb",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4226,
-        "y": 153,
-        "z": "fdc94a5e.7c86f8",
+        "x": 4260,
+        "y": 161,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "48966cee.55dba4",
-                "d85cad49.e7fe3",
-                "ee878ee.4f8847"
+                "66c06218.223abc",
+                "c9c3e28f.63609",
+                "8fb6a8ce.c9f538"
             ]
         ]
     },
     {
-        "id": "48966cee.55dba4",
+        "id": "66c06218.223abc",
         "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": 4462,
-        "y": 114,
-        "z": "fdc94a5e.7c86f8",
+        "x": 4496,
+        "y": 122,
+        "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "5b32aba.7fc39d4",
+        "id": "3dd076cd.5c231a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4642,
-        "y": 157,
-        "z": "fdc94a5e.7c86f8",
+        "x": 4676,
+        "y": 165,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "20fc8e76.a69222"
+                "ffc56656.084b18"
             ]
         ]
     },
     {
-        "id": "43d71291.c727fc",
+        "id": "c9f64ae8.35669",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4634,
-        "y": 212,
-        "z": "fdc94a5e.7c86f8",
+        "x": 4668,
+        "y": 220,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "51e97aab.2d7044"
+                "df0df27a.a48ca"
             ]
         ]
     },
     {
-        "id": "6b05861c.156668",
+        "id": "7381c16f.b370e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4639,
-        "y": 269,
-        "z": "fdc94a5e.7c86f8",
+        "x": 4673,
+        "y": 277,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "ef0b1a78.fffea8"
+                "1cc1a486.bc1f73"
             ]
         ]
     },
     {
-        "id": "ef0b1a78.fffea8",
+        "id": "1cc1a486.bc1f73",
         "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": 4791,
-        "y": 270,
-        "z": "fdc94a5e.7c86f8",
+        "x": 4825,
+        "y": 278,
+        "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "51e97aab.2d7044",
+        "id": "df0df27a.a48ca",
         "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": 4802,
-        "y": 215,
-        "z": "fdc94a5e.7c86f8",
+        "x": 4836,
+        "y": 223,
+        "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "20fc8e76.a69222",
+        "id": "ffc56656.084b18",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4786.38232421875,
-        "y": 154.65567016601562,
-        "z": "fdc94a5e.7c86f8",
+        "x": 4820.38232421875,
+        "y": 162.65567016601562,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "a8dfc05f.e2f018"
+                "f9ba3b0e.b3dbd8"
             ]
         ]
     },
     {
-        "id": "f7ee255a.8640e",
+        "id": "e408bf35.72655",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4047,
-        "y": 153,
-        "z": "fdc94a5e.7c86f8",
+        "x": 4081,
+        "y": 161,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "98badb93.a08c9"
+                "e8fac782.8b4fb"
             ]
         ]
     },
     {
-        "id": "a8dfc05f.e2f018",
+        "id": "f9ba3b0e.b3dbd8",
         "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": 5001,
-        "y": 151,
-        "z": "fdc94a5e.7c86f8",
+        "x": 5035,
+        "y": 159,
+        "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "ee878ee.4f8847",
+        "id": "8fb6a8ce.c9f538",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4382,
-        "y": 230,
-        "z": "fdc94a5e.7c86f8",
+        "x": 4416,
+        "y": 238,
+        "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "952ea8f1.7bda",
+        "id": "d80ddf6.5239ba",
         "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/eth-svc-instances=' + $tmp.aai.connectivity.connectivity-id`\" />\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",
+        "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.connectivity-id`\" />\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": 3255,
-        "y": 594,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3289,
+        "y": 602,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "d9dc02b.5b9308",
-                "f01b6c55.209f38"
+                "56ef2c2f.bde334",
+                "20356ae6.118a76"
             ]
         ]
     },
     {
-        "id": "d9dc02b.5b9308",
+        "id": "56ef2c2f.bde334",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3601.5,
-        "y": 587,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3635.5,
+        "y": 595,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "174c3f65.a9f0e1"
+                "45e55581.afe784"
             ]
         ]
     },
     {
-        "id": "f01b6c55.209f38",
+        "id": "20356ae6.118a76",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3605.5,
-        "y": 627,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3639.5,
+        "y": 635,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "de16161.028de68"
+                "b4e6443a.f1c248"
             ]
         ]
     },
     {
-        "id": "de16161.028de68",
+        "id": "b4e6443a.f1c248",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3763,
-        "y": 627,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3797,
+        "y": 635,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "1a3ebd6b.2a7953",
-                "30c3e280.4d41f6"
+                "f2316450.62431",
+                "6c3e1e17.47ccd8"
             ]
         ]
     },
     {
-        "id": "174c3f65.a9f0e1",
+        "id": "45e55581.afe784",
         "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 vpn rest api\" />\n",
+        "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": 3759.5,
-        "y": 587,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3793.5,
+        "y": 595,
+        "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "1a3ebd6b.2a7953",
+        "id": "f2316450.62431",
         "type": "save",
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-id`' />\n\n<parameter name='operational-status' value='Deactivated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4091.5,
-        "y": 627,
-        "z": "fdc94a5e.7c86f8",
+        "x": 4125.5,
+        "y": 635,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "30c3e280.4d41f6",
+        "id": "6c3e1e17.47ccd8",
         "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": 4018.5,
-        "y": 673,
-        "z": "fdc94a5e.7c86f8",
+        "x": 4052.5,
+        "y": 681,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "14a01812.a7d138",
+        "id": "a14e9d29.27087",
         "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/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-id`\" />\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=\"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`\" />",
+        "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-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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3228,
-        "y": 466,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3262,
+        "y": 474,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "8e721e50.020db",
-                "8f6c71d1.f7e258"
+                "692cf34e.ccecdc",
+                "64e95b5b.03211c"
             ]
         ]
     },
     {
-        "id": "8e721e50.020db",
+        "id": "692cf34e.ccecdc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3560.5,
-        "y": 436,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3594.5,
+        "y": 444,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "b94a74e8.509ec"
+                "8f4d555e.2bf24"
             ]
         ]
     },
     {
-        "id": "8f6c71d1.f7e258",
+        "id": "64e95b5b.03211c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3565.5,
-        "y": 501,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3599.5,
+        "y": 509,
+        "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "e36acb2.364b538"
+                "deb2a97d.a041c8"
             ]
         ]
     },
     {
-        "id": "b94a74e8.509ec",
+        "id": "8f4d555e.2bf24",
         "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 vpn rest api\" />\n",
+        "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": 3736.5,
-        "y": 436,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3770.5,
+        "y": 444,
+        "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "e36acb2.364b538",
+        "id": "deb2a97d.a041c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3732,
-        "y": 501,
-        "z": "fdc94a5e.7c86f8",
+        "x": 3766,
+        "y": 509,
+        "z": "b39eb7ec.28f1a8",
         "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 4e31cf5d..6690c0c9 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": "9067dc50.e26888",
+        "id": "bf5e551e.2a4d68",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 130,
-        "y": 78,
-        "z": "65374df1.8a48d4",
+        "x": 150,
+        "y": 61,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "51326c57.b5118c"
+                "536d861a.099138"
             ]
         ]
     },
     {
-        "id": "51326c57.b5118c",
+        "id": "536d861a.099138",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,988 +22,988 @@
         "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": 261.2856903076172,
-        "y": 127.23810863494873,
-        "z": "65374df1.8a48d4",
+        "x": 281.2856903076172,
+        "y": 110.23810863494873,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "1a80b7c8.5e20d"
+                "6541c50d.7a4ee4"
             ]
         ]
     },
     {
-        "id": "1a80b7c8.5e20d",
+        "id": "6541c50d.7a4ee4",
         "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": 264.4286193847656,
-        "y": 212.00003242492676,
-        "z": "65374df1.8a48d4",
+        "x": 284.4286193847656,
+        "y": 195.00003242492676,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "727ca303.e92f14"
+                "b890e0d.be3caa"
             ]
         ]
     },
     {
-        "id": "727ca303.e92f14",
+        "id": "b890e0d.be3caa",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 414.238037109375,
-        "y": 341.6666564941406,
-        "z": "65374df1.8a48d4",
+        "x": 434.238037109375,
+        "y": 324.6666564941406,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "89ce3405.afdad8",
-                "f34628af.971e58",
-                "662b7b8b.c02da4"
+                "2c42b5ac.a1886a",
+                "a9ded91f.36ccb8",
+                "783cf92b.26682"
             ]
         ]
     },
     {
-        "id": "89ce3405.afdad8",
+        "id": "2c42b5ac.a1886a",
         "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": 710.5716552734375,
-        "y": 618.59716796875,
-        "z": "65374df1.8a48d4",
+        "x": 730.5716552734375,
+        "y": 601.59716796875,
+        "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "7661af19.3745a8",
+        "id": "231b56c7.bc5152",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 742,
-        "y": 293,
-        "z": "65374df1.8a48d4",
+        "x": 762,
+        "y": 276,
+        "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "f34628af.971e58",
+        "id": "a9ded91f.36ccb8",
         "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": 762,
-        "y": 389,
-        "z": "65374df1.8a48d4",
+        "x": 782,
+        "y": 372,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "f2d7e1a3.9c55b8",
-                "893eca26.41fe2",
-                "67ceb9a8.a14aa8"
+                "ebd2852a.6b8948",
+                "6eeb6239.832acc",
+                "accd90f7.832538"
             ]
         ]
     },
     {
-        "id": "f2d7e1a3.9c55b8",
+        "id": "ebd2852a.6b8948",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 981,
-        "y": 327,
-        "z": "65374df1.8a48d4",
+        "x": 1001,
+        "y": 310,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "6a81e2af.afefb4"
+                "cd7dc6c0.b4fb9"
             ]
         ]
     },
     {
-        "id": "893eca26.41fe2",
+        "id": "6eeb6239.832acc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 990.490966796875,
-        "y": 369.57403564453125,
-        "z": "65374df1.8a48d4",
+        "x": 1010.490966796875,
+        "y": 352.57403564453125,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "adcdedad.e4cfa8"
+                "63941e02.5fb4"
             ]
         ]
     },
     {
-        "id": "67ceb9a8.a14aa8",
+        "id": "accd90f7.832538",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 979,
-        "y": 416,
-        "z": "65374df1.8a48d4",
+        "x": 999,
+        "y": 399,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "51f8ebc0.b96fdc"
+                "331acfad.087d3"
             ]
         ]
     },
     {
-        "id": "adcdedad.e4cfa8",
+        "id": "63941e02.5fb4",
         "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": 1144.0623779296875,
-        "y": 372.8597717285156,
-        "z": "65374df1.8a48d4",
+        "x": 1164.0623779296875,
+        "y": 355.8597717285156,
+        "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "51f8ebc0.b96fdc",
+        "id": "331acfad.087d3",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1148,
-        "y": 417,
-        "z": "65374df1.8a48d4",
+        "x": 1168,
+        "y": 400,
+        "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "6a81e2af.afefb4",
+        "id": "cd7dc6c0.b4fb9",
         "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": 1178,
-        "y": 323,
-        "z": "65374df1.8a48d4",
+        "x": 1198,
+        "y": 306,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "37d91278.b2e28e"
+                "71a5e1a5.fba1e8"
             ]
         ]
     },
     {
-        "id": "37d91278.b2e28e",
+        "id": "71a5e1a5.fba1e8",
         "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": 1401.33349609375,
-        "y": 322.99993896484375,
-        "z": "65374df1.8a48d4",
+        "x": 1421.33349609375,
+        "y": 305.99993896484375,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "63dc2a73.eea004"
+                "45ab176d.29b28"
             ]
         ]
     },
     {
-        "id": "63dc2a73.eea004",
+        "id": "45ab176d.29b28",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1602.0001335144043,
-        "y": 324.00002098083496,
-        "z": "65374df1.8a48d4",
+        "x": 1622.0001335144043,
+        "y": 307.00002098083496,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "3bc5d31f.4eff1c"
+                "8b30afaa.f156f"
             ]
         ]
     },
     {
-        "id": "662b7b8b.c02da4",
+        "id": "783cf92b.26682",
         "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": 728,
-        "y": 337,
-        "z": "65374df1.8a48d4",
+        "x": 748,
+        "y": 320,
+        "z": "e001b214.9c4f88",
         "wires": [
             []
         ]
     },
     {
-        "id": "3bc5d31f.4eff1c",
+        "id": "8b30afaa.f156f",
         "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": 1840,
-        "y": 326,
-        "z": "65374df1.8a48d4",
+        "x": 1860,
+        "y": 309,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "f9ddca30.13fc18",
-                "2e83e20a.a4c64e",
-                "bbb85f3b.347968"
+                "a8a15026.50a8d",
+                "c9ce2298.2cf6b",
+                "be682b6.40831d8"
             ]
         ]
     },
     {
-        "id": "f9ddca30.13fc18",
+        "id": "a8a15026.50a8d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2048,
-        "y": 290,
-        "z": "65374df1.8a48d4",
+        "x": 2068,
+        "y": 273,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "7f6304c6.68b434"
+                "d739426f.d36bb8"
             ]
         ]
     },
     {
-        "id": "2e83e20a.a4c64e",
+        "id": "c9ce2298.2cf6b",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2048.490966796875,
-        "y": 335.57403564453125,
-        "z": "65374df1.8a48d4",
+        "x": 2068.490966796875,
+        "y": 318.57403564453125,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "848ced52.aed45"
+                "21e5c859.ccd51"
             ]
         ]
     },
     {
-        "id": "bbb85f3b.347968",
+        "id": "be682b6.40831d8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2046,
-        "y": 379,
-        "z": "65374df1.8a48d4",
+        "x": 2066,
+        "y": 362,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "67746d9a.bb8fac"
+                "fbd36b9c.f4a15"
             ]
         ]
     },
     {
-        "id": "848ced52.aed45",
+        "id": "21e5c859.ccd51",
         "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": 2211.0623779296875,
-        "y": 335.8597717285156,
-        "z": "65374df1.8a48d4",
+        "x": 2231.0623779296875,
+        "y": 318.8597717285156,
+        "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "67746d9a.bb8fac",
+        "id": "fbd36b9c.f4a15",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2215,
-        "y": 380,
-        "z": "65374df1.8a48d4",
+        "x": 2235,
+        "y": 363,
+        "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "a1788c2.5cbcc7",
+        "id": "a46cc38.98dbb4",
         "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": 2521,
-        "y": 379,
-        "z": "65374df1.8a48d4",
+        "x": 2541,
+        "y": 362,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "ff5b5708.803718",
-                "2b7ab4e7.4996c4",
-                "8f3a9f9c.feba08"
+                "9e895711.9515a",
+                "45b51772.60fd7",
+                "90f1dd00.339a68"
             ]
         ]
     },
     {
-        "id": "66c494d6.d131ec",
+        "id": "41605fb3.ac785",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2905,
-        "y": 379,
-        "z": "65374df1.8a48d4",
+        "x": 2925,
+        "y": 362,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "4df4ccfd.828a9c",
-                "cc810976.1e78e",
-                "6804b3fb.447a5c",
-                "1114cd30.8fbe33",
-                "77014142.ee291",
-                "eea604e.273be78",
-                "c7f4c6b5.89c68"
+                "315634a1.892b34",
+                "34cfba69.4d51e6",
+                "58dd3cb5.26ee4c",
+                "e4194069.37887",
+                "e5415b2a.1b069",
+                "af105f82.f24",
+                "bfb53be2.1d7798"
             ]
         ]
     },
     {
-        "id": "ff5b5708.803718",
+        "id": "9e895711.9515a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2732,
-        "y": 381,
-        "z": "65374df1.8a48d4",
+        "x": 2752,
+        "y": 364,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "66c494d6.d131ec"
+                "41605fb3.ac785"
             ]
         ]
     },
     {
-        "id": "2b7ab4e7.4996c4",
+        "id": "45b51772.60fd7",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2732.490966796875,
-        "y": 426.57403564453125,
-        "z": "65374df1.8a48d4",
+        "x": 2752.490966796875,
+        "y": 409.57403564453125,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "71b7f260.a02afc"
+                "80ebbe87.b5f13"
             ]
         ]
     },
     {
-        "id": "8f3a9f9c.feba08",
+        "id": "90f1dd00.339a68",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2730,
-        "y": 470,
-        "z": "65374df1.8a48d4",
+        "x": 2750,
+        "y": 453,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "f1455dfe.4b515"
+                "928e602f.f7958"
             ]
         ]
     },
     {
-        "id": "f1455dfe.4b515",
+        "id": "928e602f.f7958",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2897,
-        "y": 469,
-        "z": "65374df1.8a48d4",
+        "x": 2917,
+        "y": 452,
+        "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "71b7f260.a02afc",
+        "id": "80ebbe87.b5f13",
         "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": 2895.0623779296875,
-        "y": 426.8597717285156,
-        "z": "65374df1.8a48d4",
+        "x": 2915.0623779296875,
+        "y": 409.8597717285156,
+        "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "7f6304c6.68b434",
+        "id": "d739426f.d36bb8",
         "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": 2249,
-        "y": 285,
-        "z": "65374df1.8a48d4",
+        "x": 2269,
+        "y": 268,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "df01a5ae.6dc3e8"
+                "953eda1a.4d542"
             ]
         ]
     },
     {
-        "id": "df01a5ae.6dc3e8",
+        "id": "953eda1a.4d542",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2454,
-        "y": 285,
-        "z": "65374df1.8a48d4",
+        "x": 2474,
+        "y": 268,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "3c18e8d0.67c0b"
+                "75a62157.0a968"
             ]
         ]
     },
     {
-        "id": "3c18e8d0.67c0b",
+        "id": "75a62157.0a968",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2620,
-        "y": 285,
-        "z": "65374df1.8a48d4",
+        "x": 2640,
+        "y": 268,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "2564f00.0bbdd9"
+                "d166d1d9.165cd8"
             ]
         ]
     },
     {
-        "id": "2564f00.0bbdd9",
+        "id": "d166d1d9.165cd8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2783,
-        "y": 285,
-        "z": "65374df1.8a48d4",
+        "x": 2803,
+        "y": 268,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "a1788c2.5cbcc7"
+                "a46cc38.98dbb4"
             ]
         ]
     },
     {
-        "id": "4df4ccfd.828a9c",
+        "id": "315634a1.892b34",
         "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": 3120,
-        "y": 89,
-        "z": "65374df1.8a48d4",
+        "x": 3140,
+        "y": 72,
+        "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "cc810976.1e78e",
+        "id": "34cfba69.4d51e6",
         "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": 3146,
-        "y": 206,
-        "z": "65374df1.8a48d4",
+        "x": 3166,
+        "y": 189,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "fbb5125b.955718",
-                "693af83c.f3ea18",
-                "2473f4a.835008c"
+                "b3f1fbc8.de108",
+                "b343cfff.aa8d4",
+                "284e02e7.51cff6"
             ]
         ]
     },
     {
-        "id": "fbb5125b.955718",
+        "id": "b3f1fbc8.de108",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3341.5001220703125,
-        "y": 158,
-        "z": "65374df1.8a48d4",
+        "x": 3361.5001220703125,
+        "y": 141,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "9a9b433a.0ee84"
+                "81f23c52.9a8b3"
             ]
         ]
     },
     {
-        "id": "693af83c.f3ea18",
+        "id": "b343cfff.aa8d4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3333.5001220703125,
-        "y": 213,
-        "z": "65374df1.8a48d4",
+        "x": 3353.5001220703125,
+        "y": 196,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "3249d5d1.aac972"
+                "f8c3b27d.bb7ca8"
             ]
         ]
     },
     {
-        "id": "9a9b433a.0ee84",
+        "id": "81f23c52.9a8b3",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3485.8824462890625,
-        "y": 157.65567016601562,
-        "z": "65374df1.8a48d4",
+        "x": 3505.8824462890625,
+        "y": 140.65567016601562,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "4c1ac004.69f11"
+                "cf4fab4f.ff26f8"
             ]
         ]
     },
     {
-        "id": "4c1ac004.69f11",
+        "id": "cf4fab4f.ff26f8",
         "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": 3670,
-        "y": 156,
-        "z": "65374df1.8a48d4",
+        "x": 3690,
+        "y": 139,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "4cdbe422.34f9d4"
+                "e5bf62b8.3c949"
             ]
         ]
     },
     {
-        "id": "4cdbe422.34f9d4",
+        "id": "e5bf62b8.3c949",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3865,
-        "y": 156,
-        "z": "65374df1.8a48d4",
+        "x": 3885,
+        "y": 139,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "9761202f.b6a0b"
+                "8f16d6f1.620958"
             ]
         ]
     },
     {
-        "id": "2473f4a.835008c",
+        "id": "284e02e7.51cff6",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3338.5001220703125,
-        "y": 270,
-        "z": "65374df1.8a48d4",
+        "x": 3358.5001220703125,
+        "y": 253,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "aacead6d.fefcb8"
+                "a632f8eb.4977a"
             ]
         ]
     },
     {
-        "id": "aacead6d.fefcb8",
+        "id": "a632f8eb.4977a",
         "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": 3490.5001220703125,
-        "y": 271,
-        "z": "65374df1.8a48d4",
+        "x": 3510.5001220703125,
+        "y": 254,
+        "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "3249d5d1.aac972",
+        "id": "f8c3b27d.bb7ca8",
         "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": 3501.5001220703125,
-        "y": 214,
-        "z": "65374df1.8a48d4",
+        "x": 3521.5001220703125,
+        "y": 197,
+        "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "4c67262e.3701a8",
+        "id": "c808ab3d.c57d7",
         "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": 4453,
-        "y": 173,
-        "z": "65374df1.8a48d4",
+        "x": 4473,
+        "y": 156,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "906ef06e.7739a8",
-                "cb4dc0cc.5ae2c",
-                "8ceaa5d5.dc9b88"
+                "2713e757.2f3d8",
+                "638dc84.73ac0b8",
+                "4816e676.e50758"
             ]
         ]
     },
     {
-        "id": "12825971.5566ff",
+        "id": "c8c24e1.d1c68b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4247,
-        "y": 160,
-        "z": "65374df1.8a48d4",
+        "x": 4267,
+        "y": 143,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "dddd5795.4cbcd",
-                "4c67262e.3701a8",
-                "459c85bd.d88044"
+                "e331349b.029ff",
+                "c808ab3d.c57d7",
+                "3516a6c6.78d90a"
             ]
         ]
     },
     {
-        "id": "dddd5795.4cbcd",
+        "id": "e331349b.029ff",
         "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": 4483,
-        "y": 121,
-        "z": "65374df1.8a48d4",
+        "x": 4503,
+        "y": 104,
+        "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "906ef06e.7739a8",
+        "id": "2713e757.2f3d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4663,
-        "y": 164,
-        "z": "65374df1.8a48d4",
+        "x": 4683,
+        "y": 147,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "97b50ccf.b69cd8"
+                "f914c736.a35ec"
             ]
         ]
     },
     {
-        "id": "cb4dc0cc.5ae2c",
+        "id": "638dc84.73ac0b8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4655,
-        "y": 219,
-        "z": "65374df1.8a48d4",
+        "x": 4675,
+        "y": 202,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "34cf9d59.f69aea"
+                "ff1a96b1.1ab44"
             ]
         ]
     },
     {
-        "id": "8ceaa5d5.dc9b88",
+        "id": "4816e676.e50758",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4660,
-        "y": 276,
-        "z": "65374df1.8a48d4",
+        "x": 4680,
+        "y": 259,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "6573a76f.8f9128"
+                "81b24b13.ecc93"
             ]
         ]
     },
     {
-        "id": "6573a76f.8f9128",
+        "id": "81b24b13.ecc93",
         "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": 4812,
-        "y": 277,
-        "z": "65374df1.8a48d4",
+        "x": 4832,
+        "y": 260,
+        "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "34cf9d59.f69aea",
+        "id": "ff1a96b1.1ab44",
         "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": 4823,
-        "y": 222,
-        "z": "65374df1.8a48d4",
+        "x": 4843,
+        "y": 205,
+        "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "97b50ccf.b69cd8",
+        "id": "f914c736.a35ec",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4807.38232421875,
-        "y": 161.65567016601562,
-        "z": "65374df1.8a48d4",
+        "x": 4827.38232421875,
+        "y": 144.65567016601562,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "e66f9d95.0b353"
+                "3dce9a6f.ca54ee"
             ]
         ]
     },
     {
-        "id": "9761202f.b6a0b",
+        "id": "8f16d6f1.620958",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4068,
-        "y": 160,
-        "z": "65374df1.8a48d4",
+        "x": 4088,
+        "y": 143,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "12825971.5566ff"
+                "c8c24e1.d1c68b"
             ]
         ]
     },
     {
-        "id": "e66f9d95.0b353",
+        "id": "3dce9a6f.ca54ee",
         "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": 5022,
-        "y": 158,
-        "z": "65374df1.8a48d4",
+        "x": 5042,
+        "y": 141,
+        "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "459c85bd.d88044",
+        "id": "3516a6c6.78d90a",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4403,
-        "y": 237,
-        "z": "65374df1.8a48d4",
+        "x": 4423,
+        "y": 220,
+        "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "1114cd30.8fbe33",
+        "id": "af105f82.f24",
         "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=\"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",
+        "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": 3270,
-        "y": 504,
-        "z": "65374df1.8a48d4",
+        "x": 3290,
+        "y": 487,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "aa415b48.c51fe8",
-                "f0d3a65b.427ad8"
+                "58523c50.a8358c",
+                "666e388c.437238"
             ]
         ]
     },
     {
-        "id": "aa415b48.c51fe8",
+        "id": "58523c50.a8358c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3613.5,
-        "y": 499,
-        "z": "65374df1.8a48d4",
+        "x": 3633.5,
+        "y": 482,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "c60de7c9.d4f7f8"
+                "3480dc80.ce39a4"
             ]
         ]
     },
     {
-        "id": "f0d3a65b.427ad8",
+        "id": "666e388c.437238",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3617.5,
-        "y": 539,
-        "z": "65374df1.8a48d4",
+        "x": 3637.5,
+        "y": 522,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "a329dc5b.ef894"
+                "f77842b2.9897b"
             ]
         ]
     },
     {
-        "id": "a329dc5b.ef894",
+        "id": "f77842b2.9897b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3775,
-        "y": 539,
-        "z": "65374df1.8a48d4",
+        "x": 3795,
+        "y": 522,
+        "z": "e001b214.9c4f88",
         "wires": [
             []
         ]
     },
     {
-        "id": "c60de7c9.d4f7f8",
+        "id": "3480dc80.ce39a4",
         "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 vpn rest api\" />\n",
+        "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": 3771.5,
-        "y": 499,
-        "z": "65374df1.8a48d4",
+        "x": 3791.5,
+        "y": 482,
+        "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "6804b3fb.447a5c",
+        "id": "58dd3cb5.26ee4c",
         "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": 3246,
-        "y": 379,
-        "z": "65374df1.8a48d4",
+        "x": 3266,
+        "y": 362,
+        "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "77014142.ee291",
+        "id": "e4194069.37887",
         "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": 3176,
-        "y": 814,
-        "z": "65374df1.8a48d4",
+        "x": 3196,
+        "y": 797,
+        "z": "e001b214.9c4f88",
         "wires": [
             []
         ]
     },
     {
-        "id": "eea604e.273be78",
+        "id": "e5415b2a.1b069",
         "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": 3172,
-        "y": 858,
-        "z": "65374df1.8a48d4",
+        "x": 3192,
+        "y": 841,
+        "z": "e001b214.9c4f88",
         "wires": [
             []
         ]
     },
     {
-        "id": "c7f4c6b5.89c68",
+        "id": "bfb53be2.1d7798",
         "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:tp-slice-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",
+        "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": 3233,
-        "y": 677,
-        "z": "65374df1.8a48d4",
+        "x": 3253,
+        "y": 660,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "e6edfa38.71c268",
-                "137ffb3e.b1daa5"
+                "9751ec98.3e8be8",
+                "4652cbec.507204"
             ]
         ]
     },
     {
-        "id": "137ffb3e.b1daa5",
+        "id": "4652cbec.507204",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3499,
-        "y": 657,
-        "z": "65374df1.8a48d4",
+        "x": 3519,
+        "y": 640,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "7548726d.c6844c"
+                "45199d8e.7e5fdc"
             ]
         ]
     },
     {
-        "id": "e6edfa38.71c268",
+        "id": "9751ec98.3e8be8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3500.000213623047,
-        "y": 707.9999094009399,
-        "z": "65374df1.8a48d4",
+        "x": 3520.000213623047,
+        "y": 690.9999094009399,
+        "z": "e001b214.9c4f88",
         "wires": [
             [
-                "67229e1a.f4d798"
+                "ebd36513.cafc88"
             ]
         ]
     },
     {
-        "id": "7548726d.c6844c",
+        "id": "45199d8e.7e5fdc",
         "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",
+        "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": 3639.0002479553223,
-        "y": 657.0000009536743,
-        "z": "65374df1.8a48d4",
+        "x": 3659.0002479553223,
+        "y": 640.0000009536743,
+        "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "67229e1a.f4d798",
+        "id": "ebd36513.cafc88",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3645.02725982666,
-        "y": 705.7453947067261,
-        "z": "65374df1.8a48d4",
+        "x": 3665.02725982666,
+        "y": 688.7453947067261,
+        "z": "e001b214.9c4f88",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/resources/graph.versions b/platform-logic/generic-resource-api/src/main/resources/graph.versions
index ba54f849..cfae11c1 100755
--- a/platform-logic/generic-resource-api/src/main/resources/graph.versions
+++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions
@@ -281,4 +281,9 @@ GENERIC-RESOURCE-API sotn-vnf-topology-operation-underlay-create ${project.versi
 GENERIC-RESOURCE-API sotn-vnf-topology-operation-underlay-deactivate ${project.version} sync
 GENERIC-RESOURCE-API sotn-vnf-topology-operation-underlay-delete ${project.version} sync
 GENERIC-RESOURCE-API sotn-get-vf-module-uni-param ${project.version} sync
+GENERIC-RESOURCE-API tsli-vnf-topology-operation-trans-slice-allocate ${project.version} sync
+GENERIC-RESOURCE-API tsli-vnf-topology-operation-trans-slice-activate ${project.version} sync
+GENERIC-RESOURCE-API tsli-vnf-topology-operation-trans-slice-deactivate ${project.version} sync
+GENERIC-RESOURCE-API tsli-vnf-topology-operation-trans-slice-deallocate ${project.version} sync
+GENERIC-RESOURCE-API tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof ${project.version} sync
 
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 c3b48106..3af9347e 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
@@ -43,6 +43,9 @@
                                                                       pfx="tmp.aai.vpn-binding" >
                                                             <outcome value='success'>
                                                                 <block atomic="true">
+                                                                    <set>
+                                                                        <parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />
+                                                                    </set>
                                                                     <switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>
                                                                         <outcome value='Other'>
                                                                             <block atomic="true">
@@ -149,7 +152,7 @@
                                                                                     <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="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"/>
@@ -160,7 +163,7 @@
                                                                                         <return status='failure'>
                                                                                             <parameter name='ack-final' value='Y'/>
                                                                                             <parameter name="error-code" value="500" />
-                                                                                            <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                                                            <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />
                                                                                         </return>
                                                                                     </outcome>
                                                                                     <outcome value='success'>
@@ -185,7 +188,7 @@
                                                                                     <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="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"/>
@@ -196,7 +199,7 @@
                                                                                         <return status='failure'>
                                                                                             <parameter name='ack-final' value='Y'/>
                                                                                             <parameter name="error-code" value="500" />
-                                                                                            <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                                                            <parameter name="error-message" value="Error executing Create ethernet service rest api" />
                                                                                         </return>
                                                                                     </outcome>
                                                                                     <outcome value='success'>
@@ -231,7 +234,7 @@
                                                                                             <parameter name='src-tpn-id' value='1' />
                                                                                             <parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />
                                                                                             <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                            <parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
+                                                                                            <parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
                                                                                             <parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />
                                                                                             <parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />
                                                                                             <parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />
@@ -324,7 +327,7 @@
                                                                                             <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="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"/>
@@ -335,7 +338,7 @@
                                                                                                 <return status='failure'>
                                                                                                     <parameter name='ack-final' value='Y'/>
                                                                                                     <parameter name="error-code" value="500" />
-                                                                                                    <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                                                                    <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />
                                                                                                 </return>
                                                                                             </outcome>
                                                                                             <outcome value='success'>
@@ -371,7 +374,7 @@
                                                                                                 <return status='failure'>
                                                                                                     <parameter name='ack-final' value='Y'/>
                                                                                                     <parameter name="error-code" value="500" />
-                                                                                                    <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                                                                    <parameter name="error-message" value="Error executing Create ethernet service rest api" />
                                                                                                 </return>
                                                                                             </outcome>
                                                                                             <outcome value='success'>
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 33e7facb..02312230 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
@@ -123,6 +123,10 @@
                                                                                             <block>
                                                                                                 <set>
                                                                                                     <parameter name='maximum-bandwidth' value="`$tmp.aai.network-policy.max-bandwidth`" />
+                                                                                                    <parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />
+                                                                                                </set>
+                                                                                                <set>
+                                                                                                    <parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />
                                                                                                 </set>
                                                                                             </block>
                                                                                         </outcome>
@@ -710,6 +714,7 @@
                                                                                                     <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`' />
@@ -745,6 +750,7 @@
                                                                                                     <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`' />
@@ -766,7 +772,7 @@
                                                                                                     <parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />
                                                                                                     <parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
                                                                                                     <parameter name='otn-dest-node' value='`$domain-A.node-id`' />
-                                                                                                    <parameter name='bw-odu' value="`'0,' + $maximum-bandwidth /1000 *2 /3 `" />
+                                                                                                    <parameter name='bw-odu' value="`'0,' + $gfp`" />
                                                                                                     <!--<parameter name='src-ttp-id' value='`$source.tunnel-tp-id`' />-->
                                                                                                     <parameter name='dst-ttp-id' value='`$domain-A.tunnel-tp-id`' />
                                                                                                     <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
@@ -788,7 +794,7 @@
                                                                                                         <return status='failure'>
                                                                                                             <parameter name='ack-final' value='Y'/>
                                                                                                             <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="Error executing OOF api" />
+                                                                                                            <parameter name="error-message" value="Error executing slice creation api for domain A" />
                                                                                                         </return>
                                                                                                     </outcome>
                                                                                                     <outcome value='success'>
@@ -797,11 +803,11 @@
                                                                                                 </execute>
                                                                                                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                                                                                     <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />
-                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te/ietf-optical-slice:tp-slice-id' `" />
+                                                                                                    <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="post"/>
+                                                                                                    <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"/>
@@ -812,7 +818,7 @@
                                                                                                         <return status='failure'>
                                                                                                             <parameter name='ack-final' value='Y'/>
                                                                                                             <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="Error executing OOF api" />
+                                                                                                            <parameter name="error-message" value="Error executing UNI Coloring for domain A" />
                                                                                                         </return>
                                                                                                     </outcome>
                                                                                                     <outcome value='success'>
@@ -824,7 +830,7 @@
                                                                                                     <parameter name='otn-source-node' value='`$domain-B.node-id`' />
                                                                                                     <parameter name='otn-dest-node' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
                                                                                                     <!--<parameter name='bw-odu' value='`$maximum-bandwidth /10`' />-->
-                                                                                                    <parameter name='bw-odu' value="`'0,' + $maximum-bandwidth /1000 *2 /3 `" />
+                                                                                                    <parameter name='bw-odu' value="`'0,' + $gfp`" />
                                                                                                     <parameter name='src-ttp-id' value='`$domain-B.tunnel-tp-id`' />
                                                                                                     <!--<parameter name='dst-ttp-id' value='`$destination.tunnel-tp-id`' />-->
                                                                                                     <parameter name='dst-ttp-id' value='' />
@@ -848,7 +854,7 @@
                                                                                                         <return status='failure'>
                                                                                                             <parameter name='ack-final' value='Y'/>
                                                                                                             <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="Error executing OOF api" />
+                                                                                                            <parameter name="error-message" value="Error executing slice creation api for domain B" />
                                                                                                         </return>
                                                                                                     </outcome>
                                                                                                     <outcome value='success'>
@@ -857,11 +863,11 @@
                                                                                                 </execute>
                                                                                                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                                                                                     <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />
-                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te/ietf-optical-slice:tp-slice-id' `" />
+                                                                                                    <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="post"/>
+                                                                                                    <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"/>
@@ -872,7 +878,7 @@
                                                                                                         <return status='failure'>
                                                                                                             <parameter name='ack-final' value='Y'/>
                                                                                                             <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="Error executing OOF api" />
+                                                                                                            <parameter name="error-message" value="Error executing UNI coloring for domain B" />
                                                                                                         </return>
                                                                                                     </outcome>
                                                                                                     <outcome value='success'>
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 2517645d..3fe38029 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
@@ -128,9 +128,9 @@
                                                                     </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/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-id`" />
-                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
-                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-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"/>
@@ -143,7 +143,7 @@
                                                                             <return status='failure'>
                                                                                 <parameter name='ack-final' value='Y'/>
                                                                                 <parameter name="error-code" value="500" />
-                                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                                                <parameter name="error-message" value="Error executing delete OTN tunnel rest api" />
                                                                             </return>
                                                                         </outcome>
                                                                         <outcome value='success'>
@@ -151,7 +151,7 @@
                                                                         </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/eth-svc-instances=' + $tmp.aai.connectivity.connectivity-id`" />
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.connectivity-id`" />
                                                                         <!--<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`" />
@@ -168,7 +168,7 @@
                                                                             <return status='failure'>
                                                                                 <parameter name='ack-final' value='Y'/>
                                                                                 <parameter name="error-code" value="500" />
-                                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                                                <parameter name="error-message" value="Error executing delete ethernet service rest api" />
                                                                             </return>
                                                                         </outcome>
                                                                         <outcome value='success'>
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 648929a6..b6ddc9ad 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
@@ -135,7 +135,7 @@
                                                                         <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="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"/>
@@ -146,7 +146,7 @@
                                                                             <return status='failure'>
                                                                                 <parameter name='ack-final' value='Y'/>
                                                                                 <parameter name="error-code" value="500" />
-                                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                                                <parameter name="error-message" value="Error executing deallocate transport slice rest api" />
                                                                             </return>
                                                                         </outcome>
                                                                         <outcome value='success'>
@@ -155,7 +155,7 @@
                                                                     </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:tp-slice-id' `" />
+                                                                        <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"/>
@@ -170,7 +170,7 @@
                                                                             <return status='failure'>
                                                                                 <parameter name='ack-final' value='Y'/>
                                                                                 <parameter name="error-code" value="500" />
-                                                                                <parameter name="error-message" value="Error executing OOF api" />
+                                                                                <parameter name="error-message" value="Error executing decoloring UNI rest api" />
                                                                             </return>
                                                                         </outcome>
                                                                         <outcome value='success'>
diff --git a/platform-logic/restapi-templates/src/main/json/ts-coloring-uni-port.json b/platform-logic/restapi-templates/src/main/json/ts-coloring-uni-port.json
index a29586a2..f4b978b2 100644
--- a/platform-logic/restapi-templates/src/main/json/ts-coloring-uni-port.json
+++ b/platform-logic/restapi-templates/src/main/json/ts-coloring-uni-port.json
@@ -1,3 +1,7 @@
 {
-  "ietf-optical-slice:tp-slice-id": ${slice-instance-id}
+  "ietf-te-topology:te": {
+    "ietf-optical-slice:slice-id-list": [
+      ${slice-instance-id}
+    ]
+  }
 }
diff --git a/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-dst-domain.json b/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-dst-domain.json
index 0a4f7142..40b1888e 100644
--- a/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-dst-domain.json
+++ b/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-dst-domain.json
@@ -8,7 +8,8 @@
           "ietf-otn-tunnel:src-tpn": ${src-tpn-id},
           "src-ttp-id": ${src-ttp-id},
           "te-bandwidth": {
-            "ietf-otn-tunnel:odu-type": "ietf-otn-types:prot-ODU2"
+            "ietf-otn-tunnel:odu-type": "ietf-otn-types:prot-ODUFlex-gfp",
+            "ietf-otn-tunnel:gfp-n": ${gfp-n}
           },
           "ietf-otn-tunnel:dst-tributary-slot-count": 1,
           "ietf-optical-slice:slice-id": ${slice-instance-id},
diff --git a/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-src-domain.json b/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-src-domain.json
index 425caab6..cbfde9f4 100644
--- a/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-src-domain.json
+++ b/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-src-domain.json
@@ -8,7 +8,8 @@
         "ietf-otn-tunnel:dst-tpn": ${dst-tpn-id},
         "dst-ttp-id": ${dst-ttp-id},
         "te-bandwidth": {
-          "ietf-otn-tunnel:odu-type": "ietf-otn-types:prot-ODU2"
+          "ietf-otn-tunnel:odu-type": "ietf-otn-types:prot-ODUFlex-gfp",
+          "ietf-otn-tunnel:gfp-n": ${gfp-n}
         },
         "ietf-otn-tunnel:dst-tributary-slot-count": 1,
         "ietf-optical-slice:slice-id": ${slice-instance-id},
-- 
2.16.6