From c84a5266fc2ab31cb2bb68927457f6cdbb40c0b3 Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Fri, 30 Oct 2020 03:29:17 +0000
Subject: Completing the logic and the call flow for Transport Slicing
 operations:  - Allocate a Transport Slice  - Activate a Transport Slice  -
 DeActivate a Transport Slice  - Delete a Transport Slice

Bug Fixing and cleaning up the DGs.

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

Former-commit-id: 37a6361877cd1b9cae35e94f4a0be3a19bd4d088
---
 ...ogy-operation-get-otn-tunnel-path-from-oof.json | 1652 +++++++++
 ...nf-topology-operation-trans-slice-activate.json | 1930 +++++-----
 ...nf-topology-operation-trans-slice-allocate.json | 3816 +++++++++++++-------
 ...-topology-operation-trans-slice-deactivate.json | 1334 +++----
 ...-vnf-topology-operation-trans-slice-delete.json | 1633 +++------
 ...logy-operation-get-otn-tunnel-path-from-oof.xml |  333 ++
 ...vnf-topology-operation-trans-slice-activate.xml |  862 +++--
 ...vnf-topology-operation-trans-slice-allocate.xml | 1345 ++++---
 ...f-topology-operation-trans-slice-deactivate.xml |  528 ++-
 ...i-vnf-topology-operation-trans-slice-delete.xml |  565 ++-
 10 files changed, 8255 insertions(+), 5743 deletions(-)
 create mode 100644 platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml

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

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
new file mode 100644
index 00000000..edc6aadf
--- /dev/null
+++ 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
@@ -0,0 +1,1652 @@
+[
+    {
+        "id": "ffc612a5.7b0918",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 183,
+        "y": 130,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "6dda290e.27dad8"
+            ]
+        ]
+    },
+    {
+        "id": "6dda290e.27dad8",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 308,
+        "y": 456.00001525878906,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "3ffa7f3f.e7e27"
+            ]
+        ]
+    },
+    {
+        "id": "3ffa7f3f.e7e27",
+        "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",
+        "wires": [
+            [
+                "9aa7ba3c.52a7f"
+            ]
+        ]
+    },
+    {
+        "id": "4ab3abe1.e87adc",
+        "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",
+        "wires": [
+            [
+                "6b5ff944.5bf648",
+                "850f0c15.20d28"
+            ]
+        ]
+    },
+    {
+        "id": "6b5ff944.5bf648",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1094.9732246398926,
+        "y": 231.9959716796875,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "cd276ba.d3fc218"
+            ]
+        ]
+    },
+    {
+        "id": "905d3517.25cab8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "850f0c15.20d28",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1093.9730110168457,
+        "y": 180.99606227874756,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "905d3517.25cab8"
+            ]
+        ]
+    },
+    {
+        "id": "6a5159e4.7418a",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "eda4482b.a18e38",
+        "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",
+        "wires": [
+            [
+                "576c4b0b.248fb4"
+            ]
+        ]
+    },
+    {
+        "id": "735419f0.115878",
+        "type": "comment",
+        "name": "Loop through OTN links",
+        "info": "",
+        "comments": "",
+        "x": 929.4732055664062,
+        "y": 596.74609375,
+        "z": "59711e8e.29744",
+        "wires": []
+    },
+    {
+        "id": "576c4b0b.248fb4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 950.5001220703125,
+        "y": 708.2864990234375,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "da160010.38d94",
+                "5b4dabd5.4d7054"
+            ]
+        ]
+    },
+    {
+        "id": "da160010.38d94",
+        "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",
+        "wires": [
+            [
+                "38a6a5c5.3878b2",
+                "7911950a.d4f9bc",
+                "c37b490.2ec29b8"
+            ]
+        ]
+    },
+    {
+        "id": "c37b490.2ec29b8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1409.0001220703125,
+        "y": 573.2864685058594,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "203a4a36.513986"
+            ]
+        ]
+    },
+    {
+        "id": "38a6a5c5.3878b2",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1445.0001220703125,
+        "y": 698.2864990234375,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "21535143.0a939e"
+            ]
+        ]
+    },
+    {
+        "id": "7911950a.d4f9bc",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1439.0001220703125,
+        "y": 748.2864990234375,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "21f78d15.02bd0a"
+            ]
+        ]
+    },
+    {
+        "id": "21535143.0a939e",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "21f78d15.02bd0a",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "875b8573.2757",
+        "type": "comment",
+        "name": "get cross-domain-link information",
+        "info": "",
+        "comments": "",
+        "x": 1218.5001220703125,
+        "y": 589.2864685058594,
+        "z": "59711e8e.29744",
+        "wires": []
+    },
+    {
+        "id": "5b4dabd5.4d7054",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "cd276ba.d3fc218",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1240.0002708435059,
+        "y": 229.74145698547363,
+        "z": "59711e8e.29744",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9aa7ba3c.52a7f",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 612.9688835144043,
+        "y": 475.74163722991943,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "eda4482b.a18e38",
+                "4ab3abe1.e87adc"
+            ]
+        ]
+    },
+    {
+        "id": "edd38a6c.67c6b8",
+        "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",
+        "wires": [
+            [
+                "344b3505.db598a"
+            ]
+        ]
+    },
+    {
+        "id": "344b3505.db598a",
+        "type": "outcome",
+        "name": "outcome cross-domain",
+        "xml": "<outcome value='cross-domain'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1960.5001220703125,
+        "y": 574,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "bdc2d141.60e88"
+            ]
+        ]
+    },
+    {
+        "id": "7c9a4f45.2dfb5",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 2279.5,
+        "y": 1051,
+        "z": "59711e8e.29744",
+        "wires": []
+    },
+    {
+        "id": "bdc2d141.60e88",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2163.5001220703125,
+        "y": 575,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "7c9a4f45.2dfb5",
+                "54d54d35.c8ade4",
+                "965a7aea.98984",
+                "f57884fd.e852f"
+            ]
+        ]
+    },
+    {
+        "id": "7f48300c.649cc8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2604,
+        "y": 542,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "2a6040f8.29261"
+            ]
+        ]
+    },
+    {
+        "id": "9cd22818.9c99c",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2637.0001220703125,
+        "y": 600,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "8222994e.269fa"
+            ]
+        ]
+    },
+    {
+        "id": "11e5f855.56b93",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2640.0001220703125,
+        "y": 652,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "39b267f5.2906b8"
+            ]
+        ]
+    },
+    {
+        "id": "8222994e.269fa",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "39b267f5.2906b8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "6235283.bbe1f58",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "4dcc3c3f.b0f8dc",
+        "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",
+        "wires": [
+            [
+                "83dfda72.1dad78"
+            ]
+        ]
+    },
+    {
+        "id": "83dfda72.1dad78",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4155,
+        "y": 487,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "bd70272d.20274"
+            ]
+        ]
+    },
+    {
+        "id": "49b3daba.22ab04",
+        "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",
+        "wires": [
+            [
+                "2abdfdd6.de70da"
+            ]
+        ]
+    },
+    {
+        "id": "db5fdeca.64d9c8",
+        "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",
+        "wires": [
+            [
+                "7fedd7f6.218328"
+            ]
+        ]
+    },
+    {
+        "id": "7fedd7f6.218328",
+        "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",
+        "wires": [
+            [
+                "49b3daba.22ab04"
+            ]
+        ]
+    },
+    {
+        "id": "2abdfdd6.de70da",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3719.5,
+        "y": 524,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "6235283.bbe1f58",
+                "4dcc3c3f.b0f8dc",
+                "3af252ac.f5160e",
+                "b3928b44.45b93",
+                "6051cb19.bdbedc"
+            ]
+        ]
+    },
+    {
+        "id": "54d54d35.c8ade4",
+        "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",
+        "wires": [
+            [
+                "caa1180f.475d",
+                "4f60ddcb.06c464",
+                "99e66acf.ef78a8"
+            ]
+        ]
+    },
+    {
+        "id": "caa1180f.475d",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2583,
+        "y": 1089,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "99dd61a2.0612b8"
+            ]
+        ]
+    },
+    {
+        "id": "4f60ddcb.06c464",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2567,
+        "y": 1140,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "ecf71935.9fff1"
+            ]
+        ]
+    },
+    {
+        "id": "99e66acf.ef78a8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2570,
+        "y": 1192,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "b029d176.ebc328"
+            ]
+        ]
+    },
+    {
+        "id": "b029d176.ebc328",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "ecf71935.9fff1",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "446999ee.737b88",
+        "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",
+        "wires": [
+            [
+                "733247bb.4951e8"
+            ]
+        ]
+    },
+    {
+        "id": "733247bb.4951e8",
+        "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",
+        "wires": [
+            [
+                "551892cc.c334d4"
+            ]
+        ]
+    },
+    {
+        "id": "d1ae1073.116fc8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4948.5,
+        "y": 900,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "e4453cc8.2d68",
+                "a58a5fab.4b9628",
+                "a3e0896b.517c78"
+            ]
+        ]
+    },
+    {
+        "id": "551892cc.c334d4",
+        "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",
+        "wires": [
+            [
+                "167858f1.4d47ff"
+            ]
+        ]
+    },
+    {
+        "id": "c5e10d55.b93e8",
+        "type": "outcome",
+        "name": "network-resource",
+        "xml": "<outcome value='network-resource'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4735.5,
+        "y": 899,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "d1ae1073.116fc8"
+            ]
+        ]
+    },
+    {
+        "id": "167858f1.4d47ff",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3738.5,
+        "y": 1096,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "b3d72c6d.8cf07",
+                "1624e4ba.2068eb",
+                "140c24f7.3b14f3",
+                "c25cb799.15c3f8",
+                "a035bf70.73a55"
+            ]
+        ]
+    },
+    {
+        "id": "b3d72c6d.8cf07",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "1624e4ba.2068eb",
+        "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",
+        "wires": [
+            [
+                "58cdb5cc.380cfc"
+            ]
+        ]
+    },
+    {
+        "id": "58cdb5cc.380cfc",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4158,
+        "y": 1099,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "355115bb.2168d2"
+            ]
+        ]
+    },
+    {
+        "id": "e4453cc8.2d68",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "a58a5fab.4b9628",
+        "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",
+        "wires": [
+            [
+                "a2d84f11.e4cb88"
+            ]
+        ]
+    },
+    {
+        "id": "a2d84f11.e4cb88",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5444,
+        "y": 913,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "33f08d3a.c124c2"
+            ]
+        ]
+    },
+    {
+        "id": "33f08d3a.c124c2",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "2a6040f8.29261",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2738,
+        "y": 538,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "db5fdeca.64d9c8"
+            ]
+        ]
+    },
+    {
+        "id": "99dd61a2.0612b8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2729,
+        "y": 1080,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "446999ee.737b88"
+            ]
+        ]
+    },
+    {
+        "id": "203a4a36.513986",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1543,
+        "y": 575,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "edd38a6c.67c6b8"
+            ]
+        ]
+    },
+    {
+        "id": "965a7aea.98984",
+        "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",
+        "wires": [
+            [
+                "3bc95abb.a9239e"
+            ]
+        ]
+    },
+    {
+        "id": "3bc95abb.a9239e",
+        "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",
+        "wires": [
+            [
+                "3cce24fd.740654"
+            ]
+        ]
+    },
+    {
+        "id": "3cce24fd.740654",
+        "type": "outcome",
+        "name": "p-interface",
+        "xml": "<outcome value='p-interface'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2689.117431640625,
+        "y": 354.34027099609375,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "6ac060c8.1a11e8"
+            ]
+        ]
+    },
+    {
+        "id": "9ef5481b.bf4b48",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "ddeb58ef.e40c3",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 2964,
+        "y": 361,
+        "z": "59711e8e.29744",
+        "wires": []
+    },
+    {
+        "id": "6ac060c8.1a11e8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2829,
+        "y": 339,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "9ef5481b.bf4b48",
+                "ddeb58ef.e40c3"
+            ]
+        ]
+    },
+    {
+        "id": "bd70272d.20274",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4330,
+        "y": 483,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "b2e7a790.6b1818"
+            ]
+        ]
+    },
+    {
+        "id": "355115bb.2168d2",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4347,
+        "y": 1088,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "d4658a57.f78ed8"
+            ]
+        ]
+    },
+    {
+        "id": "f57884fd.e852f",
+        "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",
+        "wires": [
+            [
+                "7f48300c.649cc8",
+                "9cd22818.9c99c",
+                "11e5f855.56b93"
+            ]
+        ]
+    },
+    {
+        "id": "3af252ac.f5160e",
+        "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",
+        "wires": [
+            [
+                "fd4b75db.4422e8",
+                "650bdcdc.cfece4",
+                "72662c6f.14033c"
+            ]
+        ]
+    },
+    {
+        "id": "fd4b75db.4422e8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4005.5001220703125,
+        "y": 279,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "b45c7d99.22c22"
+            ]
+        ]
+    },
+    {
+        "id": "650bdcdc.cfece4",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3997.5001220703125,
+        "y": 334,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "cb3c1121.cbe778"
+            ]
+        ]
+    },
+    {
+        "id": "72662c6f.14033c",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4002.5001220703125,
+        "y": 391,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "789ed2a8.499b74"
+            ]
+        ]
+    },
+    {
+        "id": "789ed2a8.499b74",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "cb3c1121.cbe778",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "b45c7d99.22c22",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4149.8824462890625,
+        "y": 276.6556701660156,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "ba380e73.fe2bc8",
+                "65a7e039.6dcda8"
+            ]
+        ]
+    },
+    {
+        "id": "ba380e73.fe2bc8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "b3928b44.45b93",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 3897,
+        "y": 574,
+        "z": "59711e8e.29744",
+        "wires": []
+    },
+    {
+        "id": "b2e7a790.6b1818",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "c25cb799.15c3f8",
+        "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",
+        "wires": [
+            [
+                "c37473f2.19f208",
+                "c644027c.70c3f8",
+                "98fb79a9.84cdc8"
+            ]
+        ]
+    },
+    {
+        "id": "98fb79a9.84cdc8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4002.5001220703125,
+        "y": 882,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "3c4a5895.c63a"
+            ]
+        ]
+    },
+    {
+        "id": "c644027c.70c3f8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3994.5001220703125,
+        "y": 937,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "70fd1b7c.8d1aac"
+            ]
+        ]
+    },
+    {
+        "id": "c37473f2.19f208",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3999.5001220703125,
+        "y": 994,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "cd3e066f.324aa"
+            ]
+        ]
+    },
+    {
+        "id": "3c4a5895.c63a",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4146.8824462890625,
+        "y": 879.6556701660156,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "a79b012a.c282e",
+                "469c63f2.54b414"
+            ]
+        ]
+    },
+    {
+        "id": "70fd1b7c.8d1aac",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "cd3e066f.324aa",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "a79b012a.c282e",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "140c24f7.3b14f3",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 3926,
+        "y": 1142,
+        "z": "59711e8e.29744",
+        "wires": []
+    },
+    {
+        "id": "d4658a57.f78ed8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "4b900139.065478",
+        "type": "outcome",
+        "name": "network-resource",
+        "xml": "<outcome value='network-resource'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4732,
+        "y": 295,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "c3283205.62573"
+            ]
+        ]
+    },
+    {
+        "id": "c3283205.62573",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4909,
+        "y": 287,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "e3322f04.45bf9",
+                "201af2cb.ff685e",
+                "24c615e9.67af32"
+            ]
+        ]
+    },
+    {
+        "id": "e3322f04.45bf9",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "201af2cb.ff685e",
+        "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",
+        "wires": [
+            [
+                "ba151945.9e348"
+            ]
+        ]
+    },
+    {
+        "id": "ba151945.9e348",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5364.5,
+        "y": 333,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "bf5ba977.146f8"
+            ]
+        ]
+    },
+    {
+        "id": "bf5ba977.146f8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "65a7e039.6dcda8",
+        "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",
+        "wires": [
+            [
+                "ebc07ec5.500b48"
+            ]
+        ]
+    },
+    {
+        "id": "ebc07ec5.500b48",
+        "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",
+        "wires": [
+            [
+                "4b900139.065478"
+            ]
+        ]
+    },
+    {
+        "id": "24c615e9.67af32",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 5068,
+        "y": 385,
+        "z": "59711e8e.29744",
+        "wires": []
+    },
+    {
+        "id": "469c63f2.54b414",
+        "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",
+        "wires": [
+            [
+                "a4a499c0.e7f04"
+            ]
+        ]
+    },
+    {
+        "id": "a4a499c0.e7f04",
+        "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",
+        "wires": [
+            [
+                "c5e10d55.b93e8"
+            ]
+        ]
+    },
+    {
+        "id": "a3e0896b.517c78",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 5154,
+        "y": 978,
+        "z": "59711e8e.29744",
+        "wires": []
+    },
+    {
+        "id": "6051cb19.bdbedc",
+        "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",
+        "wires": [
+            [
+                "474c52a4.93fc74",
+                "2bdecc1b.43ff94"
+            ]
+        ]
+    },
+    {
+        "id": "2bdecc1b.43ff94",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4059,
+        "y": 89,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "21520c33.eb9b1c"
+            ]
+        ]
+    },
+    {
+        "id": "474c52a4.93fc74",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4059,
+        "y": 136,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "ff0936f5.25fc9"
+            ]
+        ]
+    },
+    {
+        "id": "21520c33.eb9b1c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4224,
+        "y": 86,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "47f81613.356b38"
+            ]
+        ]
+    },
+    {
+        "id": "47f81613.356b38",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "ff0936f5.25fc9",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "a035bf70.73a55",
+        "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",
+        "wires": [
+            [
+                "310e01dd.c1a27e",
+                "976ae4f1.c35c1"
+            ]
+        ]
+    },
+    {
+        "id": "976ae4f1.c35c1",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4067,
+        "y": 713,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "20b670c9.8ae9c8"
+            ]
+        ]
+    },
+    {
+        "id": "310e01dd.c1a27e",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4067,
+        "y": 760,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "75ef28c6.5e31a"
+            ]
+        ]
+    },
+    {
+        "id": "20b670c9.8ae9c8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4232,
+        "y": 710,
+        "z": "59711e8e.29744",
+        "wires": [
+            [
+                "3c392a8.397b7d6"
+            ]
+        ]
+    },
+    {
+        "id": "3c392a8.397b7d6",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "75ef28c6.5e31a",
+        "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",
+        "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 669eca8d..9ffaaf75 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": "c95751e3.8ae788",
+        "id": "d3bb30c4.60fa",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 133,
-        "y": 58,
-        "z": "978d88fe.49f858",
+        "x": 130,
+        "y": 87,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "a120d0c2.d16848"
+                "d58b4202.9cdb3"
             ]
         ]
     },
     {
-        "id": "a120d0c2.d16848",
+        "id": "d58b4202.9cdb3",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1663 +22,1715 @@
         "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": 264.2856903076172,
-        "y": 107.23810863494873,
-        "z": "978d88fe.49f858",
+        "x": 261.2856903076172,
+        "y": 136.23810863494873,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "e3f08946.3b4f3"
+                "617bde2e.1132b"
             ]
         ]
     },
     {
-        "id": "e3f08946.3b4f3",
+        "id": "617bde2e.1132b",
         "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": 267.4286193847656,
-        "y": 192.00003242492676,
-        "z": "978d88fe.49f858",
+        "x": 264.4286193847656,
+        "y": 221.00003242492676,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "da15bb94.f35d78"
+                "8ac7a60e.72d768"
             ]
         ]
     },
     {
-        "id": "da15bb94.f35d78",
+        "id": "8ac7a60e.72d768",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 417.238037109375,
-        "y": 321.6666564941406,
-        "z": "978d88fe.49f858",
+        "x": 414.238037109375,
+        "y": 350.6666564941406,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "a0613c64.0d3d18",
-                "bec74808.bd7fc8",
-                "6e589ca9.47c63c",
-                "a8ba9960.6cb65",
-                "d40da373.f15598",
-                "358d1f62.e4f2c8",
-                "a739ea85.93c65",
-                "19a0d774.67fb01"
+                "72b21bde.5e8f94",
+                "9fe7f5eb.e26c6",
+                "9bca10ea.41532"
             ]
         ]
     },
     {
-        "id": "a0613c64.0d3d18",
-        "type": "set",
-        "name": "set vnf-level-oper-status to Active",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />",
-        "comments": "",
-        "x": 760.3849563598633,
-        "y": 558.6705458434299,
-        "z": "978d88fe.49f858",
-        "wires": []
-    },
-    {
-        "id": "bec74808.bd7fc8",
+        "id": "72b21bde.5e8f94",
         "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": 687.5716552734375,
-        "y": 1430.59716796875,
-        "z": "978d88fe.49f858",
+        "x": 682.5716552734375,
+        "y": 737.59716796875,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "6e589ca9.47c63c",
-        "type": "set",
-        "name": "set vnf-index and vnf-object-path",
-        "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` \" />",
+        "id": "441fc399.08ca9c",
+        "type": "comment",
+        "name": "new for TransportSlicing",
+        "info": "",
         "comments": "",
-        "x": 766.5716018676758,
-        "y": 506.5968001158908,
-        "z": "978d88fe.49f858",
+        "x": 714,
+        "y": 412,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "a8ba9960.6cb65",
-        "type": "switchNode",
-        "name": "switch service-data.vnfs.vnf_length",
-        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
+        "id": "9fe7f5eb.e26c6",
+        "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": 775,
-        "y": 261,
-        "z": "978d88fe.49f858",
+        "x": 734,
+        "y": 508,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "752da5f3.b4cc4c",
-                "b945aefb.e762f",
-                "8cef6bde.bc7818"
+                "926c12ae.af2a48",
+                "5deb4cbf.60b5f4",
+                "35c77549.8e65c2"
             ]
         ]
     },
     {
-        "id": "8cef6bde.bc7818",
-        "type": "outcome",
-        "name": "0",
-        "xml": "<outcome value='0'>\n",
+        "id": "926c12ae.af2a48",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1167.968994140625,
-        "y": 226.96875,
-        "z": "978d88fe.49f858",
+        "x": 953,
+        "y": 446,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "5417fb2d.edce0c"
+                "c296586e.046f08"
             ]
         ]
     },
     {
-        "id": "5417fb2d.edce0c",
-        "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
+        "id": "5deb4cbf.60b5f4",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
-        "x": 1322.7778816223145,
-        "y": 245.889018535614,
-        "z": "978d88fe.49f858",
-        "wires": []
+        "outputs": 1,
+        "x": 962.490966796875,
+        "y": 488.57403564453125,
+        "z": "bc9d969b.328b8",
+        "wires": [
+            [
+                "bb46ff52.717af8"
+            ]
+        ]
     },
     {
-        "id": "752da5f3.b4cc4c",
-        "type": "other",
-        "name": "Null",
-        "xml": "<outcome value=''>\n",
+        "id": "35c77549.8e65c2",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1161.0001335144043,
-        "y": 266.00007152557373,
-        "z": "978d88fe.49f858",
+        "x": 951,
+        "y": 535,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "5417fb2d.edce0c"
+                "236d61d5.47d9a6"
             ]
         ]
     },
     {
-        "id": "b945aefb.e762f",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "bb46ff52.717af8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "236d61d5.47d9a6",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "c296586e.046f08",
+        "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": 1154.0005416870117,
-        "y": 299.000075340271,
-        "z": "978d88fe.49f858",
+        "x": 1150,
+        "y": 442,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "39deabe9.dfa46c"
+                "b77b70ed.c591c"
             ]
         ]
     },
     {
-        "id": "39deabe9.dfa46c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "b77b70ed.c591c",
+        "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": 1301.2700843811035,
-        "y": 299.5547204017639,
-        "z": "978d88fe.49f858",
+        "x": 1373.33349609375,
+        "y": 441.99993896484375,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "ffe0cb12.24663"
+                "2fc295b4.0602da"
             ]
         ]
     },
     {
-        "id": "ffe0cb12.24663",
-        "type": "for",
-        "name": "for vidx..service-data.vnfs.vnf_length[]",
-        "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
+        "id": "2fc295b4.0602da",
+        "type": "outcome",
+        "name": "connectivity",
+        "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1547.2862014770508,
-        "y": 306.42864084243774,
-        "z": "978d88fe.49f858",
+        "x": 1574.0001335144043,
+        "y": 443.00002098083496,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "d581e614.41ca28"
+                "483259b4.af3e1"
             ]
         ]
     },
     {
-        "id": "d581e614.41ca28",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "cba9b813.e1b22",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "c84632a9.494938",
+        "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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1766.6358337402344,
-        "y": 305.96872091293335,
-        "z": "978d88fe.49f858",
+        "x": 3916,
+        "y": 477,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "6cb341ea.d215b"
+                "f012f442.27b7b8",
+                "961e7c8c.e8988"
             ]
         ]
     },
     {
-        "id": "6cb341ea.d215b",
-        "type": "switchNode",
-        "name": "switch vnfid found",
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
+        "id": "f012f442.27b7b8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1920.715431213379,
-        "y": 305.67880296707153,
-        "z": "978d88fe.49f858",
+        "x": 4225.5,
+        "y": 446,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "7e8f8e16.82297"
+                "85de6f60.586588"
             ]
         ]
     },
     {
-        "id": "7e8f8e16.82297",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "961e7c8c.e8988",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2131.6675758361816,
-        "y": 308.571494102478,
-        "z": "978d88fe.49f858",
+        "x": 4230.5,
+        "y": 511,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "1efc1703.0b69f1"
+                "b3e28f35.f331c"
             ]
         ]
     },
     {
-        "id": "1efc1703.0b69f1",
-        "type": "set",
-        "name": "set tmp.vidx and ctx.vnf-data",
-        "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n",
+        "id": "85de6f60.586588",
+        "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",
         "comments": "",
-        "x": 2341.199951171875,
-        "y": 310.32159423828125,
-        "z": "978d88fe.49f858",
+        "x": 4401.5,
+        "y": 446,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "d40da373.f15598",
-        "type": "save",
-        "name": "update AnAI - vnf-instance.orchestration-status",
-        "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $vnfId\" >\n<parameter name=\"orchestration-status\" value=\"Active\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",
+        "id": "b3e28f35.f331c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 785.9999618530273,
-        "y": 625.0103714736179,
-        "z": "978d88fe.49f858",
+        "x": 4397,
+        "y": 511,
+        "z": "bc9d969b.328b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "358d1f62.e4f2c8",
+        "id": "9e9578a4.5a4df",
         "type": "set",
-        "name": "copy input data to service data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />",
+        "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": 765.0000762939453,
-        "y": 456.01033284980804,
-        "z": "978d88fe.49f858",
+        "x": 3782.5,
+        "y": 665,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "a739ea85.93c65",
-        "type": "switchNode",
-        "name": "switch vnf-level-oper-status",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>\n",
+        "id": "8d5f5723.afac28",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 751.7499389648438,
-        "y": 361.00390270072967,
-        "z": "978d88fe.49f858",
+        "x": 3936.5,
+        "y": 713,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "c40ac9fb.21106",
-                "625ef5e9.0fa304"
+                "7efa3090.e1e078",
+                "602bb58a.eb8054"
             ]
         ]
     },
     {
-        "id": "c40ac9fb.21106",
-        "type": "outcome",
-        "name": "outcome Created",
-        "xml": "<outcome value='Created'>\n",
+        "id": "7efa3090.e1e078",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1131.5833320617676,
-        "y": 366.1149909766391,
-        "z": "978d88fe.49f858",
+        "x": 4282,
+        "y": 694,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "50da061e.3d2a4"
+                "d892eebe.cdbb5"
             ]
         ]
     },
     {
-        "id": "625ef5e9.0fa304",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "602bb58a.eb8054",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1109.583351135254,
-        "y": 416.1150024207309,
-        "z": "978d88fe.49f858",
+        "x": 4286,
+        "y": 734,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "9d9a6d0b.f63a18"
+                "34660646.412fea"
             ]
         ]
     },
     {
-        "id": "9d9a6d0b.f63a18",
+        "id": "d892eebe.cdbb5",
         "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=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",
+        "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",
         "comments": "",
-        "x": 1269.0831184387207,
-        "y": 419.1150014670566,
-        "z": "978d88fe.49f858",
+        "x": 4440,
+        "y": 694,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "50da061e.3d2a4",
+        "id": "34660646.412fea",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
+        "comments": "",
         "outputs": 1,
-        "x": 1341.889705657959,
-        "y": 377.44016626197845,
-        "z": "978d88fe.49f858",
+        "x": 4443.5,
+        "y": 734,
+        "z": "bc9d969b.328b8",
         "wires": [
-            []
+            [
+                "63e48280.b2cb84",
+                "ffe3929d.a2fda"
+            ]
         ]
     },
     {
-        "id": "7a49c1a1.74cca",
+        "id": "bae980db.b9d408",
         "type": "comment",
-        "name": "new for TransportSlicing",
-        "info": "",
+        "name": "TODO: FIXME:",
+        "info": "put proper values based on connectivity resource retrieved from AAI",
+        "comments": "",
+        "x": 3780,
+        "y": 621,
+        "z": "bc9d969b.328b8",
+        "wires": []
+    },
+    {
+        "id": "63e48280.b2cb84",
+        "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": "",
-        "x": 726,
+        "outputs": 1,
+        "x": 4774,
         "y": 699,
-        "z": "978d88fe.49f858",
+        "z": "bc9d969b.328b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2bc3079a.d7dde",
+        "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",
         "wires": []
     },
     {
-        "id": "19a0d774.67fb01",
+        "id": "ffe3929d.a2fda",
         "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.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\">",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f01334b4.1d8928",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "dbf99a2b.67c71",
+        "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": 737,
-        "y": 749,
-        "z": "978d88fe.49f858",
+        "x": 3799,
+        "y": 327,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "ef923a7d.6928a8",
-                "981c314b.31ecb8",
-                "65818037.104038"
+                "27a62f4.f17ab5",
+                "1aa65c21.28f974",
+                "a732e62d.9d3f9"
             ]
         ]
     },
     {
-        "id": "ef923a7d.6928a8",
+        "id": "27a62f4.f17ab5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 953,
-        "y": 714,
-        "z": "978d88fe.49f858",
+        "x": 3994.5001220703125,
+        "y": 279,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "c4da4ce2.e86fd"
+                "b04b9242.14b66"
             ]
         ]
     },
     {
-        "id": "981c314b.31ecb8",
+        "id": "1aa65c21.28f974",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 962.490966796875,
-        "y": 756.5740356445312,
-        "z": "978d88fe.49f858",
+        "x": 3986.5001220703125,
+        "y": 334,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "2c51a746.8529b8"
+                "5b188d77.8ffc8c"
             ]
         ]
     },
     {
-        "id": "65818037.104038",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "b04b9242.14b66",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 951,
-        "y": 803,
-        "z": "978d88fe.49f858",
+        "x": 4138.8824462890625,
+        "y": 278.6556701660156,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "11f3085c.6c3b58"
+                "14763204.df94c6"
             ]
         ]
     },
     {
-        "id": "2c51a746.8529b8",
-        "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": 759.8597717285156,
-        "z": "978d88fe.49f858",
-        "wires": []
-    },
-    {
-        "id": "11f3085c.6c3b58",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "id": "a517ec9b.cf8fc8",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
-        "x": 1120,
-        "y": 804,
-        "z": "978d88fe.49f858",
-        "wires": []
+        "outputs": 1,
+        "x": 4721,
+        "y": 281,
+        "z": "bc9d969b.328b8",
+        "wires": [
+            [
+                "37ce34d7.e5314c"
+            ]
+        ]
     },
     {
-        "id": "c4da4ce2.e86fd",
+        "id": "14763204.df94c6",
         "type": "for",
         "name": "for each relationship",
-        "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
+        "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1150,
-        "y": 710,
-        "z": "978d88fe.49f858",
+        "x": 4323,
+        "y": 277,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "eb26c03f.cde3a"
+                "bbbe4e04.e26da"
             ]
         ]
     },
     {
-        "id": "eb26c03f.cde3a",
+        "id": "bbbe4e04.e26da",
         "type": "switchNode",
         "name": "switch related-to",
-        "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
+        "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1373.33349609375,
-        "y": 709.9999389648438,
-        "z": "978d88fe.49f858",
+        "x": 4518,
+        "y": 277,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "b65d7d38.16fc68"
+                "a517ec9b.cf8fc8"
             ]
         ]
     },
     {
-        "id": "b65d7d38.16fc68",
-        "type": "outcome",
-        "name": "connectivity",
-        "xml": "<outcome value='connectivity'>\n",
+        "id": "a732e62d.9d3f9",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1574.0001335144043,
-        "y": 711.000020980835,
-        "z": "978d88fe.49f858",
+        "x": 3991.5001220703125,
+        "y": 391,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "fda5561b.cca698"
+                "ebcd1e8f.a8cb18"
             ]
         ]
     },
     {
-        "id": "edc6ee23.1891a",
-        "type": "save",
-        "name": "get connectivityA 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[0].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivityA\" >\n",
+        "id": "ebcd1e8f.a8cb18",
+        "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": "",
-        "outputs": 1,
-        "x": 2179,
-        "y": 599,
-        "z": "978d88fe.49f858",
-        "wires": [
-            [
-                "81d6e319.abfd8",
-                "313c36d7.969d3a",
-                "3d5cf6f2.953e9a"
-            ]
-        ]
+        "x": 4143.5001220703125,
+        "y": 392,
+        "z": "bc9d969b.328b8",
+        "wires": []
     },
     {
-        "id": "fda5561b.cca698",
-        "type": "switchNode",
-        "name": "switch $rel-index == 0",
-        "xml": "<switch test=\"`$rel-index == 0`\">\n\n",
+        "id": "5b188d77.8ffc8c",
+        "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": "",
-        "outputs": 1,
-        "x": 1762,
-        "y": 709,
-        "z": "978d88fe.49f858",
-        "wires": [
-            [
-                "44bd1b.3cc782e4",
-                "f85fb605.a76398"
-            ]
-        ]
+        "x": 4154.5001220703125,
+        "y": 335,
+        "z": "bc9d969b.328b8",
+        "wires": []
     },
     {
-        "id": "44bd1b.3cc782e4",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "d99536cb.cbc39",
+        "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": 1985,
-        "y": 599,
-        "z": "978d88fe.49f858",
+        "x": 5106,
+        "y": 294,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "edc6ee23.1891a"
+                "5f8e12fe.363034",
+                "3e541a04.379ece",
+                "5e7e63a7.7acdcc"
             ]
         ]
     },
     {
-        "id": "f85fb605.a76398",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
+        "id": "37ce34d7.e5314c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 1971,
-        "y": 1156,
-        "z": "978d88fe.49f858",
+        "x": 4900,
+        "y": 281,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "7b60b790.bc4c4"
+                "17ccdbf.84352a4",
+                "d99536cb.cbc39"
             ]
         ]
     },
     {
-        "id": "7b60b790.bc4c4",
-        "type": "save",
-        "name": "get connectivityB 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[1].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivityB\" >\n",
+        "id": "17ccdbf.84352a4",
+        "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": "",
-        "outputs": 1,
-        "x": 2167,
-        "y": 1156,
-        "z": "978d88fe.49f858",
-        "wires": [
-            [
-                "8b96b70e.2f635",
-                "20f5c9d8.832b4e",
-                "f513c25.b78554"
-            ]
-        ]
+        "x": 5136,
+        "y": 242,
+        "z": "bc9d969b.328b8",
+        "wires": []
     },
     {
-        "id": "81d6e319.abfd8",
+        "id": "5f8e12fe.363034",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2385,
-        "y": 559,
-        "z": "978d88fe.49f858",
+        "x": 5316,
+        "y": 285,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "98b1c0b9.f7f4b"
+                "a674bdd4.cbe5f"
             ]
         ]
     },
     {
-        "id": "313c36d7.969d3a",
+        "id": "3e541a04.379ece",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2385.490966796875,
-        "y": 604.5740356445312,
-        "z": "978d88fe.49f858",
+        "x": 5308,
+        "y": 340,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "d4d990d4.f7b0a8"
+                "b14ed6a2.e3874"
             ]
         ]
     },
     {
-        "id": "3d5cf6f2.953e9a",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "5e7e63a7.7acdcc",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2383,
-        "y": 648,
-        "z": "978d88fe.49f858",
-        "wires": [
-            [
-                "97be5e5a.798428"
-            ]
-        ]
-    },
-    {
-        "id": "98b1c0b9.f7f4b",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2557.66650390625,
-        "y": 558,
-        "z": "978d88fe.49f858",
+        "x": 5313,
+        "y": 397,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "2d415746.a7be9",
-                "96d25665.97a75",
-                "2f11d14a.7d5856",
-                "d0c66bee.225358"
+                "1ce96021.1d8b"
             ]
         ]
     },
     {
-        "id": "d4d990d4.f7b0a8",
+        "id": "1ce96021.1d8b",
         "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",
+        "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": 2548.0623779296875,
-        "y": 604.8597717285156,
-        "z": "978d88fe.49f858",
+        "x": 5465,
+        "y": 398,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "97be5e5a.798428",
+        "id": "b14ed6a2.e3874",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\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=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 2552,
-        "y": 649,
-        "z": "978d88fe.49f858",
+        "x": 5476,
+        "y": 343,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "8b96b70e.2f635",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "a674bdd4.cbe5f",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2387,
-        "y": 1127,
-        "z": "978d88fe.49f858",
+        "x": 5460.38232421875,
+        "y": 282.6556701660156,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "aff8819.10cbe8"
+                "67e87cc0.72543c"
             ]
         ]
     },
     {
-        "id": "20f5c9d8.832b4e",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "67e87cc0.72543c",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "9bca10ea.41532",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9469a92e.1082c",
+        "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",
+        "comments": "",
+        "x": 3815,
+        "y": 966,
+        "z": "bc9d969b.328b8",
+        "wires": []
+    },
+    {
+        "id": "8e72aaca.f223b8",
+        "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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2388.490966796875,
-        "y": 1172.5740356445312,
-        "z": "978d88fe.49f858",
+        "x": 3878,
+        "y": 1295,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "cb55df0.f8980a"
+                "4967c60e.7eec88",
+                "d728c3b6.b72d4"
             ]
         ]
     },
     {
-        "id": "f513c25.b78554",
+        "id": "4967c60e.7eec88",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2385,
-        "y": 1218,
-        "z": "978d88fe.49f858",
+        "x": 4173.5,
+        "y": 1262,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "fd8e37a.cf27348"
+                "957f3c62.36bab"
             ]
         ]
     },
     {
-        "id": "aff8819.10cbe8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "d728c3b6.b72d4",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
         "outputs": 1,
-        "x": 2559.66650390625,
-        "y": 1128,
-        "z": "978d88fe.49f858",
+        "x": 4178.5,
+        "y": 1327,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "490cf25b.6f8bbc",
-                "7192c89b.9fa8a",
-                "83e10369.9e2a48",
-                "8632824a.a7d1a"
+                "9b37bb11.43c248"
             ]
         ]
     },
     {
-        "id": "cb55df0.f8980a",
+        "id": "957f3c62.36bab",
         "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",
+        "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",
         "comments": "",
-        "x": 2550.0623779296875,
-        "y": 1174.8597717285156,
-        "z": "978d88fe.49f858",
+        "x": 4341.5,
+        "y": 1262,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "fd8e37a.cf27348",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "id": "9b37bb11.43c248",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "comments": "",
-        "x": 2554,
-        "y": 1219,
-        "z": "978d88fe.49f858",
+        "outputs": 1,
+        "x": 4352,
+        "y": 1327,
+        "z": "bc9d969b.328b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "24fc86b.f179cfa",
+        "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",
         "wires": []
     },
     {
-        "id": "2d415746.a7be9",
-        "type": "save",
-        "name": "get vpn-binding-A 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.connectivityA.relationship-list.relationship[0].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-bindingA\" >\n",
+        "id": "a4e80e5.b17c0f",
+        "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": 2782,
-        "y": 556,
-        "z": "978d88fe.49f858",
+        "x": 3774,
+        "y": 1120,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "2054e000.51325",
-                "24cb3e35.5919ba",
-                "49ca8d9.cac6774"
+                "d87e44a4.312df",
+                "c39adf70.78fbd",
+                "ae2b50d9.d9592"
             ]
         ]
     },
     {
-        "id": "490cf25b.6f8bbc",
-        "type": "save",
-        "name": "get vpn-binding-B 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.connectivityB.relationship-list.relationship[0].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-bindingB\" >\n",
+        "id": "d87e44a4.312df",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2786,
-        "y": 1126,
-        "z": "978d88fe.49f858",
+        "x": 3976.5001220703125,
+        "y": 1073,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "9697ed36.e16ad8",
-                "1b825f20.68c389",
-                "214845f.325e5ba"
+                "1f01bb4d.6d662d"
             ]
         ]
     },
     {
-        "id": "8505e692.6e58e8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "c39adf70.78fbd",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
         "outputs": 1,
-        "x": 3166,
-        "y": 556,
-        "z": "978d88fe.49f858",
+        "x": 3968.5001220703125,
+        "y": 1128,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "1e245d3c.a778db",
-                "f09e2868.9a86c8"
+                "7e32fa48.cb95e4"
             ]
         ]
     },
     {
-        "id": "1e245d3c.a778db",
-        "type": "set",
-        "name": "set attachment_param for OTN A",
-        "xml": "<set>\n<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$tmp.aai.vpn-bindingA.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$tmp.aai.vpn-bindingA.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n\n",
-        "comments": "",
-        "x": 3402,
-        "y": 555,
-        "z": "978d88fe.49f858",
-        "wires": []
-    },
-    {
-        "id": "2054e000.51325",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "1f01bb4d.6d662d",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2993,
-        "y": 558,
-        "z": "978d88fe.49f858",
+        "x": 4120.8824462890625,
+        "y": 1070.6556701660156,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "8505e692.6e58e8"
+                "71c66ab3.44665c"
             ]
         ]
     },
     {
-        "id": "24cb3e35.5919ba",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "71c66ab3.44665c",
+        "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": 2993.490966796875,
-        "y": 603.5740356445312,
-        "z": "978d88fe.49f858",
+        "x": 4305,
+        "y": 1085,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "7b7e2f47.0a22b"
+                "7900c812.a2abd"
             ]
         ]
     },
     {
-        "id": "49ca8d9.cac6774",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "ae2b50d9.d9592",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2991,
-        "y": 647,
-        "z": "978d88fe.49f858",
+        "x": 3973.5001220703125,
+        "y": 1185,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "f869989c.799108"
+                "c7f28bc4.db74a"
             ]
         ]
     },
     {
-        "id": "f869989c.799108",
+        "id": "c7f28bc4.db74a",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\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=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3158,
-        "y": 646,
-        "z": "978d88fe.49f858",
+        "x": 4125.5001220703125,
+        "y": 1186,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "7b7e2f47.0a22b",
+        "id": "7e32fa48.cb95e4",
         "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",
+        "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": 3156.0623779296875,
-        "y": 603.8597717285156,
-        "z": "978d88fe.49f858",
+        "x": 4136.5001220703125,
+        "y": 1131,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "9697ed36.e16ad8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "d3528946.ee7a88",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2993,
-        "y": 1129,
-        "z": "978d88fe.49f858",
+        "x": 4703,
+        "y": 1089,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "d0988988.8d0a18"
+                "746ece73.5c4d48"
             ]
         ]
     },
     {
-        "id": "1b825f20.68c389",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "7900c812.a2abd",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2993.490966796875,
-        "y": 1174.5740356445312,
-        "z": "978d88fe.49f858",
+        "x": 4500,
+        "y": 1085,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "875a2548.0cfdc8"
+                "d3528946.ee7a88"
             ]
         ]
     },
     {
-        "id": "214845f.325e5ba",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "f8459d33.082c4",
+        "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": 2991,
-        "y": 1218,
-        "z": "978d88fe.49f858",
+        "x": 5088,
+        "y": 1088,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "5743b059.d8fee"
+                "652db70b.f69af",
+                "cd87b694.170a2",
+                "e10452ec.f851f"
             ]
         ]
     },
     {
-        "id": "5743b059.d8fee",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 3160,
-        "y": 1219,
-        "z": "978d88fe.49f858",
-        "wires": []
-    },
-    {
-        "id": "875a2548.0cfdc8",
-        "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": 3156.0623779296875,
-        "y": 1174.8597717285156,
-        "z": "978d88fe.49f858",
-        "wires": []
-    },
-    {
-        "id": "d0988988.8d0a18",
+        "id": "746ece73.5c4d48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3162,
-        "y": 1129,
-        "z": "978d88fe.49f858",
+        "x": 4880,
+        "y": 1081,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "7dda745d.4071a4",
-                "6468b39.c45bd4c"
+                "13e8c9be.60d2ee",
+                "f8459d33.082c4"
             ]
         ]
     },
     {
-        "id": "7dda745d.4071a4",
+        "id": "13e8c9be.60d2ee",
         "type": "set",
-        "name": "set attachment_param for OTN B",
-        "xml": "<set>\n<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$tmp.aai.vpn-bindingB.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$tmp.aai.vpn-bindingB.dst-access-ltp-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$tmp.aai.vpn-bindingB.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n\n",
+        "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": 3398,
-        "y": 1128,
-        "z": "978d88fe.49f858",
+        "x": 5118,
+        "y": 1036,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "f09e2868.9a86c8",
-        "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 + '/sotn-otn-tunnel-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\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=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<!--<parameter name='dirPath' value=\"/opt/sdnc/restapi/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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "id": "64b1d1df.af4928",
+        "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": "",
-        "outputs": 1,
-        "x": 3480,
-        "y": 601,
-        "z": "978d88fe.49f858",
-        "wires": [
-            [
-                "a8d618e8.7c53c8",
-                "84fddcaa.8b02a"
-            ]
-        ]
+        "x": 5447,
+        "y": 1192,
+        "z": "bc9d969b.328b8",
+        "wires": []
     },
     {
-        "id": "a8d618e8.7c53c8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "afae5d5f.cf8cd8",
+        "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": "",
-        "outputs": 1,
-        "x": 3790.5,
-        "y": 568,
-        "z": "978d88fe.49f858",
-        "wires": [
-            [
-                "6eacb8a7.7aa3d"
-            ]
-        ]
+        "x": 5458,
+        "y": 1137,
+        "z": "bc9d969b.328b8",
+        "wires": []
     },
     {
-        "id": "84fddcaa.8b02a",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "fe8767e6.75d1",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3805.5,
-        "y": 633,
-        "z": "978d88fe.49f858",
+        "x": 5442.38232421875,
+        "y": 1076.6556701660156,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "b82bd962.cbba2"
+                "9e679808.748fd"
             ]
         ]
     },
     {
-        "id": "6eacb8a7.7aa3d",
-        "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",
+        "id": "9e679808.748fd",
+        "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": 3974.5,
-        "y": 564,
-        "z": "978d88fe.49f858",
+        "x": 5657,
+        "y": 1073,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "b82bd962.cbba2",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "652db70b.f69af",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4000,
-        "y": 626,
-        "z": "978d88fe.49f858",
+        "x": 5298,
+        "y": 1079,
+        "z": "bc9d969b.328b8",
         "wires": [
-            []
+            [
+                "fe8767e6.75d1"
+            ]
         ]
     },
     {
-        "id": "74c1bd3a.398664",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "cd87b694.170a2",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3775,
-        "y": 1150,
-        "z": "978d88fe.49f858",
+        "x": 5290,
+        "y": 1134,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "fc791248.fc4648"
+                "afae5d5f.cf8cd8"
             ]
         ]
     },
     {
-        "id": "fdc0c54.10c51b8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "e10452ec.f851f",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3790,
-        "y": 1215,
-        "z": "978d88fe.49f858",
+        "x": 5295,
+        "y": 1191,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "16f26dc2.3147e2"
+                "64b1d1df.af4928"
             ]
         ]
     },
     {
-        "id": "fc791248.fc4648",
-        "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",
-        "comments": "",
-        "x": 3959,
-        "y": 1146,
-        "z": "978d88fe.49f858",
-        "wires": []
-    },
-    {
-        "id": "16f26dc2.3147e2",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "483259b4.af3e1",
+        "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": 3984.5,
-        "y": 1208,
-        "z": "978d88fe.49f858",
+        "x": 1812,
+        "y": 445,
+        "z": "bc9d969b.328b8",
         "wires": [
-            []
+            [
+                "deb24009.8fcaa8",
+                "f99db731.cec29",
+                "20c66e63.50491a"
+            ]
         ]
     },
     {
-        "id": "6468b39.c45bd4c",
-        "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 + '/sotn-otn-tunnel-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\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=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<!--<parameter name='dirPath' value=\"/opt/sdnc/restapi/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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "id": "deb24009.8fcaa8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3464.5,
-        "y": 1183,
-        "z": "978d88fe.49f858",
+        "x": 2020,
+        "y": 409,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "74c1bd3a.398664",
-                "fdc0c54.10c51b8"
+                "4730a3bd.f32424"
             ]
         ]
     },
     {
-        "id": "2f11d14a.7d5856",
-        "type": "set",
-        "name": "set sotn_value",
-        "xml": "<set>\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />\n\n<parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />",
-        "comments": "",
-        "x": 2766.5,
-        "y": 898,
-        "z": "978d88fe.49f858",
-        "wires": []
-    },
-    {
-        "id": "d0c66bee.225358",
-        "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=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />\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=\"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\"/>",
+        "id": "f99db731.cec29",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2920.5,
-        "y": 946,
-        "z": "978d88fe.49f858",
+        "x": 2020.490966796875,
+        "y": 454.57403564453125,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "3db41fa8.f38878",
-                "fbb2729e.49853"
+                "5f621d7d.168d04"
             ]
         ]
     },
     {
-        "id": "3db41fa8.f38878",
+        "id": "20c66e63.50491a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3266,
-        "y": 927,
-        "z": "978d88fe.49f858",
+        "x": 2018,
+        "y": 498,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "f346270d.843368"
+                "3d808fc9.409a"
             ]
         ]
     },
     {
-        "id": "fbb2729e.49853",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "5f621d7d.168d04",
+        "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": "",
-        "outputs": 1,
-        "x": 3270,
-        "y": 967,
-        "z": "978d88fe.49f858",
-        "wires": [
-            [
-                "c716fb9b.f3ffc"
-            ]
-        ]
+        "x": 2183.0623779296875,
+        "y": 454.8597717285156,
+        "z": "bc9d969b.328b8",
+        "wires": []
     },
     {
-        "id": "f346270d.843368",
+        "id": "3d808fc9.409a",
         "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<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3424,
-        "y": 927,
-        "z": "978d88fe.49f858",
+        "x": 2187,
+        "y": 499,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "c716fb9b.f3ffc",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "98bf7163.623b18",
+        "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": 3427.5,
-        "y": 967,
-        "z": "978d88fe.49f858",
+        "x": 2493,
+        "y": 498,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "3124f6f9.b8bd1a",
-                "856ae03f.786118"
+                "4a10f363.97f04c",
+                "75240e64.8364b",
+                "7a8b2677.1e3f6"
             ]
         ]
     },
     {
-        "id": "4c34ee00.d0d39",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "put proper values based on connectivity resource retrieved from AAI",
-        "comments": "",
-        "x": 2764,
-        "y": 854,
-        "z": "978d88fe.49f858",
-        "wires": []
-    },
-    {
-        "id": "96d25665.97a75",
-        "type": "get-resource",
-        "name": "get-resource 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 = $prop.sdncRestApi.thirdpartySdnc.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
-        "comments": "",
+        "id": "262c25a6.ad70a2",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 2816,
-        "y": 780,
-        "z": "978d88fe.49f858",
+        "x": 2877,
+        "y": 498,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "4a3c4a39.62e724",
-                "e52cd6a7.6aeb28",
-                "bb40af56.1cbe7"
+                "471d55bd.ad492c"
             ]
         ]
     },
     {
-        "id": "4a3c4a39.62e724",
+        "id": "4a10f363.97f04c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3062,
-        "y": 740,
-        "z": "978d88fe.49f858",
+        "x": 2704,
+        "y": 500,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "9e28f8d9.f64138"
+                "262c25a6.ad70a2"
             ]
         ]
     },
     {
-        "id": "e52cd6a7.6aeb28",
+        "id": "75240e64.8364b",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3066,
-        "y": 780,
-        "z": "978d88fe.49f858",
+        "x": 2704.490966796875,
+        "y": 545.5740356445312,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "916c7538.648ed"
+                "1484cf74.c39e71"
             ]
         ]
     },
     {
-        "id": "bb40af56.1cbe7",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "7a8b2677.1e3f6",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3058,
-        "y": 820,
-        "z": "978d88fe.49f858",
+        "x": 2702,
+        "y": 589,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "a678576a.20b77"
+                "d377f001.ff927"
             ]
         ]
     },
     {
-        "id": "a678576a.20b77",
+        "id": "d377f001.ff927",
         "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3216,
-        "y": 820,
-        "z": "978d88fe.49f858",
+        "x": 2869,
+        "y": 588,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "916c7538.648ed",
+        "id": "1484cf74.c39e71",
         "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
-        "comments": "",
-        "x": 3216,
-        "y": 780,
-        "z": "978d88fe.49f858",
-        "wires": []
-    },
-    {
-        "id": "9e28f8d9.f64138",
-        "type": "set",
-        "name": "set controller data",
-        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.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": 3232,
-        "y": 740,
-        "z": "978d88fe.49f858",
-        "wires": []
-    },
-    {
-        "id": "b0af8ca6.269818",
-        "type": "comment",
-        "name": "Get controller info and send request",
-        "info": "",
-        "comments": "",
-        "x": 2824,
-        "y": 740,
-        "z": "978d88fe.49f858",
-        "wires": []
-    },
-    {
-        "id": "83e10369.9e2a48",
-        "type": "set",
-        "name": "set sotn_value",
-        "xml": "<set>\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />\n\n<parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />",
+        "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": 2752,
-        "y": 1454,
-        "z": "978d88fe.49f858",
+        "x": 2867.0623779296875,
+        "y": 545.8597717285156,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "8632824a.a7d1a",
-        "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=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />\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=\"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\"/>",
+        "id": "4730a3bd.f32424",
+        "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": 2906,
-        "y": 1502,
-        "z": "978d88fe.49f858",
+        "x": 2221,
+        "y": 404,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "51ac9234.46b414",
-                "a5f17af5.5d803"
+                "ed79cbad.42008"
             ]
         ]
     },
     {
-        "id": "51ac9234.46b414",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "ed79cbad.42008",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3251.5,
-        "y": 1483,
-        "z": "978d88fe.49f858",
+        "x": 2426,
+        "y": 404,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "6f72d542.94964c"
+                "87636f23.10a238"
             ]
         ]
     },
     {
-        "id": "a5f17af5.5d803",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "87636f23.10a238",
+        "type": "outcome",
+        "name": "vpn-binding",
+        "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3255.5,
-        "y": 1523,
-        "z": "978d88fe.49f858",
+        "x": 2592,
+        "y": 404,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "2dab9f7d.db59d8"
+                "f49319bb.999b88"
             ]
         ]
     },
     {
-        "id": "6f72d542.94964c",
-        "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",
-        "comments": "",
-        "x": 3409.5,
-        "y": 1483,
-        "z": "978d88fe.49f858",
-        "wires": []
-    },
-    {
-        "id": "2dab9f7d.db59d8",
+        "id": "f49319bb.999b88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
+        "outputs": 1,
+        "x": 2755,
+        "y": 404,
+        "z": "bc9d969b.328b8",
+        "wires": [
+            [
+                "98bf7163.623b18"
+            ]
+        ]
+    },
+    {
+        "id": "471d55bd.ad492c",
+        "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": 3413,
-        "y": 1523,
-        "z": "978d88fe.49f858",
+        "x": 3131,
+        "y": 497,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "a1391891.c310f",
-                "ccc1b1df.33721"
+                "a6851b6e.131e78",
+                "f997812a.bb5bf"
             ]
         ]
     },
     {
-        "id": "5d06869f.f8bcb8",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "put proper values based on connectivity resource retrieved from AAI",
+        "id": "a6851b6e.131e78",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
         "comments": "",
-        "x": 2749.5,
-        "y": 1410,
-        "z": "978d88fe.49f858",
-        "wires": []
+        "outputs": 1,
+        "x": 3384,
+        "y": 531,
+        "z": "bc9d969b.328b8",
+        "wires": [
+            [
+                "9ec23d9e.f5fd3"
+            ]
+        ]
     },
     {
-        "id": "7192c89b.9fa8a",
-        "type": "get-resource",
-        "name": "get-resource 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 = $prop.sdncRestApi.thirdpartySdnc.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
+        "id": "f997812a.bb5bf",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2801.5,
-        "y": 1336,
-        "z": "978d88fe.49f858",
+        "x": 3384,
+        "y": 475,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "e2e5c437.a11d5",
-                "9dfaf98b.e80c9",
-                "dcca7d62.830ee8"
+                "a48cbe42.98bbb"
             ]
         ]
     },
     {
-        "id": "e2e5c437.a11d5",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "9ec23d9e.f5fd3",
+        "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": 3047.5,
-        "y": 1296,
-        "z": "978d88fe.49f858",
+        "x": 3123,
+        "y": 1317,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "427eefc5.61bc"
+                "12733247.02817e",
+                "457dfc0a.58968c"
             ]
         ]
     },
     {
-        "id": "9dfaf98b.e80c9",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "12733247.02817e",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3051.5,
-        "y": 1336,
-        "z": "978d88fe.49f858",
+        "x": 3376,
+        "y": 1351,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "8ac5fa96.75d4b"
+                "13d35870.d79cf8"
             ]
         ]
     },
     {
-        "id": "dcca7d62.830ee8",
+        "id": "457dfc0a.58968c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3043.5,
-        "y": 1376,
-        "z": "978d88fe.49f858",
+        "x": 3376,
+        "y": 1295,
+        "z": "bc9d969b.328b8",
         "wires": [
             [
-                "39cf0825.d43ae"
+                "b272db0a.663f1"
             ]
         ]
     },
     {
-        "id": "39cf0825.d43ae",
+        "id": "13d35870.d79cf8",
         "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3201.5,
-        "y": 1376,
-        "z": "978d88fe.49f858",
+        "x": 3527,
+        "y": 1351,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "8ac5fa96.75d4b",
-        "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+        "id": "d316857d.f41628",
+        "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": 3201.5,
-        "y": 1336,
-        "z": "978d88fe.49f858",
+        "x": 3830,
+        "y": 102,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "427eefc5.61bc",
+        "id": "3accaf74.7f8a68",
         "type": "set",
-        "name": "set controller data",
-        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.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",
+        "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": 3217.5,
-        "y": 1296,
-        "z": "978d88fe.49f858",
+        "x": 3811,
+        "y": 908,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "74572637.f29d7",
-        "type": "comment",
-        "name": "Get controller info and send request",
-        "info": "",
+        "id": "a48cbe42.98bbb",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "comments": "",
-        "x": 2809.5,
-        "y": 1296,
-        "z": "978d88fe.49f858",
-        "wires": []
+        "outputs": 1,
+        "x": 3552,
+        "y": 477,
+        "z": "bc9d969b.328b8",
+        "wires": [
+            [
+                "d316857d.f41628",
+                "cba9b813.e1b22",
+                "f01334b4.1d8928",
+                "dbf99a2b.67c71",
+                "9e9578a4.5a4df",
+                "8d5f5723.afac28",
+                "c84632a9.494938"
+            ]
+        ]
     },
     {
-        "id": "135b0ed7.2faa91",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "How to know which domain's (A or B) controller is bein retrieved?",
+        "id": "b272db0a.663f1",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3527,
+        "y": 1294,
+        "z": "bc9d969b.328b8",
+        "wires": [
+            [
+                "3accaf74.7f8a68",
+                "9469a92e.1082c",
+                "24fc86b.f179cfa",
+                "a4e80e5.b17c0f",
+                "8e72aaca.f223b8",
+                "6e17b735.11933",
+                "35d8443b.290754"
+            ]
+        ]
+    },
+    {
+        "id": "6e17b735.11933",
+        "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": 2744,
-        "y": 1256,
-        "z": "978d88fe.49f858",
+        "x": 3756,
+        "y": 1437,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "a58ac83b.b037d",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "How to know which domain's (A or B) controller is bein retrieved?",
+        "id": "35d8443b.290754",
+        "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": "",
-        "x": 2756,
-        "y": 700,
-        "z": "978d88fe.49f858",
-        "wires": []
+        "outputs": 1,
+        "x": 3910,
+        "y": 1485,
+        "z": "bc9d969b.328b8",
+        "wires": [
+            [
+                "3ee71f70.cef2d8",
+                "ec28887e.13052"
+            ]
+        ]
     },
     {
-        "id": "3124f6f9.b8bd1a",
-        "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.vpnName' >\n<parameter name='vpn-id' value='`$tmp.vpnName`' />\n<parameter name='vpn-name' value='`$tmp.vpnName`' />\n\n<parameter name='operational-status' value='Activated' />\n",
+        "id": "3ee71f70.cef2d8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3756,
-        "y": 967,
-        "z": "978d88fe.49f858",
+        "x": 4255.5,
+        "y": 1466,
+        "z": "bc9d969b.328b8",
         "wires": [
-            []
+            [
+                "146e8cbe.f1427b"
+            ]
         ]
     },
     {
-        "id": "554a4766.c457a",
-        "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?",
+        "id": "ec28887e.13052",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4259.5,
+        "y": 1506,
+        "z": "bc9d969b.328b8",
+        "wires": [
+            [
+                "6938dd8d.725ce4"
+            ]
+        ]
+    },
+    {
+        "id": "146e8cbe.f1427b",
+        "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",
         "comments": "",
-        "x": 3620,
-        "y": 926,
-        "z": "978d88fe.49f858",
+        "x": 4413.5,
+        "y": 1466,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "a1391891.c310f",
-        "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.vpnName' >\n<parameter name='vpn-id' value='`$tmp.vpnName`' />\n<parameter name='vpn-name' value='`$tmp.vpnName`' />\n\n<parameter name='operational-status' value='Activated' />\n",
+        "id": "6938dd8d.725ce4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3753,
-        "y": 1522,
-        "z": "978d88fe.49f858",
+        "x": 4417,
+        "y": 1506,
+        "z": "bc9d969b.328b8",
         "wires": [
-            []
+            [
+                "3103adf.03ebdd2",
+                "abd5a958.8851"
+            ]
         ]
     },
     {
-        "id": "90d3682d.e54348",
+        "id": "b5e2d859.f89e48",
         "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?",
+        "name": "TODO: FIXME:",
+        "info": "put proper values based on connectivity resource retrieved from AAI",
         "comments": "",
-        "x": 3611,
-        "y": 1480,
-        "z": "978d88fe.49f858",
+        "x": 3753.5,
+        "y": 1393,
+        "z": "bc9d969b.328b8",
         "wires": []
     },
     {
-        "id": "856ae03f.786118",
+        "id": "3103adf.03ebdd2",
         "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 = $prop.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Activated' />\n",
+        "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": 3683,
-        "y": 1013,
-        "z": "978d88fe.49f858",
+        "x": 4757,
+        "y": 1505,
+        "z": "bc9d969b.328b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ccc1b1df.33721",
+        "id": "1ee5068c.50a041",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "abd5a958.8851",
         "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 = $prop.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Activated' />\n",
+        "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": 3682,
-        "y": 1571,
-        "z": "978d88fe.49f858",
+        "x": 4686,
+        "y": 1554,
+        "z": "bc9d969b.328b8",
         "wires": [
             []
         ]
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 967f65e1..41f969b0 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": "c7ab28db.5fa9f8",
+        "id": "a3297c66.2e7f5",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 108,
-        "y": 69,
-        "z": "5b68e0d.bd97b2",
+        "x": 142,
+        "y": 86,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "b4f2bafa.fe95a"
+                "48923819.f8ff98"
             ]
         ]
     },
     {
-        "id": "b4f2bafa.fe95a",
+        "id": "48923819.f8ff98",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,2126 +22,3474 @@
         "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": 392.2856903076172,
-        "y": 130.23810863494873,
-        "z": "5b68e0d.bd97b2",
+        "x": 426.2856903076172,
+        "y": 147.23810863494873,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "5dd33274.e7d4cc"
+                "e1ba1fcc.8dbf6"
             ]
         ]
     },
     {
-        "id": "5dd33274.e7d4cc",
+        "id": "e1ba1fcc.8dbf6",
         "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": 398.42860412597656,
-        "y": 215.00003051757812,
-        "z": "5b68e0d.bd97b2",
+        "x": 432.42860412597656,
+        "y": 232.00003051757812,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "28d22516.fc87aa"
+                "8bc33ebc.b214a8"
             ]
         ]
     },
     {
-        "id": "28d22516.fc87aa",
+        "id": "8bc33ebc.b214a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 768.238037109375,
-        "y": 239.66668701171875,
-        "z": "5b68e0d.bd97b2",
+        "x": 802.238037109375,
+        "y": 256.66668701171875,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "7c0b6069.496758",
-                "11269eb9.b73d59",
-                "b98a68a9.509cb8",
-                "18445def.73c80a",
-                "703f0f3.2526ff",
-                "d4cb43.708284c",
-                "9006694b.0db0e8",
-                "e3c7ee55.46e6f8",
-                "efeb4f56.d9cc7",
-                "4948ae3d.2fb728",
-                "e0ae06d.cc68bf8",
-                "fd6957d.13c0a28",
-                "8c69784a.6fe62",
-                "e181a758.620248"
+                "e456a6e6.bd0f",
+                "de4cd097.718578",
+                "7ac4d896.f266b8"
             ]
         ]
     },
     {
-        "id": "11269eb9.b73d59",
-        "type": "set",
-        "name": "set vnf-level-oper-status to Created",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",
+        "id": "e456a6e6.bd0f",
+        "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": 1190.3848495483398,
-        "y": 603.6706197531894,
-        "z": "5b68e0d.bd97b2",
+        "x": 1103.571533203125,
+        "y": 527.5969848632812,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "7c0b6069.496758",
-        "type": "set",
-        "name": "copy input data to service data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n",
+        "id": "de4cd097.718578",
+        "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": "",
-        "x": 1182.238037109375,
-        "y": 498.6668718131259,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
+        "outputs": 1,
+        "x": 1125,
+        "y": 230,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "2bb44cf2.b576bc",
+                "23a4fd03.4dc0a2",
+                "7fe07366.1d3c84"
+            ]
+        ]
     },
     {
-        "id": "703f0f3.2526ff",
-        "type": "execute",
-        "name": "execute generate-vnf-index",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vnf-id\"/>\n",
+        "id": "2bb44cf2.b576bc",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1170.5715408325195,
-        "y": 448.3334558280185,
-        "z": "5b68e0d.bd97b2",
+        "x": 1350,
+        "y": 88,
+        "z": "a52db008.999ba",
         "wires": [
-            []
+            [
+                "de3469e6.1a5318"
+            ]
         ]
     },
     {
-        "id": "4948ae3d.2fb728",
-        "type": "set",
-        "name": "set vnf-index to service data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-id`' />\n",
+        "id": "23a4fd03.4dc0a2",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
-        "x": 1181.5716171264648,
-        "y": 555.3334596427158,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
+        "outputs": 1,
+        "x": 1359.490966796875,
+        "y": 130.57403564453125,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "abc9c45c.0486d"
+            ]
+        ]
     },
     {
-        "id": "b98a68a9.509cb8",
-        "type": "switchNode",
-        "name": "switch service-data.vnfs.vnf_length",
-        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
+        "id": "7fe07366.1d3c84",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1197.5713577270508,
-        "y": 118.33337858039886,
-        "z": "5b68e0d.bd97b2",
+        "x": 1348,
+        "y": 177,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "45cce5a8.451aac",
-                "48e9b931.dabab8"
+                "bf6c9630.da1718"
             ]
         ]
     },
     {
-        "id": "45cce5a8.451aac",
-        "type": "other",
-        "name": "NULL",
-        "xml": "<outcome value=''>\n",
+        "id": "de3469e6.1a5318",
+        "type": "switchNode",
+        "name": "switch allotted-resources_length != 0",
+        "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1432.285743713379,
-        "y": 113.47619893867522,
-        "z": "5b68e0d.bd97b2",
+        "x": 1589,
+        "y": 85,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "6299edd9.775e24"
+                "3fe961c5.f65bb6",
+                "9b0ccc32.5daa98"
             ]
         ]
     },
     {
-        "id": "6299edd9.775e24",
-        "type": "set",
-        "name": "set vnf-index=0",
-        "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",
+        "id": "abc9c45c.0486d",
+        "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": 1592.5714492797852,
-        "y": 113.4762904914096,
-        "z": "5b68e0d.bd97b2",
+        "x": 1513.0623779296875,
+        "y": 133.85977172851562,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "48e9b931.dabab8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "bf6c9630.da1718",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "outputs": 1,
-        "x": 1428.714282989502,
-        "y": 146.76203039009124,
-        "z": "5b68e0d.bd97b2",
-        "wires": [
-            [
-                "777ae1e9.6bbca"
-            ]
-        ]
+        "x": 1517,
+        "y": 178,
+        "z": "a52db008.999ba",
+        "wires": []
     },
     {
-        "id": "6abef48d.2c4e6c",
+        "id": "e72a9478.9558f",
         "type": "set",
-        "name": "set vnf-index = vnf_length",
-        "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",
+        "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": 1821.5715255737305,
-        "y": 125.04775598365813,
-        "z": "5b68e0d.bd97b2",
+        "x": 1988,
+        "y": 152,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "8a52abb7.25d258",
-        "type": "for",
-        "name": "for each existing VNF",
-        "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
+        "id": "3fe961c5.f65bb6",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1810.000144958496,
-        "y": 160.0477278502658,
-        "z": "5b68e0d.bd97b2",
+        "x": 1802,
+        "y": 109,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "1ea03c6.7395dc4"
+                "7db53ef.cfaf2c"
             ]
         ]
     },
     {
-        "id": "777ae1e9.6bbca",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "9b0ccc32.5daa98",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1563.428565979004,
-        "y": 148.76199987251312,
-        "z": "5b68e0d.bd97b2",
+        "x": 1804,
+        "y": 49,
+        "z": "a52db008.999ba",
         "wires": [
-            [
-                "6abef48d.2c4e6c",
-                "8a52abb7.25d258"
-            ]
+            []
         ]
     },
     {
-        "id": "1ea03c6.7395dc4",
-        "type": "switchNode",
-        "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id",
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",
+        "id": "3b9d4f7a.e5b418",
+        "type": "comment",
+        "name": "new for TransportSlicing",
+        "info": "",
         "comments": "",
-        "outputs": 1,
-        "x": 2203.2858810424805,
-        "y": 160.6192119391635,
-        "z": "5b68e0d.bd97b2",
-        "wires": [
-            [
-                "95d50976.54cf58"
-            ]
-        ]
+        "x": 1104,
+        "y": 118,
+        "z": "a52db008.999ba",
+        "wires": []
     },
     {
-        "id": "95d50976.54cf58",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "7db53ef.cfaf2c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2484.5715827941895,
-        "y": 159.1906173499301,
-        "z": "5b68e0d.bd97b2",
+        "x": 1787,
+        "y": 197,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "19c5d87f.a3e7b"
+                "e72a9478.9558f",
+                "f1da2bc3.8935b"
             ]
         ]
     },
     {
-        "id": "78e378bf.79cf5",
-        "type": "comment",
-        "name": "make sure this vnf-id doesn't exist already",
-        "info": "",
-        "comments": "",
-        "x": 2172.428497314453,
-        "y": 124.19060399848968,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
-    },
-    {
-        "id": "18445def.73c80a",
+        "id": "fd1e5e1b.83e83",
         "type": "set",
-        "name": "set new vnf_length",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",
+        "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": 1128.571533203125,
-        "y": 396.33343505859375,
-        "z": "5b68e0d.bd97b2",
+        "x": 2349,
+        "y": 795,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "d4cb43.708284c",
-        "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",
+        "id": "ff342d97.b64c78",
+        "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": 1124.571533203125,
-        "y": 1344.5969848632812,
-        "z": "5b68e0d.bd97b2",
+        "x": 2351,
+        "y": 846,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "efeb4f56.d9cc7",
+        "id": "f1da2bc3.8935b",
         "type": "save",
-        "name": "save service relationship in AAI",
-        "xml": "<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.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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-id`\" />\n\n\n<!--key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--key='service-instance.service-instance-id = $service-data.service-instance-id -->\n",
+        "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": 1162.2382736206055,
-        "y": 815.5968644889072,
-        "z": "5b68e0d.bd97b2",
+        "x": 1991,
+        "y": 227,
+        "z": "a52db008.999ba",
         "wires": [
-            []
+            [
+                "24443c7d.51e17c",
+                "5466a6b1.99c71",
+                "6dbbe1dd.c8d2"
+            ]
         ]
     },
     {
-        "id": "9006694b.0db0e8",
-        "type": "set",
-        "name": "set vnf-index and vnf-object-path",
-        "xml": "<set>\n<parameter name='vnfId' value='`$prop.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` \" />",
+        "id": "24443c7d.51e17c",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
-        "x": 1183.571533203125,
-        "y": 644.5968902381137,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
+        "outputs": 1,
+        "x": 2207,
+        "y": 294,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "381969a5.e5019e"
+            ]
+        ]
     },
     {
-        "id": "19c5d87f.a3e7b",
-        "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=\"`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id\n      + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`\" />\n",
+        "id": "5466a6b1.99c71",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
-        "x": 2613.142951965332,
-        "y": 210.19063165504485,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
+        "outputs": 1,
+        "x": 2207.490966796875,
+        "y": 193.573974609375,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "5f41762b.9fae3"
+            ]
+        ]
     },
     {
-        "id": "e3c7ee55.46e6f8",
-        "type": "save",
-        "name": "save AnAI - vnf-instance.orchestration-status",
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey='generic-vnf.vnf-id = $prop.vnf-id' >\n<parameter name=\"orchestration-status\" value=\"Created\" />\n<parameter name=\"in-maint\" value = \"true\" />\n<parameter name=\"vnf-type\" value='`$prop.vnfName`' />\n<parameter name=\"vnf-name\" value = \"`$prop.vnfName`\"/>\n<parameter name=\"model-invariant-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`\"/>\n<parameter name=\"model-version-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`\"/>\n<parameter name=\"model-customization-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`\"/>",
+        "id": "6dbbe1dd.c8d2",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1238.5458374023438,
-        "y": 754.2471072943881,
-        "z": "5b68e0d.bd97b2",
+        "x": 2203,
+        "y": 243,
+        "z": "a52db008.999ba",
         "wires": [
-            []
+            [
+                "35df5bd.60d91a4"
+            ]
         ]
     },
     {
-        "id": "8b2c577f.aa706",
-        "type": "comment",
-        "name": "TODO: change AAI models",
-        "info": "",
+        "id": "5f41762b.9fae3",
+        "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": 1172.1820983886719,
-        "y": 713.9743230612949,
-        "z": "5b68e0d.bd97b2",
+        "x": 2385.0625,
+        "y": 193.8597412109375,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "d58f334a.ba5338",
-        "type": "execute",
-        "name": "execute split parameterName",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
+        "id": "35df5bd.60d91a4",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "8c284458.c08ae8",
+        "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": 1598.7395858764648,
-        "y": 207.75002291519195,
-        "z": "5b68e0d.bd97b2",
+        "x": 1726,
+        "y": 716,
+        "z": "a52db008.999ba",
         "wires": [
-            []
+            [
+                "2b62ab10.ff50ec",
+                "a72426b1.68469",
+                "f1a9c962.2a68a8"
+            ]
         ]
     },
     {
-        "id": "889ccd2d.4a8fe8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "a72426b1.68469",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1402.483383178711,
-        "y": 212.00189593154937,
-        "z": "5b68e0d.bd97b2",
+        "x": 2017.490966796875,
+        "y": 694.573974609375,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "d58f334a.ba5338",
-                "e9083033.2291c8"
+                "b15724ee.fb934"
             ]
         ]
     },
     {
-        "id": "e0ae06d.cc68bf8",
-        "type": "for",
-        "name": "for loop idx - VNF input parameters",
-        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n",
+        "id": "f1a9c962.2a68a8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1187.7050399780273,
-        "y": 214.44631197769195,
-        "z": "5b68e0d.bd97b2",
+        "x": 2006,
+        "y": 739,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "889ccd2d.4a8fe8"
+                "71027f5f.6dfd2"
             ]
         ]
     },
     {
-        "id": "fd6957d.13c0a28",
-        "type": "set",
-        "name": "set vnf-request-input.",
-        "xml": "<set>\n<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\n",
+        "id": "b15724ee.fb934",
+        "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.7046737670898,
-        "y": 284.77101900894195,
-        "z": "5b68e0d.bd97b2",
+        "x": 2166.0625,
+        "y": 694.8597412109375,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "e9083033.2291c8",
-        "type": "set",
-        "name": "set parameterName",
-        "xml": "<set>\n<parameter name=\"`vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
+        "id": "71027f5f.6dfd2",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1575.7395858764648,
-        "y": 253.75002291519195,
-        "z": "5b68e0d.bd97b2",
+        "x": 2165,
+        "y": 739,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "8c69784a.6fe62",
-        "type": "for",
-        "name": "for each sdwan-get-request-input-param",
-        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n",
+        "id": "2b62ab10.ff50ec",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1200.7395858764648,
-        "y": 336.75002291519195,
-        "z": "5b68e0d.bd97b2",
+        "x": 2013,
+        "y": 818,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "ab7df566.3e05d"
+                "68ca5242.42eadc"
             ]
         ]
     },
     {
-        "id": "ab7df566.3e05d",
+        "id": "68ca5242.42eadc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1426.9722518920898,
-        "y": 335.09377291519195,
-        "z": "5b68e0d.bd97b2",
+        "x": 2152,
+        "y": 818,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "352dca87.707f0e"
+                "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"
             ]
         ]
     },
     {
-        "id": "352dca87.707f0e",
-        "type": "switchNode",
-        "name": "switch vnf name",
-        "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`\">\n",
+        "id": "c6e4c4bb.cde228",
+        "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": 1583.4722518920898,
-        "y": 333.0938339503482,
-        "z": "5b68e0d.bd97b2",
+        "x": 2381,
+        "y": 899,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "590b3579.cf8c54"
+                "99527920.d104f",
+                "471613.ac9f61ec",
+                "d7106a2a.e2e008"
             ]
         ]
     },
     {
-        "id": "590b3579.cf8c54",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "beeca149.096358",
+        "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": 1744.4726181030273,
-        "y": 333.09389498550445,
-        "z": "5b68e0d.bd97b2",
+        "x": 2360,
+        "y": 1500.9998779296875,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "63083064.a23a18"
+                "f5b57d2.711fb8",
+                "ee69c7ed.d244a",
+                "b86b9154.d8271"
             ]
         ]
     },
     {
-        "id": "63083064.a23a18",
-        "type": "set",
-        "name": "set vnf name",
-        "xml": "<set>\n<parameter name='prop.vnfName' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
+        "id": "99527920.d104f",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
-        "x": 1902.4727401733398,
-        "y": 331.6939316065982,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
+        "outputs": 1,
+        "x": 2582,
+        "y": 783,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "dee03a78.25dd08"
+            ]
+        ]
     },
     {
-        "id": "e181a758.620248",
-        "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.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\">",
+        "id": "471613.ac9f61ec",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1155,
-        "y": 940,
-        "z": "5b68e0d.bd97b2",
+        "x": 2577.509033203125,
+        "y": 832.426025390625,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "5d430eb5.2b236",
-                "4db06806.f53418",
-                "95ae5b5a.c22a4"
+                "afb5fd1c.14f968"
             ]
         ]
     },
     {
-        "id": "5d430eb5.2b236",
+        "id": "d7106a2a.e2e008",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1371,
-        "y": 905,
-        "z": "5b68e0d.bd97b2",
+        "x": 2581.509033203125,
+        "y": 883.426025390625,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "53896828.686ee8"
+                "b1e48bbc.9418f8"
             ]
         ]
     },
     {
-        "id": "4db06806.f53418",
+        "id": "dee03a78.25dd08",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "afb5fd1c.14f968",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "f5b57d2.711fb8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1380.490966796875,
-        "y": 947.5740356445312,
-        "z": "5b68e0d.bd97b2",
+        "x": 2583,
+        "y": 1470.9998779296875,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "2be30b71.aee02c"
+                "e4bc5398.587c9"
             ]
         ]
     },
     {
-        "id": "95ae5b5a.c22a4",
+        "id": "ee69c7ed.d244a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1369,
-        "y": 994,
-        "z": "5b68e0d.bd97b2",
+        "x": 2578.509033203125,
+        "y": 1520.4259033203125,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "ecad310e.0677"
+                "7a22de95.f8d34"
             ]
         ]
     },
     {
-        "id": "53896828.686ee8",
-        "type": "switchNode",
-        "name": "switch allotted-resources_length != 0",
-        "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources_length != 0`'>\n",
+        "id": "b86b9154.d8271",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1610,
-        "y": 902,
-        "z": "5b68e0d.bd97b2",
+        "x": 2582.509033203125,
+        "y": 1571.4259033203125,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "a4b1136f.62ed08",
-                "46b85697.e69b9"
+                "706786f4.1c86"
             ]
         ]
     },
     {
-        "id": "2be30b71.aee02c",
+        "id": "e4bc5398.587c9",
         "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": 1534.0623779296875,
-        "y": 950.8597717285156,
-        "z": "5b68e0d.bd97b2",
+        "x": 2731.571533203125,
+        "y": 1470.28564453125,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "ecad310e.0677",
+        "id": "7a22de95.f8d34",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1538,
-        "y": 995,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
-    },
-    {
-        "id": "a019135.4f8ccf",
-        "type": "set",
-        "name": "set the 1st allotted-resource-id",
-        "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources[0]`\" />\n\n\n",
-        "comments": "",
-        "x": 2009,
-        "y": 969,
-        "z": "5b68e0d.bd97b2",
+        "x": 2721.509033203125,
+        "y": 1520.4259033203125,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "a4b1136f.62ed08",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
+        "id": "6a5608a5.7646c8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 1823,
-        "y": 926,
-        "z": "5b68e0d.bd97b2",
+        "x": 3395.66650390625,
+        "y": 927,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "cb1b8f06.47ef2"
+                "e59ae0d9.0b3bb8",
+                "b65b8a91.4e15",
+                "600bf3e5.b14284",
+                "af7a5358.49a49",
+                "a8e7dd16.944608"
             ]
         ]
     },
     {
-        "id": "46b85697.e69b9",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
+        "id": "b8369203.6c1e7",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1825,
-        "y": 866,
-        "z": "5b68e0d.bd97b2",
+        "x": 3223,
+        "y": 928,
+        "z": "a52db008.999ba",
         "wires": [
-            []
+            [
+                "6a5608a5.7646c8"
+            ]
         ]
     },
     {
-        "id": "67d7c08a.0b2928",
-        "type": "comment",
-        "name": "new for TransportSlicing",
-        "info": "",
+        "id": "9feeef15.8800c",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
-        "x": 1144,
-        "y": 890,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
+        "outputs": 1,
+        "x": 3232.490966796875,
+        "y": 970.5740356445312,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "cbf27e14.644ef8"
+            ]
+        ]
     },
     {
-        "id": "457beb03.a98104",
-        "type": "switchNode",
-        "name": "switch logical-links_length != 0",
-        "xml": "<switch test='`$tmp.aai.allotted-resource.logical-links_length != 0`'>\n",
+        "id": "e8e1bd1d.029dd",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1270,
-        "y": 1266,
-        "z": "5b68e0d.bd97b2",
+        "x": 3221,
+        "y": 1017,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "643d2cea.4605b4",
-                "7caeb522.7a961c"
+                "7478805e.d0dee8"
             ]
         ]
     },
     {
-        "id": "643d2cea.4605b4",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1464,
-        "y": 1400,
-        "z": "5b68e0d.bd97b2",
-        "wires": [
-            [
-                "152d2d7d.5e3893"
-            ]
-        ]
-    },
-    {
-        "id": "7caeb522.7a961c",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
+        "id": "cbf27e14.644ef8",
+        "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": "",
-        "outputs": 1,
-        "x": 1467,
-        "y": 1354,
-        "z": "5b68e0d.bd97b2",
-        "wires": [
-            []
-        ]
+        "x": 3386.0623779296875,
+        "y": 973.8597717285156,
+        "z": "a52db008.999ba",
+        "wires": []
     },
     {
-        "id": "814386d7.12d29",
-        "type": "set",
-        "name": "set the 1st logical-link-name",
-        "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.logical-links[0]`\" />\n\n\n",
+        "id": "7478805e.d0dee8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1804,
-        "y": 1372,
-        "z": "5b68e0d.bd97b2",
+        "x": 3390,
+        "y": 1018,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "cb1b8f06.47ef2",
+        "id": "b1e48bbc.9418f8",
         "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 1808,
-        "y": 1014,
-        "z": "5b68e0d.bd97b2",
+        "x": 2743,
+        "y": 885,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "a019135.4f8ccf",
-                "e575462e.50d5b"
+                "b8e4ab1b.5f9428",
+                "7b409cff.da197c"
             ]
         ]
     },
     {
-        "id": "152d2d7d.5e3893",
+        "id": "706786f4.1c86",
         "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 1595,
-        "y": 1405,
-        "z": "5b68e0d.bd97b2",
+        "x": 2733,
+        "y": 1572.9998779296875,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "814386d7.12d29",
-                "fecafec9.0d1c5"
+                "6545b277.ec5df4",
+                "e04c02f4.2f63f8"
             ]
         ]
     },
     {
-        "id": "67195ddd.58b94c",
-        "type": "set",
-        "name": "set EndpointA",
-        "xml": "<set>\n<parameter name='endpointA' value=\"`$tmp.aai.logical-link.name`\" />\n\n\n",
-        "comments": "",
-        "x": 2350,
-        "y": 1468,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
-    },
-    {
-        "id": "3cb07e0e.1a73c2",
-        "type": "set",
-        "name": "set EndpointB",
-        "xml": "<set>\n<parameter name='endpointB' value=\"`$tmp.aai.logical-link.name2`\" />\n\n\n",
-        "comments": "",
-        "x": 2351,
-        "y": 1515,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
-    },
-    {
-        "id": "e575462e.50d5b",
-        "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='allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">",
-        "comments": "",
+        "id": "a1cc2eec.aa7708",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 2012,
-        "y": 1044,
-        "z": "5b68e0d.bd97b2",
+        "x": 3363.66650390625,
+        "y": 1763,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "9038c1c3.67b67",
-                "d5fe3cc1.f1ab58",
-                "3a3c5476.f230dc"
+                "69afc187.c0c28",
+                "9c8c62ca.8659",
+                "72280e7f.000388",
+                "5d487f8.16a5d",
+                "34f70001.b13958"
             ]
         ]
     },
     {
-        "id": "9038c1c3.67b67",
+        "id": "a9223749.8519e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2228,
-        "y": 1111,
-        "z": "5b68e0d.bd97b2",
+        "x": 3191,
+        "y": 1764,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "457beb03.a98104"
+                "a1cc2eec.aa7708"
             ]
         ]
     },
     {
-        "id": "d5fe3cc1.f1ab58",
+        "id": "8aac19ac.984638",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2228.490966796875,
-        "y": 1010.573974609375,
-        "z": "5b68e0d.bd97b2",
+        "x": 3200.490966796875,
+        "y": 1806.5740356445312,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "d1ddfc7b.e8b11"
+                "e01c6b8b.6173d8"
             ]
         ]
     },
     {
-        "id": "3a3c5476.f230dc",
+        "id": "15568030.09492",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2224,
-        "y": 1060,
-        "z": "5b68e0d.bd97b2",
+        "x": 3189,
+        "y": 1853,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "5d76fda0.b3386c"
+                "f17ea401.42a54"
             ]
         ]
     },
     {
-        "id": "d1ddfc7b.e8b11",
+        "id": "e01c6b8b.6173d8",
         "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": 2377.0625,
-        "y": 1009.8597412109375,
-        "z": "5b68e0d.bd97b2",
+        "x": 3354.0623779296875,
+        "y": 1809.8597717285156,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "5d76fda0.b3386c",
+        "id": "f17ea401.42a54",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2367,
-        "y": 1060,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
-    },
-    {
-        "id": "9b0fc370.e7b168",
-        "type": "comment",
-        "name": "Question?",
-        "info": "Can we assume ....logical-links[0] would have \nthe whole object or it is only a pointer to \nlogical-link name in AAI?\nIf only name, then we have to retrieve it from \nAAI",
-        "comments": "",
-        "x": 1837,
-        "y": 1325,
-        "z": "5b68e0d.bd97b2",
+        "x": 3358,
+        "y": 1854,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "fecafec9.0d1c5",
-        "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.name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
+        "id": "e59ae0d9.0b3bb8",
+        "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": 1791,
-        "y": 1444,
-        "z": "5b68e0d.bd97b2",
+        "x": 3660,
+        "y": 911,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "c3decf76.de238",
-                "cbe9f0d3.03cae",
-                "f1d67d6b.7b18f8"
+                "b90f8b2c.3443f8",
+                "f2af84b7.f19e7"
             ]
         ]
     },
     {
-        "id": "cbe9f0d3.03cae",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "f2af84b7.f19e7",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2056.490966796875,
-        "y": 1366.573974609375,
-        "z": "5b68e0d.bd97b2",
+        "x": 3883,
+        "y": 866,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "df9ad0cd.393e9"
+                "af749f90.aea73"
             ]
         ]
     },
     {
-        "id": "f1d67d6b.7b18f8",
+        "id": "b90f8b2c.3443f8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2045,
-        "y": 1411,
-        "z": "5b68e0d.bd97b2",
+        "x": 3885,
+        "y": 930,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "387801a6.c55046"
+                "37b87470.480804"
             ]
         ]
     },
     {
-        "id": "df9ad0cd.393e9",
-        "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",
+        "id": "58adc121.da62b8",
+        "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": 2205.0625,
-        "y": 1366.8597412109375,
-        "z": "5b68e0d.bd97b2",
+        "x": 4218,
+        "y": 824,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "387801a6.c55046",
+        "id": "37b87470.480804",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "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": 2204,
-        "y": 1411,
-        "z": "5b68e0d.bd97b2",
+        "x": 4047,
+        "y": 926,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "c3decf76.de238",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
+        "id": "af749f90.aea73",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 2052,
-        "y": 1490,
-        "z": "5b68e0d.bd97b2",
+        "x": 4048,
+        "y": 863,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "85643202.66a9f8"
+                "a0d3646d.84d22",
+                "58adc121.da62b8"
             ]
         ]
     },
     {
-        "id": "85643202.66a9f8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "a0d3646d.84d22",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "b948285d.fc6638",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "600bf3e5.b14284",
+        "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": 2191,
-        "y": 1490,
-        "z": "5b68e0d.bd97b2",
+        "x": 3662,
+        "y": 1070,
+        "z": "a52db008.999ba",
         "wires": [
-            [
-                "67195ddd.58b94c",
-                "3cb07e0e.1a73c2",
-                "e13bd0db.73d81",
-                "44095776.64c828",
-                "3eb8bee0.c23c0a",
-                "e199c2c7.64ce48",
-                "4e9e1552.e1012c",
-                "879bdb34.60c748",
-                "ccc984ea.946438",
-                "3824458b.0c70c2"
-            ]
+            []
         ]
     },
     {
-        "id": "e13bd0db.73d81",
-        "type": "save",
-        "name": "get EndpointA from aai",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"endpoint\"\n\tkey='endpoint.endpoint-id = $endpointA'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.endpointA\">",
+        "id": "b65b8a91.4e15",
+        "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": 2399,
-        "y": 1573,
-        "z": "5b68e0d.bd97b2",
+        "x": 3707,
+        "y": 980,
+        "z": "a52db008.999ba",
         "wires": [
-            [
-                "6b7f9293.5e4b3c",
-                "271678cd.b7a718",
-                "fda0cd5e.c574c8"
-            ]
+            []
         ]
     },
     {
-        "id": "44095776.64c828",
-        "type": "save",
-        "name": "get EndpointB from aai",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"endpoint\"\n\tkey='endpoint.endpoint-id = $endpointB'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.endpointB\">",
+        "id": "584061d2.7f676",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "69afc187.c0c28",
+        "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": 2413,
-        "y": 1845,
-        "z": "5b68e0d.bd97b2",
+        "x": 3650,
+        "y": 1767.0001220703125,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "cac7dfa0.02314",
-                "cd4a18c4.24c5e8",
-                "b2a92c1e.f10cd8"
+                "73786f45.91fbd",
+                "a8286fc.413fb9"
             ]
         ]
     },
     {
-        "id": "6b7f9293.5e4b3c",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "a8286fc.413fb9",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2621,
-        "y": 1455,
-        "z": "5b68e0d.bd97b2",
+        "x": 3873,
+        "y": 1722.0001220703125,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "6df2f8ce.f4df28"
+                "6edaf2ce.ba97ac"
             ]
         ]
     },
     {
-        "id": "271678cd.b7a718",
+        "id": "73786f45.91fbd",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2616.509033203125,
-        "y": 1504.426025390625,
-        "z": "5b68e0d.bd97b2",
+        "x": 3875,
+        "y": 1786.0001220703125,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "a0e96fb5.85588"
+                "fcba834.c469f8"
             ]
         ]
     },
     {
-        "id": "fda0cd5e.c574c8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "e5ecf778.a4711",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "fcba834.c469f8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "6edaf2ce.ba97ac",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 2620.509033203125,
-        "y": 1555.426025390625,
-        "z": "5b68e0d.bd97b2",
+        "x": 4038,
+        "y": 1719.0001220703125,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "57154704.0e805"
+                "e5ecf778.a4711",
+                "865f8e50.82a5c"
             ]
         ]
     },
     {
-        "id": "6df2f8ce.f4df28",
-        "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",
+        "id": "865f8e50.82a5c",
+        "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": 2769.571533203125,
-        "y": 1454.2857666015625,
-        "z": "5b68e0d.bd97b2",
+        "x": 4209,
+        "y": 1785.0001220703125,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "a0e96fb5.85588",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "id": "9e10e06d.c116e8",
+        "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": 2759.509033203125,
-        "y": 1504.426025390625,
-        "z": "5b68e0d.bd97b2",
+        "x": 4204,
+        "y": 1734.0001220703125,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "cac7dfa0.02314",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "72280e7f.000388",
+        "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": 2636,
-        "y": 1815,
-        "z": "5b68e0d.bd97b2",
+        "x": 3652,
+        "y": 1926.0001220703125,
+        "z": "a52db008.999ba",
         "wires": [
-            [
-                "857e5bf7.e021b"
-            ]
+            []
         ]
     },
     {
-        "id": "cd4a18c4.24c5e8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "9c8c62ca.8659",
+        "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": 2631.509033203125,
-        "y": 1864.426025390625,
-        "z": "5b68e0d.bd97b2",
+        "x": 3697,
+        "y": 1836.0001220703125,
+        "z": "a52db008.999ba",
         "wires": [
-            [
-                "68a88270.f542bc"
-            ]
+            []
         ]
     },
     {
-        "id": "b2a92c1e.f10cd8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "eb2e4b08.8488e",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "b3a21500.4dc258",
+        "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": 2635.509033203125,
-        "y": 1915.426025390625,
-        "z": "5b68e0d.bd97b2",
+        "x": 2561,
+        "y": 2001,
+        "z": "a52db008.999ba",
         "wires": [
-            [
-                "4220b72.dbed048"
-            ]
+            []
         ]
     },
     {
-        "id": "857e5bf7.e021b",
-        "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",
+        "id": "4a385582.c0497c",
+        "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": 2784.571533203125,
-        "y": 1814.2857666015625,
-        "z": "5b68e0d.bd97b2",
+        "x": 2355,
+        "y": 1941,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "68a88270.f542bc",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "id": "1846dda4.ce84b2",
+        "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": 2774.509033203125,
-        "y": 1864.426025390625,
-        "z": "5b68e0d.bd97b2",
+        "x": 2329,
+        "y": 1894,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "404469ae.c8a71",
-        "type": "for",
-        "name": "for each relationship",
-        "xml": "<for index='rel-index' start='0' end='`$tmp.aai.endpointA.relationship-list.relationship_length`' >\n",
+        "id": "8ecd4f21.958f3",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 2993,
-        "y": 1556,
-        "z": "5b68e0d.bd97b2",
+        "x": 2437,
+        "y": 2160,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "ca5e0e2a.2b9fd8"
+                "9a891a89.705e9"
             ]
         ]
     },
     {
-        "id": "ca5e0e2a.2b9fd8",
-        "type": "switchNode",
-        "name": "switch related-to",
-        "xml": "<switch test='`$tmp.aai.endpointA.relationship-list.relationship[$rel-index].related-to`'>\n",
+        "id": "87e71c84.c17b98",
+        "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": 3206.3334426879883,
-        "y": 1555.9999389648438,
-        "z": "5b68e0d.bd97b2",
+        "x": 2440.5,
+        "y": 2230,
+        "z": "a52db008.999ba",
         "wires": [
-            [
-                "20488961.beb436"
-            ]
+            []
         ]
     },
     {
-        "id": "20488961.beb436",
-        "type": "outcome",
-        "name": "p-interface",
-        "xml": "<outcome value='p-interface'>\n",
+        "id": "65814f19.31d048",
+        "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": 3378.0000801086426,
-        "y": 1556.000020980835,
-        "z": "5b68e0d.bd97b2",
+        "x": 3088.5,
+        "y": 2149,
+        "z": "a52db008.999ba",
         "wires": [
-            [
-                "3536184f.ec7b9"
-            ]
+            []
         ]
     },
     {
-        "id": "6bc94704.d03de",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "9a488056.fd463",
+        "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": 4040.66650390625,
-        "y": 1548,
-        "z": "5b68e0d.bd97b2",
+        "x": 3090.5,
+        "y": 2188,
+        "z": "a52db008.999ba",
         "wires": [
-            [
-                "b0648d5.a5c8bf",
-                "502adfb6.94aa38",
-                "6f6a8b61.fa1ffc",
-                "24d9a7fc.8cd3f8"
-            ]
+            []
         ]
     },
     {
-        "id": "3536184f.ec7b9",
+        "id": "af7a5358.49a49",
         "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=\"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\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",
+        "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": 3625,
-        "y": 1554,
-        "z": "5b68e0d.bd97b2",
+        "x": 3790,
+        "y": 1118,
+        "z": "a52db008.999ba",
         "wires": [
-            [
-                "d439294.8fb6358",
-                "5c59ee09.9262d",
-                "f82521c.310fee"
-            ]
+            []
         ]
     },
     {
-        "id": "d439294.8fb6358",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "5d487f8.16a5d",
+        "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": 3868,
-        "y": 1549,
-        "z": "5b68e0d.bd97b2",
+        "x": 3779,
+        "y": 1991.0001220703125,
+        "z": "a52db008.999ba",
         "wires": [
-            [
-                "6bc94704.d03de"
-            ]
+            []
         ]
     },
     {
-        "id": "f82521c.310fee",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "9a891a89.705e9",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3877.490966796875,
-        "y": 1591.5740356445312,
-        "z": "5b68e0d.bd97b2",
+        "x": 2737,
+        "y": 2167,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "da7fc859.beff18"
+                "a2095f6a.84829"
             ]
         ]
     },
     {
-        "id": "5c59ee09.9262d",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "a2095f6a.84829",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3866,
-        "y": 1638,
-        "z": "5b68e0d.bd97b2",
+        "x": 2877.500244140625,
+        "y": 2168.25390625,
+        "z": "a52db008.999ba",
         "wires": [
-            [
-                "872414be.4b5f28"
-            ]
+            []
         ]
     },
     {
-        "id": "da7fc859.beff18",
-        "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",
+        "id": "421e8d3c.2d000c",
+        "type": "comment",
+        "name": "TODO: FIXME: do we need this relationship?",
+        "info": "",
         "comments": "",
-        "x": 4031.0623779296875,
-        "y": 1594.8597717285156,
-        "z": "5b68e0d.bd97b2",
+        "x": 3125,
+        "y": 2108,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "872414be.4b5f28",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "id": "ec5e7e31.de7c9",
+        "type": "comment",
+        "name": "TODO: FIXME: put proper values",
+        "info": "",
         "comments": "",
-        "x": 4035,
-        "y": 1639,
-        "z": "5b68e0d.bd97b2",
+        "x": 2404,
+        "y": 2120,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "57154704.0e805",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "b0430b3.4eee0f8",
+        "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",
+        "comments": "",
         "outputs": 1,
-        "x": 2782,
-        "y": 1557,
-        "z": "5b68e0d.bd97b2",
+        "x": 2440,
+        "y": 2448,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "404469ae.c8a71"
+                "ceffa653.90d39"
             ]
         ]
     },
     {
-        "id": "85084de0.cfb7d",
+        "id": "3a1d826b.1f953e",
         "type": "comment",
-        "name": "Question?",
-        "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
+        "name": "TODO: FIXME: do we need this relationship?",
+        "info": "",
         "comments": "",
-        "x": 3568,
-        "y": 1507,
-        "z": "5b68e0d.bd97b2",
+        "x": 3128,
+        "y": 2388,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "4220b72.dbed048",
+        "id": "4a53aeab.a2778",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "36a3debe.6aad72",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a45d9658.764968",
         "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
         "outputs": 1,
-        "x": 2786,
-        "y": 1917,
-        "z": "5b68e0d.bd97b2",
+        "x": 2880.500244140625,
+        "y": 2448.25390625,
+        "z": "a52db008.999ba",
         "wires": [
-            [
-                "8dfc41f6.4f4f"
-            ]
+            []
         ]
     },
     {
-        "id": "8dfc41f6.4f4f",
-        "type": "for",
-        "name": "for each relationship",
-        "xml": "<for index='rel-index' start='0' end='`$tmp.aai.endpointB.relationship-list.relationship_length`' >\n",
+        "id": "ceffa653.90d39",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2997,
-        "y": 1916,
-        "z": "5b68e0d.bd97b2",
+        "x": 2740,
+        "y": 2447,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "5452c2da.11d5dc"
+                "a45d9658.764968"
             ]
         ]
     },
     {
-        "id": "5452c2da.11d5dc",
-        "type": "switchNode",
-        "name": "switch related-to",
-        "xml": "<switch test='`$tmp.aai.endpointB.relationship-list.relationship[$rel-index].related-to`'>\n",
+        "id": "7449a31b.49a87c",
+        "type": "comment",
+        "name": "TODO: FIXME: put proper values",
+        "info": "",
+        "comments": "",
+        "x": 2420,
+        "y": 2408,
+        "z": "a52db008.999ba",
+        "wires": []
+    },
+    {
+        "id": "9e9e0741.eed478",
+        "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": 3210.3334426879883,
-        "y": 1915.9999389648438,
-        "z": "5b68e0d.bd97b2",
+        "x": 2438.5,
+        "y": 2488,
+        "z": "a52db008.999ba",
         "wires": [
-            [
-                "cb7a504b.d626a"
-            ]
+            []
         ]
     },
     {
-        "id": "cb7a504b.d626a",
-        "type": "outcome",
-        "name": "p-interface",
-        "xml": "<outcome value='p-interface'>\n",
+        "id": "a04f201b.1fb08",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "a0a45fd6.c31fe",
+        "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",
+        "comments": "",
+        "x": 2377,
+        "y": 2616,
+        "z": "a52db008.999ba",
+        "wires": []
+    },
+    {
+        "id": "32eb8024.15dcc8",
+        "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": 3382.0000801086426,
-        "y": 1916.000020980835,
-        "z": "5b68e0d.bd97b2",
+        "x": 4834,
+        "y": 638,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "8fa1d382.ebbb3"
+                "73d2c0a6.ca0098",
+                "2f388561.aeb472",
+                "c9248b9c.994ac"
             ]
         ]
     },
     {
-        "id": "825ff590.84496",
+        "id": "381969a5.e5019e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4044.66650390625,
-        "y": 1908,
-        "z": "5b68e0d.bd97b2",
+        "x": 2387,
+        "y": 294,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "674b1eb0.174b2",
-                "f4b1b11a.276db8",
-                "485a23dc.9461bc",
-                "a54100e4.bdfd8"
+                "2fa39853.fd6f7"
             ]
         ]
     },
     {
-        "id": "8fa1d382.ebbb3",
-        "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=\"p-interface.interface-name = $tmp.aai.endpointB.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.endpointB.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.endpointB.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointB.p-interface-dst\" >-->\n",
+        "id": "93b21596.ec10e8",
+        "type": "outcome",
+        "name": "logical-link",
+        "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3629,
-        "y": 1914,
-        "z": "5b68e0d.bd97b2",
+        "x": 1317.0001220703125,
+        "y": 711.0001220703125,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "e30b52f2.d3bd18",
-                "2a8a7b32.c6c034",
-                "95395b70.5ce658"
+                "993cc770.3c90b"
             ]
         ]
     },
     {
-        "id": "e30b52f2.d3bd18",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "8fdb5adc.4040d",
+        "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": 3872,
-        "y": 1909,
-        "z": "5b68e0d.bd97b2",
+        "x": 2055,
+        "y": 417,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "825ff590.84496"
+                "332b207c.0fec28",
+                "310fb819.3e915"
             ]
         ]
     },
     {
-        "id": "95395b70.5ce658",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "310fb819.3e915",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3881.490966796875,
-        "y": 1951.5740356445312,
-        "z": "5b68e0d.bd97b2",
+        "x": 2365,
+        "y": 424,
+        "z": "a52db008.999ba",
         "wires": [
-            [
-                "ec0be134.e7e7f8"
-            ]
+            []
         ]
     },
     {
-        "id": "2a8a7b32.c6c034",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "332b207c.0fec28",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3870,
-        "y": 1998,
-        "z": "5b68e0d.bd97b2",
+        "x": 2364,
+        "y": 478,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "5f44beb8.f571"
+                "b6e0228b.bc6398"
             ]
         ]
     },
     {
-        "id": "ec0be134.e7e7f8",
-        "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",
+        "id": "d9c8107.cbe1d7",
+        "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": 4035.0623779296875,
-        "y": 1954.8597717285156,
-        "z": "5b68e0d.bd97b2",
+        "x": 1737,
+        "y": 661,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "5f44beb8.f571",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 4039,
-        "y": 1999,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
+        "id": "993cc770.3c90b",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1494,
+        "y": 704,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "d9c8107.cbe1d7",
+                "8c284458.c08ae8"
+            ]
+        ]
     },
     {
-        "id": "18f16001.6c653",
+        "id": "d4f8497.5d30938",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3572,
-        "y": 1867,
-        "z": "5b68e0d.bd97b2",
+        "x": 2923,
+        "y": 890,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "b0648d5.a5c8bf",
-        "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.endpointA.p-interface-src`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[^-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
+        "id": "b8e4ab1b.5f9428",
+        "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": 4301,
-        "y": 1546,
-        "z": "5b68e0d.bd97b2",
+        "x": 2966,
+        "y": 955,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "6bf39cd9.c078dc",
-                "1f241f8d.ded588"
+                "b8369203.6c1e7",
+                "9feeef15.8800c",
+                "e8e1bd1d.029dd"
             ]
         ]
     },
     {
-        "id": "1f241f8d.ded588",
-        "type": "failure",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "6545b277.ec5df4",
+        "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": 4524,
-        "y": 1501,
-        "z": "5b68e0d.bd97b2",
+        "x": 2963,
+        "y": 1799,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "711e2d50.cbfec4"
+                "a9223749.8519e8",
+                "8aac19ac.984638",
+                "15568030.09492"
             ]
         ]
     },
     {
-        "id": "6bf39cd9.c078dc",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "4f7449aa.1cee1",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "2fa39853.fd6f7",
+        "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": 4526,
-        "y": 1565,
-        "z": "5b68e0d.bd97b2",
+        "x": 2680,
+        "y": 241,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "d87f8a80.c2edb8"
+                "e187deec.568f28",
+                "ca2e6451.404f78",
+                "42b58dd4.7191cc"
             ]
         ]
     },
     {
-        "id": "8f149145.0a9d38",
-        "type": "set",
-        "name": "set ltpId",
-        "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
+        "id": "ca2e6451.404f78",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
-        "x": 4859,
-        "y": 1459,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
+        "outputs": 1,
+        "x": 2953.490966796875,
+        "y": 133.573974609375,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "e5b0a6e5.509578"
+            ]
+        ]
     },
     {
-        "id": "d87f8a80.c2edb8",
+        "id": "e5b0a6e5.509578",
         "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",
+        "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": 4685,
-        "y": 1584,
-        "z": "5b68e0d.bd97b2",
+        "x": 3131.0625,
+        "y": 133.8597412109375,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "711e2d50.cbfec4",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "42b58dd4.7191cc",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
         "outputs": 1,
-        "x": 4689,
-        "y": 1498,
-        "z": "5b68e0d.bd97b2",
+        "x": 2949,
+        "y": 183,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "8f149145.0a9d38",
-                "ed673da0.d5043"
+                "ecd1ffcd.8fafe8"
             ]
         ]
     },
     {
-        "id": "ed673da0.d5043",
-        "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": 4860,
-        "y": 1564,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
-    },
-    {
-        "id": "5bd7fa96.a6e064",
-        "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",
+        "id": "ecd1ffcd.8fafe8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4859,
-        "y": 1525,
-        "z": "5b68e0d.bd97b2",
+        "x": 3131,
+        "y": 183,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "6f6a8b61.fa1ffc",
-        "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-domainA-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='' />\n<parameter name='access-client-id' value='' />\n<parameter name='access-topology-id' value='' />\n<parameter name='access-node-id' value='' />\n<parameter name='access-ltp-id' value='' />\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",
+        "id": "e187deec.568f28",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4303,
-        "y": 1705,
-        "z": "5b68e0d.bd97b2",
+        "x": 2953,
+        "y": 234,
+        "z": "a52db008.999ba",
         "wires": [
-            []
+            [
+                "d246d860.a6b138"
+            ]
         ]
     },
     {
-        "id": "502adfb6.94aa38",
-        "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=\"prop.connectivity-domainA-uuid\"/>\n",
-        "comments": "",
+        "id": "d246d860.a6b138",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 4348,
-        "y": 1615,
-        "z": "5b68e0d.bd97b2",
+        "x": 3133,
+        "y": 234,
+        "z": "a52db008.999ba",
         "wires": [
-            []
+            [
+                "8fdb5adc.4040d"
+            ]
         ]
     },
     {
-        "id": "2f48d78c.e343f8",
-        "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.",
+        "id": "65e46dcd.9c5144",
+        "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": "",
-        "x": 4238,
-        "y": 1671,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
+        "outputs": 1,
+        "x": 2624,
+        "y": 458,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "dd606d5c.9d70f"
+            ]
+        ]
     },
     {
-        "id": "674b1eb0.174b2",
-        "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.endpointB.p-interface-dst`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[^-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n",
+        "id": "dd606d5c.9d70f",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4299,
-        "y": 1904,
-        "z": "5b68e0d.bd97b2",
+        "x": 2904,
+        "y": 458,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "bf4f2038.8bcc6",
-                "816a3f3d.c967d"
+                "93b21596.ec10e8"
             ]
         ]
     },
     {
-        "id": "816a3f3d.c967d",
-        "type": "failure",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "da58235b.ecd51",
+        "type": "outcome",
+        "name": "network-policy",
+        "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4522,
-        "y": 1859,
-        "z": "5b68e0d.bd97b2",
+        "x": 3109,
+        "y": 432,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "bbb7eb1.f117918"
+                "bae40be2.1a0898"
             ]
         ]
     },
     {
-        "id": "bf4f2038.8bcc6",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
+        "id": "bae40be2.1a0898",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 4524,
-        "y": 1923,
-        "z": "5b68e0d.bd97b2",
+        "x": 3285.9998779296875,
+        "y": 424.9998779296875,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "3fe77c2.445af04"
+                "26610962.4550fe",
+                "1b905535.187f13"
             ]
         ]
     },
     {
-        "id": "2024c7b6.3996d",
+        "id": "26610962.4550fe",
         "type": "set",
-        "name": "set ltpId",
-        "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
+        "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": 4857,
-        "y": 1817,
-        "z": "5b68e0d.bd97b2",
+        "x": 3528.9998779296875,
+        "y": 381.9998779296875,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "3fe77c2.445af04",
-        "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",
+        "id": "1b905535.187f13",
+        "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",
+        "wires": [
+            [
+                "690d79a7.ec256",
+                "33a9cbc4.26d4ec",
+                "93a52247.c17dd8"
+            ]
+        ]
+    },
+    {
+        "id": "93a52247.c17dd8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3771,
+        "y": 323,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "2900fde3.f79c7a"
+            ]
+        ]
+    },
+    {
+        "id": "2900fde3.f79c7a",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "6f314ac7.786434",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "33a9cbc4.26d4ec",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3759.509033203125,
+        "y": 367.426025390625,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "6f314ac7.786434"
+            ]
+        ]
+    },
+    {
+        "id": "690d79a7.ec256",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3766.509033203125,
+        "y": 446.426025390625,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "13407089.aa8267"
+            ]
+        ]
+    },
+    {
+        "id": "13407089.aa8267",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3905.509033203125,
+        "y": 446.426025390625,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "d0bc6aa5.e1fca8"
+            ]
+        ]
+    },
+    {
+        "id": "d0bc6aa5.e1fca8",
+        "type": "set",
+        "name": "set the max bandwidth",
+        "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n\n\n",
+        "comments": "",
+        "x": 4111,
+        "y": 444,
+        "z": "a52db008.999ba",
+        "wires": []
+    },
+    {
+        "id": "7b409cff.da197c",
+        "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",
+        "wires": [
+            [
+                "6c1cd175.73bac",
+                "685f5c8c.4102b4"
+            ]
+        ]
+    },
+    {
+        "id": "685f5c8c.4102b4",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3190,
+        "y": 611,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "1331c07a.407898"
+            ]
+        ]
+    },
+    {
+        "id": "6c1cd175.73bac",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3192,
+        "y": 644,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "c779d61e.1b8528"
+            ]
+        ]
+    },
+    {
+        "id": "c779d61e.1b8528",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "1331c07a.407898",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3338,
+        "y": 604,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "59393385.2a7954",
+                "5055791b.75c5d"
+            ]
+        ]
+    },
+    {
+        "id": "59393385.2a7954",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "e04c02f4.2f63f8",
+        "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",
+        "wires": [
+            [
+                "250eb2ce.721286",
+                "7ff4092b.9f4c3"
+            ]
+        ]
+    },
+    {
+        "id": "7ff4092b.9f4c3",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3204,
+        "y": 1447.9998779296875,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "4e15b8c4.ecfe8"
+            ]
+        ]
+    },
+    {
+        "id": "250eb2ce.721286",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3206,
+        "y": 1480.9998779296875,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "d740a9b4.496fa"
+            ]
+        ]
+    },
+    {
+        "id": "d740a9b4.496fa",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "4e15b8c4.ecfe8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3352,
+        "y": 1440.9998779296875,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "a09d9728.0836a8",
+                "a9ef3bf.dca6748"
+            ]
+        ]
+    },
+    {
+        "id": "a09d9728.0836a8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "7ac4d896.f266b8",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "41475eff.deafd",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "171af565.db9233",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a8e7dd16.944608",
+        "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",
+        "wires": [
+            [
+                "58871d7.533a164"
+            ]
+        ]
+    },
+    {
+        "id": "58871d7.533a164",
+        "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",
+        "wires": [
+            [
+                "e6111c32.d5195"
+            ]
+        ]
+    },
+    {
+        "id": "e6111c32.d5195",
+        "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",
+        "wires": [
+            [
+                "4a0a1881.22b0b"
+            ]
+        ]
+    },
+    {
+        "id": "4a0a1881.22b0b",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4242.1171875,
+        "y": 1195.34033203125,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "5e5dd832.1a8688",
+                "54bc0e63.9b6c2",
+                "21213693.b01ef2"
+            ]
+        ]
+    },
+    {
+        "id": "5e5dd832.1a8688",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "54bc0e63.9b6c2",
+        "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",
+        "wires": [
+            [
+                "de5f8f91.d806"
+            ]
+        ]
+    },
+    {
+        "id": "21213693.b01ef2",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 4409.6171875,
+        "y": 1238.34033203125,
+        "z": "a52db008.999ba",
+        "wires": []
+    },
+    {
+        "id": "de5f8f91.d806",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4634.6171875,
+        "y": 1195.34033203125,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "f282b1a5.b5514"
+            ]
+        ]
+    },
+    {
+        "id": "f282b1a5.b5514",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4792.6171875,
+        "y": 1195.34033203125,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "5cf873ba.a6923c"
+            ]
+        ]
+    },
+    {
+        "id": "5cf873ba.a6923c",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "34f70001.b13958",
+        "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",
+        "wires": [
+            [
+                "a071673c.fc9a28"
+            ]
+        ]
+    },
+    {
+        "id": "a071673c.fc9a28",
+        "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",
+        "wires": [
+            [
+                "6adf0421.fc4f54"
+            ]
+        ]
+    },
+    {
+        "id": "6adf0421.fc4f54",
+        "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",
+        "wires": [
+            [
+                "2bb1f1c3.65f2c6"
+            ]
+        ]
+    },
+    {
+        "id": "2bb1f1c3.65f2c6",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4239.1171875,
+        "y": 2064.3404541015625,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "11642463.fe6e2c",
+                "c588c96b.efcac",
+                "4df609a.395b578"
+            ]
+        ]
+    },
+    {
+        "id": "11642463.fe6e2c",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "c588c96b.efcac",
+        "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",
+        "wires": [
+            [
+                "946398a2.3fdd3"
+            ]
+        ]
+    },
+    {
+        "id": "4df609a.395b578",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 4406.6171875,
+        "y": 2107.3404541015625,
+        "z": "a52db008.999ba",
+        "wires": []
+    },
+    {
+        "id": "946398a2.3fdd3",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4631.6171875,
+        "y": 2064.3404541015625,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "4ada9462.92f41c"
+            ]
+        ]
+    },
+    {
+        "id": "4ada9462.92f41c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4789.6171875,
+        "y": 2064.3404541015625,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "85bbe5c.988a398"
+            ]
+        ]
+    },
+    {
+        "id": "85bbe5c.988a398",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "62bd6081.059d7",
+        "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",
+        "comments": "",
+        "x": 2372,
+        "y": 2991,
+        "z": "a52db008.999ba",
+        "wires": []
+    },
+    {
+        "id": "5055791b.75c5d",
+        "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",
+        "wires": [
+            [
+                "b37ffca0.5536d8",
+                "f29e8ee3.6f68c8",
+                "12ff2066.526398"
+            ]
+        ]
+    },
+    {
+        "id": "b37ffca0.5536d8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3722.5001220703125,
+        "y": 623,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "8d70b5c4.7732f8"
+            ]
+        ]
+    },
+    {
+        "id": "f29e8ee3.6f68c8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3714.5001220703125,
+        "y": 678,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "aea102ae.c04f58"
+            ]
+        ]
+    },
+    {
+        "id": "12ff2066.526398",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3719.5001220703125,
+        "y": 735,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "d2755963.27f41"
+            ]
+        ]
+    },
+    {
+        "id": "d2755963.27f41",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "aea102ae.c04f58",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "8d70b5c4.7732f8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3866.8824462890625,
+        "y": 620.6556701660156,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "bbf0aa7e.e2119"
+            ]
+        ]
+    },
+    {
+        "id": "f4395a66.200ea",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4449,
+        "y": 639,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "89965e9d.5bf73"
+            ]
+        ]
+    },
+    {
+        "id": "89965e9d.5bf73",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4626,
+        "y": 631,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "cf2b04e9.c7ece",
+                "32eb8024.15dcc8"
+            ]
+        ]
+    },
+    {
+        "id": "bbf0aa7e.e2119",
+        "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",
+        "wires": [
+            [
+                "5e8a47e5.344b2"
+            ]
+        ]
+    },
+    {
+        "id": "5e8a47e5.344b2",
+        "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",
+        "wires": [
+            [
+                "f4395a66.200ea",
+                "cfe936cc.62cbd8"
+            ]
+        ]
+    },
+    {
+        "id": "cf2b04e9.c7ece",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "73d2c0a6.ca0098",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5044,
+        "y": 629,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "c43ff31d.81e548"
+            ]
+        ]
+    },
+    {
+        "id": "2f388561.aeb472",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5036,
+        "y": 684,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "d2cf9090.58e4c8"
+            ]
+        ]
+    },
+    {
+        "id": "c9248b9c.994ac",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5041,
+        "y": 741,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "c9c36e85.c10ae8"
+            ]
+        ]
+    },
+    {
+        "id": "c9c36e85.c10ae8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "d2cf9090.58e4c8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "c43ff31d.81e548",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5188.38232421875,
+        "y": 626.6556701660156,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "2aa1f89d.d99288"
+            ]
+        ]
+    },
+    {
+        "id": "2aa1f89d.d99288",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "a9ef3bf.dca6748",
+        "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",
+        "wires": [
+            [
+                "4ce90a1d.60092c",
+                "60723c85.f84054",
+                "343ac8c.8b51638"
+            ]
+        ]
+    },
+    {
+        "id": "4ce90a1d.60092c",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3763.5001220703125,
+        "y": 1464,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "ce24a29a.e4d57"
+            ]
+        ]
+    },
+    {
+        "id": "60723c85.f84054",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3755.5001220703125,
+        "y": 1519,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "e9f57737.1a79b8"
+            ]
+        ]
+    },
+    {
+        "id": "343ac8c.8b51638",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3760.5001220703125,
+        "y": 1576,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "67449715.5406e8"
+            ]
+        ]
+    },
+    {
+        "id": "67449715.5406e8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "e9f57737.1a79b8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "ce24a29a.e4d57",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3907.8824462890625,
+        "y": 1461.6556701660156,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "ed40a410.dc6fe8"
+            ]
+        ]
+    },
+    {
+        "id": "857c3216.12f558",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4490,
+        "y": 1480,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "6bbf97a7.ebebb8"
+            ]
+        ]
+    },
+    {
+        "id": "6bbf97a7.ebebb8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4667,
+        "y": 1472,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "ee554955.44691",
+                "1c8432c4.e13b6d"
+            ]
+        ]
+    },
+    {
+        "id": "ed40a410.dc6fe8",
+        "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",
+        "wires": [
+            [
+                "70b35483.a830f4"
+            ]
+        ]
+    },
+    {
+        "id": "70b35483.a830f4",
+        "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",
+        "wires": [
+            [
+                "857c3216.12f558",
+                "dc8e8812.fdd648"
+            ]
+        ]
+    },
+    {
+        "id": "1c8432c4.e13b6d",
+        "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",
+        "wires": [
+            [
+                "6cc22b96.ba67f4",
+                "b08dfdd6.0852f8",
+                "4f7e6e24.1a4"
+            ]
+        ]
+    },
+    {
+        "id": "ee554955.44691",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "6cc22b96.ba67f4",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5085,
+        "y": 1470,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "19f4c2b.fd2d63d"
+            ]
+        ]
+    },
+    {
+        "id": "b08dfdd6.0852f8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
-        "x": 4683,
-        "y": 1942,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
+        "outputs": 1,
+        "x": 5077,
+        "y": 1525,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "4d7c2f7b.855e48"
+            ]
+        ]
     },
     {
-        "id": "bbb7eb1.f117918",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "4f7e6e24.1a4",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
         "outputs": 1,
-        "x": 4687,
-        "y": 1856,
-        "z": "5b68e0d.bd97b2",
+        "x": 5082,
+        "y": 1582,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "2024c7b6.3996d",
-                "e7f53e76.5ddf"
+                "92c87883.16eab"
             ]
         ]
     },
     {
-        "id": "e7f53e76.5ddf",
-        "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",
+        "id": "92c87883.16eab",
+        "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": 4858,
-        "y": 1922,
-        "z": "5b68e0d.bd97b2",
+        "x": 5234,
+        "y": 1583,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "71ef13be.57065c",
-        "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",
+        "id": "4d7c2f7b.855e48",
+        "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": 4857,
-        "y": 1883,
-        "z": "5b68e0d.bd97b2",
+        "x": 5245,
+        "y": 1528,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "485a23dc.9461bc",
-        "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='' />\n<parameter name='access-client-id' value='' />\n<parameter name='access-topology-id' value='' />\n<parameter name='access-node-id' value='' />\n<parameter name='access-ltp-id' value='' />\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",
+        "id": "19f4c2b.fd2d63d",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4301,
-        "y": 2063,
-        "z": "5b68e0d.bd97b2",
+        "x": 5229.38232421875,
+        "y": 1467.6556701660156,
+        "z": "a52db008.999ba",
         "wires": [
-            []
+            [
+                "f5fd6d7b.ccf568"
+            ]
         ]
     },
     {
-        "id": "f4b1b11a.276db8",
+        "id": "f5fd6d7b.ccf568",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "fdbb72c5.61c228",
         "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",
+        "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": 4346,
-        "y": 1973,
-        "z": "5b68e0d.bd97b2",
+        "x": 2423,
+        "y": 2674,
+        "z": "a52db008.999ba",
         "wires": [
-            []
+            [
+                "b62b791e.5db38",
+                "47c9af20.002648"
+            ]
         ]
     },
     {
-        "id": "985d1e1b.82a998",
-        "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.",
+        "id": "47c9af20.002648",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
-        "x": 4236,
-        "y": 2029,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
+        "outputs": 1,
+        "x": 2689,
+        "y": 2654,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "e173211c.50ca1"
+            ]
+        ]
     },
     {
-        "id": "3eb8bee0.c23c0a",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:sotn-get-otn-tunnel-path-from-oof",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync' >\n",
+        "id": "b62b791e.5db38",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2518,
-        "y": 2064,
-        "z": "5b68e0d.bd97b2",
+        "x": 2690.000213623047,
+        "y": 2704.99990940094,
+        "z": "a52db008.999ba",
         "wires": [
-            []
+            [
+                "9a481111.191d4"
+            ]
         ]
     },
     {
-        "id": "e199c2c7.64ce48",
-        "type": "set",
-        "name": "set attachment_param",
-        "xml": "<set>\n<parameter name='prop.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='prop.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='prop.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<parameter name='prop.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='prop.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\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",
+        "id": "e173211c.50ca1",
+        "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": 2381,
-        "y": 2024,
-        "z": "5b68e0d.bd97b2",
+        "x": 2829.0002479553223,
+        "y": 2654.0000009536743,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "50e758b0.2c60a",
-        "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)",
+        "id": "9a481111.191d4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
-        "x": 2353,
-        "y": 1988,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
+        "outputs": 1,
+        "x": 2835.02725982666,
+        "y": 2702.745394706726,
+        "z": "a52db008.999ba",
+        "wires": [
+            []
+        ]
     },
     {
-        "id": "4e9e1552.e1012c",
-        "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 = $tmp.vpnName' >\n<parameter name='vpn-id' value='`$tmp.vpnName`' />\n<parameter name='vpn-name' value='`$tmp.vpnName`' />\n<parameter name='access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<parameter name='src-access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\n<parameter name='dst-access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$oof.vpn.dst-access-ltp-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`' />",
+        "id": "3f4df906.b67d7e",
+        "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": 2483,
-        "y": 2168,
-        "z": "5b68e0d.bd97b2",
+        "x": 2423,
+        "y": 3046,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "eee018f4.9abed"
+                "e8fdf08e.e8b0f8",
+                "a8718b8a.f404c8"
             ]
         ]
     },
     {
-        "id": "879bdb34.60c748",
-        "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 = $tmp.vpnName' \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/' + $mdsal-psd.service-data.networks.network[0].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=\"`$mdsal-psd.service-data.networks.network[0].network-id`\" />",
+        "id": "a8718b8a.f404c8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2481.5,
-        "y": 2211,
-        "z": "5b68e0d.bd97b2",
+        "x": 2689,
+        "y": 3026,
+        "z": "a52db008.999ba",
         "wires": [
-            []
+            [
+                "fcecbd56.8e1ac"
+            ]
         ]
     },
     {
-        "id": "5ac2c26e.60f274",
-        "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",
+        "id": "e8fdf08e.e8b0f8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3134.5,
-        "y": 2149,
-        "z": "5b68e0d.bd97b2",
+        "x": 2690.000213623047,
+        "y": 3076.99990940094,
+        "z": "a52db008.999ba",
         "wires": [
-            []
+            [
+                "ccb1984d.b4313"
+            ]
         ]
     },
     {
-        "id": "481b1bdc.29fad4",
-        "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`\" />",
+        "id": "fcecbd56.8e1ac",
+        "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": 2829.0002479553223,
+        "y": 3026.0000009536743,
+        "z": "a52db008.999ba",
+        "wires": []
+    },
+    {
+        "id": "ccb1984d.b4313",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3136.5,
-        "y": 2188,
-        "z": "5b68e0d.bd97b2",
+        "x": 2835.02725982666,
+        "y": 3074.745394706726,
+        "z": "a52db008.999ba",
         "wires": [
             []
         ]
     },
     {
-        "id": "24d9a7fc.8cd3f8",
-        "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 = $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      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-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=\"`$prop.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`\" />-->",
+        "id": "b6e0228b.bc6398",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2528,
+        "y": 404,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "65e46dcd.9c5144",
+                "bb6c8a2e.a61878"
+            ]
+        ]
+    },
+    {
+        "id": "bb6c8a2e.a61878",
+        "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": 4431,
-        "y": 1753,
-        "z": "5b68e0d.bd97b2",
+        "x": 2809,
+        "y": 360,
+        "z": "a52db008.999ba",
         "wires": [
-            []
+            [
+                "475f2872.5fafd"
+            ]
         ]
     },
     {
-        "id": "a54100e4.bdfd8",
-        "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 = $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      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<!--<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`\" />-->",
+        "id": "475f2872.5fafd",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4428,
-        "y": 2128,
-        "z": "5b68e0d.bd97b2",
+        "x": 3071,
+        "y": 360,
+        "z": "a52db008.999ba",
         "wires": [
-            []
+            [
+                "da58235b.ecd51"
+            ]
         ]
     },
     {
-        "id": "eee018f4.9abed",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "cfe936cc.62cbd8",
+        "type": "outcome",
+        "name": "network-resource",
+        "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 2783,
-        "y": 2167,
-        "z": "5b68e0d.bd97b2",
+        "x": 4452,
+        "y": 713,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "60c98c50.d9d324"
+                "29038cb1.b59084"
             ]
         ]
     },
     {
-        "id": "60c98c50.d9d324",
+        "id": "29038cb1.b59084",
         "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 2923.500244140625,
-        "y": 2168.25390625,
-        "z": "5b68e0d.bd97b2",
+        "x": 4629,
+        "y": 705,
+        "z": "a52db008.999ba",
         "wires": [
-            []
+            [
+                "c25692cd.684ce8"
+            ]
         ]
     },
     {
-        "id": "99e923c8.5700b8",
-        "type": "comment",
-        "name": "TODO: FIXME: do we need this relationship?",
-        "info": "",
+        "id": "c25692cd.684ce8",
+        "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": 3171,
-        "y": 2108,
-        "z": "5b68e0d.bd97b2",
+        "x": 4864,
+        "y": 829,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "debe7c1a.c25a08",
-        "type": "comment",
-        "name": "TODO: FIXME: put proper values",
-        "info": "",
+        "id": "68f808b3.66b5",
+        "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": 2409,
-        "y": 2130,
-        "z": "5b68e0d.bd97b2",
+        "x": 4904,
+        "y": 1669,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "ccc984ea.946438",
-        "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 = $tmp.vpnName' >\n<parameter name='vpn-id' value='`$tmp.vpnName`' />\n<parameter name='vpn-name' value='`$tmp.vpnName`' />\n<parameter name='access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<parameter name='src-access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\n<parameter name='dst-access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$oof.vpn.dst-access-ltp-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`' />",
+        "id": "ad76d9b4.88b908",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4669,
+        "y": 1545,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "68f808b3.66b5"
+            ]
+        ]
+    },
+    {
+        "id": "dc8e8812.fdd648",
+        "type": "outcome",
+        "name": "network-resource",
+        "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 2465,
-        "y": 2348,
-        "z": "5b68e0d.bd97b2",
+        "x": 4492,
+        "y": 1553,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "de2c330e.390d88"
+                "ad76d9b4.88b908"
             ]
         ]
     },
     {
-        "id": "ff4306de.40969",
-        "type": "comment",
-        "name": "TODO: FIXME: do we need this relationship?",
-        "info": "",
+        "id": "fad5035b.7ee3a8",
+        "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`\" />",
         "comments": "",
-        "x": 3153,
-        "y": 2288,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
+        "outputs": 1,
+        "x": 2425,
+        "y": 2807,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "bc31fb8e.e87f08",
+                "8c5d2dc9.bdb42"
+            ]
+        ]
     },
     {
-        "id": "bddb99db.4eee1",
-        "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",
+        "id": "8c5d2dc9.bdb42",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3116.5,
-        "y": 2329,
-        "z": "5b68e0d.bd97b2",
+        "x": 2691,
+        "y": 2787,
+        "z": "a52db008.999ba",
         "wires": [
-            []
+            [
+                "536d6d82.f4f124"
+            ]
         ]
     },
     {
-        "id": "4e5e60ab.6592a8",
-        "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`\" />",
+        "id": "bc31fb8e.e87f08",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3118.5,
-        "y": 2368,
-        "z": "5b68e0d.bd97b2",
+        "x": 2692.000213623047,
+        "y": 2837.99990940094,
+        "z": "a52db008.999ba",
         "wires": [
-            []
+            [
+                "509489f1.58fe18"
+            ]
         ]
     },
     {
-        "id": "82297458.0d3c48",
+        "id": "536d6d82.f4f124",
+        "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": 2831.0002479553223,
+        "y": 2787.0000009536743,
+        "z": "a52db008.999ba",
+        "wires": []
+    },
+    {
+        "id": "509489f1.58fe18",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2905.500244140625,
-        "y": 2348.25390625,
-        "z": "5b68e0d.bd97b2",
+        "x": 2837.02725982666,
+        "y": 2835.745394706726,
+        "z": "a52db008.999ba",
         "wires": [
             []
         ]
     },
     {
-        "id": "de2c330e.390d88",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "d037b0c3.f093c",
+        "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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2765,
-        "y": 2347,
-        "z": "5b68e0d.bd97b2",
+        "x": 2425,
+        "y": 3173,
+        "z": "a52db008.999ba",
         "wires": [
             [
-                "82297458.0d3c48"
+                "8c8a801.d7272",
+                "b835a972.f48b7"
             ]
         ]
     },
     {
-        "id": "8b5978da.cf55b8",
-        "type": "comment",
-        "name": "TODO: FIXME: put proper values",
-        "info": "",
-        "comments": "",
-        "x": 2386,
-        "y": 2308,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
-    },
-    {
-        "id": "3824458b.0c70c2",
-        "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 = $tmp.vpnName' \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/' + $mdsal-psd.service-data.networks.network[0].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=\"`$mdsal-psd.service-data.networks.network[0].network-id`\" />",
+        "id": "b835a972.f48b7",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2463.5,
-        "y": 2388,
-        "z": "5b68e0d.bd97b2",
+        "x": 2691,
+        "y": 3153,
+        "z": "a52db008.999ba",
         "wires": [
-            []
+            [
+                "88a6a85e.9ed23"
+            ]
         ]
     },
     {
-        "id": "ed749360.08754",
-        "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",
+        "id": "8c8a801.d7272",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
-        "x": 2337,
-        "y": 2471,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
+        "outputs": 1,
+        "x": 2692.000213623047,
+        "y": 3203.99990940094,
+        "z": "a52db008.999ba",
+        "wires": [
+            [
+                "7de5bd62.f4f62c"
+            ]
+        ]
     },
     {
-        "id": "97832dc3.63313",
-        "type": "set",
-        "name": "set attachment_param",
-        "xml": "<set>\n<parameter name='prop.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='prop.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='prop.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<parameter name='prop.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='prop.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\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",
+        "id": "88a6a85e.9ed23",
+        "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": 2360,
-        "y": 2511,
-        "z": "5b68e0d.bd97b2",
+        "x": 2831.0002479553223,
+        "y": 3153.0000009536743,
+        "z": "a52db008.999ba",
         "wires": []
     },
     {
-        "id": "f27e6517.ff7968",
-        "type": "execute",
-        "name": "get parent-service-data tmp.ar-url-psd",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-psd\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n",
+        "id": "7de5bd62.f4f62c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5071,
-        "y": 1523,
-        "z": "5b68e0d.bd97b2",
+        "x": 2837.02725982666,
+        "y": 3201.745394706726,
+        "z": "a52db008.999ba",
         "wires": [
             []
         ]
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 fa7b88c4..3584527b 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": "303f7566.d219ba",
+        "id": "fed3eb51.781ac8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 110,
-        "y": 318,
-        "z": "15891279.d6b57e",
+        "x": 131,
+        "y": 81,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "f39490a3.b09b28"
+                "d2a4ea36.881b68"
             ]
         ]
     },
     {
-        "id": "f39490a3.b09b28",
+        "id": "d2a4ea36.881b68",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1339 +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": 394.2856903076172,
-        "y": 379.23810863494873,
-        "z": "15891279.d6b57e",
+        "x": 262.2856903076172,
+        "y": 130.23810863494873,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "72c32dea.176324"
+                "7b1236d6.83c2c"
             ]
         ]
     },
     {
-        "id": "72c32dea.176324",
+        "id": "7b1236d6.83c2c",
         "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": 400.42860412597656,
-        "y": 464.0000305175781,
-        "z": "15891279.d6b57e",
+        "x": 265.4286193847656,
+        "y": 215.00003242492676,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "d12dc6f7.97bdd"
+                "8228a949.234f38"
             ]
         ]
     },
     {
-        "id": "d12dc6f7.97bdd",
+        "id": "8228a949.234f38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 596.2380447387695,
-        "y": 622.6666681496426,
-        "z": "15891279.d6b57e",
+        "x": 415.238037109375,
+        "y": 344.6666564941406,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "6aad2197.a72ef",
-                "1be9220f.ba6ca6",
-                "7fd5d3ea.13b334",
-                "5cda8af7.9a0634",
-                "225a4cf6.f0c67c",
-                "a4c45de.b22e5a",
-                "d2fb34de.34839",
-                "2fc6eaae.5fdc7e"
+                "341b32a3.25428e",
+                "1a6e5da0.98eb02",
+                "e5c8285b.2b695"
             ]
         ]
     },
     {
-        "id": "6aad2197.a72ef",
-        "type": "set",
-        "name": "set vnf-level-oper-status to PendingDelete",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='PendingDelete' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />",
-        "comments": "",
-        "x": 1004.3849029541016,
-        "y": 771.670627951622,
-        "z": "15891279.d6b57e",
-        "wires": []
-    },
-    {
-        "id": "1be9220f.ba6ca6",
+        "id": "341b32a3.25428e",
         "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": 916.5716552734375,
-        "y": 1843.5970458984375,
-        "z": "15891279.d6b57e",
+        "x": 689.5716552734375,
+        "y": 611.59716796875,
+        "z": "fdc94a5e.7c86f8",
         "wires": []
     },
     {
-        "id": "7fd5d3ea.13b334",
-        "type": "set",
-        "name": "set vnf-index and vnf-object-path",
-        "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` \" />",
+        "id": "f743b3f1.72f9f",
+        "type": "comment",
+        "name": "new for TransportSlicing",
+        "info": "",
         "comments": "",
-        "x": 981.5716247558594,
-        "y": 727.5968955755234,
-        "z": "15891279.d6b57e",
+        "x": 721,
+        "y": 286,
+        "z": "fdc94a5e.7c86f8",
         "wires": []
     },
     {
-        "id": "5cda8af7.9a0634",
-        "type": "switchNode",
-        "name": "switch service-data.vnfs.vnf_length",
-        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
+        "id": "1a6e5da0.98eb02",
+        "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": 1026.0000610351562,
-        "y": 512.000005456619,
-        "z": "15891279.d6b57e",
+        "x": 741,
+        "y": 382,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "183040b7.7ccbff",
-                "71cafe22.189b2",
-                "b0ad485b.8627c"
+                "2976ce78.f07a42",
+                "de3912b8.6d67e",
+                "77b5fc18.2082a4"
             ]
         ]
     },
     {
-        "id": "b0ad485b.8627c",
-        "type": "outcome",
-        "name": "0",
-        "xml": "<outcome value='0'>\n",
+        "id": "2976ce78.f07a42",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1284.9689559936523,
-        "y": 473.96876499336213,
-        "z": "15891279.d6b57e",
+        "x": 960,
+        "y": 320,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "f9a51cd3.102398"
+                "7ee13e19.7c1348"
             ]
         ]
     },
     {
-        "id": "f9a51cd3.102398",
-        "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
-        "comments": "",
-        "x": 1439.7778434753418,
-        "y": 492.88903352897614,
-        "z": "15891279.d6b57e",
-        "wires": []
-    },
-    {
-        "id": "183040b7.7ccbff",
-        "type": "other",
-        "name": "Null",
-        "xml": "<outcome value=''>\n",
+        "id": "de3912b8.6d67e",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1278.0000953674316,
-        "y": 513.0000865189359,
-        "z": "15891279.d6b57e",
+        "x": 969.490966796875,
+        "y": 362.57403564453125,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "f9a51cd3.102398"
+                "4a305009.90c32"
             ]
         ]
     },
     {
-        "id": "71cafe22.189b2",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "77b5fc18.2082a4",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1271.000503540039,
-        "y": 546.0000903336331,
-        "z": "15891279.d6b57e",
+        "x": 958,
+        "y": 409,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "f6c4231c.6894e8"
+                "cd4775e4.2da96"
             ]
         ]
     },
     {
-        "id": "f6c4231c.6894e8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1418.2700462341309,
-        "y": 546.554735395126,
-        "z": "15891279.d6b57e",
-        "wires": [
-            [
-                "541e7856.d1e2",
-                "8337a3da.3c8e38"
-            ]
-        ]
+        "id": "4a305009.90c32",
+        "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",
+        "wires": []
     },
     {
-        "id": "541e7856.d1e2",
-        "type": "for",
-        "name": "for vidx..service-data.vnfs.vnf_length[]",
-        "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
+        "id": "cd4775e4.2da96",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "outputs": 1,
-        "x": 1664.2861633300781,
-        "y": 553.4286558357999,
-        "z": "15891279.d6b57e",
-        "wires": [
-            [
-                "ebbd7e9e.ba96c8"
-            ]
-        ]
+        "x": 1127,
+        "y": 410,
+        "z": "fdc94a5e.7c86f8",
+        "wires": []
     },
     {
-        "id": "ebbd7e9e.ba96c8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "7ee13e19.7c1348",
+        "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": 1883.6357955932617,
-        "y": 552.9687359062955,
-        "z": "15891279.d6b57e",
+        "x": 1157,
+        "y": 316,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "436917e7.e9b6a"
+                "bc03982b.15ba78"
             ]
         ]
     },
     {
-        "id": "436917e7.e9b6a",
+        "id": "bc03982b.15ba78",
         "type": "switchNode",
-        "name": "switch vnfid found",
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2037.7153930664062,
-        "y": 552.6788179604337,
-        "z": "15891279.d6b57e",
+        "x": 1380.33349609375,
+        "y": 315.99993896484375,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "27314ab3.a1187e"
+                "aca4b74a.cb3118"
             ]
         ]
     },
     {
-        "id": "27314ab3.a1187e",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "aca4b74a.cb3118",
+        "type": "outcome",
+        "name": "connectivity",
+        "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2213.6675148010254,
-        "y": 552.5715000359342,
-        "z": "15891279.d6b57e",
-        "wires": [
-            [
-                "cf77593a.1343d8"
-            ]
-        ]
-    },
-    {
-        "id": "cf77593a.1343d8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2362.312973022461,
-        "y": 540.97913000267,
-        "z": "15891279.d6b57e",
+        "x": 1581.0001335144043,
+        "y": 317.00002098083496,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "f0ff74da.16b248"
+                "2544f612.eeddca"
             ]
         ]
     },
     {
-        "id": "f0ff74da.16b248",
-        "type": "set",
-        "name": "set tmp.vidx and ctx.vnf-data",
-        "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n",
-        "comments": "",
-        "x": 2624.1997680664062,
-        "y": 518.3215563027188,
-        "z": "15891279.d6b57e",
-        "wires": []
-    },
-    {
-        "id": "8337a3da.3c8e38",
-        "type": "switchNode",
-        "name": "switch tmp.vidx ",
-        "xml": "<switch test=\"`$tmp.vidx`\">\n\n",
+        "id": "e5c8285b.2b695",
+        "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": 1607.0000228881836,
-        "y": 607.99999353569,
-        "z": "15891279.d6b57e",
+        "x": 707,
+        "y": 330,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
-            [
-                "1cd8ba9c.bf5235"
-            ]
+            []
         ]
     },
     {
-        "id": "1cd8ba9c.bf5235",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>\n",
+        "id": "2544f612.eeddca",
+        "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": 1762.4286499023438,
-        "y": 607.5713770119473,
-        "z": "15891279.d6b57e",
+        "x": 1819,
+        "y": 319,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "6dd6d49d.d00eec"
+                "75c7fde8.1d4a84",
+                "563ee44e.bd096c",
+                "bc425b5.1b1fba8"
             ]
         ]
     },
     {
-        "id": "6dd6d49d.d00eec",
-        "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
-        "comments": "",
-        "x": 1907.8573913574219,
-        "y": 607.7143146721646,
-        "z": "15891279.d6b57e",
-        "wires": []
-    },
-    {
-        "id": "225a4cf6.f0c67c",
-        "type": "switchNode",
-        "name": "switch vnf-level-oper-status",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>\n",
+        "id": "75c7fde8.1d4a84",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 975.0000762939453,
-        "y": 620.8890204429626,
-        "z": "15891279.d6b57e",
+        "x": 2027,
+        "y": 283,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "e0bfe23d.068ad8",
-                "3e0c4d79.12e802"
+                "e6a3b8f2.9e7b38"
             ]
         ]
     },
     {
-        "id": "e0bfe23d.068ad8",
-        "type": "outcome",
-        "name": "outcome Active",
-        "xml": "<outcome value='Active'>\n",
+        "id": "563ee44e.bd096c",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1220.8333702087402,
-        "y": 622.0001182556152,
-        "z": "15891279.d6b57e",
+        "x": 2027.490966796875,
+        "y": 328.57403564453125,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "40413c0b.9420dc"
+                "ad15182e.154a8"
             ]
         ]
     },
     {
-        "id": "40413c0b.9420dc",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1434.139762878418,
-        "y": 631.3253078460693,
-        "z": "15891279.d6b57e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "3e0c4d79.12e802",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "bc425b5.1b1fba8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1198.8333892822266,
-        "y": 672.000129699707,
-        "z": "15891279.d6b57e",
+        "x": 2025,
+        "y": 372,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "fc734294.cf7788"
+                "8719a717.3cd9f8"
             ]
         ]
     },
     {
-        "id": "fc734294.cf7788",
+        "id": "ad15182e.154a8",
         "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=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",
+        "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": 1358.3331565856934,
-        "y": 675.0001287460327,
-        "z": "15891279.d6b57e",
+        "x": 2190.0623779296875,
+        "y": 328.8597717285156,
+        "z": "fdc94a5e.7c86f8",
         "wires": []
     },
     {
-        "id": "a4c45de.b22e5a",
-        "type": "set",
-        "name": "copy input data to service data",
-        "xml": "<set>\n<!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />",
+        "id": "8719a717.3cd9f8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 984.0065612792969,
-        "y": 680.010435461998,
-        "z": "15891279.d6b57e",
+        "x": 2194,
+        "y": 373,
+        "z": "fdc94a5e.7c86f8",
         "wires": []
     },
     {
-        "id": "d2fb34de.34839",
+        "id": "c776a79f.7f2db",
         "type": "save",
-        "name": "update AnAI - vnf-instance.orchestration-status",
-        "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $vnfId\" >\n<parameter name=\"orchestration-status\" value=\"PendingDelete\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",
+        "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": 1026.0064239501953,
-        "y": 826.0105141401291,
-        "z": "15891279.d6b57e",
+        "x": 2500,
+        "y": 372,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
-            []
+            [
+                "b403a898.9fbc18",
+                "5d1a47a8.0dfe7",
+                "f3733135.d8a078"
+            ]
         ]
     },
     {
-        "id": "5dd794c8.fb268c",
-        "type": "comment",
-        "name": "new for TransportSlicing",
-        "info": "",
-        "comments": "",
-        "x": 967,
-        "y": 898,
-        "z": "15891279.d6b57e",
-        "wires": []
-    },
-    {
-        "id": "2fc6eaae.5fdc7e",
-        "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.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": "",
+        "id": "c765be65.0f488",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 978,
-        "y": 948,
-        "z": "15891279.d6b57e",
+        "x": 2884,
+        "y": 372,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "aebcc6b7.4bd97",
-                "534659e3.16c99",
-                "4b75ad0e.b2264c"
+                "e9922fb9.764098",
+                "eef29d57.4c4228",
+                "952ea8f1.7bda",
+                "14a01812.a7d138"
             ]
         ]
     },
     {
-        "id": "aebcc6b7.4bd97",
+        "id": "b403a898.9fbc18",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1194,
-        "y": 913,
-        "z": "15891279.d6b57e",
+        "x": 2711,
+        "y": 374,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "dfa58322.db6e7"
+                "c765be65.0f488"
             ]
         ]
     },
     {
-        "id": "534659e3.16c99",
+        "id": "5d1a47a8.0dfe7",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1203.490966796875,
-        "y": 955.5740356445312,
-        "z": "15891279.d6b57e",
+        "x": 2711.490966796875,
+        "y": 419.57403564453125,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "7aae8b9.3267cf4"
+                "1295f1fa.69cac6"
             ]
         ]
     },
     {
-        "id": "4b75ad0e.b2264c",
+        "id": "f3733135.d8a078",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1192,
-        "y": 1002,
-        "z": "15891279.d6b57e",
+        "x": 2709,
+        "y": 463,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "47847ce9.cdac14"
+                "6ac7a77b.f5232"
             ]
         ]
     },
     {
-        "id": "7aae8b9.3267cf4",
+        "id": "6ac7a77b.f5232",
         "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",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1357.0623779296875,
-        "y": 958.8597717285156,
-        "z": "15891279.d6b57e",
+        "x": 2876,
+        "y": 462,
+        "z": "fdc94a5e.7c86f8",
         "wires": []
     },
     {
-        "id": "47847ce9.cdac14",
+        "id": "1295f1fa.69cac6",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\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=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1361,
-        "y": 1003,
-        "z": "15891279.d6b57e",
+        "x": 2874.0623779296875,
+        "y": 419.8597717285156,
+        "z": "fdc94a5e.7c86f8",
         "wires": []
     },
     {
-        "id": "dfa58322.db6e7",
+        "id": "e6a3b8f2.9e7b38",
         "type": "for",
         "name": "for each relationship",
-        "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
+        "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1391,
-        "y": 909,
-        "z": "15891279.d6b57e",
+        "x": 2228,
+        "y": 278,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "1fcd5169.0fe3ef"
+                "d8c7aa6c.9474d"
             ]
         ]
     },
     {
-        "id": "1fcd5169.0fe3ef",
+        "id": "d8c7aa6c.9474d",
         "type": "switchNode",
         "name": "switch related-to",
-        "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
+        "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1614.33349609375,
-        "y": 908.9999389648438,
-        "z": "15891279.d6b57e",
+        "x": 2433,
+        "y": 278,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "b3fa3516.3c5f7"
+                "6afd9b1f.24ad3c"
             ]
         ]
     },
     {
-        "id": "b3fa3516.3c5f7",
+        "id": "6afd9b1f.24ad3c",
         "type": "outcome",
-        "name": "connectivity",
-        "xml": "<outcome value='connectivity'>\n",
+        "name": "vpn-binding",
+        "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1810,
-        "y": 911,
-        "z": "15891279.d6b57e",
+        "x": 2599,
+        "y": 278,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "8171ffc1.700ce8"
+                "489d615f.74d2b8"
             ]
         ]
     },
     {
-        "id": "8171ffc1.700ce8",
-        "type": "switchNode",
-        "name": "switch $rel-index == 0",
-        "xml": "<switch test=\"`$rel-index == 0`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1997.9998664855957,
-        "y": 908.999979019165,
-        "z": "15891279.d6b57e",
-        "wires": [
-            [
-                "4491f21f.012e44",
-                "66fe8847.e5db68"
-            ]
-        ]
-    },
-    {
-        "id": "4491f21f.012e44",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
+        "id": "489d615f.74d2b8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 2220.9998664855957,
-        "y": 798.999979019165,
-        "z": "15891279.d6b57e",
+        "x": 2762,
+        "y": 278,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "50b3c107.0ef428"
+                "c776a79f.7f2db"
             ]
         ]
     },
     {
-        "id": "66fe8847.e5db68",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
+        "id": "e9922fb9.764098",
+        "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": "",
-        "outputs": 1,
-        "x": 2191.999755859375,
-        "y": 1225,
-        "z": "15891279.d6b57e",
-        "wires": [
-            [
-                "49f4be1a.dd4768"
-            ]
-        ]
+        "x": 3099,
+        "y": 82,
+        "z": "fdc94a5e.7c86f8",
+        "wires": []
     },
     {
-        "id": "50b3c107.0ef428",
-        "type": "save",
-        "name": "get connectivityA 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[0].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivityA\" >\n",
+        "id": "eef29d57.4c4228",
+        "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": 2414.9998664855957,
-        "y": 798.999979019165,
-        "z": "15891279.d6b57e",
+        "x": 3125,
+        "y": 199,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "c5f57c4d.37656",
-                "f8bc0153.3111b",
-                "fd26821d.45f278"
+                "e1caf9b0.f16ef",
+                "8ba822ff.3c855",
+                "3e54396e.89bb66"
             ]
         ]
     },
     {
-        "id": "c5f57c4d.37656",
+        "id": "e1caf9b0.f16ef",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2620.9998664855957,
-        "y": 758.999979019165,
-        "z": "15891279.d6b57e",
+        "x": 3320.5001220703125,
+        "y": 151,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "944973cd.969b48"
+                "12b4a6a1.bdd529"
             ]
         ]
     },
     {
-        "id": "f8bc0153.3111b",
+        "id": "8ba822ff.3c855",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2621.4908332824707,
-        "y": 804.5740146636963,
-        "z": "15891279.d6b57e",
-        "wires": [
-            [
-                "4c56e2b6.ecbe4c"
-            ]
-        ]
-    },
-    {
-        "id": "fd26821d.45f278",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2618.9998664855957,
-        "y": 847.999979019165,
-        "z": "15891279.d6b57e",
+        "x": 3312.5001220703125,
+        "y": 206,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "5f2713ec.fce9b4"
+                "6aa3fcb.c3a6c84"
             ]
         ]
     },
     {
-        "id": "49f4be1a.dd4768",
-        "type": "save",
-        "name": "get connectivityB 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[1].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivityB\" >\n",
+        "id": "12b4a6a1.bdd529",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2387.999755859375,
-        "y": 1225,
-        "z": "15891279.d6b57e",
+        "x": 3464.8824462890625,
+        "y": 150.65567016601562,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "99901664.bef67",
-                "fa356ad9.66e31",
-                "3216507d.6f0df8"
+                "8559d2a.befa2b"
             ]
         ]
     },
     {
-        "id": "99901664.bef67",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "8559d2a.befa2b",
+        "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": 2607.999755859375,
-        "y": 1196,
-        "z": "15891279.d6b57e",
+        "x": 3649,
+        "y": 149,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "b3f3fc8e.164aa8"
+                "a2c1ad39.50b17"
             ]
         ]
     },
     {
-        "id": "fa356ad9.66e31",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "a2c1ad39.50b17",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2609.49072265625,
-        "y": 1241.5740356445312,
-        "z": "15891279.d6b57e",
+        "x": 3844,
+        "y": 149,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "9c397b15.bf0e5"
+                "f7ee255a.8640e"
             ]
         ]
     },
     {
-        "id": "3216507d.6f0df8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "3e54396e.89bb66",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2605.999755859375,
-        "y": 1287,
-        "z": "15891279.d6b57e",
+        "x": 3317.5001220703125,
+        "y": 263,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "1f619a9f.fc34dd"
+                "ff13ab9d.2deb7"
             ]
         ]
     },
     {
-        "id": "944973cd.969b48",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2793.6663703918457,
-        "y": 757.999979019165,
-        "z": "15891279.d6b57e",
-        "wires": [
-            [
-                "905f3b23.ac61b8",
-                "6125d5eb.a534c4",
-                "b1bd9fc5.bac3a"
-            ]
-        ]
-    },
-    {
-        "id": "4c56e2b6.ecbe4c",
+        "id": "ff13ab9d.2deb7",
         "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",
+        "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": 2784.062244415283,
-        "y": 804.8597507476807,
-        "z": "15891279.d6b57e",
+        "x": 3469.5001220703125,
+        "y": 264,
+        "z": "fdc94a5e.7c86f8",
         "wires": []
     },
     {
-        "id": "5f2713ec.fce9b4",
+        "id": "6aa3fcb.c3a6c84",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 2787.9998664855957,
-        "y": 848.999979019165,
-        "z": "15891279.d6b57e",
-        "wires": []
-    },
-    {
-        "id": "6125d5eb.a534c4",
-        "type": "set",
-        "name": "set sotn_value for ETH deletion",
-        "xml": "<set>\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />\n\n<parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />",
+        "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": 3081.4996452331543,
-        "y": 849.000020980835,
-        "z": "15891279.d6b57e",
+        "x": 3480.5001220703125,
+        "y": 207,
+        "z": "fdc94a5e.7c86f8",
         "wires": []
     },
     {
-        "id": "b1bd9fc5.bac3a",
+        "id": "d85cad49.e7fe3",
         "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.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />\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=\"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\"/>",
+        "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": 3179.499755859375,
-        "y": 894,
-        "z": "15891279.d6b57e",
+        "x": 4432,
+        "y": 166,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "43014871.10916",
-                "ef466a56.4961d8"
+                "5b32aba.7fc39d4",
+                "43d71291.c727fc",
+                "6b05861c.156668"
             ]
         ]
     },
     {
-        "id": "43014871.10916",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3524.999755859375,
-        "y": 875,
-        "z": "15891279.d6b57e",
-        "wires": [
-            [
-                "b872830e.e33218"
-            ]
-        ]
-    },
-    {
-        "id": "ef466a56.4961d8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
+        "id": "98badb93.a08c9",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 3528.999755859375,
-        "y": 915,
-        "z": "15891279.d6b57e",
+        "x": 4226,
+        "y": 153,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "ecca88b1.05406"
+                "48966cee.55dba4",
+                "d85cad49.e7fe3",
+                "ee878ee.4f8847"
             ]
         ]
     },
     {
-        "id": "53822d52.50003c",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "put proper values based on connectivity resource retrieved from AAI",
+        "id": "48966cee.55dba4",
+        "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": 3022.999755859375,
-        "y": 802,
-        "z": "15891279.d6b57e",
+        "x": 4462,
+        "y": 114,
+        "z": "fdc94a5e.7c86f8",
         "wires": []
     },
     {
-        "id": "905f3b23.ac61b8",
-        "type": "get-resource",
-        "name": "get-resource 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 = $prop.sdncRestApi.thirdpartySdnc.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3074.999755859375,
-        "y": 728,
-        "z": "15891279.d6b57e",
-        "wires": [
-            [
-                "7583aec3.33d84",
-                "34076538.0ecf52",
-                "5f6cfa0b.4be42c"
-            ]
-        ]
-    },
-    {
-        "id": "7583aec3.33d84",
+        "id": "5b32aba.7fc39d4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3320.999755859375,
-        "y": 688,
-        "z": "15891279.d6b57e",
+        "x": 4642,
+        "y": 157,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "af220c19.d532d8"
+                "20fc8e76.a69222"
             ]
         ]
     },
     {
-        "id": "34076538.0ecf52",
+        "id": "43d71291.c727fc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3324.999755859375,
-        "y": 728,
-        "z": "15891279.d6b57e",
+        "x": 4634,
+        "y": 212,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "c8a27e43.a20b28"
+                "51e97aab.2d7044"
             ]
         ]
     },
     {
-        "id": "5f6cfa0b.4be42c",
+        "id": "6b05861c.156668",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3316.999755859375,
-        "y": 768,
-        "z": "15891279.d6b57e",
+        "x": 4639,
+        "y": 269,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "d282616c.39fe68"
+                "ef0b1a78.fffea8"
             ]
         ]
     },
     {
-        "id": "d282616c.39fe68",
+        "id": "ef0b1a78.fffea8",
         "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\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=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3474.999755859375,
-        "y": 768,
-        "z": "15891279.d6b57e",
+        "x": 4791,
+        "y": 270,
+        "z": "fdc94a5e.7c86f8",
         "wires": []
     },
     {
-        "id": "c8a27e43.a20b28",
+        "id": "51e97aab.2d7044",
         "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\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=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3474.999755859375,
-        "y": 728,
-        "z": "15891279.d6b57e",
+        "x": 4802,
+        "y": 215,
+        "z": "fdc94a5e.7c86f8",
         "wires": []
     },
     {
-        "id": "af220c19.d532d8",
-        "type": "set",
-        "name": "set controller data",
-        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.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": 3490.999755859375,
-        "y": 688,
-        "z": "15891279.d6b57e",
-        "wires": []
-    },
-    {
-        "id": "c61ae526.8c7cb8",
-        "type": "comment",
-        "name": "Get controller info and send request",
-        "info": "",
-        "comments": "",
-        "x": 3082.999755859375,
-        "y": 688,
-        "z": "15891279.d6b57e",
-        "wires": []
-    },
-    {
-        "id": "24a118da.312548",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "How to know which domain's (A or B) controller is bein retrieved?",
-        "comments": "",
-        "x": 3014.999755859375,
-        "y": 648,
-        "z": "15891279.d6b57e",
-        "wires": []
-    },
-    {
-        "id": "b3f3fc8e.164aa8",
+        "id": "20fc8e76.a69222",
         "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
         "outputs": 1,
-        "x": 2780.666259765625,
-        "y": 1197,
-        "z": "15891279.d6b57e",
+        "x": 4786.38232421875,
+        "y": 154.65567016601562,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "c56d5bdd.22466",
-                "ba468b68.004d98",
-                "8df38d4b.ee6e2"
+                "a8dfc05f.e2f018"
             ]
         ]
     },
     {
-        "id": "9c397b15.bf0e5",
-        "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",
+        "id": "f7ee255a.8640e",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
-        "x": 2771.0621337890625,
-        "y": 1243.8597717285156,
-        "z": "15891279.d6b57e",
-        "wires": []
+        "outputs": 1,
+        "x": 4047,
+        "y": 153,
+        "z": "fdc94a5e.7c86f8",
+        "wires": [
+            [
+                "98badb93.a08c9"
+            ]
+        ]
     },
     {
-        "id": "1f619a9f.fc34dd",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "id": "a8dfc05f.e2f018",
+        "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": 2774.999755859375,
-        "y": 1288,
-        "z": "15891279.d6b57e",
+        "x": 5001,
+        "y": 151,
+        "z": "fdc94a5e.7c86f8",
         "wires": []
     },
     {
-        "id": "ba468b68.004d98",
-        "type": "set",
-        "name": "set sotn_value for ETH deletion",
-        "xml": "<set>\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />\n\n<parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />",
+        "id": "ee878ee.4f8847",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
         "comments": "",
-        "x": 3068.9995346069336,
-        "y": 1274.00004196167,
-        "z": "15891279.d6b57e",
+        "x": 4382,
+        "y": 230,
+        "z": "fdc94a5e.7c86f8",
         "wires": []
     },
     {
-        "id": "8df38d4b.ee6e2",
+        "id": "952ea8f1.7bda",
         "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.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />\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=\"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\"/>",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 3173.9996452331543,
-        "y": 1321.000020980835,
-        "z": "15891279.d6b57e",
+        "x": 3255,
+        "y": 594,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "846e91eb.5fd658",
-                "9847a507.3f69e"
+                "d9dc02b.5b9308",
+                "f01b6c55.209f38"
             ]
         ]
     },
     {
-        "id": "846e91eb.5fd658",
+        "id": "d9dc02b.5b9308",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3519.4996452331543,
-        "y": 1302.000020980835,
-        "z": "15891279.d6b57e",
+        "x": 3601.5,
+        "y": 587,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "dcec496b.f92f38"
+                "174c3f65.a9f0e1"
             ]
         ]
     },
     {
-        "id": "9847a507.3f69e",
+        "id": "f01b6c55.209f38",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3523.4996452331543,
-        "y": 1342.000020980835,
-        "z": "15891279.d6b57e",
+        "x": 3605.5,
+        "y": 627,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "43eceb78.82b2dc"
+                "de16161.028de68"
             ]
         ]
     },
     {
-        "id": "de77a242.224c1",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "put proper values based on connectivity resource retrieved from AAI",
-        "comments": "",
-        "x": 3017.4996452331543,
-        "y": 1229.000020980835,
-        "z": "15891279.d6b57e",
-        "wires": []
-    },
-    {
-        "id": "c56d5bdd.22466",
-        "type": "get-resource",
-        "name": "get-resource 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 = $prop.sdncRestApi.thirdpartySdnc.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
+        "id": "de16161.028de68",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3069.4996452331543,
-        "y": 1155.000020980835,
-        "z": "15891279.d6b57e",
+        "x": 3763,
+        "y": 627,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "c6d3e171.5193a",
-                "9098a017.2895f8",
-                "8e10fa0e.d0c448"
+                "1a3ebd6b.2a7953",
+                "30c3e280.4d41f6"
             ]
         ]
     },
     {
-        "id": "c6d3e171.5193a",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "174c3f65.a9f0e1",
+        "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",
         "comments": "",
-        "outputs": 1,
-        "x": 3315.4996452331543,
-        "y": 1115.000020980835,
-        "z": "15891279.d6b57e",
-        "wires": [
-            [
-                "ec0b6188.dc04e"
-            ]
-        ]
+        "x": 3759.5,
+        "y": 587,
+        "z": "fdc94a5e.7c86f8",
+        "wires": []
     },
     {
-        "id": "9098a017.2895f8",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "1a3ebd6b.2a7953",
+        "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": 3319.4996452331543,
-        "y": 1155.000020980835,
-        "z": "15891279.d6b57e",
+        "x": 4091.5,
+        "y": 627,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
-            [
-                "8b3e7b4d.6376a"
-            ]
+            []
         ]
     },
     {
-        "id": "8e10fa0e.d0c448",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "30c3e280.4d41f6",
+        "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": 3311.4996452331543,
-        "y": 1195.000020980835,
-        "z": "15891279.d6b57e",
+        "x": 4018.5,
+        "y": 673,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
-            [
-                "124616cb.e9eee9"
-            ]
+            []
         ]
     },
     {
-        "id": "124616cb.e9eee9",
-        "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
-        "comments": "",
-        "x": 3469.4996452331543,
-        "y": 1195.000020980835,
-        "z": "15891279.d6b57e",
-        "wires": []
-    },
-    {
-        "id": "8b3e7b4d.6376a",
-        "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
-        "comments": "",
-        "x": 3469.4996452331543,
-        "y": 1155.000020980835,
-        "z": "15891279.d6b57e",
-        "wires": []
-    },
-    {
-        "id": "ec0b6188.dc04e",
-        "type": "set",
-        "name": "set controller data",
-        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.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": 3485.4996452331543,
-        "y": 1115.000020980835,
-        "z": "15891279.d6b57e",
-        "wires": []
-    },
-    {
-        "id": "98e2fbb6.34e38",
-        "type": "comment",
-        "name": "Get controller info and send request",
-        "info": "",
-        "comments": "",
-        "x": 3077.4996452331543,
-        "y": 1115.000020980835,
-        "z": "15891279.d6b57e",
-        "wires": []
-    },
-    {
-        "id": "758d1f74.6d4218",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "How to know which domain's (A or B) controller is bein retrieved?",
-        "comments": "",
-        "x": 3011.9996452331543,
-        "y": 1075.000020980835,
-        "z": "15891279.d6b57e",
-        "wires": []
-    },
-    {
-        "id": "dcec496b.f92f38",
-        "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",
-        "comments": "",
-        "x": 3677.4996452331543,
-        "y": 1302.000020980835,
-        "z": "15891279.d6b57e",
-        "wires": []
-    },
-    {
-        "id": "43eceb78.82b2dc",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "14a01812.a7d138",
+        "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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3680.9996452331543,
-        "y": 1342.000020980835,
-        "z": "15891279.d6b57e",
+        "x": 3228,
+        "y": 466,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "a040c34e.71e608",
-                "29ceb3fa.1e4b14"
+                "8e721e50.020db",
+                "8f6c71d1.f7e258"
             ]
         ]
     },
     {
-        "id": "1acc213f.73169f",
-        "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": 3878.9996452331543,
-        "y": 1299.000020980835,
-        "z": "15891279.d6b57e",
-        "wires": []
-    },
-    {
-        "id": "a040c34e.71e608",
-        "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.vpnName' >\n<parameter name='vpn-id' value='`$tmp.vpnName`' />\n<parameter name='vpn-name' value='`$tmp.vpnName`' />\n\n<parameter name='operational-status' value='DeActivated' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4020.9996452331543,
-        "y": 1341.000020980835,
-        "z": "15891279.d6b57e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "29ceb3fa.1e4b14",
-        "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 = $prop.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='DeActivated' />\n",
+        "id": "8e721e50.020db",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3949.9996452331543,
-        "y": 1390.000020980835,
-        "z": "15891279.d6b57e",
+        "x": 3560.5,
+        "y": 436,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
-            []
+            [
+                "b94a74e8.509ec"
+            ]
         ]
     },
     {
-        "id": "ecca88b1.05406",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "8f6c71d1.f7e258",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3686.499755859375,
-        "y": 915,
-        "z": "15891279.d6b57e",
+        "x": 3565.5,
+        "y": 501,
+        "z": "fdc94a5e.7c86f8",
         "wires": [
             [
-                "f3cb9aac.524828",
-                "4b8d9e90.2bfc"
+                "e36acb2.364b538"
             ]
         ]
     },
     {
-        "id": "b872830e.e33218",
+        "id": "b94a74e8.509ec",
         "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",
         "comments": "",
-        "x": 3682.999755859375,
-        "y": 875,
-        "z": "15891279.d6b57e",
+        "x": 3736.5,
+        "y": 436,
+        "z": "fdc94a5e.7c86f8",
         "wires": []
     },
     {
-        "id": "270674fa.6cafe4",
-        "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": 3878.999755859375,
-        "y": 874,
-        "z": "15891279.d6b57e",
-        "wires": []
-    },
-    {
-        "id": "f3cb9aac.524828",
-        "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.vpnName' >\n<parameter name='vpn-id' value='`$tmp.vpnName`' />\n<parameter name='vpn-name' value='`$tmp.vpnName`' />\n\n<parameter name='operational-status' value='DeActivated' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4014.999755859375,
-        "y": 915,
-        "z": "15891279.d6b57e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4b8d9e90.2bfc",
-        "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 = $prop.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='DeActivated' />\n",
+        "id": "e36acb2.364b538",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3941.999755859375,
-        "y": 961,
-        "z": "15891279.d6b57e",
+        "x": 3732,
+        "y": 501,
+        "z": "fdc94a5e.7c86f8",
         "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 ae15591f..4e31cf5d 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": "fa505d09.c9298",
+        "id": "9067dc50.e26888",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 106,
-        "y": 62,
-        "z": "b189bed1.bef5e8",
+        "x": 130,
+        "y": 78,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "96d975d7.ae7b9"
+                "51326c57.b5118c"
             ]
         ]
     },
     {
-        "id": "96d975d7.ae7b9",
+        "id": "51326c57.b5118c",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1637 +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": 390.2856903076172,
-        "y": 123.23810863494873,
-        "z": "b189bed1.bef5e8",
+        "x": 261.2856903076172,
+        "y": 127.23810863494873,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "197a98e4.ad38d7"
+                "1a80b7c8.5e20d"
             ]
         ]
     },
     {
-        "id": "197a98e4.ad38d7",
+        "id": "1a80b7c8.5e20d",
         "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": 396.42860412597656,
-        "y": 208.00003051757812,
-        "z": "b189bed1.bef5e8",
+        "x": 264.4286193847656,
+        "y": 212.00003242492676,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "eeba2d4.aaa3b5"
+                "727ca303.e92f14"
             ]
         ]
     },
     {
-        "id": "9e471fb5.d24a9",
-        "type": "comment",
-        "name": "site-vnf-topology-operation-delete",
-        "info": "",
-        "comments": "",
-        "x": 968.9162979125977,
-        "y": 129.58639907836914,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "eeba2d4.aaa3b5",
+        "id": "727ca303.e92f14",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 596.2380447387695,
-        "y": 357.6666717529297,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "cdad3ccf.c778c8",
-                "ddca427c.b6135",
-                "16b5196b.e4f74f",
-                "72550323.add05c",
-                "bcb30576.c5395",
-                "1ee10a8.e75cb76",
-                "2400813d.b23cfe",
-                "466b59d1.1f9ec8",
-                "8fb031c0.32361",
-                "4290869b.c0e258",
-                "12c0646.e45499c"
-            ]
-        ]
-    },
-    {
-        "id": "72550323.add05c",
-        "type": "switchNode",
-        "name": "switch service-data.vnfs.vnf_length",
-        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1048.6660919189453,
-        "y": 275.2611792087555,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "f1600d0.d3bcd7",
-                "5da847de.3e7bd8"
-            ]
-        ]
-    },
-    {
-        "id": "f1600d0.d3bcd7",
-        "type": "other",
-        "name": "outcome Null",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1313.3884048461914,
-        "y": 257.81680130958557,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "2758e1f4.65c7de"
-            ]
-        ]
-    },
-    {
-        "id": "2758e1f4.65c7de",
-        "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
-        "comments": "",
-        "x": 1494.3882751464844,
-        "y": 252.81667923927307,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "5da847de.3e7bd8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1298.8884048461914,
-        "y": 309.81676411628723,
-        "z": "b189bed1.bef5e8",
+        "x": 414.238037109375,
+        "y": 341.6666564941406,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "3d795ab1.0cafb6"
+                "89ce3405.afdad8",
+                "f34628af.971e58",
+                "662b7b8b.c02da4"
             ]
         ]
     },
     {
-        "id": "3d795ab1.0cafb6",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1470.888111114502,
-        "y": 309.8167622089386,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "ed865e4c.fb2fe",
-                "ef77d3e7.8772d"
-            ]
-        ]
-    },
-    {
-        "id": "ef77d3e7.8772d",
-        "type": "switchNode",
-        "name": "switch tmp.nidx ",
-        "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1645.888282775879,
-        "y": 328.81668400764465,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "e8dd060b.17e57"
-            ]
-        ]
-    },
-    {
-        "id": "16b5196b.e4f74f",
-        "type": "switchNode",
-        "name": "switch vnf-level-oper-status",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1019.0550918579102,
-        "y": 349.7056429386139,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "284f50fc.866d8",
-                "cdf83757.65b4b8"
-            ]
-        ]
-    },
-    {
-        "id": "284f50fc.866d8",
-        "type": "outcome",
-        "name": "outcome PendingDelete",
-        "xml": "<outcome value='PendingDelete'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1295.8884353637695,
-        "y": 352.8167426586151,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "e9cca7ec.303c7"
-            ]
-        ]
-    },
-    {
-        "id": "cdf83757.65b4b8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1256.8884201049805,
-        "y": 398.8167917728424,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "28762357.a03f74"
-            ]
-        ]
-    },
-    {
-        "id": "28762357.a03f74",
-        "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=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",
-        "comments": "",
-        "x": 1405.3881340026855,
-        "y": 397.81677174568176,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "bcb30576.c5395",
-        "type": "execute",
-        "name": "execute requiredParameters",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"vnf-topology-operation-input.vnf-information.vnf-id\" value=\"$vnf-topology-operation-input.vnf-information.vnf-id\"/>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1035.388427734375,
-        "y": 218.8167588710785,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ed865e4c.fb2fe",
-        "type": "for",
-        "name": "for nidx..service-data.vnfs.vnf[]",
-        "xml": "<for index='nidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1706.3882865905762,
-        "y": 264.8166801929474,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "5b03bf9c.f15f28"
-            ]
-        ]
-    },
-    {
-        "id": "5b03bf9c.f15f28",
-        "type": "switchNode",
-        "name": "switch vnf-id found",
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$nidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1962.3883056640625,
-        "y": 264.8166801929474,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "b0289fb.f82296"
-            ]
-        ]
-    },
-    {
-        "id": "b0289fb.f82296",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2138.888359069824,
-        "y": 267.8166801929474,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "772109f8.0b899"
-            ]
-        ]
-    },
-    {
-        "id": "772109f8.0b899",
-        "type": "set",
-        "name": "set tmp.nidx and ctx.vnf-data",
-        "xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$nidx].vnf-data.`' />\n",
-        "comments": "",
-        "x": 2305.8883743286133,
-        "y": 328.8166801929474,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "68963ea5.a81b48",
-        "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
-        "comments": "",
-        "x": 1951.388298034668,
-        "y": 328.81668400764465,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "e8dd060b.17e57",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1813.888298034668,
-        "y": 328.81668400764465,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "68963ea5.a81b48"
-            ]
-        ]
-    },
-    {
-        "id": "cdad3ccf.c778c8",
-        "type": "set",
-        "name": "set vnfId and vnf-object-path",
-        "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='vnf-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vnf-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'` \" />",
-        "comments": "",
-        "x": 1005.9051132202148,
-        "y": 564.3336856365204,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "ddca427c.b6135",
+        "id": "89ce3405.afdad8",
         "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": 906.0162353515625,
-        "y": 1435.88916015625,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "e9cca7ec.303c7",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1491.1947937011719,
-        "y": 360.14194798469543,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1ee10a8.e75cb76",
-        "type": "set",
-        "name": "set prop.vnfNewidx",
-        "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`0`' />\n",
-        "comments": "",
-        "x": 988.0000839233398,
-        "y": 400.00007796287537,
-        "z": "b189bed1.bef5e8",
+        "x": 710.5716552734375,
+        "y": 618.59716796875,
+        "z": "65374df1.8a48d4",
         "wires": []
     },
     {
-        "id": "2400813d.b23cfe",
-        "type": "for",
-        "name": "for lidx..service-data.vnfs.vnf[]",
-        "xml": "<for index='lidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1012.0000686645508,
-        "y": 442.0000765323639,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "572dbcf2.896d3c"
-            ]
-        ]
-    },
-    {
-        "id": "572dbcf2.896d3c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1273.000144958496,
-        "y": 446.00011134147644,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "53356e5d.7d71c"
-            ]
-        ]
-    },
-    {
-        "id": "53356e5d.7d71c",
-        "type": "switchNode",
-        "name": "switch vnf-id found",
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$lidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1465.0000915527344,
-        "y": 455.00015568733215,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "82733dd2.3a7d"
-            ]
-        ]
-    },
-    {
-        "id": "82733dd2.3a7d",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1651.0001068115234,
-        "y": 439.0000422000885,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "d7f72ca.5dc4ed"
-            ]
-        ]
-    },
-    {
-        "id": "d7f72ca.5dc4ed",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1802.0000305175781,
-        "y": 440.0000784397125,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "920da24f.169358",
-                "953950.d86c6eb"
-            ]
-        ]
-    },
-    {
-        "id": "920da24f.169358",
-        "type": "set",
-        "name": "set  vnf data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$lidx].vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$lidx].vnf-data.`' />\n",
-        "comments": "",
-        "x": 1969.0001983642578,
-        "y": 414.00026202201843,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "953950.d86c6eb",
-        "type": "set",
-        "name": "set prop.vnfNewidx",
-        "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\n",
-        "comments": "",
-        "x": 1989.0001258850098,
-        "y": 471.0001976490021,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "466b59d1.1f9ec8",
-        "type": "set",
-        "name": "set new vnf length",
-        "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf_length\" value='`$prop.vnfidxLen`'/>\n\n\t\n",
-        "comments": "",
-        "x": 980.1014823913574,
-        "y": 485.804429769516,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "8fb031c0.32361",
-        "type": "set",
-        "name": "Remove vnf from ServiceData",
-        "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$prop.vnfidxLen].\" value=\"\"/>\n\n",
-        "comments": "",
-        "x": 1010.0002517700195,
-        "y": 524.0002129077911,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "4290869b.c0e258",
-        "type": "save",
-        "name": "delete AnAI - vnf-instance.orchestration-status",
-        "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $vnfId\" >\n<parameter name=\"orchestration-status\" value=\"PendingDelete\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1067.0066452026367,
-        "y": 601.0106251239777,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "740c712e.7b0a18",
+        "id": "7661af19.3745a8",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 1001,
-        "y": 735,
-        "z": "b189bed1.bef5e8",
+        "x": 742,
+        "y": 293,
+        "z": "65374df1.8a48d4",
         "wires": []
     },
     {
-        "id": "12c0646.e45499c",
+        "id": "f34628af.971e58",
         "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.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\">",
+        "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": 1012,
-        "y": 785,
-        "z": "b189bed1.bef5e8",
+        "x": 762,
+        "y": 389,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "f9064279.1b4f8",
-                "17f4eefe.af8569",
-                "e0ea0e9c.c1ac38"
+                "f2d7e1a3.9c55b8",
+                "893eca26.41fe2",
+                "67ceb9a8.a14aa8"
             ]
         ]
     },
     {
-        "id": "f9064279.1b4f8",
+        "id": "f2d7e1a3.9c55b8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1228,
-        "y": 750,
-        "z": "b189bed1.bef5e8",
+        "x": 981,
+        "y": 327,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "7baaa7aa.36e958"
+                "6a81e2af.afefb4"
             ]
         ]
     },
     {
-        "id": "17f4eefe.af8569",
+        "id": "893eca26.41fe2",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1237.490966796875,
-        "y": 792.5740356445312,
-        "z": "b189bed1.bef5e8",
+        "x": 990.490966796875,
+        "y": 369.57403564453125,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "48a0edde.3f94f4"
+                "adcdedad.e4cfa8"
             ]
         ]
     },
     {
-        "id": "e0ea0e9c.c1ac38",
+        "id": "67ceb9a8.a14aa8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1226,
-        "y": 839,
-        "z": "b189bed1.bef5e8",
+        "x": 979,
+        "y": 416,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "b71eb698.9367c8"
+                "51f8ebc0.b96fdc"
             ]
         ]
     },
     {
-        "id": "48a0edde.3f94f4",
+        "id": "adcdedad.e4cfa8",
         "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": 1391.0623779296875,
-        "y": 795.8597717285156,
-        "z": "b189bed1.bef5e8",
+        "x": 1144.0623779296875,
+        "y": 372.8597717285156,
+        "z": "65374df1.8a48d4",
         "wires": []
     },
     {
-        "id": "b71eb698.9367c8",
+        "id": "51f8ebc0.b96fdc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1395,
-        "y": 840,
-        "z": "b189bed1.bef5e8",
+        "x": 1148,
+        "y": 417,
+        "z": "65374df1.8a48d4",
         "wires": []
     },
     {
-        "id": "7baaa7aa.36e958",
+        "id": "6a81e2af.afefb4",
         "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": 1425,
-        "y": 746,
-        "z": "b189bed1.bef5e8",
+        "x": 1178,
+        "y": 323,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "7f9e9a3e.4de224"
+                "37d91278.b2e28e"
             ]
         ]
     },
     {
-        "id": "7f9e9a3e.4de224",
+        "id": "37d91278.b2e28e",
         "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": 1648.33349609375,
-        "y": 745.9999389648438,
-        "z": "b189bed1.bef5e8",
+        "x": 1401.33349609375,
+        "y": 322.99993896484375,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "316daf9e.190dc"
+                "63dc2a73.eea004"
             ]
         ]
     },
     {
-        "id": "316daf9e.190dc",
+        "id": "63dc2a73.eea004",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1844,
-        "y": 748,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "d510feb6.348d7"
-            ]
-        ]
-    },
-    {
-        "id": "d510feb6.348d7",
-        "type": "switchNode",
-        "name": "switch $rel-index == 0",
-        "xml": "<switch test=\"`$rel-index == 0`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2031.9998664855957,
-        "y": 745.999979019165,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "71f2cf8d.3a35e",
-                "264b9f2.1aba9e"
-            ]
-        ]
-    },
-    {
-        "id": "71f2cf8d.3a35e",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2254.9998664855957,
-        "y": 635.999979019165,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "c924f778.a2b848"
-            ]
-        ]
-    },
-    {
-        "id": "264b9f2.1aba9e",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2225.999755859375,
-        "y": 1062,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "beac7966.aff0e"
-            ]
-        ]
-    },
-    {
-        "id": "c924f778.a2b848",
-        "type": "save",
-        "name": "get connectivityA 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[0].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivityA\" >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2448.9998664855957,
-        "y": 635.999979019165,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "b8d26364.3207e8",
-                "ce782cd0.462e9",
-                "c0db2841.2c9108"
-            ]
-        ]
-    },
-    {
-        "id": "beac7966.aff0e",
-        "type": "save",
-        "name": "get connectivityB 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[1].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivityB\" >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2421.999755859375,
-        "y": 1062,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "e783575a.ee3408",
-                "f2d51460.33b19",
-                "7c2969db.4e66a"
-            ]
-        ]
-    },
-    {
-        "id": "b8d26364.3207e8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2654.9998664855957,
-        "y": 595.999979019165,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "888a4917.61b98"
-            ]
-        ]
-    },
-    {
-        "id": "ce782cd0.462e9",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2655.4908332824707,
-        "y": 641.5740146636963,
-        "z": "b189bed1.bef5e8",
+        "x": 1602.0001335144043,
+        "y": 324.00002098083496,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "a71edbbe.5f5c18"
+                "3bc5d31f.4eff1c"
             ]
         ]
     },
     {
-        "id": "c0db2841.2c9108",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "662b7b8b.c02da4",
+        "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": 2652.9998664855957,
-        "y": 684.999979019165,
-        "z": "b189bed1.bef5e8",
+        "x": 728,
+        "y": 337,
+        "z": "65374df1.8a48d4",
         "wires": [
-            [
-                "a3da676a.d60b68"
-            ]
+            []
         ]
     },
     {
-        "id": "888a4917.61b98",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "3bc5d31f.4eff1c",
+        "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": 2827.6663703918457,
-        "y": 594.999979019165,
-        "z": "b189bed1.bef5e8",
+        "x": 1840,
+        "y": 326,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "e61d24fe.b9f57"
+                "f9ddca30.13fc18",
+                "2e83e20a.a4c64e",
+                "bbb85f3b.347968"
             ]
         ]
     },
     {
-        "id": "a71edbbe.5f5c18",
-        "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": 2818.062244415283,
-        "y": 641.8597507476807,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "a3da676a.d60b68",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 2821.9998664855957,
-        "y": 685.999979019165,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "e783575a.ee3408",
+        "id": "f9ddca30.13fc18",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2641.999755859375,
-        "y": 1033,
-        "z": "b189bed1.bef5e8",
+        "x": 2048,
+        "y": 290,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "589b1078.8544c"
+                "7f6304c6.68b434"
             ]
         ]
     },
     {
-        "id": "f2d51460.33b19",
+        "id": "2e83e20a.a4c64e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2643.49072265625,
-        "y": 1078.5740356445312,
-        "z": "b189bed1.bef5e8",
+        "x": 2048.490966796875,
+        "y": 335.57403564453125,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "41e63be3.fadc5c"
+                "848ced52.aed45"
             ]
         ]
     },
     {
-        "id": "7c2969db.4e66a",
+        "id": "bbb85f3b.347968",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2639.999755859375,
-        "y": 1124,
-        "z": "b189bed1.bef5e8",
+        "x": 2046,
+        "y": 379,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "2d54d7a1.ac5068"
+                "67746d9a.bb8fac"
             ]
         ]
     },
     {
-        "id": "589b1078.8544c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2814.666259765625,
-        "y": 1034,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "be4e9140.d69b68"
-            ]
-        ]
-    },
-    {
-        "id": "41e63be3.fadc5c",
+        "id": "848ced52.aed45",
         "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": 2805.0621337890625,
-        "y": 1080.8597717285156,
-        "z": "b189bed1.bef5e8",
+        "x": 2211.0623779296875,
+        "y": 335.8597717285156,
+        "z": "65374df1.8a48d4",
         "wires": []
     },
     {
-        "id": "2d54d7a1.ac5068",
+        "id": "67746d9a.bb8fac",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2808.999755859375,
-        "y": 1125,
-        "z": "b189bed1.bef5e8",
+        "x": 2215,
+        "y": 380,
+        "z": "65374df1.8a48d4",
         "wires": []
     },
     {
-        "id": "e61d24fe.b9f57",
+        "id": "a1788c2.5cbcc7",
         "type": "save",
-        "name": "get vpn-binding-A 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.connectivityA.relationship-list.relationship[0].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-bindingA\" >\n",
+        "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": 3047,
-        "y": 579,
-        "z": "b189bed1.bef5e8",
+        "x": 2521,
+        "y": 379,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "2b60392e.ff6d9e",
-                "49846022.e395b8",
-                "b35a5936.c908e8"
+                "ff5b5708.803718",
+                "2b7ab4e7.4996c4",
+                "8f3a9f9c.feba08"
             ]
         ]
     },
     {
-        "id": "abc0c7ad.b5acd8",
+        "id": "66c494d6.d131ec",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3431,
-        "y": 579,
-        "z": "b189bed1.bef5e8",
+        "x": 2905,
+        "y": 379,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "4263af43.fa9c48",
-                "196f2286.5bda85",
-                "e474491b.fe4e98",
-                "f4710eb9.81bb",
-                "4d26fd5b.dd7194"
+                "4df4ccfd.828a9c",
+                "cc810976.1e78e",
+                "6804b3fb.447a5c",
+                "1114cd30.8fbe33",
+                "77014142.ee291",
+                "eea604e.273be78",
+                "c7f4c6b5.89c68"
             ]
         ]
     },
     {
-        "id": "4263af43.fa9c48",
-        "type": "set",
-        "name": "set attachment_param for TN NSSSI deleteion in PNC A",
-        "xml": "<set>\n<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$tmp.aai.vpn-bindingA.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$tmp.aai.vpn-bindingA.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n\n",
-        "comments": "",
-        "x": 3783,
-        "y": 572,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "2b60392e.ff6d9e",
+        "id": "ff5b5708.803718",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3258,
-        "y": 581,
-        "z": "b189bed1.bef5e8",
+        "x": 2732,
+        "y": 381,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "abc0c7ad.b5acd8"
+                "66c494d6.d131ec"
             ]
         ]
     },
     {
-        "id": "49846022.e395b8",
+        "id": "2b7ab4e7.4996c4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3258.490966796875,
-        "y": 626.5740356445312,
-        "z": "b189bed1.bef5e8",
+        "x": 2732.490966796875,
+        "y": 426.57403564453125,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "df7bab95.4da49"
+                "71b7f260.a02afc"
             ]
         ]
     },
     {
-        "id": "b35a5936.c908e8",
+        "id": "8f3a9f9c.feba08",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3256,
-        "y": 670,
-        "z": "b189bed1.bef5e8",
+        "x": 2730,
+        "y": 470,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "2e3ee94d.2c9d76"
+                "f1455dfe.4b515"
             ]
         ]
     },
     {
-        "id": "2e3ee94d.2c9d76",
+        "id": "f1455dfe.4b515",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3423,
-        "y": 669,
-        "z": "b189bed1.bef5e8",
+        "x": 2897,
+        "y": 469,
+        "z": "65374df1.8a48d4",
         "wires": []
     },
     {
-        "id": "df7bab95.4da49",
+        "id": "71b7f260.a02afc",
         "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": 3421.0623779296875,
-        "y": 626.8597717285156,
-        "z": "b189bed1.bef5e8",
+        "x": 2895.0623779296875,
+        "y": 426.8597717285156,
+        "z": "65374df1.8a48d4",
         "wires": []
     },
     {
-        "id": "4d26fd5b.dd7194",
-        "type": "execute",
-        "name": "execute RestApiCallNode Delete TN NSSI",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\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=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<!--<parameter name='dirPath' value=\"/opt/sdnc/restapi/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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "id": "7f6304c6.68b434",
+        "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": 3739,
-        "y": 623,
-        "z": "b189bed1.bef5e8",
+        "x": 2249,
+        "y": 285,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "1605b46c.2a0984",
-                "49599f6.eb505e"
+                "df01a5ae.6dc3e8"
             ]
         ]
     },
     {
-        "id": "1605b46c.2a0984",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "df01a5ae.6dc3e8",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4086.5,
-        "y": 593,
-        "z": "b189bed1.bef5e8",
+        "x": 2454,
+        "y": 285,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "c35b0230.a333b8"
+                "3c18e8d0.67c0b"
             ]
         ]
     },
     {
-        "id": "49599f6.eb505e",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "3c18e8d0.67c0b",
+        "type": "outcome",
+        "name": "vpn-binding",
+        "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4101.5,
-        "y": 658,
-        "z": "b189bed1.bef5e8",
+        "x": 2620,
+        "y": 285,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "c575a6f8.585bd8"
+                "2564f00.0bbdd9"
             ]
         ]
     },
     {
-        "id": "c35b0230.a333b8",
-        "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",
-        "comments": "",
-        "x": 4270.5,
-        "y": 589,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "c575a6f8.585bd8",
+        "id": "2564f00.0bbdd9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
-        "comments": "",
         "outputs": 1,
-        "x": 4296,
-        "y": 651,
-        "z": "b189bed1.bef5e8",
+        "x": 2783,
+        "y": 285,
+        "z": "65374df1.8a48d4",
         "wires": [
-            []
+            [
+                "a1788c2.5cbcc7"
+            ]
         ]
     },
     {
-        "id": "196f2286.5bda85",
+        "id": "4df4ccfd.828a9c",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "cc810976.1e78e",
         "type": "get-resource",
-        "name": "get-resource 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 = $prop.sdncRestApi.thirdpartySdnc.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
+        "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": 3734,
-        "y": 444,
-        "z": "b189bed1.bef5e8",
+        "x": 3146,
+        "y": 206,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "1da34d03.94651b",
-                "c42b64ae.aaab8",
-                "25d5725f.b07fee"
+                "fbb5125b.955718",
+                "693af83c.f3ea18",
+                "2473f4a.835008c"
             ]
         ]
     },
     {
-        "id": "1da34d03.94651b",
+        "id": "fbb5125b.955718",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3980,
-        "y": 404,
-        "z": "b189bed1.bef5e8",
+        "x": 3341.5001220703125,
+        "y": 158,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "6e678297.9224ac"
+                "9a9b433a.0ee84"
             ]
         ]
     },
     {
-        "id": "c42b64ae.aaab8",
+        "id": "693af83c.f3ea18",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3984,
-        "y": 444,
-        "z": "b189bed1.bef5e8",
+        "x": 3333.5001220703125,
+        "y": 213,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "96b16b61.297a58"
+                "3249d5d1.aac972"
             ]
         ]
     },
     {
-        "id": "25d5725f.b07fee",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "9a9b433a.0ee84",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3976,
-        "y": 484,
-        "z": "b189bed1.bef5e8",
+        "x": 3485.8824462890625,
+        "y": 157.65567016601562,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "8951a2c3.b71c18"
+                "4c1ac004.69f11"
             ]
         ]
     },
     {
-        "id": "8951a2c3.b71c18",
-        "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
-        "comments": "",
-        "x": 4134,
-        "y": 484,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "96b16b61.297a58",
-        "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+        "id": "4c1ac004.69f11",
+        "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": "",
-        "x": 4134,
-        "y": 444,
-        "z": "b189bed1.bef5e8",
-        "wires": []
+        "outputs": 1,
+        "x": 3670,
+        "y": 156,
+        "z": "65374df1.8a48d4",
+        "wires": [
+            [
+                "4cdbe422.34f9d4"
+            ]
+        ]
     },
     {
-        "id": "6e678297.9224ac",
-        "type": "set",
-        "name": "set controller data",
-        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.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",
+        "id": "4cdbe422.34f9d4",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
-        "x": 4150,
-        "y": 404,
-        "z": "b189bed1.bef5e8",
-        "wires": []
+        "outputs": 1,
+        "x": 3865,
+        "y": 156,
+        "z": "65374df1.8a48d4",
+        "wires": [
+            [
+                "9761202f.b6a0b"
+            ]
+        ]
     },
     {
-        "id": "7ef0083.0af5478",
-        "type": "comment",
-        "name": "Get controller info and send request",
-        "info": "",
+        "id": "2473f4a.835008c",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
-        "x": 3742,
-        "y": 404,
-        "z": "b189bed1.bef5e8",
-        "wires": []
+        "outputs": 1,
+        "x": 3338.5001220703125,
+        "y": 270,
+        "z": "65374df1.8a48d4",
+        "wires": [
+            [
+                "aacead6d.fefcb8"
+            ]
+        ]
     },
     {
-        "id": "3d0f709d.f526f8",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "How to know which domain's (A or B) controller is bein retrieved?",
+        "id": "aacead6d.fefcb8",
+        "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": 3674,
-        "y": 364,
-        "z": "b189bed1.bef5e8",
+        "x": 3490.5001220703125,
+        "y": 271,
+        "z": "65374df1.8a48d4",
         "wires": []
     },
     {
-        "id": "744d9a2e.8e773c",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "Set proper values to generate a good JSON body to be sent to PNC A for TN NSSI deletion.",
+        "id": "3249d5d1.aac972",
+        "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": 3654,
-        "y": 528,
-        "z": "b189bed1.bef5e8",
+        "x": 3501.5001220703125,
+        "y": 214,
+        "z": "65374df1.8a48d4",
         "wires": []
     },
     {
-        "id": "e474491b.fe4e98",
-        "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.connectivityA.connectivity-id'>\n",
+        "id": "4c67262e.3701a8",
+        "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": 3711,
-        "y": 715,
-        "z": "b189bed1.bef5e8",
+        "x": 4453,
+        "y": 173,
+        "z": "65374df1.8a48d4",
         "wires": [
-            []
+            [
+                "906ef06e.7739a8",
+                "cb4dc0cc.5ae2c",
+                "8ceaa5d5.dc9b88"
+            ]
         ]
     },
     {
-        "id": "47618fca.ed7b18",
-        "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": 3646,
-        "y": 681,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "f4710eb9.81bb",
-        "type": "save",
-        "name": "delete vpn-binding resource in AAI",
-        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='tmp.aai.vpn-bindingA = $tmp.aai.vpn-bindingA'>\n",
-        "comments": "",
+        "id": "12825971.5566ff",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 3707,
-        "y": 759,
-        "z": "b189bed1.bef5e8",
+        "x": 4247,
+        "y": 160,
+        "z": "65374df1.8a48d4",
         "wires": [
-            []
+            [
+                "dddd5795.4cbcd",
+                "4c67262e.3701a8",
+                "459c85bd.d88044"
+            ]
         ]
     },
     {
-        "id": "be4e9140.d69b68",
-        "type": "save",
-        "name": "get vpn-binding-B 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.connectivityB.relationship-list.relationship[0].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-bindingB\" >\n",
+        "id": "dddd5795.4cbcd",
+        "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": "",
-        "outputs": 1,
-        "x": 3079,
-        "y": 1027,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "ef723c11.8ecf08",
-                "d24eb3b1.82784",
-                "d82f4ae7.ff1938"
-            ]
-        ]
+        "x": 4483,
+        "y": 121,
+        "z": "65374df1.8a48d4",
+        "wires": []
     },
     {
-        "id": "ef723c11.8ecf08",
+        "id": "906ef06e.7739a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3286,
-        "y": 1030,
-        "z": "b189bed1.bef5e8",
+        "x": 4663,
+        "y": 164,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "db88eddf.0d68b8"
+                "97b50ccf.b69cd8"
             ]
         ]
     },
     {
-        "id": "d24eb3b1.82784",
+        "id": "cb4dc0cc.5ae2c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3286.490966796875,
-        "y": 1075.5740356445312,
-        "z": "b189bed1.bef5e8",
+        "x": 4655,
+        "y": 219,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "b2d386a0.34fcc8"
+                "34cf9d59.f69aea"
             ]
         ]
     },
     {
-        "id": "d82f4ae7.ff1938",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "8ceaa5d5.dc9b88",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3284,
-        "y": 1119,
-        "z": "b189bed1.bef5e8",
+        "x": 4660,
+        "y": 276,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "fced2850.46c338"
+                "6573a76f.8f9128"
             ]
         ]
     },
     {
-        "id": "fced2850.46c338",
+        "id": "6573a76f.8f9128",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\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=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3453,
-        "y": 1120,
-        "z": "b189bed1.bef5e8",
+        "x": 4812,
+        "y": 277,
+        "z": "65374df1.8a48d4",
         "wires": []
     },
     {
-        "id": "b2d386a0.34fcc8",
+        "id": "34cf9d59.f69aea",
         "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",
+        "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": 3449.0623779296875,
-        "y": 1075.8597717285156,
-        "z": "b189bed1.bef5e8",
+        "x": 4823,
+        "y": 222,
+        "z": "65374df1.8a48d4",
         "wires": []
     },
     {
-        "id": "db88eddf.0d68b8",
+        "id": "97b50ccf.b69cd8",
         "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 3455,
-        "y": 1030,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "968b60ca.b919a8",
-                "4bf2b1b3.14be6",
-                "474863fb.23ac14",
-                "13714ee3.ae8141",
-                "408a0c32.404a4c"
-            ]
-        ]
-    },
-    {
-        "id": "968b60ca.b919a8",
-        "type": "set",
-        "name": "set attachment_param for TN NSSSI deleteion in PNC B",
-        "xml": "<set>\n<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$tmp.aai.vpn-bindingB.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$tmp.aai.vpn-bindingB.dst-access-ltp-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$tmp.aai.vpn-bindingB.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n\n",
-        "comments": "",
-        "x": 3816,
-        "y": 1131,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "cb725e7f.5dd5b",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4075,
-        "y": 1158,
-        "z": "b189bed1.bef5e8",
+        "x": 4807.38232421875,
+        "y": 161.65567016601562,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "8ff601d0.110ad8"
+                "e66f9d95.0b353"
             ]
         ]
     },
     {
-        "id": "9cd7bc00.01b8a8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "9761202f.b6a0b",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4090,
-        "y": 1223,
-        "z": "b189bed1.bef5e8",
+        "x": 4068,
+        "y": 160,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "f31755df.8bf058"
+                "12825971.5566ff"
             ]
         ]
     },
     {
-        "id": "8ff601d0.110ad8",
-        "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",
+        "id": "e66f9d95.0b353",
+        "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": 4259,
-        "y": 1154,
-        "z": "b189bed1.bef5e8",
+        "x": 5022,
+        "y": 158,
+        "z": "65374df1.8a48d4",
         "wires": []
     },
     {
-        "id": "f31755df.8bf058",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "459c85bd.d88044",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
         "comments": "",
-        "outputs": 1,
-        "x": 4257.5,
-        "y": 1217,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            []
-        ]
+        "x": 4403,
+        "y": 237,
+        "z": "65374df1.8a48d4",
+        "wires": []
     },
     {
-        "id": "4bf2b1b3.14be6",
+        "id": "1114cd30.8fbe33",
         "type": "execute",
-        "name": "execute RestApiCallNode Delete TN NSSI",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\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=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<!--<parameter name='dirPath' value=\"/opt/sdnc/restapi/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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 3775.5,
-        "y": 1181,
-        "z": "b189bed1.bef5e8",
+        "x": 3270,
+        "y": 504,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "cb725e7f.5dd5b",
-                "9cd7bc00.01b8a8"
+                "aa415b48.c51fe8",
+                "f0d3a65b.427ad8"
             ]
         ]
     },
     {
-        "id": "474863fb.23ac14",
-        "type": "get-resource",
-        "name": "get-resource 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 = $prop.sdncRestApi.thirdpartySdnc.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
+        "id": "aa415b48.c51fe8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3743,
-        "y": 1016,
-        "z": "b189bed1.bef5e8",
+        "x": 3613.5,
+        "y": 499,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "d06c3921.6cace",
-                "88d90a9f.091b3",
-                "12a460ba.ca9617"
+                "c60de7c9.d4f7f8"
             ]
         ]
     },
     {
-        "id": "d06c3921.6cace",
+        "id": "f0d3a65b.427ad8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3989,
-        "y": 976,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "21d11018.7e29f8"
-            ]
-        ]
-    },
-    {
-        "id": "88d90a9f.091b3",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3993,
-        "y": 1016,
-        "z": "b189bed1.bef5e8",
+        "x": 3617.5,
+        "y": 539,
+        "z": "65374df1.8a48d4",
         "wires": [
             [
-                "863d5ed9.b49e18"
+                "a329dc5b.ef894"
             ]
         ]
     },
     {
-        "id": "12a460ba.ca9617",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "a329dc5b.ef894",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3985,
-        "y": 1056,
-        "z": "b189bed1.bef5e8",
+        "x": 3775,
+        "y": 539,
+        "z": "65374df1.8a48d4",
         "wires": [
-            [
-                "1cdaf293.72e3fd"
-            ]
+            []
         ]
     },
     {
-        "id": "1cdaf293.72e3fd",
+        "id": "c60de7c9.d4f7f8",
         "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\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 vpn rest api\" />\n",
         "comments": "",
-        "x": 4143,
-        "y": 1056,
-        "z": "b189bed1.bef5e8",
+        "x": 3771.5,
+        "y": 499,
+        "z": "65374df1.8a48d4",
         "wires": []
     },
     {
-        "id": "863d5ed9.b49e18",
-        "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+        "id": "6804b3fb.447a5c",
+        "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": 4143,
-        "y": 1016,
-        "z": "b189bed1.bef5e8",
+        "x": 3246,
+        "y": 379,
+        "z": "65374df1.8a48d4",
         "wires": []
     },
     {
-        "id": "21d11018.7e29f8",
-        "type": "set",
-        "name": "set controller data",
-        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.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",
+        "id": "77014142.ee291",
+        "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": "",
-        "x": 4159,
-        "y": 976,
-        "z": "b189bed1.bef5e8",
-        "wires": []
+        "outputs": 1,
+        "x": 3176,
+        "y": 814,
+        "z": "65374df1.8a48d4",
+        "wires": [
+            []
+        ]
     },
     {
-        "id": "ef8c4420.4b2328",
-        "type": "comment",
-        "name": "Get controller info and send request",
-        "info": "",
+        "id": "eea604e.273be78",
+        "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": "",
-        "x": 3751,
-        "y": 976,
-        "z": "b189bed1.bef5e8",
-        "wires": []
+        "outputs": 1,
+        "x": 3172,
+        "y": 858,
+        "z": "65374df1.8a48d4",
+        "wires": [
+            []
+        ]
     },
     {
-        "id": "e3821d69.5cd46",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "How to know which domain's (A or B) controller is bein retrieved?",
+        "id": "c7f4c6b5.89c68",
+        "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",
         "comments": "",
-        "x": 3685.5,
-        "y": 936,
-        "z": "b189bed1.bef5e8",
-        "wires": []
+        "outputs": 1,
+        "x": 3233,
+        "y": 677,
+        "z": "65374df1.8a48d4",
+        "wires": [
+            [
+                "e6edfa38.71c268",
+                "137ffb3e.b1daa5"
+            ]
+        ]
     },
     {
-        "id": "e565282f.4ac74",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "Set proper values to generate a good JSON body to be sent to PNC A for TN NSSI deletion.",
+        "id": "137ffb3e.b1daa5",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
-        "x": 3682,
-        "y": 1080,
-        "z": "b189bed1.bef5e8",
-        "wires": []
+        "outputs": 1,
+        "x": 3499,
+        "y": 657,
+        "z": "65374df1.8a48d4",
+        "wires": [
+            [
+                "7548726d.c6844c"
+            ]
+        ]
     },
     {
-        "id": "13714ee3.ae8141",
-        "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.connectivityB.connectivity-id'>\n",
+        "id": "e6edfa38.71c268",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3733,
-        "y": 1273,
-        "z": "b189bed1.bef5e8",
+        "x": 3500.000213623047,
+        "y": 707.9999094009399,
+        "z": "65374df1.8a48d4",
         "wires": [
-            []
+            [
+                "67229e1a.f4d798"
+            ]
         ]
     },
     {
-        "id": "36d49abc.7de96e",
-        "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.",
+        "id": "7548726d.c6844c",
+        "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": 3668,
-        "y": 1239,
-        "z": "b189bed1.bef5e8",
+        "x": 3639.0002479553223,
+        "y": 657.0000009536743,
+        "z": "65374df1.8a48d4",
         "wires": []
     },
     {
-        "id": "408a0c32.404a4c",
-        "type": "save",
-        "name": "delete vpn-binding resource in AAI",
-        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='tmp.aai.vpn-bindingB = $tmp.aai.vpn-bindingB'>\n",
+        "id": "67229e1a.f4d798",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3729,
-        "y": 1317,
-        "z": "b189bed1.bef5e8",
+        "x": 3645.02725982666,
+        "y": 705.7453947067261,
+        "z": "65374df1.8a48d4",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
new file mode 100644
index 00000000..e1b76faf
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
@@ -0,0 +1,333 @@
+<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}'>
+    <method rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync'>
+        <block atomic="true">
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`" />
+                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />
+                <parameter name="restapiUser" value="`$prop.oof.user`" />
+                <parameter name="restapiPassword" value="`$prop.oof.password`" />
+                <parameter name="format" value="json"/>
+                <parameter name="httpMethod" value="post"/>
+                <parameter name="responsePrefix" value="otn-oof"/>
+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                <parameter name="trustStorePassword" value="adminadmin"/>
+                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                <parameter name="keyStorePassword" value="adminadmin"/>
+                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error executing OOF api" />
+                    </return>
+                </outcome>
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+            </execute>
+            <for index='vidx' start='0' end='`$otn-oof.solutions_length`' >
+                <block atomic="true">
+                    <set>
+                        <parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].link`' />
+                    </set>
+                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                  resource="logical-link"
+                                  key="logical-link.link-name = $otn-oof.link-name"
+                                  pfx='tmp.aai.cross-link' local-only='false' >
+                        <!--AND depth = '0'"-->
+                        <outcome value='success'>
+                            <block>
+                                <switch test='`$tmp.aai.cross-link.link-role`'>
+                                    <outcome value='cross-domain'>
+                                        <block atomic="true">
+                                            <for index='lridx' start='0' end='`$tmp.aai.cross-link.relationship-list.relationship_length`' >
+                                                <switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`'>
+                                                    <outcome value='p-interface'>
+                                                        <block>
+                                                            <set>
+                                                                <parameter name='tmp.cross-link.src-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />
+                                                                <parameter name='tmp.cross-link.dst-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[1].relationship-value`" />
+                                                                <parameter name='tmp.src-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />
+                                                                <parameter name='tmp.dst-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`" />
+                                                            </set>
+                                                            <break/>
+                                                        </block>
+                                                    </outcome>
+                                                </switch>
+                                            </for>
+                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                          resource="p-interface"
+                                                          key="pnf.pnf-name = $tmp.src-pnf-name
+		    AND p-interface.interface-name = $tmp.cross-link.src-ltpId"
+                                                          pfx='tmp.aai.src-tp' local-only='false' >
+                                                <!--AND depth = '0'"-->
+                                                <outcome value='success'>
+                                                    <block>
+                                                        <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.src-tp.relationship-list.relationship_length`' >
+                                                            <switch test='`$tmp.aai.src-tp.relationship-list.relationship[$vidx].related-to`'>
+                                                                <outcome value='tunnel-termination-point'>
+                                                                    <block atomic="true">
+                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                            <parameter name="original_string" value='`$tmp.aai.src-tp`'/>
+                                                                            <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                            <parameter name="regex" value="[-]+"/>
+                                                                            <parameter name="ctx_memory_result_key" value="param-prefix-src-tp"/>
+                                                                            <outcome value='success'>
+                                                                                <block atomic="true">
+                                                                                    <set>
+                                                                                        <parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />
+                                                                                    </set>
+                                                                                </block>
+                                                                            </outcome>
+                                                                            <outcome value='failure'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='error-code' value='' />
+                                                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                        </execute>
+                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                      resource="pnf"
+                                                                                      key="pnf.pnf-name = $tmp.src-pnf-name"
+                                                                                      pfx='tmp.aai.src-pnf' local-only='false' >
+                                                                            <!--AND depth = '0'"-->
+                                                                            <outcome value='success'>
+                                                                                <block>
+                                                                                    <set>
+                                                                                        <parameter name='domain-A.node-id' value="`$tmp.aai.src-pnf.pnf-id`" />
+                                                                                        <parameter name='domain-A.tpn' value='1' />
+                                                                                    </set>
+                                                                                    <for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >
+                                                                                        <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>
+                                                                                            <outcome value='network-resource'>
+                                                                                                <block atomic="true">
+                                                                                                    <set>
+                                                                                                        <parameter name='tmp.domain-A.network-id' value="`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].relationship-data[0].relationship-value`" />
+                                                                                                    </set>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="network-resource"
+                                                                                                                  key="network-resource.network-id = $tmp.domain-A.network-id
+		AND depth = '0'"
+                                                                                                                  pfx='tmp.aai.src-network-resource' local-only='false' >
+                                                                                                        <outcome value='success'>
+                                                                                                            <set>
+                                                                                                                <parameter name='domain-A.network-id' value="`$tmp.aai.src-network-resource.network-id`" />
+                                                                                                                <parameter name='domain-A.provider-id' value="`$tmp.aai.src-network-resource.provider-id`" />
+                                                                                                                <parameter name='domain-A.client-id' value="`$tmp.aai.src-network-resource.client-id`" />
+                                                                                                                <parameter name='domain-A.te-topo-id' value="`$tmp.aai.src-network-resource.te-topo-id`" />
+                                                                                                                <parameter name='domain-A.network-type' value="`$tmp.aai.src-network-resource.network-type`" />
+                                                                                                            </set>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <break/>
+                                                                                                </block>
+                                                                                            </outcome>
+                                                                                        </switch>
+                                                                                    </for>
+                                                                                </block>
+                                                                            </outcome>
+                                                                            <outcome value='not-found'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
+                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                            <outcome value='Other'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
+                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                        </get-resource>
+                                                                        <set>
+                                                                            <parameter name='tmp.domain-A.ttp-id' value="`$tmp.aai.src-tp.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
+                                                                        </set>
+                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                      resource="tunnel-termination-point"
+                                                                                      key="tunnel-termination-point.ttp-id = $tmp.domain-A.ttp-id
+		AND depth = '0'"
+                                                                                      pfx='tmp.aai.src-ttp' local-only='false' >
+                                                                            <outcome value='success'>
+                                                                                <block atomic="true">
+                                                                                    <set>
+                                                                                        <parameter name='domain-A.tunnel-tp-id' value="`$tmp.aai.src-ttp.tunnel-tp-id`" />
+                                                                                    </set>
+                                                                                </block>
+                                                                            </outcome>
+                                                                        </get-resource>
+                                                                        <break/>
+                                                                    </block>
+                                                                </outcome>
+                                                            </switch>
+                                                        </for>
+                                                    </block>
+                                                </outcome>
+                                                <outcome value='not-found'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                    </return>
+                                                </outcome>
+                                            </get-resource>
+                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                          resource="p-interface"
+                                                          key="pnf.pnf-name = $tmp.dst-pnf-name
+		    AND p-interface.interface-name = $tmp.cross-link.dst-ltpId"
+                                                          pfx='tmp.aai.dst-tp' local-only='false' >
+                                                <!--AND depth = '0'"-->
+                                                <outcome value='success'>
+                                                    <block>
+                                                        <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.dst-tp.relationship-list.relationship_length`' >
+                                                            <switch test='`$tmp.aai.dst-tp.relationship-list.relationship[$vidx].related-to`'>
+                                                                <outcome value='tunnel-termination-point'>
+                                                                    <block atomic="true">
+                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                            <parameter name="original_string" value='`$tmp.aai.dst-tp`'/>
+                                                                            <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                            <parameter name="regex" value="[-]+"/>
+                                                                            <parameter name="ctx_memory_result_key" value="param-prefix-dst-tp"/>
+                                                                            <outcome value='success'>
+                                                                                <block atomic="true">
+                                                                                    <set>
+                                                                                        <parameter name='domain-B.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />
+                                                                                    </set>
+                                                                                </block>
+                                                                            </outcome>
+                                                                            <outcome value='failure'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='error-code' value='' />
+                                                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                        </execute>
+                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                      resource="pnf"
+                                                                                      key="pnf.pnf-name = $tmp.dst-pnf-name"
+                                                                                      pfx='tmp.aai.dst-pnf' local-only='false' >
+                                                                            <!--AND depth = '0'"-->
+                                                                            <outcome value='success'>
+                                                                                <block>
+                                                                                    <set>
+                                                                                        <parameter name='domain-B.node-id' value="`$tmp.aai.dst-pnf.pnf-id`" />
+                                                                                        <parameter name='domain-B.tpn' value='1' />
+                                                                                    </set>
+                                                                                    <for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >
+                                                                                        <switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>
+                                                                                            <outcome value='network-resource'>
+                                                                                                <block atomic="true">
+                                                                                                    <set>
+                                                                                                        <parameter name='tmp.domain-B.network-id' value="`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].relationship-data[0].relationship-value`" />
+                                                                                                    </set>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="network-resource"
+                                                                                                                  key="network-resource.network-id = $tmp.domain-B.network-id
+		AND depth = '0'"
+                                                                                                                  pfx='tmp.aai.dst-network-resource' local-only='false' >
+                                                                                                        <outcome value='success'>
+                                                                                                            <set>
+                                                                                                                <parameter name='domain-B.network-id' value="`$tmp.aai.dst-network-resource.network-id`" />
+                                                                                                                <parameter name='domain-B.provider-id' value="`$tmp.aai.dst-network-resource.provider-id`" />
+                                                                                                                <parameter name='domain-B.client-id' value="`$tmp.aai.dst-network-resource.client-id`" />
+                                                                                                                <parameter name='domain-B.te-topo-id' value="`$tmp.aai.dst-network-resource.te-topo-id`" />
+                                                                                                                <parameter name='domain-B.network-type' value="`$tmp.aai.dst-network-resource.network-type`" />
+                                                                                                            </set>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <break/>
+                                                                                                </block>
+                                                                                            </outcome>
+                                                                                        </switch>
+                                                                                    </for>
+                                                                                </block>
+                                                                            </outcome>
+                                                                            <outcome value='not-found'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
+                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                            <outcome value='Other'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
+                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                        </get-resource>
+                                                                        <set>
+                                                                            <parameter name='tmp.domain-B.ttp-id' value="`$tmp.aai.dst-tp.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
+                                                                        </set>
+                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                      resource="tunnel-termination-point"
+                                                                                      key="tunnel-termination-point.ttp-id = $tmp.domain-B.ttp-id
+		AND depth = '0'"
+                                                                                      pfx='tmp.aai.dst-ttp' local-only='false' >
+                                                                            <outcome value='success'>
+                                                                                <block atomic="true">
+                                                                                    <set>
+                                                                                        <parameter name='domain-B.tunnel-tp-id' value="`$tmp.aai.dst-ttp.tunnel-tp-id`" />
+                                                                                    </set>
+                                                                                </block>
+                                                                            </outcome>
+                                                                        </get-resource>
+                                                                        <break/>
+                                                                    </block>
+                                                                </outcome>
+                                                            </switch>
+                                                        </for>
+                                                    </block>
+                                                </outcome>
+                                                <outcome value='not-found'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                    </return>
+                                                </outcome>
+                                            </get-resource>
+                                            <break/>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                            </block>
+                        </outcome>
+                        <outcome value='not-found'>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                            </return>
+                        </outcome>
+                        <outcome value='Other'>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                            </return>
+                        </outcome>
+                    </get-resource>
+                </block>
+            </for>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-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 5d181c93..c3b48106 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
@@ -1,447 +1,441 @@
 <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}'>
+        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}'>
     <method rpc='tsli-vnf-topology-operation-trans-slice-activate' mode='sync'>
         <block atomic="true">
-            <switch test='`$service-data.vnfs.vnf_length`'>
-                <outcome value='0'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />
-                    </return>
-                </outcome>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />
-                    </return>
-                </outcome>
-                <outcome value='Other'>
-                    <block atomic="true">
-                        <for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >
-                            <block>
-                                <switch test="`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`">
-                                    <outcome value='true'>
-                                        <set>
-                                            <parameter name='tmp.vidx' value='`$vidx`' />
-                                            <parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                            </block>
-                        </for>
-                    </block>
-                </outcome>
-            </switch>
-            <switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>
-                <outcome value='Created'>
-                    <block atomic="true"></block>
-                </outcome>
-                <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`" />
-                    </return>
-                </outcome>
-            </switch>
-            <set>
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />
-            </set>
-            <set>
-                <parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
-                <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` " />
-            </set>
-            <set>
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />
-            </set>
-            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="generic-vnf"   
-		key="generic-vnf.vnf-id = $vnfId" >
-                <parameter name="orchestration-status" value="Active" />
-                <parameter name="vnf-type" value="some vnf-type" />
-            </update>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="service-instance"
-	key='service-instance.service-instance-id = $service-data.service-information.service-instance-id
-         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id 
-         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'
-	local-only="false"
-	force="true" pfx="tmp.aai.service-instance">
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+            <!--	resource="service-instance"-->
+            <!--	key='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->
+            <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->
+            <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->
+            <!--	local-only="false"-->
+            <!--	force="true" pfx="tmp.aai.service-instance">-->
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                          resource="service-instance"
+                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                          local-only="false"
+                          force="true" pfx="tmp.aai.service-instance">
+                <!--$vnf-topology-operation-input.service-information.service-instance-id-->
                 <outcome value='success'>
                     <for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >
                         <switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>
                             <outcome value='connectivity'>
-                                <switch test="`$rel-index == 0`">
-                                    <outcome value='true'>
-                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="connectivity"
-	    key="connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[0].relationship-data[0].relationship-value"
-		local-only="false" 
-		pfx="tmp.aai.connectivityA" >
-                                            <outcome value='success'>
-                                                <block atomic="true">
-                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="vpn-binding"
-	    key="vpn-binding.vpn-id = $tmp.aai.connectivityA.relationship-list.relationship[0].relationship-data[0].relationship-value"
-		local-only="false" 
-		pfx="tmp.aai.vpn-bindingA" >
-                                                        <outcome value='success'>
-                                                            <block atomic="true">
-                                                                <set>
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$tmp.aai.vpn-bindingA.access-node-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$tmp.aai.vpn-bindingA.access-node-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />
-                                                                </set>
-                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`" />
-                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`" />
-                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                                                    <parameter name="format" value="json"/>
-                                                                    <parameter name="httpMethod" value="patch"/>
-                                                                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                                    <!--<parameter name='dirPath' value="/opt/sdnc/restapi/yang" />-->
-                                                                    <parameter name="responsePrefix" value="vpn-result"/>
-                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                    <outcome value='failure'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="Error executing Create vpn rest api" />
-                                                                        </return>
-                                                                    </outcome>
-                                                                    <outcome value='success'>
-                                                                        <block atomic="true"></block>
-                                                                    </outcome>
-                                                                </execute>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='not-found'>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                            </return>
-                                                        </outcome>
-                                                        <outcome value='failure'>
-                                                            <return status='failure'>
-                                                                <parameter name='error-code' value='' />
-                                                                <parameter name='error-message' value='' />
-                                                            </return>
-                                                        </outcome>
-                                                    </get-resource>
-                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="esr-thirdparty-sdnc" 
-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND 
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="connectivity"
+                                              key="connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"
+                                              local-only="false"
+                                              pfx="tmp.aai.connectivity" >
+                                    <outcome value='success'>
+                                        <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
+                                            <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
+                                                <outcome value='vpn-binding'>
+                                                    <block atomic="true">
+                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                      resource="vpn-binding"
+                                                                      key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
+                                                                      local-only="false"
+                                                                      pfx="tmp.aai.vpn-binding" >
+                                                            <outcome value='success'>
+                                                                <block atomic="true">
+                                                                    <switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>
+                                                                        <outcome value='Other'>
+                                                                            <block atomic="true">
+                                                                                <set>
+                                                                                    <parameter name='tmp.aai.vpn-bindingA.' value="`$tmp.aai.vpn-binding.`" />
+                                                                                    <parameter name='tmp.aai.connectivityA.' value="`$tmp.aai.connectivity.`" />
+                                                                                </set>
+                                                                                <set>
+                                                                                    <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />
+                                                                                    <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />
+                                                                                    <parameter name='dst-tpn-id' value='1' />
+                                                                                    <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />
+                                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                    <parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
+                                                                                    <parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />
+                                                                                    <parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />
+                                                                                    <parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />
+                                                                                </set>
+                                                                                <set>
+                                                                                    <parameter name='tmp.src.domainA.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +
+                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +
+                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +
+                                                   $tmp.aai.vpn-bindingA.src-access-node-id`" />
+                                                                                </set>
+                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                              resource="pnf"
+                                                                                              key="pnf.pnf-name = $tmp.src.domainA.pnf-name"
+                                                                                              pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                                    <!--AND depth = '0'"-->
+                                                                                    <outcome value='success'>
+                                                                                        <block>
+                                                                                            <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
+                                                                                                <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                                    <outcome value='esr-thirdparty-sdnc'>
+                                                                                                        <block atomic="true">
+                                                                                                            <set>
+                                                                                                                <parameter name='tmp.domainA.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                            </set>
+                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                          resource="esr-thirdparty-sdnc"
+                                                                                                                          key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND
 		     depth = '1'"
-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
-                                                        <outcome value='success'>
-                                                            <set>
-                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                <!--<parameter name="format" value="json"/>-->
-                                                                <!--<parameter name="httpMethod" value="get"/>-->
-                                                                <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                            </set>
-                                                        </outcome>
-                                                        <outcome value='not-found'>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                                                            </return>
-                                                        </outcome>
-                                                        <outcome value='Other'>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                                                            </return>
-                                                        </outcome>
-                                                    </get-resource>
-                                                    <set>
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id' value='`$oof.vpn.access-node-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id' value='`$oof.vpn.access-node-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />
-                                                    </set>
-                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
-                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />
-                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                                        <parameter name="format" value="json"/>
-                                                        <parameter name="httpMethod" value="patch"/>
-                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                        <parameter name="responsePrefix" value="vpn-result"/>
-                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                                        <outcome value='failure'>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
-                                                            </return>
-                                                        </outcome>
-                                                        <outcome value='success'>
-                                                            <block atomic="true">
-                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' 
-      key='vpn-binding.vpn-id = $tmp.vpnName' >
-                                                                    <parameter name='vpn-id' value='`$tmp.vpnName`' />
-                                                                    <parameter name='vpn-name' value='`$tmp.vpnName`' />
-                                                                    <parameter name='operational-status' value='Activated' />
-                                                                </update>
-                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
-      key='connectivity.connectivity-id = $prop.connectivity-domainA-uuid'>
-                                                                    <parameter name='connectivity-id' value='`$prop.connectivity-domainA-uuid`' />
-                                                                    <parameter name='operational-status' value='Activated' />
-                                                                </update>
-                                                            </block>
-                                                        </outcome>
-                                                    </execute>
-                                                </block>
-                                            </outcome>
-                                            <outcome value='not-found'>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                </return>
-                                            </outcome>
-                                            <outcome value='failure'>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='' />
-                                                    <parameter name='error-message' value='' />
-                                                </return>
-                                            </outcome>
-                                        </get-resource>
-                                    </outcome>
-                                    <outcome value='false'>
-                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="connectivity"
-	    key="connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[1].relationship-data[0].relationship-value"
-		local-only="false" 
-		pfx="tmp.aai.connectivityB" >
-                                            <outcome value='success'>
-                                                <block atomic="true">
-                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="vpn-binding"
-	    key="vpn-binding.vpn-id = $tmp.aai.connectivityB.relationship-list.relationship[0].relationship-data[0].relationship-value"
-		local-only="false" 
-		pfx="tmp.aai.vpn-bindingB" >
-                                                        <outcome value='success'>
-                                                            <block atomic="true">
-                                                                <set>
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$tmp.aai.vpn-bindingB.access-node-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$tmp.aai.vpn-bindingB.dst-access-ltp-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$tmp.aai.vpn-bindingB.access-node-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />
-                                                                </set>
-                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`" />
-                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`" />
-                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                                                    <parameter name="format" value="json"/>
-                                                                    <parameter name="httpMethod" value="patch"/>
-                                                                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                                    <!--<parameter name='dirPath' value="/opt/sdnc/restapi/yang" />-->
-                                                                    <parameter name="responsePrefix" value="vpn-result"/>
-                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                    <outcome value='failure'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="Error executing Create vpn rest api" />
-                                                                        </return>
-                                                                    </outcome>
-                                                                    <outcome value='success'>
-                                                                        <block atomic="true"></block>
-                                                                    </outcome>
-                                                                </execute>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='not-found'>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                            </return>
-                                                        </outcome>
-                                                        <outcome value='failure'>
-                                                            <return status='failure'>
-                                                                <parameter name='error-code' value='' />
-                                                                <parameter name='error-message' value='' />
-                                                            </return>
-                                                        </outcome>
-                                                    </get-resource>
-                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="esr-thirdparty-sdnc" 
-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND 
+                                                                                                                          pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                <outcome value='success'>
+                                                                                                                    <block>
+                                                                                                                        <set>
+                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                            <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                            <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                            <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                            <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                            <!--<parameter name="format" value="json"/>-->
+                                                                                                                            <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                            <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                        </set>
+                                                                                                                    </block>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='not-found'>
+                                                                                                                    <return status='failure'>
+                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                    </return>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='Other'>
+                                                                                                                    <return status='failure'>
+                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                    </return>
+                                                                                                                </outcome>
+                                                                                                            </get-resource>
+                                                                                                        </block>
+                                                                                                    </outcome>
+                                                                                                </switch>
+                                                                                            </for>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                    <outcome value='not-found'>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
+                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                        </return>
+                                                                                    </outcome>
+                                                                                    <outcome value='Other'>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
+                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                        </return>
+                                                                                    </outcome>
+                                                                                </get-resource>
+                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />
+                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`" />
+                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
+                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                                                                    <parameter name="format" value="json"/>
+                                                                                    <parameter name="httpMethod" value="post"/>
+                                                                                    <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                                    <outcome value='failure'>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
+                                                                                            <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                                                        </return>
+                                                                                    </outcome>
+                                                                                    <outcome value='success'>
+                                                                                        <block atomic="true"></block>
+                                                                                    </outcome>
+                                                                                </execute>
+                                                                                <set>
+                                                                                    <parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />
+                                                                                    <parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />
+                                                                                    <parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />
+                                                                                    <parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />
+                                                                                    <parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
+                                                                                    <parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />
+                                                                                    <parameter name='index-number' value='0' />
+                                                                                    <parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />
+                                                                                    <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />
+                                                                                </set>
+                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />
+                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                                                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
+                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                                                                    <parameter name="format" value="json"/>
+                                                                                    <parameter name="httpMethod" value="post"/>
+                                                                                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                    <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                    <outcome value='failure'>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
+                                                                                            <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                                                        </return>
+                                                                                    </outcome>
+                                                                                    <outcome value='success'>
+                                                                                        <block atomic="true">
+                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >
+                                                                                                <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />
+                                                                                                <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-id`' />
+                                                                                                <parameter name='operational-status' value='Activated' />
+                                                                                            </update>
+                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                    key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>
+                                                                                                <parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />
+                                                                                                <parameter name='operational-status' value='Activated' />
+                                                                                            </update>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                </execute>
+                                                                            </block>
+                                                                        </outcome>
+                                                                        <outcome value=''>
+                                                                            <switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>
+                                                                                <outcome value='Other'>
+                                                                                    <block atomic="true">
+                                                                                        <set>
+                                                                                            <parameter name='tmp.aai.vpn-bindingB.' value="`$tmp.aai.vpn-binding.`" />
+                                                                                            <parameter name='tmp.aai.connectivityB.' value="`$tmp.aai.connectivity.`" />
+                                                                                        </set>
+                                                                                        <set>
+                                                                                            <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />
+                                                                                            <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />
+                                                                                            <parameter name='src-tpn-id' value='1' />
+                                                                                            <parameter name='src-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='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`' />
+                                                                                        </set>
+                                                                                        <set>
+                                                                                            <parameter name='tmp.dst.domainB.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +
+                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +
+                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +
+                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`" />
+                                                                                        </set>
+                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                      resource="pnf"
+                                                                                                      key="pnf.pnf-name = $tmp.dst.domainB.pnf-name"
+                                                                                                      pfx='tmp.aai.destination-pnf' local-only='false' >
+                                                                                            <!--AND depth = '0'"-->
+                                                                                            <outcome value='success'>
+                                                                                                <block>
+                                                                                                    <for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >
+                                                                                                        <switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>
+                                                                                                            <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                <block atomic="true">
+                                                                                                                    <set>
+                                                                                                                        <parameter name='tmp.domainB.esr-thirdparty-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
+                                                                                                                    </set>
+                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                  resource="esr-thirdparty-sdnc"
+                                                                                                                                  key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND
 		     depth = '1'"
-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
-                                                        <outcome value='success'>
-                                                            <set>
-                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                <!--<parameter name="format" value="json"/>-->
-                                                                <!--<parameter name="httpMethod" value="get"/>-->
-                                                                <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                            </set>
-                                                        </outcome>
-                                                        <outcome value='not-found'>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                                                            </return>
-                                                        </outcome>
-                                                        <outcome value='Other'>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                                                            </return>
-                                                        </outcome>
-                                                    </get-resource>
-                                                    <set>
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id' value='`$oof.vpn.access-node-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id' value='`$oof.vpn.access-node-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />
-                                                    </set>
-                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
-                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />
-                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                                        <parameter name="format" value="json"/>
-                                                        <parameter name="httpMethod" value="patch"/>
-                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                        <parameter name="responsePrefix" value="vpn-result"/>
-                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                                        <outcome value='failure'>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
-                                                            </return>
-                                                        </outcome>
-                                                        <outcome value='success'>
-                                                            <block atomic="true">
-                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' 
-      key='vpn-binding.vpn-id = $tmp.vpnName' >
-                                                                    <parameter name='vpn-id' value='`$tmp.vpnName`' />
-                                                                    <parameter name='vpn-name' value='`$tmp.vpnName`' />
-                                                                    <parameter name='operational-status' value='Activated' />
-                                                                </update>
-                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
-      key='connectivity.connectivity-id = $prop.connectivity-domainA-uuid'>
-                                                                    <parameter name='connectivity-id' value='`$prop.connectivity-domainA-uuid`' />
-                                                                    <parameter name='operational-status' value='Activated' />
-                                                                </update>
-                                                            </block>
-                                                        </outcome>
-                                                    </execute>
-                                                </block>
-                                            </outcome>
-                                            <outcome value='not-found'>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                </return>
-                                            </outcome>
-                                            <outcome value='failure'>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='' />
-                                                    <parameter name='error-message' value='' />
-                                                </return>
-                                            </outcome>
-                                        </get-resource>
+                                                                                                                                  pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                        <outcome value='success'>
+                                                                                                                            <block>
+                                                                                                                                <set>
+                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                    <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                    <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                                    <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                                    <!--<parameter name="format" value="json"/>-->
+                                                                                                                                    <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                                    <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                    <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                    <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                    <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                    <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                </set>
+                                                                                                                            </block>
+                                                                                                                        </outcome>
+                                                                                                                        <outcome value='not-found'>
+                                                                                                                            <return status='failure'>
+                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                            </return>
+                                                                                                                        </outcome>
+                                                                                                                        <outcome value='Other'>
+                                                                                                                            <return status='failure'>
+                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                            </return>
+                                                                                                                        </outcome>
+                                                                                                                    </get-resource>
+                                                                                                                </block>
+                                                                                                            </outcome>
+                                                                                                        </switch>
+                                                                                                    </for>
+                                                                                                </block>
+                                                                                            </outcome>
+                                                                                            <outcome value='not-found'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='Other'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                        </get-resource>
+                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-dst-domain-creation.templatefile`" />
+                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te: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="responsePrefix" value="otn-oof"/>
+                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                            <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                            <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                                            <outcome value='failure'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                    <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='success'>
+                                                                                                <block atomic="true"></block>
+                                                                                            </outcome>
+                                                                                        </execute>
+                                                                                        <set>
+                                                                                            <parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />
+                                                                                            <parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />
+                                                                                            <parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />
+                                                                                            <parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />
+                                                                                            <parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
+                                                                                            <parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />
+                                                                                            <parameter name='index-number' value='0' />
+                                                                                            <parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />
+                                                                                            <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />
+                                                                                        </set>
+                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />
+                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                                                                            <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
+                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
+                                                                                            <parameter name="format" value="json"/>
+                                                                                            <parameter name="httpMethod" value="patch"/>
+                                                                                            <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                            <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                            <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                            <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                            <outcome value='failure'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                    <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='success'>
+                                                                                                <block atomic="true">
+                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                            key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >
+                                                                                                        <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />
+                                                                                                        <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-id`' />
+                                                                                                        <parameter name='operational-status' value='Activated' />
+                                                                                                    </update>
+                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                            key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>
+                                                                                                        <parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />
+                                                                                                        <parameter name='operational-status' value='Activated' />
+                                                                                                    </update>
+                                                                                                </block>
+                                                                                            </outcome>
+                                                                                        </execute>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                                <outcome value=''>
+                                                                                    <return status='failure'>
+                                                                                        <parameter name='error-code' value='' />
+                                                                                        <parameter name='error-message' value='' />
+                                                                                    </return>
+                                                                                </outcome>
+                                                                            </switch>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </block>
+                                                            </outcome>
+                                                            <outcome value='not-found'>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                </return>
+                                                            </outcome>
+                                                            <outcome value='failure'>
+                                                                <return status='failure'>
+                                                                    <parameter name='error-code' value='' />
+                                                                    <parameter name='error-message' value='' />
+                                                                </return>
+                                                            </outcome>
+                                                        </get-resource>
+                                                    </block>
+                                                </outcome>
+                                            </switch>
+                                        </for>
+                                    </outcome>
+                                    <outcome value='not-found'>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                        </return>
+                                    </outcome>
+                                    <outcome value='failure'>
+                                        <return status='failure'>
+                                            <parameter name='error-code' value='' />
+                                            <parameter name='error-message' value='' />
+                                        </return>
                                     </outcome>
-                                </switch>
+                                </get-resource>
                             </outcome>
                         </switch>
                     </for>
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 a0c46f57..33e7facb 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
@@ -1,129 +1,57 @@
 <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}'>
+        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}'>
     <method rpc='tsli-vnf-topology-operation-trans-slice-allocate' mode='sync'>
         <block atomic="true">
-            <switch test='`$service-data.vnfs.vnf_length`'>
-                <outcome value=''>
-                    <set>
-                        <parameter name='vnf-index' value='0' />
-                    </set>
-                </outcome>
-                <outcome value='Other'>
-                    <block>
-                        <set>
-                            <parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />
-                        </set>
-                        <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >
-                            <switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>
-                                <outcome value='true'>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id
-      + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`" />
-                                    </return>
-                                </outcome>
-                            </switch>
-                        </for>
-                    </block>
-                </outcome>
-            </switch>
-            <for index="idx" start="0" end="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`">
-                <block>
-                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                        <parameter name="original_string" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`'/>
-                        <parameter name="regex" value="_"/>
-                        <parameter name="ctx_memory_result_key" value="param-prefix"/>
-                    </execute>
-                    <set>
-                        <parameter name="`vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`" value='`$param-prefix[$param-prefix_length -1]`'/>
-                    </set>
-                </block>
-            </for>
-            <set>
-                <parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />
-            </set>
-            <for index="idx" start="0" end="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`">
-                <block>
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.vnfName' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                </block>
-            </for>
-            <set>
-                <parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                <parameter name="ctx-destination" value="prop.vnf-id"/>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
             </execute>
-            <set>
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />
-            </set>
-            <set>
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-id`' />
-            </set>
-            <set>
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />
-            </set>
-            <set>
-                <parameter name='vnfId' value='`$prop.vnf-id`' />
-                <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` " />
-            </set>
-            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="generic-vnf"   
-		key='generic-vnf.vnf-id = $prop.vnf-id' >
-                <parameter name="orchestration-status" value="Created" />
-                <parameter name="in-maint" value = "true" />
-                <parameter name="vnf-type" value='`$prop.vnfName`' />
-                <parameter name="vnf-name" value = "`$prop.vnfName`"/>
-                <parameter name="model-invariant-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`"/>
-                <parameter name="model-version-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`"/>
-                <parameter name="model-customization-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`"/>
-            </save>
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' 
-      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id
-         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id 
-         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' 
-      force="true" pfx="tmp.AnAI-data">
-                <parameter name="relationship-list.relationship[0].related-to" value="generic-vnf" />
-                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`" />
-                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="generic-vnf.vnf-id" />
-                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vnf-id`" />
-                <!--key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
-                <!--key='service-instance.service-instance-id = $service-data.service-instance-id -->
-            </save>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="service-instance"
-	key='service-instance.service-instance-id = $service-data.service-information.service-instance-id
-         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id 
-         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'
-	local-only="false"
-	force="true" pfx="tmp.aai.service-instance">
+            <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+            <!--	resource="service-instance"-->
+            <!--	key='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->
+            <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->
+            <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->
+            <!--	local-only="false"-->
+            <!--	force="true" pfx="tmp.aai.service-instance">-->
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                          resource="service-instance"
+                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                          local-only="false"
+                          force="true" pfx="tmp.aai.service-instance">
+                <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                <!--	resource="service-instance"-->
+                <!--	key='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->
+                <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->
+                <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->
+                <!--	local-only="false"-->
+                <!--	force="true" pfx="tmp.aai.service-instance">-->
                 <outcome value='success'>
                     <switch test='`$tmp.aai.service-instance.allotted-resources_length != 0`'>
                         <outcome value='false'></outcome>
                         <outcome value='true'>
                             <block>
                                 <set>
-                                    <parameter name='allotted-resource-id' value="`$tmp.aai.service-instance.allotted-resources[0]`" />
+                                    <parameter name='allotted-resource-id' value="`$tmp.aai.service-instance.allotted-resources.allotted-resource[0].id`" />
                                 </set>
-                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="allotted-resource"
-	key='allotted-resource.id = $allotted-resource-id'
-	local-only="false"
-	force="true" pfx="tmp.aai.allotted-resource">
+                                <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                <!--	resource="allotted-resource"-->
+                                <!--	key='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->
+                                <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->
+                                <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->
+                                <!--         AND allotted-resource.id = $allotted-resource-id'-->
+                                <!--	local-only="false"-->
+                                <!--	force="true" pfx="tmp.aai.allotted-resource">-->
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="allotted-resource"
+                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type
+         AND allotted-resource.id = $allotted-resource-id'
+                                              local-only="false"
+                                              force="true" pfx="tmp.aai.allotted-resource">
                                     <outcome value='not-found'>
                                         <return status='failure'>
                                             <parameter name='ack-final' value='Y'/>
@@ -138,366 +66,833 @@
                                         </return>
                                     </outcome>
                                     <outcome value='success'>
-                                        <switch test='`$tmp.aai.allotted-resource.logical-links_length != 0`'>
-                                            <outcome value='false'></outcome>
-                                            <outcome value='true'>
-                                                <block>
-                                                    <set>
-                                                        <parameter name='logical-link-name' value="`$tmp.aai.allotted-resource.logical-links[0]`" />
-                                                    </set>
-                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="logical-link"
-	key='logical-link.name = $logical-link-name'
-	local-only="false"
-	force="true" pfx="tmp.aai.logical-link">
-                                                        <outcome value='not-found'>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                            </return>
-                                                        </outcome>
-                                                        <outcome value='failure'>
-                                                            <return status='failure'>
-                                                                <parameter name='error-code' value='' />
-                                                                <parameter name='error-message' value='' />
-                                                            </return>
-                                                        </outcome>
-                                                        <outcome value='success'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='endpointA' value="`$tmp.aai.logical-link.name`" />
-                                                                </set>
-                                                                <set>
-                                                                    <parameter name='endpointB' value="`$tmp.aai.logical-link.name2`" />
-                                                                </set>
-                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="endpoint"
-	key='endpoint.endpoint-id = $endpointA'
-	local-only="false"
-	force="true" pfx="tmp.aai.endpointA">
-                                                                    <outcome value='not-found'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                        </return>
-                                                                    </outcome>
-                                                                    <outcome value='failure'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='error-code' value='' />
-                                                                            <parameter name='error-message' value='' />
-                                                                        </return>
-                                                                    </outcome>
-                                                                    <outcome value='success'>
-                                                                        <block atomic="true">
-                                                                            <for index='rel-index' start='0' end='`$tmp.aai.endpointA.relationship-list.relationship_length`' >
-                                                                                <switch test='`$tmp.aai.endpointA.relationship-list.relationship[$rel-index].related-to`'>
-                                                                                    <outcome value='p-interface'>
-                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="p-interface"
-	    key="p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"
-		local-only="false" 
-		pfx="tmp.aai.endpointA.p-interface-src" >
-                                                                                            <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
-                                                                                            <!--	resource="p-interface"-->
-                                                                                            <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
-                                                                                            <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
-                                                                                            <!--		local-only="false" -->
-                                                                                            <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
-                                                                                            <outcome value='success'>
-                                                                                                <block atomic="true">
-                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                                                                        <parameter name="original_string" value='`$tmp.aai.endpointA.p-interface-src`'/>
-                                                                                                        <!--<parameter name="regex" value="[^-]+$"/>-->
-                                                                                                        <parameter name="regex" value="[^-]+"/>
-                                                                                                        <parameter name="ctx_memory_result_key" value="param-prefix-domainA"/>
-                                                                                                        <outcome value='success'>
-                                                                                                            <block atomic="true">
-                                                                                                                <set>
-                                                                                                                    <parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
-                                                                                                                </set>
-                                                                                                                <set>
-                                                                                                                    <parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
-                                                                                                                </set>
-                                                                                                            </block>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='failure'>
-                                                                                                            <return status='failure'>
-                                                                                                                <parameter name='error-code' value='' />
-                                                                                                                <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                    </execute>
-                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                        <parameter name="ctx-destination" value="prop.connectivity-domainA-uuid"/>
-                                                                                                    </execute>
-                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
-      key='connectivity.connectivity-id = $prop.connectivity-domainA-uuid'>
-                                                                                                        <parameter name='connectivity-id' value='`$prop.connectivity-domainA-uuid`' />
-                                                                                                        <parameter name='operational-status' value='Created' />
-                                                                                                        <parameter name='access-provider-id' value='' />
-                                                                                                        <parameter name='access-client-id' value='' />
-                                                                                                        <parameter name='access-topology-id' value='' />
-                                                                                                        <parameter name='access-node-id' value='' />
-                                                                                                        <parameter name='access-ltp-id' value='' />
-                                                                                                        <parameter name='cvlan' value='' />
-                                                                                                        <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
-                                                                                                        <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
-                                                                                                        <parameter name='CIR' value='`$prop.sotn.cir`' />
-                                                                                                        <parameter name='EIR' value='`$prop.sotn.eir`' />
-                                                                                                        <parameter name='CBS' value='`$prop.sotn.cbs`' />
-                                                                                                        <parameter name='EBS' value='`$prop.sotn.ebs`' />
-                                                                                                        <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
-                                                                                                        <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
-                                                                                                        <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                                                                                                        <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
-                                                                                                    </save>
-                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' 
-      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id
-         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id 
-         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' 
-      force="true" pfx="tmp.AnAI-data">
-                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainA-uuid`" />
-                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainA-uuid`" />
-                                                                                                        <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
-                                                                                                        <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
-                                                                                                        <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
-                                                                                                        <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
-                                                                                                        <!--      force="true" pfx="tmp.AnAI-data">-->
-                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
-                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
-                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
-                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
-                                                                                                    </save>
-                                                                                                </block>
-                                                                                            </outcome>
-                                                                                            <outcome value='not-found'>
-                                                                                                <return status='failure'>
-                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                                </return>
-                                                                                            </outcome>
-                                                                                            <outcome value='failure'>
-                                                                                                <return status='failure'>
-                                                                                                    <parameter name='error-code' value='' />
-                                                                                                    <parameter name='error-message' value='' />
-                                                                                                </return>
-                                                                                            </outcome>
-                                                                                        </get-resource>
-                                                                                    </outcome>
-                                                                                </switch>
-                                                                            </for>
-                                                                        </block>
-                                                                    </outcome>
-                                                                </get-resource>
-                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="endpoint"
-	key='endpoint.endpoint-id = $endpointB'
-	local-only="false"
-	force="true" pfx="tmp.aai.endpointB">
-                                                                    <outcome value='not-found'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                        </return>
-                                                                    </outcome>
-                                                                    <outcome value='failure'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='error-code' value='' />
-                                                                            <parameter name='error-message' value='' />
-                                                                        </return>
-                                                                    </outcome>
-                                                                    <outcome value='success'>
-                                                                        <block atomic="true">
-                                                                            <for index='rel-index' start='0' end='`$tmp.aai.endpointB.relationship-list.relationship_length`' >
-                                                                                <switch test='`$tmp.aai.endpointB.relationship-list.relationship[$rel-index].related-to`'>
-                                                                                    <outcome value='p-interface'>
-                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="p-interface"
-	    key="p-interface.interface-name = $tmp.aai.endpointB.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"
-		local-only="false" 
-		pfx="tmp.aai.endpointB.p-interface-dst" >
-                                                                                            <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
-                                                                                            <!--	resource="p-interface"-->
-                                                                                            <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
-                                                                                            <!--	        and p-interface.interface-name = $tmp.aai.endpointB.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
-                                                                                            <!--		local-only="false" -->
-                                                                                            <!--		pfx="tmp.aai.endpointB.p-interface-dst" >-->
-                                                                                            <outcome value='success'>
-                                                                                                <block atomic="true">
-                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                                                                        <parameter name="original_string" value='`$tmp.aai.endpointB.p-interface-dst`'/>
-                                                                                                        <!--<parameter name="regex" value="[^-]+$"/>-->
-                                                                                                        <parameter name="regex" value="[^-]+"/>
-                                                                                                        <parameter name="ctx_memory_result_key" value="param-prefix-domainB"/>
-                                                                                                        <outcome value='success'>
-                                                                                                            <block atomic="true">
-                                                                                                                <set>
-                                                                                                                    <parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
-                                                                                                                </set>
-                                                                                                                <set>
-                                                                                                                    <parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
-                                                                                                                </set>
-                                                                                                            </block>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='failure'>
-                                                                                                            <return status='failure'>
-                                                                                                                <parameter name='error-code' value='' />
-                                                                                                                <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                    </execute>
-                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                        <parameter name="ctx-destination" value="prop.connectivity-domainB-uuid"/>
-                                                                                                    </execute>
-                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
-      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>
-                                                                                                        <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />
-                                                                                                        <parameter name='operational-status' value='Created' />
-                                                                                                        <parameter name='access-provider-id' value='' />
-                                                                                                        <parameter name='access-client-id' value='' />
-                                                                                                        <parameter name='access-topology-id' value='' />
-                                                                                                        <parameter name='access-node-id' value='' />
-                                                                                                        <parameter name='access-ltp-id' value='' />
-                                                                                                        <parameter name='cvlan' value='' />
-                                                                                                        <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
-                                                                                                        <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
-                                                                                                        <parameter name='CIR' value='`$prop.sotn.cir`' />
-                                                                                                        <parameter name='EIR' value='`$prop.sotn.eir`' />
-                                                                                                        <parameter name='CBS' value='`$prop.sotn.cbs`' />
-                                                                                                        <parameter name='EBS' value='`$prop.sotn.ebs`' />
-                                                                                                        <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
-                                                                                                        <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
-                                                                                                        <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                                                                                                        <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
-                                                                                                    </save>
-                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' 
-      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id
-         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id 
-         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' 
-      force="true" pfx="tmp.AnAI-data">
-                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />
-                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
-                                                                                                        <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
-                                                                                                        <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
-                                                                                                        <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
-                                                                                                        <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
-                                                                                                        <!--      force="true" pfx="tmp.AnAI-data">-->
-                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
-                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
-                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
-                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
-                                                                                                    </save>
-                                                                                                </block>
-                                                                                            </outcome>
-                                                                                            <outcome value='not-found'>
-                                                                                                <return status='failure'>
-                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                                </return>
-                                                                                            </outcome>
-                                                                                            <outcome value='failure'>
-                                                                                                <return status='failure'>
-                                                                                                    <parameter name='error-code' value='' />
-                                                                                                    <parameter name='error-message' value='' />
-                                                                                                </return>
-                                                                                            </outcome>
-                                                                                        </get-resource>
-                                                                                    </outcome>
-                                                                                </switch>
-                                                                            </for>
-                                                                        </block>
-                                                                    </outcome>
-                                                                </get-resource>
-                                                                <set>
-                                                                    <parameter name='prop.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />
-                                                                    <parameter name='prop.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />
-                                                                    <parameter name='prop.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />
-                                                                    <parameter name='prop.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />
-                                                                    <parameter name='prop.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />
-                                                                    <parameter name='prop.remote.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />
-                                                                    <parameter name='prop.remote.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />
-                                                                    <parameter name='prop.remote.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />
-                                                                    <parameter name='prop.remote.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />
-                                                                    <parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />
-                                                                </set>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync' ></call>
-                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' 
-      key='vpn-binding.vpn-id = $tmp.vpnName' >
-                                                                    <parameter name='vpn-id' value='`$tmp.vpnName`' />
-                                                                    <parameter name='vpn-name' value='`$tmp.vpnName`' />
-                                                                    <parameter name='access-provider-id' value='`$oof.vpn.access-provider-id`' />
-                                                                    <parameter name='access-client-id' value='`$oof.vpn.access-client-id`' />
-                                                                    <parameter name='access-topology-id' value='`$oof.vpn.access-topology-id`' />
-                                                                    <parameter name='src-access-node-id' value='`$oof.vpn.access-node-id`' />
-                                                                    <parameter name='src-access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />
-                                                                    <parameter name='dst-access-node-id' value='`$oof.vpn.access-node-id`' />
-                                                                    <parameter name='dst-access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />
-                                                                    <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
-                                                                    <parameter name='operational-status' value='Created' />
-                                                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                                                                    <outcome value='success'>
-                                                                        <block></block>
-                                                                    </outcome>
-                                                                </save>
-                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
-      key='vpn-binding.vpn-id = $tmp.vpnName' 
-      force="true" pfx="tmp.AnAI-data">
-                                                                    <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $mdsal-psd.service-data.networks.network[0].network-id`" />
-                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$mdsal-psd.service-data.networks.network[0].network-id`" />
-                                                                </save>
-                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' 
-      key='vpn-binding.vpn-id = $tmp.vpnName' >
-                                                                    <parameter name='vpn-id' value='`$tmp.vpnName`' />
-                                                                    <parameter name='vpn-name' value='`$tmp.vpnName`' />
-                                                                    <parameter name='access-provider-id' value='`$oof.vpn.access-provider-id`' />
-                                                                    <parameter name='access-client-id' value='`$oof.vpn.access-client-id`' />
-                                                                    <parameter name='access-topology-id' value='`$oof.vpn.access-topology-id`' />
-                                                                    <parameter name='src-access-node-id' value='`$oof.vpn.access-node-id`' />
-                                                                    <parameter name='src-access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />
-                                                                    <parameter name='dst-access-node-id' value='`$oof.vpn.access-node-id`' />
-                                                                    <parameter name='dst-access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />
-                                                                    <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
-                                                                    <parameter name='operational-status' value='Created' />
-                                                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                                                                    <outcome value='success'>
-                                                                        <block></block>
-                                                                    </outcome>
-                                                                </save>
-                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
-      key='vpn-binding.vpn-id = $tmp.vpnName' 
-      force="true" pfx="tmp.AnAI-data">
-                                                                    <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $mdsal-psd.service-data.networks.network[0].network-id`" />
-                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$mdsal-psd.service-data.networks.network[0].network-id`" />
-                                                                </save>
-                                                            </block>
-                                                        </outcome>
-                                                    </get-resource>
-                                                </block>
-                                            </outcome>
-                                        </switch>
+                                        <block atomic="true">
+                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                          resource="allotted-resource:relationship-list"
+                                                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type
+         AND allotted-resource.id = $allotted-resource-id'
+                                                          local-only="false"
+                                                          force="true" pfx="tmp.aai.allotted-resource.relationship-list">
+                                                <outcome value='not-found'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='failure'>
+                                                    <return status='failure'>
+                                                        <parameter name='error-code' value='' />
+                                                        <parameter name='error-message' value='' />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='success'>
+                                                    <block atomic="true">
+                                                        <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>
+                                                            <outcome value='false'></outcome>
+                                                            <outcome value='true'>
+                                                                <block atomic="true">
+                                                                    <for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >
+                                                                        <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>
+                                                                            <outcome value='network-policy'>
+                                                                                <block atomic="true">
+                                                                                    <set>
+                                                                                        <parameter name='network-policy-id' value="`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`" />
+                                                                                    </set>
+                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                  resource="network-policy"
+                                                                                                  key='network-policy.network-policy-id = $network-policy-id'
+                                                                                                  local-only="false"
+                                                                                                  force="true" pfx="tmp.aai.network-policy">
+                                                                                        <outcome value='not-found'>
+                                                                                            <return status='failure'>
+                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                <parameter name="error-code" value="500" />
+                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                            </return>
+                                                                                        </outcome>
+                                                                                        <outcome value='failure'>
+                                                                                            <return status='failure'>
+                                                                                                <parameter name='error-code' value='' />
+                                                                                                <parameter name='error-message' value='' />
+                                                                                            </return>
+                                                                                        </outcome>
+                                                                                        <outcome value='success'>
+                                                                                            <block>
+                                                                                                <set>
+                                                                                                    <parameter name='maximum-bandwidth' value="`$tmp.aai.network-policy.max-bandwidth`" />
+                                                                                                </set>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </get-resource>
+                                                                                </block>
+                                                                            </outcome>
+                                                                        </switch>
+                                                                    </for>
+                                                                    <for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >
+                                                                        <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>
+                                                                            <outcome value='logical-link'>
+                                                                                <block atomic="true">
+                                                                                    <set>
+                                                                                        <parameter name='logical-link-name' value="`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`" />
+                                                                                    </set>
+                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                  resource="logical-link"
+                                                                                                  key='logical-link.link-name = $logical-link-name'
+                                                                                                  local-only="false"
+                                                                                                  force="true" pfx="tmp.aai.logical-link">
+                                                                                        <outcome value='not-found'>
+                                                                                            <return status='failure'>
+                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                <parameter name="error-code" value="500" />
+                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                            </return>
+                                                                                        </outcome>
+                                                                                        <outcome value='failure'>
+                                                                                            <return status='failure'>
+                                                                                                <parameter name='error-code' value='' />
+                                                                                                <parameter name='error-message' value='' />
+                                                                                            </return>
+                                                                                        </outcome>
+                                                                                        <outcome value='success'>
+                                                                                            <block>
+                                                                                                <set>
+                                                                                                    <parameter name='network-route-A' value="`$tmp.aai.logical-link.link-name`" />
+                                                                                                </set>
+                                                                                                <set>
+                                                                                                    <parameter name='network-route-B' value="`$tmp.aai.logical-link.link-name2`" />
+                                                                                                </set>
+                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                              resource="network-route"
+                                                                                                              key='network-route.route-id = $network-route-A'
+                                                                                                              local-only="false"
+                                                                                                              force="true" pfx="tmp.aai.network-route-A">
+                                                                                                    <outcome value='not-found'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='failure'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='error-code' value='' />
+                                                                                                            <parameter name='error-message' value='' />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='success'>
+                                                                                                        <block atomic="true">
+                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                <parameter name="original_string" value='`$tmp.aai.network-route-A.next-hop`'/>
+                                                                                                                <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                <parameter name="regex" value="[-]+"/>
+                                                                                                                <parameter name="ctx_memory_result_key" value="param-prefix-domainA-pnfName"/>
+                                                                                                                <outcome value='success'>
+                                                                                                                    <block atomic="true">
+                                                                                                                        <set>
+                                                                                                                            <parameter name='tmp.src.domainA.pnf-name' value="`$param-prefix-domainA-pnfName[0] + '-' +
+                                                   $param-prefix-domainA-pnfName[1] + '-' +
+                                                   $param-prefix-domainA-pnfName[2] + '-' +
+                                                   $param-prefix-domainA-pnfName[3] + '-' +
+                                                   $param-prefix-domainA-pnfName[4] + '-' +
+                                                   $param-prefix-domainA-pnfName[5] + '-' +
+                                                   $param-prefix-domainA-pnfName[6] + '-' +
+                                                   $param-prefix-domainA-pnfName[7] + '-' +
+                                                   $param-prefix-domainA-pnfName[8]`" />
+                                                                                                                        </set>
+                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                      resource="pnf"
+                                                                                                                                      key="pnf.pnf-name = $tmp.src.domainA.pnf-name"
+                                                                                                                                      pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                                                                            <!--AND depth = '0'"-->
+                                                                                                                            <outcome value='success'>
+                                                                                                                                <block>
+                                                                                                                                    <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
+                                                                                                                                        <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                                                                            <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                                                <block atomic="true">
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='tmp.domainA.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                                    </set>
+                                                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                                  resource="esr-thirdparty-sdnc"
+                                                                                                                                                                  key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                                                                                  pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                                        <outcome value='success'>
+                                                                                                                                                            <block>
+                                                                                                                                                                <set>
+                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                                                    <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                                                    <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                                                                    <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                                                                    <!--<parameter name="format" value="json"/>-->
+                                                                                                                                                                    <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                                                                    <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                                                    <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                                    <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                    <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                                    <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                </set>
+                                                                                                                                                            </block>
+                                                                                                                                                        </outcome>
+                                                                                                                                                        <outcome value='not-found'>
+                                                                                                                                                            <return status='failure'>
+                                                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                            </return>
+                                                                                                                                                        </outcome>
+                                                                                                                                                        <outcome value='Other'>
+                                                                                                                                                            <return status='failure'>
+                                                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                            </return>
+                                                                                                                                                        </outcome>
+                                                                                                                                                    </get-resource>
+                                                                                                                                                </block>
+                                                                                                                                            </outcome>
+                                                                                                                                            <outcome value='network-resource'>
+                                                                                                                                                <block atomic="true">
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='tmp.domainA.eth-network-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                                    </set>
+                                                                                                                                                </block>
+                                                                                                                                            </outcome>
+                                                                                                                                        </switch>
+                                                                                                                                    </for>
+                                                                                                                                </block>
+                                                                                                                            </outcome>
+                                                                                                                            <outcome value='not-found'>
+                                                                                                                                <return status='failure'>
+                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                </return>
+                                                                                                                            </outcome>
+                                                                                                                            <outcome value='Other'>
+                                                                                                                                <return status='failure'>
+                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                </return>
+                                                                                                                            </outcome>
+                                                                                                                        </get-resource>
+                                                                                                                    </block>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='failure'>
+                                                                                                                    <return status='failure'>
+                                                                                                                        <parameter name='error-code' value='' />
+                                                                                                                        <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                    </return>
+                                                                                                                </outcome>
+                                                                                                            </execute>
+                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                          resource="p-interface"
+                                                                                                                          key="pnf.pnf-name = $tmp.src.domainA.pnf-name
+	        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop"
+                                                                                                                          local-only="false"
+                                                                                                                          pfx="tmp.aai.network-route-A.p-interface-src" >
+                                                                                                                <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                                                                                                <!--	resource="p-interface"-->
+                                                                                                                <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
+                                                                                                                <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
+                                                                                                                <!--		local-only="false" -->
+                                                                                                                <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
+                                                                                                                <outcome value='success'>
+                                                                                                                    <block atomic="true">
+                                                                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                            <parameter name="original_string" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>
+                                                                                                                            <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                            <parameter name="regex" value="[-]+"/>
+                                                                                                                            <parameter name="ctx_memory_result_key" value="param-prefix-domainA"/>
+                                                                                                                            <outcome value='success'>
+                                                                                                                                <block atomic="true">
+                                                                                                                                    <set>
+                                                                                                                                        <parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
+                                                                                                                                    </set>
+                                                                                                                                    <set>
+                                                                                                                                        <parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                                                    </set>
+                                                                                                                                </block>
+                                                                                                                            </outcome>
+                                                                                                                            <outcome value='failure'>
+                                                                                                                                <return status='failure'>
+                                                                                                                                    <parameter name='error-code' value='' />
+                                                                                                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                                </return>
+                                                                                                                            </outcome>
+                                                                                                                        </execute>
+                                                                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                                            <parameter name="ctx-destination" value="uuid.connectivity-domainA-uuid"/>
+                                                                                                                        </execute>
+                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                              key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>
+                                                                                                                            <parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />
+                                                                                                                            <parameter name='operational-status' value='Created' />
+                                                                                                                            <parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
+                                                                                                                            <parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />
+                                                                                                                            <parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />
+                                                                                                                            <parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                                            <parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
+                                                                                                                            <parameter name='cvlan' value='' />
+                                                                                                                            <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
+                                                                                                                            <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
+                                                                                                                            <parameter name='CIR' value='`$prop.sotn.cir`' />
+                                                                                                                            <parameter name='EIR' value='`$prop.sotn.eir`' />
+                                                                                                                            <parameter name='CBS' value='`$prop.sotn.cbs`' />
+                                                                                                                            <parameter name='EBS' value='`$prop.sotn.ebs`' />
+                                                                                                                            <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
+                                                                                                                            <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
+                                                                                                                            <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
+                                                                                                                            <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                            <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                            <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                            <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
+                                                                                                                        </save>
+                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
+                                                                                                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                                                                                                                              force="true" pfx="tmp.AnAI-data">
+                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />
+                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />
+                                                                                                                            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
+                                                                                                                            <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
+                                                                                                                            <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
+                                                                                                                            <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
+                                                                                                                            <!--      force="true" pfx="tmp.AnAI-data">-->
+                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
+                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
+                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
+                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
+                                                                                                                        </save>
+                                                                                                                        <for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >
+                                                                                                                            <switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>
+                                                                                                                                <outcome value='tunnel-termination-point'>
+                                                                                                                                    <block atomic="true">
+                                                                                                                                        <set>
+                                                                                                                                            <parameter name='tmp.source.ttp-id' value="`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`" />
+                                                                                                                                        </set>
+                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                      resource="tunnel-termination-point"
+                                                                                                                                                      key="tunnel-termination-point.ttp-id = $tmp.source.ttp-id
+		AND depth = '0'"
+                                                                                                                                                      pfx='tmp.aai.source-ttp' local-only='false' >
+                                                                                                                                            <outcome value='success'>
+                                                                                                                                                <block atomic="true">
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='source.tunnel-tp-id' value="`$tmp.aai.source-ttp.tunnel-tp-id`" />
+                                                                                                                                                    </set>
+                                                                                                                                                </block>
+                                                                                                                                            </outcome>
+                                                                                                                                        </get-resource>
+                                                                                                                                        <break/>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                            </switch>
+                                                                                                                        </for>
+                                                                                                                    </block>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='not-found'>
+                                                                                                                    <return status='failure'>
+                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                                    </return>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='failure'>
+                                                                                                                    <return status='failure'>
+                                                                                                                        <parameter name='error-code' value='' />
+                                                                                                                        <parameter name='error-message' value='' />
+                                                                                                                    </return>
+                                                                                                                </outcome>
+                                                                                                            </get-resource>
+                                                                                                        </block>
+                                                                                                    </outcome>
+                                                                                                </get-resource>
+                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                              resource="network-route"
+                                                                                                              key='network-route.route-id = $network-route-B'
+                                                                                                              local-only="false"
+                                                                                                              force="true" pfx="tmp.aai.network-route-B">
+                                                                                                    <outcome value='not-found'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='failure'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='error-code' value='' />
+                                                                                                            <parameter name='error-message' value='' />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='success'>
+                                                                                                        <block atomic="true">
+                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                <parameter name="original_string" value='`$tmp.aai.network-route-B.next-hop`'/>
+                                                                                                                <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                <parameter name="regex" value="[-]+"/>
+                                                                                                                <parameter name="ctx_memory_result_key" value="param-prefix-domainB-pnfName"/>
+                                                                                                                <outcome value='success'>
+                                                                                                                    <block atomic="true">
+                                                                                                                        <set>
+                                                                                                                            <parameter name='tmp.dst.domainB.pnf-name' value="`$param-prefix-domainB-pnfName[0] + '-' +
+                                                   $param-prefix-domainB-pnfName[1] + '-' +
+                                                   $param-prefix-domainB-pnfName[2] + '-' +
+                                                   $param-prefix-domainB-pnfName[3] + '-' +
+                                                   $param-prefix-domainB-pnfName[4] + '-' +
+                                                   $param-prefix-domainB-pnfName[5] + '-' +
+                                                   $param-prefix-domainB-pnfName[6] + '-' +
+                                                   $param-prefix-domainB-pnfName[7] + '-' +
+                                                   $param-prefix-domainB-pnfName[8]`" />
+                                                                                                                        </set>
+                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                      resource="pnf"
+                                                                                                                                      key="pnf.pnf-name = $tmp.dst.domainB.pnf-name"
+                                                                                                                                      pfx='tmp.aai.destination-pnf' local-only='false' >
+                                                                                                                            <!--AND depth = '0'"-->
+                                                                                                                            <outcome value='success'>
+                                                                                                                                <block>
+                                                                                                                                    <for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >
+                                                                                                                                        <switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>
+                                                                                                                                            <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                                                <block atomic="true">
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='tmp.domainB.esr-thirdparty-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                                    </set>
+                                                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                                  resource="esr-thirdparty-sdnc"
+                                                                                                                                                                  key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                                                                                  pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                                        <outcome value='success'>
+                                                                                                                                                            <block>
+                                                                                                                                                                <set>
+                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                                                    <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                                                    <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                                                                    <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                                                                    <!--<parameter name="format" value="json"/>-->
+                                                                                                                                                                    <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                                                                    <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                                                    <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                                    <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                    <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                                    <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                </set>
+                                                                                                                                                            </block>
+                                                                                                                                                        </outcome>
+                                                                                                                                                        <outcome value='not-found'>
+                                                                                                                                                            <return status='failure'>
+                                                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                            </return>
+                                                                                                                                                        </outcome>
+                                                                                                                                                        <outcome value='Other'>
+                                                                                                                                                            <return status='failure'>
+                                                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                            </return>
+                                                                                                                                                        </outcome>
+                                                                                                                                                    </get-resource>
+                                                                                                                                                </block>
+                                                                                                                                            </outcome>
+                                                                                                                                            <outcome value='network-resource'>
+                                                                                                                                                <block atomic="true">
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='tmp.domainB.eth-network-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                                    </set>
+                                                                                                                                                </block>
+                                                                                                                                            </outcome>
+                                                                                                                                        </switch>
+                                                                                                                                    </for>
+                                                                                                                                </block>
+                                                                                                                            </outcome>
+                                                                                                                            <outcome value='not-found'>
+                                                                                                                                <return status='failure'>
+                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                </return>
+                                                                                                                            </outcome>
+                                                                                                                            <outcome value='Other'>
+                                                                                                                                <return status='failure'>
+                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                </return>
+                                                                                                                            </outcome>
+                                                                                                                        </get-resource>
+                                                                                                                    </block>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='failure'>
+                                                                                                                    <return status='failure'>
+                                                                                                                        <parameter name='error-code' value='' />
+                                                                                                                        <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                    </return>
+                                                                                                                </outcome>
+                                                                                                            </execute>
+                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                          resource="p-interface"
+                                                                                                                          key="pnf.pnf-name = $tmp.dst.domainB.pnf-name
+	        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop"
+                                                                                                                          local-only="false"
+                                                                                                                          pfx="tmp.aai.network-route-B.p-interface-dst" >
+                                                                                                                <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                                                                                                <!--	resource="p-interface"-->
+                                                                                                                <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
+                                                                                                                <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
+                                                                                                                <!--		local-only="false" -->
+                                                                                                                <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
+                                                                                                                <outcome value='success'>
+                                                                                                                    <block atomic="true">
+                                                                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                            <parameter name="original_string" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>
+                                                                                                                            <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                            <parameter name="regex" value="[-]+"/>
+                                                                                                                            <parameter name="ctx_memory_result_key" value="param-prefix-domainB"/>
+                                                                                                                            <outcome value='success'>
+                                                                                                                                <block atomic="true">
+                                                                                                                                    <set>
+                                                                                                                                        <parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
+                                                                                                                                    </set>
+                                                                                                                                    <set>
+                                                                                                                                        <parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                                                    </set>
+                                                                                                                                </block>
+                                                                                                                            </outcome>
+                                                                                                                            <outcome value='failure'>
+                                                                                                                                <return status='failure'>
+                                                                                                                                    <parameter name='error-code' value='' />
+                                                                                                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                                </return>
+                                                                                                                            </outcome>
+                                                                                                                        </execute>
+                                                                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                                            <parameter name="ctx-destination" value="prop.connectivity-domainB-uuid"/>
+                                                                                                                        </execute>
+                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                              key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>
+                                                                                                                            <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />
+                                                                                                                            <parameter name='operational-status' value='Created' />
+                                                                                                                            <parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />
+                                                                                                                            <parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />
+                                                                                                                            <parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />
+                                                                                                                            <parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                                            <parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
+                                                                                                                            <parameter name='cvlan' value='' />
+                                                                                                                            <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
+                                                                                                                            <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
+                                                                                                                            <parameter name='CIR' value='`$prop.sotn.cir`' />
+                                                                                                                            <parameter name='EIR' value='`$prop.sotn.eir`' />
+                                                                                                                            <parameter name='CBS' value='`$prop.sotn.cbs`' />
+                                                                                                                            <parameter name='EBS' value='`$prop.sotn.ebs`' />
+                                                                                                                            <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
+                                                                                                                            <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
+                                                                                                                            <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
+                                                                                                                            <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                            <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                            <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                            <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
+                                                                                                                        </save>
+                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
+                                                                                                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                                                                                                                              force="true" pfx="tmp.AnAI-data">
+                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />
+                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
+                                                                                                                            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
+                                                                                                                            <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
+                                                                                                                            <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
+                                                                                                                            <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
+                                                                                                                            <!--      force="true" pfx="tmp.AnAI-data">-->
+                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
+                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
+                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
+                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
+                                                                                                                        </save>
+                                                                                                                        <for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >
+                                                                                                                            <switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>
+                                                                                                                                <outcome value='tunnel-termination-point'>
+                                                                                                                                    <block atomic="true">
+                                                                                                                                        <set>
+                                                                                                                                            <parameter name='tmp.destination.ttp-id' value="`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`" />
+                                                                                                                                        </set>
+                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                      resource="tunnel-termination-point"
+                                                                                                                                                      key="tunnel-termination-point.ttp-id = $tmp.destination.ttp-id
+		AND depth = '0'"
+                                                                                                                                                      pfx='tmp.aai.destination-ttp' local-only='false' >
+                                                                                                                                            <outcome value='success'>
+                                                                                                                                                <block atomic="true">
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='destination.tunnel-tp-id' value="`$tmp.aai.destination-ttp.tunnel-tp-id`" />
+                                                                                                                                                    </set>
+                                                                                                                                                </block>
+                                                                                                                                            </outcome>
+                                                                                                                                        </get-resource>
+                                                                                                                                        <break/>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                            </switch>
+                                                                                                                        </for>
+                                                                                                                    </block>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='not-found'>
+                                                                                                                    <return status='failure'>
+                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                                    </return>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='failure'>
+                                                                                                                    <return status='failure'>
+                                                                                                                        <parameter name='error-code' value='' />
+                                                                                                                        <parameter name='error-message' value='' />
+                                                                                                                    </return>
+                                                                                                                </outcome>
+                                                                                                            </get-resource>
+                                                                                                        </block>
+                                                                                                    </outcome>
+                                                                                                </get-resource>
+                                                                                                <set>
+                                                                                                    <parameter name='prop.connection-attachment.access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
+                                                                                                    <parameter name='prop.connection-attachment.access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />
+                                                                                                    <parameter name='prop.connection-attachment.access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />
+                                                                                                    <parameter name='prop.connection-attachment.access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                    <parameter name='prop.connection-attachment.access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
+                                                                                                    <parameter name='prop.remote.connection-attachment.access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />
+                                                                                                    <parameter name='prop.remote.connection-attachment.access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />
+                                                                                                    <parameter name='prop.remote.connection-attachment.access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />
+                                                                                                    <parameter name='prop.remote.connection-attachment.access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                    <parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
+                                                                                                    <!--<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />-->
+                                                                                                    <!--<parameter name='prop.remote.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />-->
+                                                                                                    <!--<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />-->
+                                                                                                    <!--<parameter name='prop.remote.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />-->
+                                                                                                    <!--<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />-->
+                                                                                                </set>
+                                                                                                <call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' ></call>
+                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                    <parameter name="ctx-destination" value="prop.vpn-binding-domainA-uuid"/>
+                                                                                                </execute>
+                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >
+                                                                                                    <parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />
+                                                                                                    <parameter name='vpn-name' value='`$prop.vpn-binding-domainA-uuid`' />
+                                                                                                    <parameter name='access-provider-id' value='`$domain-A.provider-id`' />
+                                                                                                    <!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->
+                                                                                                    <parameter name='access-client-id' value='`$domain-A.client-id`' />
+                                                                                                    <!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->
+                                                                                                    <parameter name='access-topology-id' value='`$domain-A.te-topo-id`' />
+                                                                                                    <!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->
+                                                                                                    <parameter name='src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                    <!--<parameter name='src-access-ltp-id' value='`$source.tunnel-tp-id`' />-->
+                                                                                                    <parameter name='src-access-ltp-id' value='' />
+                                                                                                    <parameter name='dst-access-node-id' value='`$domain-A.node-id`' />
+                                                                                                    <parameter name='dst-access-ltp-id' value='`$domain-A.tunnel-tp-id`' />
+                                                                                                    <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
+                                                                                                    <parameter name='operational-status' value='Created' />
+                                                                                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                                                                                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                    <outcome value='success'>
+                                                                                                        <block></block>
+                                                                                                    </outcome>
+                                                                                                </save>
+                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
+                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid'
+                                                                                                      force="true" pfx="tmp.AnAI-data">
+                                                                                                    <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />
+                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />
+                                                                                                </save>
+                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                    <parameter name="ctx-destination" value="prop.vpn-binding-domainB-uuid"/>
+                                                                                                </execute>
+                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >
+                                                                                                    <parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />
+                                                                                                    <parameter name='vpn-name' value='`$prop.vpn-binding-domainB-uuid`' />
+                                                                                                    <parameter name='access-provider-id' value='`$domain-B.provider-id`' />
+                                                                                                    <!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->
+                                                                                                    <parameter name='access-client-id' value='`$domain-B.client-id`' />
+                                                                                                    <!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->
+                                                                                                    <parameter name='access-topology-id' value='`$domain-B.te-topo-id`' />
+                                                                                                    <!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->
+                                                                                                    <parameter name='src-access-node-id' value='`$domain-B.node-id`' />
+                                                                                                    <parameter name='src-access-ltp-id' value='`$domain-B.tunnel-tp-id`' />
+                                                                                                    <parameter name='dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                    <!--<parameter name='dst-access-ltp-id' value='`$destination.tunnel-tp-id`' />-->
+                                                                                                    <parameter name='dst-access-ltp-id' value='' />
+                                                                                                    <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
+                                                                                                    <parameter name='operational-status' value='Created' />
+                                                                                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                                                                                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                    <outcome value='success'>
+                                                                                                        <block></block>
+                                                                                                    </outcome>
+                                                                                                </save>
+                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
+                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid'
+                                                                                                      force="true" pfx="tmp.AnAI-data">
+                                                                                                    <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />
+                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
+                                                                                                </save>
+                                                                                                <set>
+                                                                                                    <parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />
+                                                                                                    <parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                    <parameter name='otn-dest-node' value='`$domain-A.node-id`' />
+                                                                                                    <parameter name='bw-odu' value="`'0,' + $maximum-bandwidth /1000 *2 /3 `" />
+                                                                                                    <!--<parameter name='src-ttp-id' value='`$source.tunnel-tp-id`' />-->
+                                                                                                    <parameter name='dst-ttp-id' value='`$domain-A.tunnel-tp-id`' />
+                                                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                </set>
+                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`" />
+                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`" />
+                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
+                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                                                                                    <parameter name="format" value="json"/>
+                                                                                                    <parameter name="httpMethod" value="post"/>
+                                                                                                    <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                                                    <outcome value='failure'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="Error executing OOF api" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='success'>
+                                                                                                        <block></block>
+                                                                                                    </outcome>
+                                                                                                </execute>
+                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />
+                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te/ietf-optical-slice:tp-slice-id' `" />
+                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
+                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                                                                                    <parameter name="format" value="json"/>
+                                                                                                    <parameter name="httpMethod" value="post"/>
+                                                                                                    <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                                                    <outcome value='failure'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="Error executing OOF api" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='success'>
+                                                                                                        <block></block>
+                                                                                                    </outcome>
+                                                                                                </execute>
+                                                                                                <set>
+                                                                                                    <parameter name='request-id' value='`$prop.vpn-binding-domainB-uuid`' />
+                                                                                                    <parameter name='otn-source-node' value='`$domain-B.node-id`' />
+                                                                                                    <parameter name='otn-dest-node' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                    <!--<parameter name='bw-odu' value='`$maximum-bandwidth /10`' />-->
+                                                                                                    <parameter name='bw-odu' value="`'0,' + $maximum-bandwidth /1000 *2 /3 `" />
+                                                                                                    <parameter name='src-ttp-id' value='`$domain-B.tunnel-tp-id`' />
+                                                                                                    <!--<parameter name='dst-ttp-id' value='`$destination.tunnel-tp-id`' />-->
+                                                                                                    <parameter name='dst-ttp-id' value='' />
+                                                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                </set>
+                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`" />
+                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`" />
+                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
+                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
+                                                                                                    <parameter name="format" value="json"/>
+                                                                                                    <parameter name="httpMethod" value="post"/>
+                                                                                                    <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                                                    <outcome value='failure'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="Error executing OOF api" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='success'>
+                                                                                                        <block></block>
+                                                                                                    </outcome>
+                                                                                                </execute>
+                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />
+                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te/ietf-optical-slice:tp-slice-id' `" />
+                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
+                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
+                                                                                                    <parameter name="format" value="json"/>
+                                                                                                    <parameter name="httpMethod" value="post"/>
+                                                                                                    <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                                                    <outcome value='failure'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="Error executing OOF api" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='success'>
+                                                                                                        <block></block>
+                                                                                                    </outcome>
+                                                                                                </execute>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </get-resource>
+                                                                                </block>
+                                                                            </outcome>
+                                                                        </switch>
+                                                                    </for>
+                                                                </block>
+                                                            </outcome>
+                                                        </switch>
+                                                    </block>
+                                                </outcome>
+                                            </get-resource>
+                                        </block>
                                     </outcome>
                                 </get-resource>
                             </block>
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 0a853f13..2517645d 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
@@ -1,327 +1,227 @@
 <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}'>
+        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}'>
     <method rpc='tsli-vnf-topology-operation-trans-slice-deactivate' mode='sync'>
         <block atomic="true">
-            <switch test='`$service-data.vnfs.vnf_length`'>
-                <outcome value='0'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />
-                    </return>
-                </outcome>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />
-                    </return>
-                </outcome>
-                <outcome value='Other'>
-                    <block atomic="true">
-                        <for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >
-                            <block>
-                                <switch test="`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`">
-                                    <outcome value='true'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name='tmp.vidx' value='`$vidx`' />
-                                                <parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />
-                                            </set>
-                                        </block>
-                                    </outcome>
-                                </switch>
-                            </block>
-                        </for>
-                        <switch test="`$tmp.vidx`">
-                            <outcome value=''>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />
-                                </return>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-            </switch>
-            <switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>
-                <outcome value='Active'>
-                    <block atomic="true"></block>
-                </outcome>
-                <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`" />
-                    </return>
-                </outcome>
-            </switch>
-            <set>
-                <!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />
-            </set>
-            <set>
-                <parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
-                <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` " />
-            </set>
-            <set>
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='PendingDelete' />
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />
-            </set>
-            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="generic-vnf"   
-		key="generic-vnf.vnf-id = $vnfId" >
-                <parameter name="orchestration-status" value="PendingDelete" />
-                <parameter name="vnf-type" value="some vnf-type" />
-            </update>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="service-instance"
-	key='service-instance.service-instance-id = $service-data.service-information.service-instance-id
-         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id 
-         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'
-	local-only="false"
-	force="true" pfx="tmp.aai.service-instance">
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+            <!--	resource="service-instance"-->
+            <!--	key='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->
+            <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->
+            <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->
+            <!--	local-only="false"-->
+            <!--	force="true" pfx="tmp.aai.service-instance">-->
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                          resource="service-instance"
+                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                          local-only="false"
+                          force="true" pfx="tmp.aai.service-instance">
+                <!--vnf-topology-operation-input.service-information.service-instance-id-->
                 <outcome value='success'>
                     <for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >
                         <switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>
                             <outcome value='connectivity'>
-                                <switch test="`$rel-index == 0`">
-                                    <outcome value='true'>
-                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="connectivity"
-	    key="connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[0].relationship-data[0].relationship-value"
-		local-only="false" 
-		pfx="tmp.aai.connectivityA" >
-                                            <outcome value='success'>
-                                                <block atomic="true">
-                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="esr-thirdparty-sdnc" 
-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND 
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="connectivity"
+                                              key="connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"
+                                              local-only="false"
+                                              pfx="tmp.aai.connectivity" >
+                                    <outcome value='success'>
+                                        <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
+                                            <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
+                                                <outcome value='vpn-binding'>
+                                                    <block atomic="true">
+                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                      resource="vpn-binding"
+                                                                      key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
+                                                                      local-only="false"
+                                                                      pfx="tmp.aai.vpn-binding" >
+                                                            <outcome value='success'>
+                                                                <block atomic="true">
+                                                                    <set>
+                                                                        <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +
+                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +
+                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +
+                                                   $tmp.aai.vpn-binding.src-access-node-id`" />
+                                                                    </set>
+                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                  resource="pnf"
+                                                                                  key="pnf.pnf-name = $tmp.domain.pnf-name"
+                                                                                  pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                        <!--AND depth = '0'"-->
+                                                                        <outcome value='success'>
+                                                                            <block>
+                                                                                <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
+                                                                                    <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                        <outcome value='esr-thirdparty-sdnc'>
+                                                                                            <block atomic="true">
+                                                                                                <set>
+                                                                                                    <parameter name='tmp.domain.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                </set>
+                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                              resource="esr-thirdparty-sdnc"
+                                                                                                              key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND
 		     depth = '1'"
-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
-                                                        <outcome value='success'>
-                                                            <set>
-                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                <!--<parameter name="format" value="json"/>-->
-                                                                <!--<parameter name="httpMethod" value="get"/>-->
-                                                                <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                            </set>
-                                                        </outcome>
-                                                        <outcome value='not-found'>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                                                            </return>
-                                                        </outcome>
-                                                        <outcome value='Other'>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                                                            </return>
-                                                        </outcome>
-                                                    </get-resource>
-                                                    <set>
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id' value='`$oof.vpn.access-node-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id' value='`$oof.vpn.access-node-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />
-                                                    </set>
-                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
-                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />
-                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                                        <parameter name="format" value="json"/>
-                                                        <parameter name="httpMethod" value="delete"/>
-                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                        <parameter name="responsePrefix" value="vpn-result"/>
-                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                                        <outcome value='failure'>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
-                                                            </return>
-                                                        </outcome>
-                                                        <outcome value='success'>
-                                                            <block atomic="true">
-                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' 
-      key='vpn-binding.vpn-id = $tmp.vpnName' >
-                                                                    <parameter name='vpn-id' value='`$tmp.vpnName`' />
-                                                                    <parameter name='vpn-name' value='`$tmp.vpnName`' />
-                                                                    <parameter name='operational-status' value='DeActivated' />
-                                                                </update>
-                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
-      key='connectivity.connectivity-id = $prop.connectivity-domainA-uuid'>
-                                                                    <parameter name='connectivity-id' value='`$prop.connectivity-domainA-uuid`' />
-                                                                    <parameter name='operational-status' value='DeActivated' />
-                                                                </update>
-                                                            </block>
-                                                        </outcome>
-                                                    </execute>
-                                                </block>
-                                            </outcome>
-                                            <outcome value='not-found'>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                </return>
-                                            </outcome>
-                                            <outcome value='failure'>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='' />
-                                                    <parameter name='error-message' value='' />
-                                                </return>
-                                            </outcome>
-                                        </get-resource>
+                                                                                                              pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                    <outcome value='success'>
+                                                                                                        <block>
+                                                                                                            <set>
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                <!--<parameter name="format" value="json"/>-->
+                                                                                                                <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                            </set>
+                                                                                                        </block>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='not-found'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='Other'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                </get-resource>
+                                                                                                <break/>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                </for>
+                                                                            </block>
+                                                                        </outcome>
+                                                                        <outcome value='not-found'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                        <outcome value='Other'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                    </get-resource>
+                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                        <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />-->
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te/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="format" value="json"/>
+                                                                        <parameter name="httpMethod" value="delete"/>
+                                                                        <parameter name="responsePrefix" value="otn-oof"/>
+                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                        <outcome value='failure'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                        <outcome value='success'>
+                                                                            <block atomic="true"></block>
+                                                                        </outcome>
+                                                                    </execute>
+                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/eth-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`" />
+                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                        <parameter name="format" value="json"/>
+                                                                        <parameter name="httpMethod" value="delete"/>
+                                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                        <parameter name="responsePrefix" value="vpn-result"/>
+                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                        <outcome value='failure'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                        <outcome value='success'>
+                                                                            <block atomic="true">
+                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >
+                                                                                    <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />
+                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-id`' />
+                                                                                    <parameter name='operational-status' value='Deactivated' />
+                                                                                </update>
+                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                        key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>
+                                                                                    <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
+                                                                                    <parameter name='operational-status' value='Deactivated' />
+                                                                                </update>
+                                                                            </block>
+                                                                        </outcome>
+                                                                    </execute>
+                                                                </block>
+                                                            </outcome>
+                                                            <outcome value='not-found'>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                </return>
+                                                            </outcome>
+                                                            <outcome value='failure'>
+                                                                <return status='failure'>
+                                                                    <parameter name='error-code' value='' />
+                                                                    <parameter name='error-message' value='' />
+                                                                </return>
+                                                            </outcome>
+                                                        </get-resource>
+                                                    </block>
+                                                </outcome>
+                                            </switch>
+                                        </for>
                                     </outcome>
-                                    <outcome value='false'>
-                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="connectivity"
-	    key="connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[1].relationship-data[0].relationship-value"
-		local-only="false" 
-		pfx="tmp.aai.connectivityB" >
-                                            <outcome value='success'>
-                                                <block atomic="true">
-                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="esr-thirdparty-sdnc" 
-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND 
-		     depth = '1'"
-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
-                                                        <outcome value='success'>
-                                                            <set>
-                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                <!--<parameter name="format" value="json"/>-->
-                                                                <!--<parameter name="httpMethod" value="get"/>-->
-                                                                <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                            </set>
-                                                        </outcome>
-                                                        <outcome value='not-found'>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                                                            </return>
-                                                        </outcome>
-                                                        <outcome value='Other'>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                                                            </return>
-                                                        </outcome>
-                                                    </get-resource>
-                                                    <set>
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id' value='`$oof.vpn.access-node-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id' value='`$oof.vpn.access-node-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />
-                                                    </set>
-                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
-                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />
-                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                                        <parameter name="format" value="json"/>
-                                                        <parameter name="httpMethod" value="delete"/>
-                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                        <parameter name="responsePrefix" value="vpn-result"/>
-                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                                        <outcome value='failure'>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
-                                                            </return>
-                                                        </outcome>
-                                                        <outcome value='success'>
-                                                            <block atomic="true">
-                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' 
-      key='vpn-binding.vpn-id = $tmp.vpnName' >
-                                                                    <parameter name='vpn-id' value='`$tmp.vpnName`' />
-                                                                    <parameter name='vpn-name' value='`$tmp.vpnName`' />
-                                                                    <parameter name='operational-status' value='DeActivated' />
-                                                                </update>
-                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
-      key='connectivity.connectivity-id = $prop.connectivity-domainA-uuid'>
-                                                                    <parameter name='connectivity-id' value='`$prop.connectivity-domainA-uuid`' />
-                                                                    <parameter name='operational-status' value='DeActivated' />
-                                                                </update>
-                                                            </block>
-                                                        </outcome>
-                                                    </execute>
-                                                </block>
-                                            </outcome>
-                                            <outcome value='not-found'>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                </return>
-                                            </outcome>
-                                            <outcome value='failure'>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='' />
-                                                    <parameter name='error-message' value='' />
-                                                </return>
-                                            </outcome>
-                                        </get-resource>
+                                    <outcome value='not-found'>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                        </return>
+                                    </outcome>
+                                    <outcome value='failure'>
+                                        <return status='failure'>
+                                            <parameter name='error-code' value='' />
+                                            <parameter name='error-message' value='' />
+                                        </return>
                                     </outcome>
-                                </switch>
+                                </get-resource>
                             </outcome>
                         </switch>
                     </for>
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 5c047638..648929a6 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
@@ -1,372 +1,221 @@
 <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}'>
+        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}'>
     <method rpc='tsli-vnf-topology-operation-trans-slice-delete' mode='sync'>
         <block atomic="true">
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >
-                <parameter name="vnf-topology-operation-input.vnf-information.vnf-id" value="$vnf-topology-operation-input.vnf-information.vnf-id"/>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
             </execute>
-            <switch test='`$service-data.vnfs.vnf_length`'>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />
-                    </return>
-                </outcome>
-                <outcome value='Other'>
-                    <block atomic="true">
-                        <for index='nidx' start='0' end='`$service-data.vnfs.vnf_length`' >
-                            <switch test="`$service-data.vnfs.vnf[$nidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`">
-                                <outcome value='true'>
-                                    <set>
-                                        <parameter name='tmp.nidx' value='`$nidx`' />
-                                        <parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$nidx].vnf-data.`' />
-                                    </set>
-                                </outcome>
-                            </switch>
-                        </for>
-                        <switch test="`$tmp.nidx`">
-                            <outcome value=''>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />
-                                </return>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-            </switch>
-            <switch test='`$service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`'>
-                <outcome value='PendingDelete'>
-                    <block atomic="true"></block>
-                </outcome>
-                <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`" />
-                    </return>
-                </outcome>
-            </switch>
-            <set>
-                <parameter name='prop.vnfidxLen' value='`0`' />
-            </set>
-            <for index='lidx' start='0' end='`$service-data.vnfs.vnf_length`' >
-                <block atomic="true">
-                    <switch test="`$service-data.vnfs.vnf[$lidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`">
-                        <outcome value='false'>
-                            <block atomic="true">
-                                <set>
-                                    <parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$lidx].vnf-id`' />
-                                    <parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$lidx].vnf-data.`' />
-                                </set>
-                                <set>
-                                    <parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />
-                                </set>
-                            </block>
-                        </outcome>
-                    </switch>
-                </block>
-            </for>
-            <set>
-                <parameter name="service-data.vnfs.vnf_length" value='`$prop.vnfidxLen`'/>
-            </set>
-            <set>
-                <parameter name="service-data.vnfs.vnf[$prop.vnfidxLen]." value=""/>
-            </set>
-            <set>
-                <parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
-                <parameter name='vnf-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
- + $vnf-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'` " />
-            </set>
-            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="generic-vnf"   
-		key="generic-vnf.vnf-id = $vnfId" >
-                <parameter name="orchestration-status" value="PendingDelete" />
-                <parameter name="vnf-type" value="some vnf-type" />
-            </delete>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="service-instance"
-	key='service-instance.service-instance-id = $service-data.service-information.service-instance-id
-         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id 
-         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'
-	local-only="false"
-	force="true" pfx="tmp.aai.service-instance">
+            <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+            <!--	resource="service-instance"-->
+            <!--	key='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->
+            <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->
+            <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->
+            <!--	local-only="false"-->
+            <!--	force="true" pfx="tmp.aai.service-instance">-->
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                          resource="service-instance"
+                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                          local-only="false"
+                          force="true" pfx="tmp.aai.service-instance">
+                <!--vnf-topology-operation-input.service-information.service-instance-id-->
                 <outcome value='success'>
                     <for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >
                         <switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>
                             <outcome value='connectivity'>
-                                <switch test="`$rel-index == 0`">
-                                    <outcome value='true'>
-                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="connectivity"
-	    key="connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[0].relationship-data[0].relationship-value"
-		local-only="false" 
-		pfx="tmp.aai.connectivityA" >
-                                            <outcome value='success'>
-                                                <block atomic="true">
-                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="vpn-binding"
-	    key="vpn-binding.vpn-id = $tmp.aai.connectivityA.relationship-list.relationship[0].relationship-data[0].relationship-value"
-		local-only="false" 
-		pfx="tmp.aai.vpn-bindingA" >
-                                                        <outcome value='success'>
-                                                            <block atomic="true">
-                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="esr-thirdparty-sdnc" 
-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND 
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="connectivity"
+                                              key="connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"
+                                              local-only="false"
+                                              pfx="tmp.aai.connectivity" >
+                                    <outcome value='success'>
+                                        <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
+                                            <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
+                                                <outcome value='vpn-binding'>
+                                                    <block atomic="true">
+                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                      resource="vpn-binding"
+                                                                      key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
+                                                                      local-only="false"
+                                                                      pfx="tmp.aai.vpn-binding" >
+                                                            <outcome value='success'>
+                                                                <block atomic="true">
+                                                                    <set>
+                                                                        <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +
+                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +
+                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +
+                                                   $tmp.aai.vpn-binding.src-access-node-id`" />
+                                                                    </set>
+                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                  resource="pnf"
+                                                                                  key="pnf.pnf-name = $tmp.domain.pnf-name"
+                                                                                  pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                        <!--AND depth = '0'"-->
+                                                                        <outcome value='success'>
+                                                                            <block>
+                                                                                <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
+                                                                                    <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                        <outcome value='esr-thirdparty-sdnc'>
+                                                                                            <block atomic="true">
+                                                                                                <set>
+                                                                                                    <parameter name='tmp.domain.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                </set>
+                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                              resource="esr-thirdparty-sdnc"
+                                                                                                              key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND
 		     depth = '1'"
-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
-                                                                    <outcome value='success'>
-                                                                        <set>
-                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                            <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                            <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                            <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                            <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                            <!--<parameter name="format" value="json"/>-->
-                                                                            <!--<parameter name="httpMethod" value="get"/>-->
-                                                                            <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                                        </set>
-                                                                    </outcome>
-                                                                    <outcome value='not-found'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                                                                        </return>
-                                                                    </outcome>
-                                                                    <outcome value='Other'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                                                                        </return>
-                                                                    </outcome>
-                                                                </get-resource>
-                                                                <set>
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$tmp.aai.vpn-bindingA.access-node-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$tmp.aai.vpn-bindingA.access-node-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />
-                                                                </set>
-                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`" />
-                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`" />
-                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                                                    <parameter name="format" value="json"/>
-                                                                    <parameter name="httpMethod" value="patch"/>
-                                                                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                                    <!--<parameter name='dirPath' value="/opt/sdnc/restapi/yang" />-->
-                                                                    <parameter name="responsePrefix" value="vpn-result"/>
-                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                    <outcome value='failure'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="Error executing Create vpn rest api" />
-                                                                        </return>
-                                                                    </outcome>
-                                                                    <outcome value='success'>
-                                                                        <block atomic="true"></block>
-                                                                    </outcome>
-                                                                </execute>
-                                                                <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
-      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'></delete>
-                                                                <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
-      key='tmp.aai.vpn-bindingA = $tmp.aai.vpn-bindingA'></delete>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='not-found'>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                            </return>
-                                                        </outcome>
-                                                        <outcome value='failure'>
-                                                            <return status='failure'>
-                                                                <parameter name='error-code' value='' />
-                                                                <parameter name='error-message' value='' />
-                                                            </return>
-                                                        </outcome>
-                                                    </get-resource>
-                                                </block>
-                                            </outcome>
-                                            <outcome value='not-found'>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                </return>
-                                            </outcome>
-                                            <outcome value='failure'>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='' />
-                                                    <parameter name='error-message' value='' />
-                                                </return>
-                                            </outcome>
-                                        </get-resource>
+                                                                                                              pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                    <outcome value='success'>
+                                                                                                        <block>
+                                                                                                            <set>
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                <!--<parameter name="format" value="json"/>-->
+                                                                                                                <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                            </set>
+                                                                                                        </block>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='not-found'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='Other'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                </get-resource>
+                                                                                                <break/>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                </for>
+                                                                            </block>
+                                                                        </outcome>
+                                                                        <outcome value='not-found'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                        <outcome value='Other'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                    </get-resource>
+                                                                    <set>
+                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                    </set>
+                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`" />
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url +  '/restconf/operations/ietf-optical-slice:deallocate-optical-slice'`" />
+                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                        <parameter name="format" value="json"/>
+                                                                        <parameter name="httpMethod" value="delete"/>
+                                                                        <parameter name="responsePrefix" value="otn-oof"/>
+                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                        <outcome value='failure'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                        <outcome value='success'>
+                                                                            <block atomic="true"></block>
+                                                                        </outcome>
+                                                                    </execute>
+                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                        <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />-->
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id +  '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:tp-slice-id' `" />
+                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                        <parameter name="format" value="json"/>
+                                                                        <parameter name="httpMethod" value="delete"/>
+                                                                        <parameter name="responsePrefix" value="otn-oof"/>
+                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                        <outcome value='failure'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="Error executing OOF api" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                        <outcome value='success'>
+                                                                            <block></block>
+                                                                        </outcome>
+                                                                    </execute>
+                                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                            key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'></delete>
+                                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                            key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' ></delete>
+                                                                </block>
+                                                            </outcome>
+                                                            <outcome value='not-found'>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                </return>
+                                                            </outcome>
+                                                            <outcome value='failure'>
+                                                                <return status='failure'>
+                                                                    <parameter name='error-code' value='' />
+                                                                    <parameter name='error-message' value='' />
+                                                                </return>
+                                                            </outcome>
+                                                        </get-resource>
+                                                    </block>
+                                                </outcome>
+                                            </switch>
+                                        </for>
                                     </outcome>
-                                    <outcome value='false'>
-                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="connectivity"
-	    key="connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[1].relationship-data[0].relationship-value"
-		local-only="false" 
-		pfx="tmp.aai.connectivityB" >
-                                            <outcome value='success'>
-                                                <block atomic="true">
-                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="vpn-binding"
-	    key="vpn-binding.vpn-id = $tmp.aai.connectivityB.relationship-list.relationship[0].relationship-data[0].relationship-value"
-		local-only="false" 
-		pfx="tmp.aai.vpn-bindingB" >
-                                                        <outcome value='success'>
-                                                            <block atomic="true">
-                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="esr-thirdparty-sdnc" 
-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND 
-		     depth = '1'"
-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
-                                                                    <outcome value='success'>
-                                                                        <set>
-                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                            <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                            <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                            <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                            <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                            <!--<parameter name="format" value="json"/>-->
-                                                                            <!--<parameter name="httpMethod" value="get"/>-->
-                                                                            <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                                        </set>
-                                                                    </outcome>
-                                                                    <outcome value='not-found'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                                                                        </return>
-                                                                    </outcome>
-                                                                    <outcome value='Other'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                                                                        </return>
-                                                                    </outcome>
-                                                                </get-resource>
-                                                                <set>
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$tmp.aai.vpn-bindingB.access-node-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$tmp.aai.vpn-bindingB.dst-access-ltp-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$tmp.aai.vpn-bindingB.access-node-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />
-                                                                    <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />
-                                                                </set>
-                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`" />
-                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`" />
-                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                                                    <parameter name="format" value="json"/>
-                                                                    <parameter name="httpMethod" value="patch"/>
-                                                                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                                    <!--<parameter name='dirPath' value="/opt/sdnc/restapi/yang" />-->
-                                                                    <parameter name="responsePrefix" value="vpn-result"/>
-                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                    <outcome value='failure'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="Error executing Create vpn rest api" />
-                                                                        </return>
-                                                                    </outcome>
-                                                                    <outcome value='success'>
-                                                                        <block atomic="true"></block>
-                                                                    </outcome>
-                                                                </execute>
-                                                                <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
-      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'></delete>
-                                                                <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
-      key='tmp.aai.vpn-bindingB = $tmp.aai.vpn-bindingB'></delete>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='not-found'>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                            </return>
-                                                        </outcome>
-                                                        <outcome value='failure'>
-                                                            <return status='failure'>
-                                                                <parameter name='error-code' value='' />
-                                                                <parameter name='error-message' value='' />
-                                                            </return>
-                                                        </outcome>
-                                                    </get-resource>
-                                                </block>
-                                            </outcome>
-                                            <outcome value='not-found'>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                </return>
-                                            </outcome>
-                                            <outcome value='failure'>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='' />
-                                                    <parameter name='error-message' value='' />
-                                                </return>
-                                            </outcome>
-                                        </get-resource>
+                                    <outcome value='not-found'>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                        </return>
+                                    </outcome>
+                                    <outcome value='failure'>
+                                        <return status='failure'>
+                                            <parameter name='error-code' value='' />
+                                            <parameter name='error-message' value='' />
+                                        </return>
                                     </outcome>
-                                </switch>
+                                </get-resource>
                             </outcome>
                         </switch>
                     </for>
-- 
cgit 1.2.3-korg