From 4b0cc62e6784f12c488d083ca38f9e4728351008 Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Fri, 15 Oct 2021 12:14:41 -0400
Subject: [PATCH] Support for proper deletion of vpn-bindings when there are
 multiple CLLs and multiple clouds.

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

Former-commit-id: 904f8819208b26f7a6b715540319d076d3819cb7
---
 ...ll-vnf-topology-operation-cll-delete-VPNBs.json | 1435 ++++--
 ...-API_cll-vnf-topology-operation-cll-delete.json | 5165 +++++++++++---------
 ...cll-vnf-topology-operation-cll-delete-VPNBs.xml |  262 +-
 ...E-API_cll-vnf-topology-operation-cll-delete.xml |  140 +
 4 files changed, 4238 insertions(+), 2764 deletions(-)

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete-VPNBs.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete-VPNBs.json
index de9383d3..ecbe0925 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete-VPNBs.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete-VPNBs.json
@@ -1,936 +1,936 @@
 [
     {
-        "id": "a88af18.67fae9",
+        "id": "3822698e.fe6a9e",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2806.316619873047,
-        "y": 668.88330078125,
-        "z": "347519d8.005516",
+        "x": 2722.4332885742188,
+        "y": 1488,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "d17bb726.fa65e8"
+                "61592847.4c1088"
             ]
         ]
     },
     {
-        "id": "d17bb726.fa65e8",
+        "id": "61592847.4c1088",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2943.316619873047,
-        "y": 756.88330078125,
-        "z": "347519d8.005516",
+        "x": 2859.4332885742188,
+        "y": 1576,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "141e9731.53d429"
+                "a18c2b6d.4397b"
             ]
         ]
     },
     {
-        "id": "5a075e5f.de06b8",
+        "id": "62ff1995.5919b8",
         "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": 3328.316619873047,
-        "y": 769.88330078125,
-        "z": "347519d8.005516",
+        "x": 3244.4332885742188,
+        "y": 1589,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "bfab05fb.6c1fd",
-                "66b97fa3.09fba8",
-                "a61f3fb8.28c2b"
+                "93829917.caf878",
+                "4d145f4b.31c318",
+                "47a377cc.3a6e08"
             ]
         ]
     },
     {
-        "id": "141e9731.53d429",
+        "id": "a18c2b6d.4397b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3122.316619873047,
-        "y": 756.88330078125,
-        "z": "347519d8.005516",
+        "x": 3038.4332885742188,
+        "y": 1576,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "6ba56bd3.970cc4",
-                "5a075e5f.de06b8",
-                "f743ac29.02b56"
+                "f904d45e.838058",
+                "62ff1995.5919b8",
+                "1ddc0d65.0a518b"
             ]
         ]
     },
     {
-        "id": "6ba56bd3.970cc4",
+        "id": "f904d45e.838058",
         "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": 3358.316619873047,
-        "y": 717.88330078125,
-        "z": "347519d8.005516",
+        "x": 3274.4332885742188,
+        "y": 1537,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "bfab05fb.6c1fd",
+        "id": "93829917.caf878",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3538.316619873047,
-        "y": 760.88330078125,
-        "z": "347519d8.005516",
+        "x": 3454.4332885742188,
+        "y": 1580,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "9395b4f9.f11e08"
+                "77ca3f11.791e38"
             ]
         ]
     },
     {
-        "id": "66b97fa3.09fba8",
+        "id": "4d145f4b.31c318",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3530.316619873047,
-        "y": 815.88330078125,
-        "z": "347519d8.005516",
+        "x": 3446.4332885742188,
+        "y": 1635,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "6a113c41.2b7f84"
+                "40a5f22a.13a82c"
             ]
         ]
     },
     {
-        "id": "a61f3fb8.28c2b",
+        "id": "47a377cc.3a6e08",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3535.316619873047,
-        "y": 872.88330078125,
-        "z": "347519d8.005516",
+        "x": 3451.4332885742188,
+        "y": 1692,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "ae24d388.debf2"
+                "a269a8ad.5fc788"
             ]
         ]
     },
     {
-        "id": "ae24d388.debf2",
+        "id": "a269a8ad.5fc788",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3687.316619873047,
-        "y": 873.88330078125,
-        "z": "347519d8.005516",
+        "x": 3603.4332885742188,
+        "y": 1693,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "6a113c41.2b7f84",
+        "id": "40a5f22a.13a82c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3698.316619873047,
-        "y": 818.88330078125,
-        "z": "347519d8.005516",
+        "x": 3614.4332885742188,
+        "y": 1638,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "9395b4f9.f11e08",
+        "id": "77ca3f11.791e38",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3682.698944091797,
-        "y": 758.5389709472656,
-        "z": "347519d8.005516",
+        "x": 3598.8156127929688,
+        "y": 1577.6556701660156,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "e30efe2.36b498"
+                "1f7af3e2.81853c"
             ]
         ]
     },
     {
-        "id": "e30efe2.36b498",
+        "id": "1f7af3e2.81853c",
         "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": 3897.316619873047,
-        "y": 754.88330078125,
-        "z": "347519d8.005516",
+        "x": 3813.4332885742188,
+        "y": 1574,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "f743ac29.02b56",
+        "id": "1ddc0d65.0a518b",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3278.316619873047,
-        "y": 833.88330078125,
-        "z": "347519d8.005516",
+        "x": 3194.4332885742188,
+        "y": 1653,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "98d7bf6.4dfe7c",
+        "id": "e639cfa.29b4c3",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 2698.816619873047,
-        "y": 955.88330078125,
-        "z": "347519d8.005516",
+        "x": 2614.9332885742188,
+        "y": 1775,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "61820fcc.882e",
+        "id": "1f0101e1.8e6866",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2694.316619873047,
-        "y": 1020.88330078125,
-        "z": "347519d8.005516",
+        "x": 2610.4332885742188,
+        "y": 1840,
+        "z": "ec6164d7.ff9708",
         "wires": [
             []
         ]
     },
     {
-        "id": "5b3a4445.ce6224",
+        "id": "944f61d3.f96e18",
         "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": 2604.3164978027344,
-        "y": 741.88330078125,
-        "z": "347519d8.005516",
+        "x": 2520.4331665039062,
+        "y": 1561,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "a88af18.67fae9"
+                "3822698e.fe6a9e"
             ]
         ]
     },
     {
-        "id": "132ce225.b79cae",
+        "id": "63959115.b850c",
         "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": 2052.316375732422,
-        "y": 721.88330078125,
-        "z": "347519d8.005516",
+        "x": 1968.4330444335938,
+        "y": 1541,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "5cdb5a7a.54733c",
+        "id": "a62a741e.9cd9d",
         "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": 2080.3164978027344,
-        "y": 791.88330078125,
-        "z": "347519d8.005516",
+        "x": 1996.4331665039062,
+        "y": 1611,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "6c0f168f.8aad68",
-                "cd12f0b4.568798",
-                "80b1b093.b4332"
+                "ca780146.c1231",
+                "2112ad82.c29caa",
+                "937e0d43.e6cd18"
             ]
         ]
     },
     {
-        "id": "6c0f168f.8aad68",
+        "id": "ca780146.c1231",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2275.816619873047,
-        "y": 743.88330078125,
-        "z": "347519d8.005516",
+        "x": 2191.9332885742188,
+        "y": 1563,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "99130a65.69efe8"
+                "7599f2ce.c74a1c"
             ]
         ]
     },
     {
-        "id": "cd12f0b4.568798",
+        "id": "2112ad82.c29caa",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2267.816619873047,
-        "y": 798.88330078125,
-        "z": "347519d8.005516",
+        "x": 2183.9332885742188,
+        "y": 1618,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "80ce6dda.3e5e5"
+                "5027d99d.8613"
             ]
         ]
     },
     {
-        "id": "99130a65.69efe8",
+        "id": "7599f2ce.c74a1c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2420.198944091797,
-        "y": 743.5389709472656,
-        "z": "347519d8.005516",
+        "x": 2336.3156127929688,
+        "y": 1562.6556701660156,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "5b3a4445.ce6224"
+                "944f61d3.f96e18"
             ]
         ]
     },
     {
-        "id": "80b1b093.b4332",
+        "id": "937e0d43.e6cd18",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2272.816619873047,
-        "y": 855.88330078125,
-        "z": "347519d8.005516",
+        "x": 2188.9332885742188,
+        "y": 1675,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "b4d035fe.9cf0b"
+                "76756fa2.c3dc2"
             ]
         ]
     },
     {
-        "id": "b4d035fe.9cf0b",
+        "id": "76756fa2.c3dc2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2424.816619873047,
-        "y": 856.88330078125,
-        "z": "347519d8.005516",
+        "x": 2340.9332885742188,
+        "y": 1676,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "80ce6dda.3e5e5",
+        "id": "5027d99d.8613",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2435.816619873047,
-        "y": 799.88330078125,
-        "z": "347519d8.005516",
+        "x": 2351.9332885742188,
+        "y": 1619,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "cbce5afd.0d149",
+        "id": "64d61f83.5de088",
         "type": "execute",
         "name": "execute RestApiCallNode Delete OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2190.316619873047,
-        "y": 985.88330078125,
-        "z": "347519d8.005516",
+        "x": 2106.4332885742188,
+        "y": 1805,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "38dfa115.008496",
-                "f31653a0.9143e8"
+                "847a88ab.176f8",
+                "60c8b991.b738f"
             ]
         ]
     },
     {
-        "id": "38dfa115.008496",
+        "id": "847a88ab.176f8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2522.816619873047,
-        "y": 955.88330078125,
-        "z": "347519d8.005516",
+        "x": 2438.9332885742188,
+        "y": 1775,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "98d7bf6.4dfe7c"
+                "e639cfa.29b4c3"
             ]
         ]
     },
     {
-        "id": "f31653a0.9143e8",
+        "id": "60c8b991.b738f",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2527.816619873047,
-        "y": 1020.88330078125,
-        "z": "347519d8.005516",
+        "x": 2443.9332885742188,
+        "y": 1840,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "61820fcc.882e"
+                "1f0101e1.8e6866"
             ]
         ]
     },
     {
-        "id": "30af1423.cd4b6c",
+        "id": "a3d6fe2.756c3",
         "type": "save",
         "name": "delete vpn-binding resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2113.316619873047,
-        "y": 1116.88330078125,
-        "z": "347519d8.005516",
+        "x": 2029.4332885742188,
+        "y": 1936,
+        "z": "ec6164d7.ff9708",
         "wires": [
             []
         ]
     },
     {
-        "id": "d0b44cbe.a16a5",
+        "id": "f2fb74bb.786498",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1822.3166198730469,
-        "y": 941.88330078125,
-        "z": "347519d8.005516",
+        "x": 1738.4332885742188,
+        "y": 1761,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "132ce225.b79cae",
-                "5cdb5a7a.54733c",
-                "cbce5afd.0d149",
-                "30af1423.cd4b6c",
-                "b097652b.150d7",
-                "e258ce61.c84d28"
+                "63959115.b850c",
+                "a62a741e.9cd9d",
+                "64d61f83.5de088",
+                "a3d6fe2.756c3",
+                "d781a807.293c48",
+                "c5cf8874.0fba"
             ]
         ]
     },
     {
-        "id": "b097652b.150d7",
+        "id": "d781a807.293c48",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
         "comments": "",
-        "x": 2101.5164489746094,
-        "y": 624.88330078125,
-        "z": "347519d8.005516",
+        "x": 2017.6331176757812,
+        "y": 1444,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "e258ce61.c84d28",
+        "id": "c5cf8874.0fba",
         "type": "set",
         "name": "set tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
         "comments": "",
-        "x": 2093.5164489746094,
-        "y": 673.88330078125,
-        "z": "347519d8.005516",
+        "x": 2009.6331176757812,
+        "y": 1493,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "3c24f82.dfab088",
+        "id": "ea6bf698.38c53",
         "type": "comment",
         "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
         "info": "",
         "comments": "",
-        "x": 1023.5003967285156,
-        "y": 746.39990234375,
-        "z": "347519d8.005516",
+        "x": 939.6170654296875,
+        "y": 1565.5166015625,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "570ad10f.ad92f8",
+        "id": "6975d798.e5c738",
         "type": "save",
         "name": "get all-vpn-bindings from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 921.5003967285156,
-        "y": 781.39990234375,
-        "z": "347519d8.005516",
+        "x": 837.6170654296875,
+        "y": 1600.5166015625,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "f405b75.e7a9fc8",
-                "4e9de096.f468b",
-                "9757d76.73f10a8"
+                "c993cc39.ec87d",
+                "2a52cdc6.c6690a",
+                "7a224e7c.af9708"
             ]
         ]
     },
     {
-        "id": "f405b75.e7a9fc8",
+        "id": "c993cc39.ec87d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1126.5003967285156,
-        "y": 778.39990234375,
-        "z": "347519d8.005516",
+        "x": 1042.6170654296875,
+        "y": 1597.5166015625,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "5de56166.922018"
+                "6326654e.b84854"
             ]
         ]
     },
     {
-        "id": "4e9de096.f468b",
+        "id": "2a52cdc6.c6690a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1109.9913635253906,
-        "y": 839.9739379882812,
-        "z": "347519d8.005516",
+        "x": 1026.1080322265625,
+        "y": 1659.0906372070312,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "a1062ebe.b15808"
+                "a71bbbd1.f4a8c"
             ]
         ]
     },
     {
-        "id": "9757d76.73f10a8",
+        "id": "7a224e7c.af9708",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1107.5003967285156,
-        "y": 883.39990234375,
-        "z": "347519d8.005516",
+        "x": 1023.6170654296875,
+        "y": 1702.5166015625,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "10e74f8b.3fb4a8"
+                "ec0ca87c.f45398"
             ]
         ]
     },
     {
-        "id": "5de56166.922018",
+        "id": "6326654e.b84854",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1294.5006408691406,
-        "y": 773.39990234375,
-        "z": "347519d8.005516",
+        "x": 1210.6173095703125,
+        "y": 1592.5166015625,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "fdc657b.398c8a8"
+                "2bc4a679.cf5d3a"
             ]
         ]
     },
     {
-        "id": "a1062ebe.b15808",
+        "id": "a71bbbd1.f4a8c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1272.5627746582031,
-        "y": 840.2596740722656,
-        "z": "347519d8.005516",
+        "x": 1188.679443359375,
+        "y": 1659.3763732910156,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "10e74f8b.3fb4a8",
+        "id": "ec0ca87c.f45398",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1274.5003967285156,
-        "y": 882.39990234375,
-        "z": "347519d8.005516",
+        "x": 1190.6170654296875,
+        "y": 1701.5166015625,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "fdc657b.398c8a8",
+        "id": "2bc4a679.cf5d3a",
         "type": "for",
         "name": "for vpnidx in all-vpn-bindings",
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 920.5007019042969,
-        "y": 1018.39990234375,
-        "z": "347519d8.005516",
+        "x": 836.6173706054688,
+        "y": 1837.5166015625,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "5a8644f1.6f626c"
+                "7c4d0989.9bb298"
             ]
         ]
     },
     {
-        "id": "5a8644f1.6f626c",
+        "id": "7c4d0989.9bb298",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1150.5004577636719,
-        "y": 1006.39990234375,
-        "z": "347519d8.005516",
+        "x": 1066.6171264648438,
+        "y": 1825.5166015625,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "71241a5.135ba64"
+                "bd37314.c09c9d"
             ]
         ]
     },
     {
-        "id": "71241a5.135ba64",
+        "id": "bd37314.c09c9d",
         "type": "switchNode",
         "name": "switch ops-note is srcTtpOtnLayer",
         "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1386.3168640136719,
-        "y": 1005.56640625,
-        "z": "347519d8.005516",
+        "x": 1302.4335327148438,
+        "y": 1824.68310546875,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "4253fbea.3b4874",
-                "6cef3566.dab14c"
+                "d2ea08ce.4f3608",
+                "40b454d5.b7ece4"
             ]
         ]
     },
     {
-        "id": "4253fbea.3b4874",
+        "id": "d2ea08ce.4f3608",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1616.3168640136719,
-        "y": 1000.56591796875,
-        "z": "347519d8.005516",
+        "x": 1532.4335327148438,
+        "y": 1819.6826171875,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "d0b44cbe.a16a5"
+                "f2fb74bb.786498"
             ]
         ]
     },
     {
-        "id": "6cef3566.dab14c",
+        "id": "40b454d5.b7ece4",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1627.3168640136719,
-        "y": 1043.56591796875,
-        "z": "347519d8.005516",
+        "x": 1543.4335327148438,
+        "y": 1862.6826171875,
+        "z": "ec6164d7.ff9708",
         "wires": [
             []
         ]
     },
     {
-        "id": "3070392b.33f8c6",
+        "id": "3e5224b.295e95c",
         "type": "set",
         "name": "set srcTtp OTN layer",
         "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",
         "comments": "",
-        "x": 1170.9999694824219,
-        "y": 593.283203125,
-        "z": "347519d8.005516",
+        "x": 1161.1166381835938,
+        "y": 618.3998718261719,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "45e829a.7cbd958",
+        "id": "2f96b0a0.fe469",
         "type": "set",
         "name": "unset tmp.aai.all-vpn-bindings",
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
         "comments": "",
-        "x": 900.2001037597656,
-        "y": 707.39990234375,
-        "z": "347519d8.005516",
+        "x": 816.3167724609375,
+        "y": 1526.5166015625,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "304ed1d7.4f9efe",
+        "id": "8609633e.a887d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 663.9999694824219,
-        "y": 737.2333984375,
-        "z": "347519d8.005516",
+        "x": 580.1166381835938,
+        "y": 1556.35009765625,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "45e829a.7cbd958",
-                "570ad10f.ad92f8"
+                "2f96b0a0.fe469",
+                "6975d798.e5c738"
             ]
         ]
     },
     {
-        "id": "7df4e9d5.2bc648",
+        "id": "483fdff.aacb22",
         "type": "switchNode",
         "name": "switch provider-id domainA",
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1515.9999694824219,
-        "y": 455.283203125,
-        "z": "347519d8.005516",
+        "x": 1506.1166381835938,
+        "y": 480.3998718261719,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "a43c232c.85575"
+                "c84682e7.370ef"
             ]
         ]
     },
     {
-        "id": "561ea33d.a2ffb4",
+        "id": "dda9e843.2f3f18",
         "type": "for",
         "name": "for netwidx..allNetworksList_length",
         "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 1222.9999694824219,
-        "y": 449.283203125,
-        "z": "347519d8.005516",
+        "x": 1213.1166381835938,
+        "y": 474.3998718261719,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "7df4e9d5.2bc648"
+                "483fdff.aacb22"
             ]
         ]
     },
     {
-        "id": "2e515252.bebdb6",
+        "id": "d616c0c5.fad828",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1477.9999694824219,
-        "y": 406.283203125,
-        "z": "347519d8.005516",
+        "x": 1468.1166381835938,
+        "y": 431.3998718261719,
+        "z": "ec6164d7.ff9708",
         "wires": [
             []
         ]
     },
     {
-        "id": "36a9a792.12dcb8",
+        "id": "a2a08a1a.858e78",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
         "comments": "",
-        "x": 1166.9999694824219,
-        "y": 501.283203125,
-        "z": "347519d8.005516",
+        "x": 1157.1166381835938,
+        "y": 526.3998718261719,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "2a69687a.5611c",
+        "id": "201e5d50.a3833a",
         "type": "set",
         "name": "set tmp.pce-src-node",
         "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' 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<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' 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                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",
         "comments": "",
-        "x": 1174.9999694824219,
-        "y": 546.283203125,
-        "z": "347519d8.005516",
+        "x": 1165.1166381835938,
+        "y": 571.3998718261719,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "f3c1922.734777",
+        "id": "6eecdb5f.76c2ac",
         "type": "set",
         "name": "unset otnTopoIdSrc",
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
         "comments": "",
-        "x": 1171.9999694824219,
-        "y": 399.283203125,
-        "z": "347519d8.005516",
+        "x": 1162.1166381835938,
+        "y": 424.3998718261719,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "a43c232c.85575",
+        "id": "c84682e7.370ef",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1424.9999694824219,
-        "y": 523.283203125,
-        "z": "347519d8.005516",
+        "x": 1415.1166381835938,
+        "y": 548.3998718261719,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "f8e0e906.2dd5c"
+                "ab0f32b5.16cbf8"
             ]
         ]
     },
     {
-        "id": "f8e0e906.2dd5c",
+        "id": "ab0f32b5.16cbf8",
         "type": "switchNode",
         "name": "switch te-topo-id",
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1609.9999694824219,
-        "y": 522.283203125,
-        "z": "347519d8.005516",
+        "x": 1600.1166381835938,
+        "y": 547.3998718261719,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "8c6726fe.7433a8"
+                "51342e13.198088"
             ]
         ]
     },
     {
-        "id": "cc1b4364.1c9f18",
+        "id": "3e0e37bf.5a574",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 866.9999694824219,
-        "y": 421.283203125,
-        "z": "347519d8.005516",
+        "x": 857.1166381835938,
+        "y": 446.3998718261719,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "7c0eef33.a4cac8",
-                "ba37203f.b37c18",
-                "36a9a792.12dcb8",
-                "2a69687a.5611c",
-                "3070392b.33f8c6",
-                "561ea33d.a2ffb4",
-                "304ed1d7.4f9efe"
+                "a4e53180.2dfc9",
+                "128161ed.802f86",
+                "a2a08a1a.858e78",
+                "201e5d50.a3833a",
+                "3e5224b.295e95c",
+                "dda9e843.2f3f18",
+                "9fcccd6f.e18a48"
             ]
         ]
     },
     {
-        "id": "59a1e33e.932044",
+        "id": "b0a1b203.5dc08",
         "type": "comment",
         "name": "The following section is to find srcTtp OTN layer (its long name)",
         "info": "The following section is to find srcTtp OTN layer (its long name)",
         "comments": "",
-        "x": 851.9999694824219,
-        "y": 355.283203125,
-        "z": "347519d8.005516",
+        "x": 842.1166381835938,
+        "y": 380.3998718261719,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "ba37203f.b37c18",
+        "id": "128161ed.802f86",
         "type": "get-resource",
         "name": "get-resource network-resources-list",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
         "comments": "",
         "outputs": 1,
-        "x": 1230.9999694824219,
-        "y": 342.283203125,
-        "z": "347519d8.005516",
+        "x": 1221.1166381835938,
+        "y": 367.3998718261719,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "c06f47ba.39269",
-                "e8314c16.79663",
-                "2e515252.bebdb6"
+                "6219ad91.7b0784",
+                "4229f1dc.fc23b8",
+                "d616c0c5.fad828"
             ]
         ]
     },
     {
-        "id": "c06f47ba.39269",
+        "id": "6219ad91.7b0784",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1466.9999694824219,
-        "y": 325.283203125,
-        "z": "347519d8.005516",
+        "x": 1457.1166381835938,
+        "y": 350.3998718261719,
+        "z": "ec6164d7.ff9708",
         "wires": [
             []
         ]
     },
     {
-        "id": "e8314c16.79663",
+        "id": "4229f1dc.fc23b8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1463.9999694824219,
-        "y": 366.283203125,
-        "z": "347519d8.005516",
+        "x": 1454.1166381835938,
+        "y": 391.3998718261719,
+        "z": "ec6164d7.ff9708",
         "wires": [
             []
         ]
     },
     {
-        "id": "7c0eef33.a4cac8",
+        "id": "a4e53180.2dfc9",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
         "comments": "",
-        "x": 1179.9999694824219,
-        "y": 299.283203125,
-        "z": "347519d8.005516",
+        "x": 1170.1166381835938,
+        "y": 324.3998718261719,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "8c6726fe.7433a8",
+        "id": "51342e13.198088",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1801.9999694824219,
-        "y": 525.283203125,
-        "z": "347519d8.005516",
+        "x": 1792.1166381835938,
+        "y": 550.3998718261719,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "99c0dc88.ef82e8"
+                "6b44ef76.186218"
             ]
         ]
     },
     {
-        "id": "99c0dc88.ef82e8",
+        "id": "6b44ef76.186218",
         "type": "set",
         "name": "set otnTopoIdSrc",
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 1973.9999694824219,
-        "y": 521.283203125,
-        "z": "347519d8.005516",
+        "x": 1964.1166381835938,
+        "y": 546.3998718261719,
+        "z": "ec6164d7.ff9708",
         "wires": []
     },
     {
-        "id": "d2cbaaf0.8cf72",
+        "id": "425448fb.cf113",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 154.88333129882812,
-        "y": 89.88333129882812,
-        "z": "347519d8.005516",
+        "x": 145,
+        "y": 115,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "a811003b.ca91f8"
+                "99235c0c.841188"
             ]
         ]
     },
     {
-        "id": "a811003b.ca91f8",
+        "id": "99235c0c.841188",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -938,29 +938,812 @@
         "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": 439.1690216064453,
-        "y": 151.12143993377686,
-        "z": "347519d8.005516",
+        "x": 429.2856903076172,
+        "y": 176.23810863494873,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "5803201b.e752d"
+                "d962c511.69b1b8"
             ]
         ]
     },
     {
-        "id": "5803201b.e752d",
+        "id": "d962c511.69b1b8",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-delete-VPNBs",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 445.3119354248047,
-        "y": 235.88336181640625,
-        "z": "347519d8.005516",
+        "x": 435.42860412597656,
+        "y": 261.0000305175781,
+        "z": "ec6164d7.ff9708",
         "wires": [
             [
-                "cc1b4364.1c9f18"
+                "3e0e37bf.5a574"
             ]
         ]
+    },
+    {
+        "id": "9fcccd6f.e18a48",
+        "type": "for",
+        "name": "for each relationship of middle-man-conn",
+        "xml": "<for index='rel-index' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 806.63330078125,
+        "y": 876.0833740234375,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "fe8b9bc1.266868"
+            ]
+        ]
+    },
+    {
+        "id": "fe8b9bc1.266868",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$rel-index].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1106.967041015625,
+        "y": 871.0833129882812,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "a50ce6d7.7af75"
+            ]
+        ]
+    },
+    {
+        "id": "a50ce6d7.7af75",
+        "type": "outcome",
+        "name": "connectivity",
+        "xml": "<outcome value='connectivity'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1286.6336669921875,
+        "y": 871.0834045410156,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "878c81c6.c1cf08"
+            ]
+        ]
+    },
+    {
+        "id": "878c81c6.c1cf08",
+        "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 = $middle-man-conn.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": 1486.633544921875,
+        "y": 871.0833740234375,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "e5ce5572.0e9be",
+                "220d084e.f1aa2",
+                "8b2d18ec.0684a8"
+            ]
+        ]
+    },
+    {
+        "id": "8b2d18ec.0684a8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1717.683349609375,
+        "y": 821.8831787109375,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "220d084e.f1aa2",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1715.1923828125,
+        "y": 865.3091430664062,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e5ce5572.0e9be",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1693.63330078125,
+        "y": 921.0833740234375,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "adf18092.0df43"
+            ]
+        ]
+    },
+    {
+        "id": "adf18092.0df43",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 695.866943359375,
+        "y": 1018.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "841267bf.5a37d8"
+            ]
+        ]
+    },
+    {
+        "id": "841267bf.5a37d8",
+        "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": 869.866943359375,
+        "y": 1020.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "83e51395.23054"
+            ]
+        ]
+    },
+    {
+        "id": "83e51395.23054",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1066.866943359375,
+        "y": 1034.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "20d4597f.7ec4fe"
+            ]
+        ]
+    },
+    {
+        "id": "20d4597f.7ec4fe",
+        "type": "outcome",
+        "name": "vpn-binding",
+        "xml": "<outcome value='vpn-binding'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1234.866943359375,
+        "y": 1027.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "962e1e07.ed3e1"
+            ]
+        ]
+    },
+    {
+        "id": "962e1e07.ed3e1",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1397.866943359375,
+        "y": 1027.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "b3331932.59a4e"
+            ]
+        ]
+    },
+    {
+        "id": "b3331932.59a4e",
+        "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": 1073.866943359375,
+        "y": 1167.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "1d1a3767.b90801",
+                "1205c3c9.a1fe14",
+                "ac824193.0ceb4"
+            ]
+        ]
+    },
+    {
+        "id": "1d1a3767.b90801",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1284.866943359375,
+        "y": 1169.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "ce3bd26f.86a788"
+            ]
+        ]
+    },
+    {
+        "id": "1205c3c9.a1fe14",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1285.35791015625,
+        "y": 1214.8571166992188,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "8c52b3a4.bb9928"
+            ]
+        ]
+    },
+    {
+        "id": "ac824193.0ceb4",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1282.866943359375,
+        "y": 1258.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "b8796894.76af28"
+            ]
+        ]
+    },
+    {
+        "id": "8c52b3a4.bb9928",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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": 1447.9293212890625,
+        "y": 1215.1428527832031,
+        "z": "ec6164d7.ff9708",
+        "wires": []
+    },
+    {
+        "id": "b8796894.76af28",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "comments": "",
+        "x": 1449.866943359375,
+        "y": 1257.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": []
+    },
+    {
+        "id": "3d324826.e49518",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2047.866943359375,
+        "y": 1097.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "cd0aab83.f02f78",
+                "8058933f.2691e",
+                "f481dab1.2bbd68",
+                "119a4845.874928",
+                "5f76b8d0.e5e58"
+            ]
+        ]
+    },
+    {
+        "id": "cd0aab83.f02f78",
+        "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": 2269.866943359375,
+        "y": 815.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": []
+    },
+    {
+        "id": "8058933f.2691e",
+        "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": 2295.866943359375,
+        "y": 932.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "d483622c.685ad",
+                "b6de022b.29ab58",
+                "e510b446.5dd1e8"
+            ]
+        ]
+    },
+    {
+        "id": "f481dab1.2bbd68",
+        "type": "execute",
+        "name": "execute RestApiCallNode Delete OTN tunnel with token",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 2398.866943359375,
+        "y": 1199.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "422a3d0e.0ac58c",
+                "dc94e365.153108"
+            ]
+        ]
+    },
+    {
+        "id": "d483622c.685ad",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2491.3670654296875,
+        "y": 884.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "d09e0056.1e082"
+            ]
+        ]
+    },
+    {
+        "id": "b6de022b.29ab58",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2483.3670654296875,
+        "y": 939.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "9a521350.d6234"
+            ]
+        ]
+    },
+    {
+        "id": "d09e0056.1e082",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2625.749267578125,
+        "y": 878.9388427734375,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "f0956103.d162e8"
+            ]
+        ]
+    },
+    {
+        "id": "e510b446.5dd1e8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2488.3670654296875,
+        "y": 996.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "e16f9ab0.64cc3"
+            ]
+        ]
+    },
+    {
+        "id": "e16f9ab0.64cc3",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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": 2640.3670654296875,
+        "y": 997.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": []
+    },
+    {
+        "id": "9a521350.d6234",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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": 2651.3670654296875,
+        "y": 940.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": []
+    },
+    {
+        "id": "f0956103.d162e8",
+        "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": 2812.866455078125,
+        "y": 880.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "af503a6c.61f9f8"
+            ]
+        ]
+    },
+    {
+        "id": "af503a6c.61f9f8",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3053.866455078125,
+        "y": 871.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "b61fba47.4726f8"
+            ]
+        ]
+    },
+    {
+        "id": "422a3d0e.0ac58c",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2706.366455078125,
+        "y": 1224.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "dec1fd1f.efb3a"
+            ]
+        ]
+    },
+    {
+        "id": "dc94e365.153108",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2707.366455078125,
+        "y": 1169.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "52cd10d1.f921d8"
+            ]
+        ]
+    },
+    {
+        "id": "dec1fd1f.efb3a",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete OTN tunnel rest api\" />\n",
+        "comments": "",
+        "x": 2878.366455078125,
+        "y": 1222.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": []
+    },
+    {
+        "id": "52cd10d1.f921d8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2874.866455078125,
+        "y": 1171.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a1fe3dae.a2d208",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3410.8662109375,
+        "y": 820.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "e7174ef6.88aea",
+                "bfd51d3e.a21cb8",
+                "b48cd5e6.4e4b88"
+            ]
+        ]
+    },
+    {
+        "id": "b61fba47.4726f8",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3259.866455078125,
+        "y": 868.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "a1fe3dae.a2d208"
+            ]
+        ]
+    },
+    {
+        "id": "bfd51d3e.a21cb8",
+        "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": 3616.8662109375,
+        "y": 833.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "cb1cf6fc.9ef978",
+                "7d19de07.9d61",
+                "2bc4bb18.4f1464"
+            ]
+        ]
+    },
+    {
+        "id": "e7174ef6.88aea",
+        "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": 3646.8662109375,
+        "y": 781.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": []
+    },
+    {
+        "id": "cb1cf6fc.9ef978",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3826.8662109375,
+        "y": 824.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "a4768784.394af8"
+            ]
+        ]
+    },
+    {
+        "id": "7d19de07.9d61",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3818.8662109375,
+        "y": 879.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "4478591a.9ef568"
+            ]
+        ]
+    },
+    {
+        "id": "2bc4bb18.4f1464",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3823.8662109375,
+        "y": 936.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "23b7e106.ef601e"
+            ]
+        ]
+    },
+    {
+        "id": "b48cd5e6.4e4b88",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 3566.8662109375,
+        "y": 897.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": []
+    },
+    {
+        "id": "23b7e106.ef601e",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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": 3975.8662109375,
+        "y": 937.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": []
+    },
+    {
+        "id": "4478591a.9ef568",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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": 3986.8662109375,
+        "y": 882.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": []
+    },
+    {
+        "id": "a4768784.394af8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3971.24853515625,
+        "y": 821.9387512207031,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "98ec4d86.407d4"
+            ]
+        ]
+    },
+    {
+        "id": "98ec4d86.407d4",
+        "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": 4185.8662109375,
+        "y": 818.2830810546875,
+        "z": "ec6164d7.ff9708",
+        "wires": []
+    },
+    {
+        "id": "371b3631.1fe46a",
+        "type": "switchNode",
+        "name": "switch ops-note is srcTtpOtnLayer",
+        "xml": "<switch test=\"`$tmp.aai.vpn-binding.ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1660.0999755859375,
+        "y": 1107.2833251953125,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "5dda0eba.cba228",
+                "cd15371c.43ee48"
+            ]
+        ]
+    },
+    {
+        "id": "5dda0eba.cba228",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1890.0999755859375,
+        "y": 1102.2828369140625,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "3d324826.e49518"
+            ]
+        ]
+    },
+    {
+        "id": "cd15371c.43ee48",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1901.0999755859375,
+        "y": 1145.2828369140625,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ce3bd26f.86a788",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1440.0999755859375,
+        "y": 1164.683349609375,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            [
+                "371b3631.1fe46a"
+            ]
+        ]
+    },
+    {
+        "id": "119a4845.874928",
+        "type": "save",
+        "name": "delete vpn-binding resource in AAI",
+        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2345.816650390625,
+        "y": 1314.4833984375,
+        "z": "ec6164d7.ff9708",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5f76b8d0.e5e58",
+        "type": "set",
+        "name": "set Underlay OTN Tunnel Name tmp.underlayOTN",
+        "xml": "<set>\n<parameter name='tmp.underlayOTN' value=\"`$tmp.aai.vpn-binding.vpn-name`\" />\n",
+        "comments": "",
+        "x": 2348.0330810546875,
+        "y": 750.2833251953125,
+        "z": "ec6164d7.ff9708",
+        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
index fb09dbd8..241228f8 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "d1a7bbc1.540ca8",
+        "id": "4eba0592.d8f9ec",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
         "x": 171.88333129882812,
-        "y": 131.88333129882812,
-        "z": "82de8dcf.518d88",
+        "y": 174,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "6b49e250.7dcf1c"
+                "2ad94242.d34e8e"
             ]
         ]
     },
     {
-        "id": "6b49e250.7dcf1c",
+        "id": "2ad94242.d34e8e",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -23,221 +23,221 @@
         "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": 456.1690216064453,
-        "y": 193.12143993377686,
-        "z": "82de8dcf.518d88",
+        "y": 235.23810863494873,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "7d29f447.50c89c"
+                "86bffa6e.8633f8"
             ]
         ]
     },
     {
-        "id": "7d29f447.50c89c",
+        "id": "86bffa6e.8633f8",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-delete",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
         "x": 462.3119354248047,
-        "y": 277.88336181640625,
-        "z": "82de8dcf.518d88",
+        "y": 320.0000305175781,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "eaada3e3.80126"
+                "47cd43dd.6a0c84"
             ]
         ]
     },
     {
-        "id": "eaada3e3.80126",
+        "id": "47cd43dd.6a0c84",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 811.8833312988281,
-        "y": 336.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 379,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "48b97bf1.34ba04",
-                "4cae2f6c.f9579",
-                "47d3b263.d1c534"
+                "17095ff1.ceb8e",
+                "f2cac95d.2dd4f",
+                "41a5db6f.16b124"
             ]
         ]
     },
     {
-        "id": "48b97bf1.34ba04",
+        "id": "17095ff1.ceb8e",
         "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": 1113.2168273925781,
-        "y": 607.8136291503906,
-        "z": "82de8dcf.518d88",
+        "y": 649.9302978515625,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "4cae2f6c.f9579",
+        "id": "f2cac95d.2dd4f",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",
         "comments": "",
         "outputs": 1,
         "x": 1134.6452941894531,
-        "y": 310.2166442871094,
-        "z": "82de8dcf.518d88",
+        "y": 352.33331298828125,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "eecf5ed7.260848",
-                "c7a2a22f.bd7b1",
-                "44494afd.f0c474"
+                "d39ef031.51bcf8",
+                "d0a14c94.f617f8",
+                "66ff38b5.215e28"
             ]
         ]
     },
     {
-        "id": "eecf5ed7.260848",
+        "id": "d39ef031.51bcf8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1359.6452941894531,
-        "y": 168.21664428710938,
-        "z": "82de8dcf.518d88",
+        "y": 210.33331298828125,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "cddb4078.0dee18"
+                "6bec9327.9503c4"
             ]
         ]
     },
     {
-        "id": "c7a2a22f.bd7b1",
+        "id": "d0a14c94.f617f8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1355.1362609863281,
-        "y": 237.79067993164062,
-        "z": "82de8dcf.518d88",
+        "y": 279.9073486328125,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "7789aaf8.1fe7d4"
+                "73227915.55ca3"
             ]
         ]
     },
     {
-        "id": "44494afd.f0c474",
+        "id": "66ff38b5.215e28",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1343.6452941894531,
-        "y": 284.2166442871094,
-        "z": "82de8dcf.518d88",
+        "y": 326.33331298828125,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "64127148.01c618"
+                "5c121a7a.2c527c"
             ]
         ]
     },
     {
-        "id": "1679e3cd.763d6c",
+        "id": "dcc088f.fb3b378",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
         "x": 1113.6452941894531,
-        "y": 198.21664428710938,
-        "z": "82de8dcf.518d88",
+        "y": 240.33331298828125,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "47d3b263.d1c534",
+        "id": "41a5db6f.16b124",
         "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": 1101.6452941894531,
-        "y": 250.21664428710938,
-        "z": "82de8dcf.518d88",
+        "y": 292.33331298828125,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "cddb4078.0dee18",
+        "id": "6bec9327.9503c4",
         "type": "switchNode",
         "name": "switch allotted-resources_length != 0",
         "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1599.8833312988281,
-        "y": 164.88333129882812,
-        "z": "82de8dcf.518d88",
+        "y": 207,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "6a54ba66.1cde8c",
-                "7bb2b732.d43ff8"
+                "52c7d728.b872f8",
+                "31624b25.4a6dec"
             ]
         ]
     },
     {
-        "id": "7789aaf8.1fe7d4",
+        "id": "73227915.55ca3",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1509.9457092285156,
-        "y": 240.74310302734375,
-        "z": "82de8dcf.518d88",
+        "y": 282.8597717285156,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "64127148.01c618",
+        "id": "5c121a7a.2c527c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 1513.8833312988281,
-        "y": 284.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 327,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "6a54ba66.1cde8c",
+        "id": "52c7d728.b872f8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1804.8833312988281,
-        "y": 201.88333129882812,
-        "z": "82de8dcf.518d88",
+        "y": 244,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "d1e88455.43ef2"
+                "b08352cf.6ac34"
             ]
         ]
     },
     {
-        "id": "7bb2b732.d43ff8",
+        "id": "31624b25.4a6dec",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1814.8833312988281,
-        "y": 128.88333129882812,
-        "z": "82de8dcf.518d88",
+        "y": 171,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "d1e88455.43ef2",
+        "id": "b08352cf.6ac34",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -245,547 +245,547 @@
         "comments": "",
         "outputs": 1,
         "x": 1797.8833312988281,
-        "y": 276.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 319,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "8390a16b.5a156",
-                "341b8f1.ea5ec7",
-                "1d2c9241.740b2e",
-                "4208fd35.4a6c74",
-                "e351db25.84cdc8"
+                "bdd428b9.6fddd",
+                "8710bcb7.6e657",
+                "6f728611.a8a3e",
+                "6d42412e.61e8d",
+                "e22daf3c.82e7c8"
             ]
         ]
     },
     {
-        "id": "2db9f3bd.0d65e4",
+        "id": "50e447ae.0fde38",
         "type": "save",
         "name": "get allotted-resource from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 2283.883331298828,
-        "y": 327.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 370,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "11f248b6.2b0fe7",
-                "fd3681a1.487b1",
-                "9338a88f.aebeb"
+                "27d61e5e.f12fe2",
+                "2c908c8d.59c394",
+                "32fadd2c.e0a1c2"
             ]
         ]
     },
     {
-        "id": "11f248b6.2b0fe7",
+        "id": "27d61e5e.f12fe2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2499.883331298828,
-        "y": 394.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 437,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "7fe5ebf8.de6a64"
+                "4e35bc34.a92d94"
             ]
         ]
     },
     {
-        "id": "fd3681a1.487b1",
+        "id": "2c908c8d.59c394",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2500.374298095703,
-        "y": 294.4573059082031,
-        "z": "82de8dcf.518d88",
+        "y": 336.573974609375,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "6e8f233d.c6dbd4"
+                "6fdcac69.b07bec"
             ]
         ]
     },
     {
-        "id": "9338a88f.aebeb",
+        "id": "32fadd2c.e0a1c2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2495.883331298828,
-        "y": 343.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 386,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "8a3025a0.71b76"
+                "71176ed6.70694"
             ]
         ]
     },
     {
-        "id": "8390a16b.5a156",
+        "id": "bdd428b9.6fddd",
         "type": "for",
         "name": "for each allotted-resource",
         "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 2000.8833312988281,
-        "y": 308.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 351,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "7858ac8a.d0ed24",
-                "2db9f3bd.0d65e4",
-                "98563074.1e7ea",
-                "c475408d.68ef"
+                "7043f926.26b93",
+                "50e447ae.0fde38",
+                "8af2638e.140428",
+                "b2d6bb83.745318"
             ]
         ]
     },
     {
-        "id": "7858ac8a.d0ed24",
+        "id": "7043f926.26b93",
         "type": "set",
         "name": "set the current allotted-resource-id",
         "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",
         "comments": "",
         "x": 2280.883331298828,
-        "y": 246.88333129882812,
-        "z": "82de8dcf.518d88",
+        "y": 289,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "4208fd35.4a6c74",
+        "id": "6d42412e.61e8d",
         "type": "set",
         "name": "set tmp.arr",
         "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",
         "comments": "",
         "x": 1974.8833312988281,
-        "y": 258.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 301,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "341b8f1.ea5ec7",
+        "id": "8710bcb7.6e657",
         "type": "get-resource",
         "name": "get-resource pnfs-list",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
         "comments": "",
         "outputs": 1,
         "x": 2017.8833312988281,
-        "y": 117.88333129882812,
-        "z": "82de8dcf.518d88",
+        "y": 160,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "1d2c9241.740b2e",
+        "id": "6f728611.a8a3e",
         "type": "get-resource",
         "name": "get-resource logical-links",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
         "comments": "",
         "outputs": 1,
         "x": 2029.8833312988281,
-        "y": 158.88333129882812,
-        "z": "82de8dcf.518d88",
+        "y": 201,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "a3743fb5.49e31",
+        "id": "8a5a98d5.6ebb1",
         "type": "comment",
         "name": "The following two nodes are for PCE",
         "info": "",
         "comments": "",
         "x": 2054.883331298828,
-        "y": 70.88333129882812,
-        "z": "82de8dcf.518d88",
+        "y": 113,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "a5956784.1c6ce8",
+        "id": "2303563c.e9131a",
         "type": "set",
         "name": "set tmp.arr",
         "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",
         "comments": "",
         "x": 1974.8833312988281,
-        "y": 204.88333129882812,
-        "z": "82de8dcf.518d88",
+        "y": 247,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "6e8f233d.c6dbd4",
+        "id": "6fdcac69.b07bec",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2678.883331298828,
-        "y": 296.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 339,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "8a3025a0.71b76",
+        "id": "71176ed6.70694",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 2678.820831298828,
-        "y": 346.0235900878906,
-        "z": "82de8dcf.518d88",
+        "y": 388.1402587890625,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "7fe5ebf8.de6a64",
+        "id": "4e35bc34.a92d94",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2680.820831298828,
-        "y": 397.0235900878906,
-        "z": "82de8dcf.518d88",
+        "y": 439.1402587890625,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "27474730.1479c8"
+                "6a0085f3.85f3dc"
             ]
         ]
     },
     {
-        "id": "27474730.1479c8",
+        "id": "6a0085f3.85f3dc",
         "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": 2973.820831298828,
-        "y": 344.0235900878906,
-        "z": "82de8dcf.518d88",
+        "y": 386.1402587890625,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "bdd221b3.05669",
-                "9c61f989.c8eaf8",
-                "fabffff4.e28138"
+                "47170bd3.47cd24",
+                "41231d4a.3c5914",
+                "413cb45a.a52f94"
             ]
         ]
     },
     {
-        "id": "9c61f989.c8eaf8",
+        "id": "41231d4a.3c5914",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3247.311798095703,
-        "y": 236.59756469726562,
-        "z": "82de8dcf.518d88",
+        "y": 278.7142333984375,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "1e4b4cbe.e5dbab"
+                "ddcd6972.1cc26"
             ]
         ]
     },
     {
-        "id": "1e4b4cbe.e5dbab",
+        "id": "ddcd6972.1cc26",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3424.883331298828,
-        "y": 236.88333129882812,
-        "z": "82de8dcf.518d88",
+        "y": 279,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "fabffff4.e28138",
+        "id": "413cb45a.a52f94",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3242.820831298828,
-        "y": 286.0235900878906,
-        "z": "82de8dcf.518d88",
+        "y": 328.1402587890625,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "3e91db11.95e81c"
+                "29789682.9a5ca2"
             ]
         ]
     },
     {
-        "id": "3e91db11.95e81c",
+        "id": "29789682.9a5ca2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 3424.820831298828,
-        "y": 286.0235900878906,
-        "z": "82de8dcf.518d88",
+        "y": 328.1402587890625,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "bdd221b3.05669",
+        "id": "47170bd3.47cd24",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3246.820831298828,
-        "y": 337.0235900878906,
-        "z": "82de8dcf.518d88",
+        "y": 379.1402587890625,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "8cb6a22.c9637e"
+                "5d602163.27f0b"
             ]
         ]
     },
     {
-        "id": "8cb6a22.c9637e",
+        "id": "5d602163.27f0b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3426.820831298828,
-        "y": 337.0235900878906,
-        "z": "82de8dcf.518d88",
+        "y": 379.1402587890625,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "6f3506c3.cf97d8"
+                "dd9e7161.bb7c"
             ]
         ]
     },
     {
-        "id": "6f3506c3.cf97d8",
+        "id": "dd9e7161.bb7c",
         "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": 2992.883331298828,
-        "y": 471.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 514,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "5a58fe79.709e",
-                "5401f43b.ed03f4"
+                "e567be5f.46cf",
+                "117d3c85.14baf3"
             ]
         ]
     },
     {
-        "id": "5401f43b.ed03f4",
+        "id": "117d3c85.14baf3",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3302.883331298828,
-        "y": 478.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 521,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "5a58fe79.709e",
+        "id": "e567be5f.46cf",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3301.883331298828,
-        "y": 532.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 575,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "126c6f21.417e99"
+                "1aa53c9a.ee4c73"
             ]
         ]
     },
     {
-        "id": "24e00055.8ca808",
+        "id": "16e58d5c.45543b",
         "type": "outcome",
         "name": "network-policy",
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4046.883331298828,
-        "y": 486.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 529,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "8c1020d2.e3fc88"
+                "e0a75ebb.a4e0a"
             ]
         ]
     },
     {
-        "id": "8c1020d2.e3fc88",
+        "id": "e0a75ebb.a4e0a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4223.883209228516,
-        "y": 479.8832092285156,
-        "z": "82de8dcf.518d88",
+        "y": 521.9998779296875,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "709d8f82.9f2e1",
-                "cef8768a.ac6e48"
+                "64783b1d.9ea984",
+                "aa6dd372.e093d"
             ]
         ]
     },
     {
-        "id": "126c6f21.417e99",
+        "id": "1aa53c9a.ee4c73",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3465.883331298828,
-        "y": 458.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 501,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "f0253be2.ef6388",
-                "d30875df.4619e8"
+                "9d9386aa.4ba0f",
+                "a5c7d0d0.70a6f8"
             ]
         ]
     },
     {
-        "id": "f0253be2.ef6388",
+        "id": "9d9386aa.4ba0f",
         "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": 3746.883331298828,
-        "y": 414.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 457,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "6ce9e370.67b09c"
+                "ac9ffe20.350ab8"
             ]
         ]
     },
     {
-        "id": "6ce9e370.67b09c",
+        "id": "ac9ffe20.350ab8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4008.883331298828,
-        "y": 414.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 457,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "24e00055.8ca808"
+                "16e58d5c.45543b"
             ]
         ]
     },
     {
-        "id": "709d8f82.9f2e1",
+        "id": "64783b1d.9ea984",
         "type": "set",
         "name": "set the 1st network-policy-id",
         "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
         "x": 4466.883209228516,
-        "y": 436.8832092285156,
-        "z": "82de8dcf.518d88",
+        "y": 478.9998779296875,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "cef8768a.ac6e48",
+        "id": "aa6dd372.e093d",
         "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": 4455.883209228516,
-        "y": 491.8832092285156,
-        "z": "82de8dcf.518d88",
+        "y": 533.9998779296875,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "442d2e35.9513b",
-                "6b7a340a.d73c24",
-                "1cf09fd1.237e88"
+                "a2aec981.c05928",
+                "c6a2ea9c.683df",
+                "b8928013.256998"
             ]
         ]
     },
     {
-        "id": "1cf09fd1.237e88",
+        "id": "b8928013.256998",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4708.883331298828,
-        "y": 377.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 420,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "830d3a39.a47178"
+                "83be4f6.3f006b"
             ]
         ]
     },
     {
-        "id": "830d3a39.a47178",
+        "id": "83be4f6.3f006b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4857.454864501953,
-        "y": 378.1690979003906,
-        "z": "82de8dcf.518d88",
+        "y": 420.2857666015625,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "4e42818f.48a268",
+        "id": "586d6db7.c2d804",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 4856.392364501953,
-        "y": 422.3093566894531,
-        "z": "82de8dcf.518d88",
+        "y": 464.426025390625,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "6b7a340a.d73c24",
+        "id": "c6a2ea9c.683df",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4697.392364501953,
-        "y": 422.3093566894531,
-        "z": "82de8dcf.518d88",
+        "y": 464.426025390625,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "4e42818f.48a268"
+                "586d6db7.c2d804"
             ]
         ]
     },
     {
-        "id": "442d2e35.9513b",
+        "id": "a2aec981.c05928",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4704.392364501953,
-        "y": 501.3093566894531,
-        "z": "82de8dcf.518d88",
+        "y": 543.426025390625,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "dd05e839.54d638"
+                "4d4b39ee.fece78"
             ]
         ]
     },
     {
-        "id": "dd05e839.54d638",
+        "id": "4d4b39ee.fece78",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -793,203 +793,203 @@
         "comments": "",
         "outputs": 1,
         "x": 4843.392364501953,
-        "y": 501.3093566894531,
-        "z": "82de8dcf.518d88",
+        "y": 543.426025390625,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "d5c9a2a0.f0c188",
-                "585ee28c.970d44"
+                "68714312.362fe4",
+                "860808d4.582b4"
             ]
         ]
     },
     {
-        "id": "d5c9a2a0.f0c188",
+        "id": "68714312.362fe4",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
         "x": 5048.883331298828,
-        "y": 498.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 541,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "585ee28c.970d44",
+        "id": "860808d4.582b4",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
         "x": 5047.883331298828,
-        "y": 544.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 587,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "d30875df.4619e8",
+        "id": "a5c7d0d0.70a6f8",
         "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": 3563.883331298828,
-        "y": 530.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 573,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "bcf8f8b2.ee17c"
+                "91204981.e8b1c8"
             ]
         ]
     },
     {
-        "id": "bcf8f8b2.ee17c",
+        "id": "91204981.e8b1c8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3843.883331298828,
-        "y": 530.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 573,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "f92213c8.e6e61"
+                "815c7496.5664a8"
             ]
         ]
     },
     {
-        "id": "f92213c8.e6e61",
+        "id": "815c7496.5664a8",
         "type": "outcome",
         "name": "logical-link",
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2256.8834533691406,
-        "y": 783.8834533691406,
-        "z": "82de8dcf.518d88",
+        "y": 826.0001220703125,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "f147a584.43d0d8"
+                "2e1a5e6a.390622"
             ]
         ]
     },
     {
-        "id": "f147a584.43d0d8",
+        "id": "2e1a5e6a.390622",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2433.883331298828,
-        "y": 776.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 819,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "5a35df58.3972",
-                "2dab28b6.2641a"
+                "fda12a63.354948",
+                "9acb494f.3c831"
             ]
         ]
     },
     {
-        "id": "5a35df58.3972",
+        "id": "fda12a63.354948",
         "type": "set",
         "name": "set the current logical-link-name",
         "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
         "x": 2676.883331298828,
-        "y": 733.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 776,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "2dab28b6.2641a",
+        "id": "9acb494f.3c831",
         "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": 2665.883331298828,
-        "y": 788.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 831,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "ffb30860.4224d",
-                "abeb5cc2.3015b",
-                "e13761ad.544c58"
+                "2cf3e7af.84ed7",
+                "7720ff91.14ecb8",
+                "6208751c.cb4214"
             ]
         ]
     },
     {
-        "id": "ffb30860.4224d",
+        "id": "2cf3e7af.84ed7",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2957.374298095703,
-        "y": 767.4573059082031,
-        "z": "82de8dcf.518d88",
+        "y": 809.573974609375,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "bd849955.1204b"
+                "644aada5.da5074"
             ]
         ]
     },
     {
-        "id": "abeb5cc2.3015b",
+        "id": "7720ff91.14ecb8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2945.883331298828,
-        "y": 811.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 854,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "33701bc2.b5a40c"
+                "b4b18b88.8b8778"
             ]
         ]
     },
     {
-        "id": "bd849955.1204b",
+        "id": "644aada5.da5074",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3105.945831298828,
-        "y": 767.7430725097656,
-        "z": "82de8dcf.518d88",
+        "y": 809.8597412109375,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "33701bc2.b5a40c",
+        "id": "b4b18b88.8b8778",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 3104.883331298828,
-        "y": 811.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 854,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "e13761ad.544c58",
+        "id": "6208751c.cb4214",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2952.883331298828,
-        "y": 890.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 933,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "d2f3b92.5263348"
+                "f4a1f138.8436a"
             ]
         ]
     },
     {
-        "id": "d2f3b92.5263348",
+        "id": "f4a1f138.8436a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -997,900 +997,900 @@
         "comments": "",
         "outputs": 1,
         "x": 3091.883331298828,
-        "y": 890.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 933,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "ef467ac0.6f7c18",
-                "f9d1859a.061ab8",
-                "3e963f23.c2be88",
-                "f9ae4741.757498",
-                "2907fb26.565cec",
-                "26f3b8c8.1692a",
-                "94a806e9.b63df",
-                "a001cedc.58f128",
-                "221f1c18.663f6c",
-                "77955a17.d633ac",
-                "1e4146ab.95c211",
-                "c8da4017.620ba8",
-                "a4dfc5e6.4600f",
-                "ce0d81bd.d28a7",
-                "7f04acf4.5afc3c"
+                "64b776d1.df13b8",
+                "cf58d1a3.b75bc8",
+                "a4d7ff96.ceb5f8",
+                "4f57fa4.5908a84",
+                "93281de6.9193c8",
+                "279a0c66.95b87c",
+                "2fd6be0.ec30642",
+                "3458f9fd.a9fdce",
+                "b114579a.337d4",
+                "83634982.62f32",
+                "a78c5989.f5207",
+                "dc895d5a.f09ef",
+                "8c6f82a5.234d18",
+                "a984d0c7.8574d",
+                "49347bae.3e2974"
             ]
         ]
     },
     {
-        "id": "4165b419.5fd914",
+        "id": "fe79d8e9.168438",
         "type": "execute",
         "name": "execute UUID generator for ethernet-service-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 3405.883331298828,
-        "y": 696.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 739,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "ef467ac0.6f7c18",
+        "id": "64b776d1.df13b8",
         "type": "execute",
         "name": "execute UUID generator for otn-tunnel-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 3386.883331298828,
-        "y": 746.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 789,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "c8da4017.620ba8",
+        "id": "dc895d5a.f09ef",
         "type": "set",
         "name": "set new ethernet-service-name",
         "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
         "comments": "",
         "x": 3343.883331298828,
-        "y": 791.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 834,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "f9d1859a.061ab8",
+        "id": "cf58d1a3.b75bc8",
         "type": "set",
         "name": "set network-route-one",
         "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",
         "comments": "",
         "x": 3318.883331298828,
-        "y": 854.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 897,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "3e963f23.c2be88",
+        "id": "a4d7ff96.ceb5f8",
         "type": "set",
         "name": "set network-route-two",
         "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
         "comments": "",
         "x": 3319.883331298828,
-        "y": 909.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 952,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "f9ae4741.757498",
+        "id": "4f57fa4.5908a84",
         "type": "save",
         "name": "get network-route-one 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-one'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-one\">",
         "comments": "",
         "outputs": 1,
         "x": 3335.883331298828,
-        "y": 957.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1000,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "d029c3a1.942f48",
-                "34db9b18.f85a0c",
-                "a8f47dda.1a0bb8"
+                "722a434e.2a3adc",
+                "e8fe3cd4.c3586",
+                "fdbfe007.1ea3b"
             ]
         ]
     },
     {
-        "id": "2907fb26.565cec",
+        "id": "93281de6.9193c8",
         "type": "save",
         "name": "get network-route-two 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-two'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-two\">",
         "comments": "",
         "outputs": 1,
         "x": 3324.883331298828,
-        "y": 1044.8832092285156,
-        "z": "82de8dcf.518d88",
+        "y": 1086.9998779296875,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "ad570631.23385",
-                "75596bb2.8de11c",
-                "ae6194f6.92ada8"
+                "b372ac3d.0a4b1",
+                "d24aa16b.e47da",
+                "419032bc.a4963c"
             ]
         ]
     },
     {
-        "id": "d029c3a1.942f48",
+        "id": "722a434e.2a3adc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3536.883331298828,
-        "y": 841.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 884,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "9c52bc0.78abb48"
+                "aae0d761.ec3158"
             ]
         ]
     },
     {
-        "id": "34db9b18.f85a0c",
+        "id": "e8fe3cd4.c3586",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3532.392364501953,
-        "y": 891.3093566894531,
-        "z": "82de8dcf.518d88",
+        "y": 933.426025390625,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "946c30bd.bd527"
+                "af62b91c.6bf638"
             ]
         ]
     },
     {
-        "id": "a8f47dda.1a0bb8",
+        "id": "fdbfe007.1ea3b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3536.392364501953,
-        "y": 944.3093566894531,
-        "z": "82de8dcf.518d88",
+        "y": 986.426025390625,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "1dcb46a1.3c7d49"
+                "72360610.10f7e"
             ]
         ]
     },
     {
-        "id": "9c52bc0.78abb48",
+        "id": "aae0d761.ec3158",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3685.454864501953,
-        "y": 841.1690979003906,
-        "z": "82de8dcf.518d88",
+        "y": 883.2857666015625,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "946c30bd.bd527",
+        "id": "af62b91c.6bf638",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 3675.392364501953,
-        "y": 891.3093566894531,
-        "z": "82de8dcf.518d88",
+        "y": 933.426025390625,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "ad570631.23385",
+        "id": "b372ac3d.0a4b1",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3547.883331298828,
-        "y": 1014.8832092285156,
-        "z": "82de8dcf.518d88",
+        "y": 1056.9998779296875,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "5f295173.cbbf5"
+                "3bdfccb0.f2d08c"
             ]
         ]
     },
     {
-        "id": "75596bb2.8de11c",
+        "id": "d24aa16b.e47da",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3543.392364501953,
-        "y": 1064.3092346191406,
-        "z": "82de8dcf.518d88",
+        "y": 1106.4259033203125,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "355d767e.1de55a"
+                "57f2def1.81f4e"
             ]
         ]
     },
     {
-        "id": "ae6194f6.92ada8",
+        "id": "419032bc.a4963c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3544.392364501953,
-        "y": 1117.3092346191406,
-        "z": "82de8dcf.518d88",
+        "y": 1159.4259033203125,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "a436621f.a466c"
+                "91fe26d2.5b80d"
             ]
         ]
     },
     {
-        "id": "5f295173.cbbf5",
+        "id": "3bdfccb0.f2d08c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3696.454864501953,
-        "y": 1014.1689758300781,
-        "z": "82de8dcf.518d88",
+        "y": 1056.28564453125,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "355d767e.1de55a",
+        "id": "57f2def1.81f4e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 3686.392364501953,
-        "y": 1064.3092346191406,
-        "z": "82de8dcf.518d88",
+        "y": 1106.4259033203125,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "1dcb46a1.3c7d49",
+        "id": "72360610.10f7e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3697.883331298828,
-        "y": 943.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 986,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "f5b5d495.086d"
+                "21ff581a.7d3f68"
             ]
         ]
     },
     {
-        "id": "a436621f.a466c",
+        "id": "91fe26d2.5b80d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3697.883331298828,
-        "y": 1116.8832092285156,
-        "z": "82de8dcf.518d88",
+        "y": 1158.9998779296875,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "43e5bf6b.ff29a8"
+                "f4949055.0aa838"
             ]
         ]
     },
     {
-        "id": "f5b5d495.086d",
+        "id": "21ff581a.7d3f68",
         "type": "switchNode",
         "name": "switch nr type",
         "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3869.883331298828,
-        "y": 943.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 986,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "55f80e1b.2635f",
-                "43049869.5a7d88"
+                "d771576e.5459b",
+                "743ce77.86c2e98"
             ]
         ]
     },
     {
-        "id": "43e5bf6b.ff29a8",
+        "id": "f4949055.0aa838",
         "type": "switchNode",
         "name": "switch nr type",
         "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3870.883331298828,
-        "y": 1116.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1159,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "f9772113.de9e58",
-                "79517b7a.195d94"
+                "854204ac.64311",
+                "5401ccd6.c2c2e4"
             ]
         ]
     },
     {
-        "id": "55f80e1b.2635f",
+        "id": "d771576e.5459b",
         "type": "outcome",
         "name": "ROOT",
         "xml": "<outcome value='ROOT'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4045.883331298828,
-        "y": 922.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 965,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "d9c9bf69.d54ef8"
+                "2e04d27d.5faff6"
             ]
         ]
     },
     {
-        "id": "43049869.5a7d88",
+        "id": "743ce77.86c2e98",
         "type": "outcome",
         "name": "LEAF",
         "xml": "<outcome value='LEAF'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4047.883331298828,
-        "y": 976.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1019,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "5ac63627.c33ff"
+                "12c64a9b.27d615"
             ]
         ]
     },
     {
-        "id": "f9772113.de9e58",
+        "id": "854204ac.64311",
         "type": "outcome",
         "name": "ROOT",
         "xml": "<outcome value='ROOT'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4046.883331298828,
-        "y": 1086.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1129,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "35523eeb.15287a"
+                "a8347389.2ab3b"
             ]
         ]
     },
     {
-        "id": "79517b7a.195d94",
+        "id": "5401ccd6.c2c2e4",
         "type": "outcome",
         "name": "LEAF",
         "xml": "<outcome value='LEAF'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4048.883331298828,
-        "y": 1140.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1183,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "377b88b8.aaeb48"
+                "49b6f3ad.a55ac4"
             ]
         ]
     },
     {
-        "id": "eba0d9fe.14aff8",
+        "id": "20ddeea0.a0e9ea",
         "type": "set",
         "name": "set network-route-ROOT",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
         "x": 4355.883331298828,
-        "y": 874.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 917,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "b156164c.4afee",
+        "id": "a4916484.b95cf",
         "type": "set",
         "name": "set network-route-LEAF",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
         "x": 4348.883331298828,
-        "y": 972.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1015,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "c46834b2.126828",
+        "id": "2f347429.e690cc",
         "type": "set",
         "name": "set network-route-ROOT",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
         "x": 4348.883331298828,
-        "y": 1059.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1102,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "67f1e499.325a54",
+        "id": "cad2e783.60fc68",
         "type": "set",
         "name": "set network-route-LEAF",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
         "x": 4352.883331298828,
-        "y": 1152.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1195,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "fa18abdb.1f3b58",
+        "id": "b1d86e33.3aa378",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3579.883331298828,
-        "y": 1561.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1604,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "acfe7f1b.815bb8"
+                "a5f9a85c.99ac48"
             ]
         ]
     },
     {
-        "id": "504369a4.383c58",
+        "id": "a4982a5c.ee1f08",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3589.374298095703,
-        "y": 1604.4573669433594,
-        "z": "82de8dcf.518d88",
+        "y": 1646.5740356445312,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "2cc2d2a0.0189de"
+                "bbb83480.f4afb8"
             ]
         ]
     },
     {
-        "id": "48dc6834.fa2a",
+        "id": "9afba595.5831a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3577.883331298828,
-        "y": 1650.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1693,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "5165f4d1.561cf4"
+                "eeac5d42.037ff"
             ]
         ]
     },
     {
-        "id": "a5821370.c906a8",
+        "id": "a9f44662.0eb94",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
         "x": 3279.883331298828,
-        "y": 1523.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1566,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "94a806e9.b63df",
+        "id": "2fd6be0.ec30642",
         "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": 3322.883331298828,
-        "y": 1588.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1631,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "fa18abdb.1f3b58",
-                "504369a4.383c58",
-                "48dc6834.fa2a"
+                "b1d86e33.3aa378",
+                "a4982a5c.ee1f08",
+                "9afba595.5831a"
             ]
         ]
     },
     {
-        "id": "26f3b8c8.1692a",
+        "id": "279a0c66.95b87c",
         "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": 3323.883331298828,
-        "y": 1258.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1301,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "e1766e3b.d98f7",
-                "2b2fec17.7ad784"
+                "ab7f6387.a06298",
+                "178d0fab.57c17"
             ]
         ]
     },
     {
-        "id": "2b2fec17.7ad784",
+        "id": "178d0fab.57c17",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3546.883331298828,
-        "y": 1244.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1287,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "9fa24ca4.2bf57"
+                "174b650f.6f4cdb"
             ]
         ]
     },
     {
-        "id": "e1766e3b.d98f7",
+        "id": "ab7f6387.a06298",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3548.883331298828,
-        "y": 1277.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1320,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "43f11543.33be3c"
+                "109222da.cab295"
             ]
         ]
     },
     {
-        "id": "acfe7f1b.815bb8",
+        "id": "a5f9a85c.99ac48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3752.549835205078,
-        "y": 1560.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1603,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "72fd24ba.a9210c",
-                "abb77544.4a8348"
+                "f0dfffc5.29d178",
+                "acd2704e.4ae308"
             ]
         ]
     },
     {
-        "id": "2cc2d2a0.0189de",
+        "id": "bbb83480.f4afb8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3742.9457092285156,
-        "y": 1607.7431030273438,
-        "z": "82de8dcf.518d88",
+        "y": 1649.8597717285156,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "5165f4d1.561cf4",
+        "id": "eeac5d42.037ff",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 3746.883331298828,
-        "y": 1651.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1694,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "72fd24ba.a9210c",
+        "id": "f0dfffc5.29d178",
         "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": 4016.883331298828,
-        "y": 1544.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1587,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "e6b87836.bef2f8",
-                "b8a921ef.444378"
+                "11bdf0f4.508487",
+                "23d1e1ad.23f75e"
             ]
         ]
     },
     {
-        "id": "b8a921ef.444378",
+        "id": "23d1e1ad.23f75e",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4239.883331298828,
-        "y": 1499.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1542,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "54ec9e81.9a2fc"
+                "3fc7a366.f1683c"
             ]
         ]
     },
     {
-        "id": "e6b87836.bef2f8",
+        "id": "11bdf0f4.508487",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4241.883331298828,
-        "y": 1563.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1606,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "27ce4c05.8bf1dc"
+                "d6cac3a3.d1f4"
             ]
         ]
     },
     {
-        "id": "27ce4c05.8bf1dc",
+        "id": "d6cac3a3.d1f4",
         "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": 4403.883331298828,
-        "y": 1559.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1602,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "54ec9e81.9a2fc",
+        "id": "3fc7a366.f1683c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4404.883331298828,
-        "y": 1496.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1539,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "f6774ff2.abd22",
-                "bb24ac55.01a618"
+                "d54289dc.18d288",
+                "cc99bc89.a9c058"
             ]
         ]
     },
     {
-        "id": "2e1ea98e.240716",
+        "id": "17e0fd07.b5de8b",
         "type": "save",
         "name": "save connectivity resource in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
         "x": 4018.883331298828,
-        "y": 1703.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1746,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "19e24364.492f0d",
+        "id": "f1afd056.64d73",
         "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": 4063.883331298828,
-        "y": 1613.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1656,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "aefdb41a.15ed9",
+        "id": "50d51c8c.dc95ac",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
         "x": 4146.883331298828,
-        "y": 1751.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1794,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "43f11543.33be3c",
+        "id": "109222da.cab295",
         "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": 3691.883331298828,
-        "y": 1274.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1317,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "9fa24ca4.2bf57",
+        "id": "174b650f.6f4cdb",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3694.883331298828,
-        "y": 1237.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1280,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "fc422c00.a0a738",
-                "4c9af5cc.7cdc6c"
+                "6b9c6245.ea050c",
+                "ab33cb14.ff6cc8"
             ]
         ]
     },
     {
-        "id": "fc422c00.a0a738",
+        "id": "6b9c6245.ea050c",
         "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": 3868.883331298828,
-        "y": 1193.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1236,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "abb77544.4a8348",
+        "id": "acd2704e.4ae308",
         "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": 3970.883331298828,
-        "y": 1828.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1871,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "af71b606.ad1ca8"
+                "73a0105b.ac0e58"
             ]
         ]
     },
     {
-        "id": "af71b606.ad1ca8",
+        "id": "73a0105b.ac0e58",
         "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": 4176.883331298828,
-        "y": 1828.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1871,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "1586191.cb5c467"
+                "6dbfb157.d8359"
             ]
         ]
     },
     {
-        "id": "1586191.cb5c467",
+        "id": "6dbfb157.d8359",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4392.168975830078,
-        "y": 1828.7051086425781,
-        "z": "82de8dcf.518d88",
+        "y": 1870.82177734375,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "2efd1433.a69a04"
+                "616def67.e5a25"
             ]
         ]
     },
     {
-        "id": "4c9af5cc.7cdc6c",
+        "id": "ab33cb14.ff6cc8",
         "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": 3883.883331298828,
-        "y": 1304.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1347,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "f48c8915.33d9e8",
-                "cce55dcf.842618",
-                "5e74a015.2ca67"
+                "e7bde0a4.3a223",
+                "856b3a3e.33dd18",
+                "ec1837c2.7e65e8"
             ]
         ]
     },
     {
-        "id": "f48c8915.33d9e8",
+        "id": "e7bde0a4.3a223",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4079.3834533691406,
-        "y": 1256.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1299,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "5a7d862f.3b4ad8"
+                "a049038b.508d4"
             ]
         ]
     },
     {
-        "id": "cce55dcf.842618",
+        "id": "856b3a3e.33dd18",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4071.3834533691406,
-        "y": 1311.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1354,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "9061c72.32ffe38"
+                "f843f7f2.8c64b8"
             ]
         ]
     },
     {
-        "id": "5e74a015.2ca67",
+        "id": "ec1837c2.7e65e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4076.3834533691406,
-        "y": 1368.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1411,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "6b55247c.21dab4"
+                "47e459e1.2a9ce"
             ]
         ]
     },
     {
-        "id": "6b55247c.21dab4",
+        "id": "47e459e1.2a9ce",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4228.383453369141,
-        "y": 1369.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1412,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "9061c72.32ffe38",
+        "id": "f843f7f2.8c64b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4239.383453369141,
-        "y": 1314.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1357,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "5a7d862f.3b4ad8",
+        "id": "a049038b.508d4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -1898,345 +1898,345 @@
         "comments": "",
         "outputs": 1,
         "x": 4223.765777587891,
-        "y": 1254.5390014648438,
-        "z": "82de8dcf.518d88",
+        "y": 1296.6556701660156,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "d89a976.d88e5e8"
+                "b2d1999f.753708"
             ]
         ]
     },
     {
-        "id": "d89a976.d88e5e8",
+        "id": "b2d1999f.753708",
         "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": 4407.883331298828,
-        "y": 1268.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1311,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "155fb221.0dbf8e"
+                "9b22416d.9cdac8"
             ]
         ]
     },
     {
-        "id": "bb24ac55.01a618",
+        "id": "cc99bc89.a9c058",
         "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": 4574.883331298828,
-        "y": 1454.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1497,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "f6774ff2.abd22",
+        "id": "d54289dc.18d288",
         "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": 4575.883331298828,
-        "y": 1562.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1605,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "1f2d63dd.89956c",
+        "id": "46e18359.07aad4",
         "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": 4576.883331298828,
-        "y": 1511.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1554,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "2efd1433.a69a04",
+        "id": "616def67.e5a25",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4599.000518798828,
-        "y": 1829.2236633300781,
-        "z": "82de8dcf.518d88",
+        "y": 1871.34033203125,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "9738e3.11ec3f2",
-                "b90b51f7.bc063",
-                "e565f202.9406"
+                "6d0c5fcb.438328",
+                "40a1c35d.17991c",
+                "6c800e67.6aa9c8"
             ]
         ]
     },
     {
-        "id": "9738e3.11ec3f2",
+        "id": "6d0c5fcb.438328",
         "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": 4814.000518798828,
-        "y": 1791.2236633300781,
-        "z": "82de8dcf.518d88",
+        "y": 1833.34033203125,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "b90b51f7.bc063",
+        "id": "40a1c35d.17991c",
         "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": 4811.000518798828,
-        "y": 1830.2236633300781,
-        "z": "82de8dcf.518d88",
+        "y": 1872.34033203125,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "2d0e3a15.1426a6"
+                "9de28790.cf8c7"
             ]
         ]
     },
     {
-        "id": "e565f202.9406",
+        "id": "6c800e67.6aa9c8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 4766.500518798828,
-        "y": 1872.2236633300781,
-        "z": "82de8dcf.518d88",
+        "y": 1914.34033203125,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "2d0e3a15.1426a6",
+        "id": "9de28790.cf8c7",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4991.500518798828,
-        "y": 1829.2236633300781,
-        "z": "82de8dcf.518d88",
+        "y": 1871.34033203125,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "a863747c.f65e78"
+                "e5173d49.fc3368"
             ]
         ]
     },
     {
-        "id": "60c94053.2751c",
+        "id": "376d58a4.adb2a",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4805.883331298828,
-        "y": 1272.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1315,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "de3b61b0.e43d2"
+                "60247fbe.4b6c2"
             ]
         ]
     },
     {
-        "id": "de3b61b0.e43d2",
+        "id": "60247fbe.4b6c2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4982.883331298828,
-        "y": 1264.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1307,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "b2f44bdb.9dc5e8",
-                "1f8e5eff.5b4f51"
+                "4270b940.4f6ac",
+                "65b48891.d54c3"
             ]
         ]
     },
     {
-        "id": "155fb221.0dbf8e",
+        "id": "9b22416d.9cdac8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4602.883331298828,
-        "y": 1268.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1311,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "60c94053.2751c",
-                "ecc099ad.aafee8"
+                "376d58a4.adb2a",
+                "59d37917.573538"
             ]
         ]
     },
     {
-        "id": "ecc099ad.aafee8",
+        "id": "59d37917.573538",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
         "x": 4808.883331298828,
-        "y": 1346.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1389,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "e5e04393.9d571"
+                "b8751b8b.fb4f58"
             ]
         ]
     },
     {
-        "id": "e5e04393.9d571",
+        "id": "b8751b8b.fb4f58",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4985.883331298828,
-        "y": 1338.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1381,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "39969cdd.a78634"
+                "673e159e.9038cc"
             ]
         ]
     },
     {
-        "id": "a863747c.f65e78",
+        "id": "e5173d49.fc3368",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5149.500518798828,
-        "y": 1829.2236633300781,
-        "z": "82de8dcf.518d88",
+        "y": 1871.34033203125,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "9ec1944.f167b68"
+                "e816a090.0c423"
             ]
         ]
     },
     {
-        "id": "9ec1944.f167b68",
+        "id": "e816a090.0c423",
         "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": 5356.500518798828,
-        "y": 1829.2236633300781,
-        "z": "82de8dcf.518d88",
+        "y": 1871.34033203125,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "1f8e5eff.5b4f51",
+        "id": "65b48891.d54c3",
         "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": 5190.883331298828,
-        "y": 1271.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1314,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "1422dd1f.ed1903",
-                "306288e7.8d0b68",
-                "adc4d006.c9a618"
+                "12ca2f18.a3fcb1",
+                "2eff6a6f.1256be",
+                "ae932fb7.b2f368"
             ]
         ]
     },
     {
-        "id": "b2f44bdb.9dc5e8",
+        "id": "4270b940.4f6ac",
         "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": 5220.883331298828,
-        "y": 1219.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1262,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "1422dd1f.ed1903",
+        "id": "12ca2f18.a3fcb1",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5400.883331298828,
-        "y": 1262.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1305,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "9be58098.9885c8"
+                "19df6125.66c90f"
             ]
         ]
     },
     {
-        "id": "306288e7.8d0b68",
+        "id": "2eff6a6f.1256be",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5392.883331298828,
-        "y": 1317.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1360,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "ddbc66fb.291808"
+                "5900b30a.9db0cc"
             ]
         ]
     },
     {
-        "id": "adc4d006.c9a618",
+        "id": "ae932fb7.b2f368",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5397.883331298828,
-        "y": 1374.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1417,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "f026a629.a20b28"
+                "abcfe080.ae7e7"
             ]
         ]
     },
     {
-        "id": "f026a629.a20b28",
+        "id": "abcfe080.ae7e7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5549.883331298828,
-        "y": 1375.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1418,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "ddbc66fb.291808",
+        "id": "5900b30a.9db0cc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5560.883331298828,
-        "y": 1320.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1363,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "9be58098.9885c8",
+        "id": "19df6125.66c90f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -2244,60 +2244,60 @@
         "comments": "",
         "outputs": 1,
         "x": 5545.265655517578,
-        "y": 1260.5390014648438,
-        "z": "82de8dcf.518d88",
+        "y": 1302.6556701660156,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "b1324a29.092c8"
+                "db94bf6b.c81da8"
             ]
         ]
     },
     {
-        "id": "39969cdd.a78634",
+        "id": "673e159e.9038cc",
         "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": 5220.883331298828,
-        "y": 1462.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1505,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "b1324a29.092c8",
+        "id": "db94bf6b.c81da8",
         "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": 5759.883331298828,
-        "y": 1256.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1299,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "e7c33475.7e91e8",
+        "id": "653ea460.331594",
         "type": "set",
         "name": "set network-route-B",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
         "x": 4343.883331298828,
-        "y": 910.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 953,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "5025b50.00b0f4c",
+        "id": "3ff377ce.541508",
         "type": "set",
         "name": "set network-route-A",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
         "x": 4334.883331298828,
-        "y": 1008.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1051,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "d9c9bf69.d54ef8",
+        "id": "2e04d27d.5faff6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -2305,17 +2305,17 @@
         "comments": "",
         "outputs": 1,
         "x": 4168.883331298828,
-        "y": 916.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 959,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "eba0d9fe.14aff8",
-                "e7c33475.7e91e8"
+                "20ddeea0.a0e9ea",
+                "653ea460.331594"
             ]
         ]
     },
     {
-        "id": "5ac63627.c33ff",
+        "id": "12c64a9b.27d615",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -2323,17 +2323,17 @@
         "comments": "",
         "outputs": 1,
         "x": 4174.883331298828,
-        "y": 980.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1023,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "b156164c.4afee",
-                "5025b50.00b0f4c"
+                "a4916484.b95cf",
+                "3ff377ce.541508"
             ]
         ]
     },
     {
-        "id": "35523eeb.15287a",
+        "id": "a8347389.2ab3b",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -2341,17 +2341,17 @@
         "comments": "",
         "outputs": 1,
         "x": 4174.883331298828,
-        "y": 1086.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1129,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "c46834b2.126828",
-                "7dcc31dd.14e278"
+                "2f347429.e690cc",
+                "64f47a9a.5541ec"
             ]
         ]
     },
     {
-        "id": "377b88b8.aaeb48",
+        "id": "49b6f3ad.a55ac4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -2359,498 +2359,498 @@
         "comments": "",
         "outputs": 1,
         "x": 4177.883331298828,
-        "y": 1139.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1182,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "67f1e499.325a54",
-                "e00fdb48.f91848"
+                "cad2e783.60fc68",
+                "93b1477b.b7ce28"
             ]
         ]
     },
     {
-        "id": "7dcc31dd.14e278",
+        "id": "64f47a9a.5541ec",
         "type": "set",
         "name": "set network-route-B",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
         "x": 4334.883331298828,
-        "y": 1099.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1142,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "e00fdb48.f91848",
+        "id": "93b1477b.b7ce28",
         "type": "set",
         "name": "set network-route-A",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
         "x": 4337.883331298828,
-        "y": 1190.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1233,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "b1c3c9b6.d1dd38",
+        "id": "bcceae66.215ea8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3709.883331298828,
-        "y": 2400.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2443,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "8d971e70.183d4",
-                "ac7f0ae7.0820f"
+                "fa55cad.2f0ddb8",
+                "341eac77.d5f56c"
             ]
         ]
     },
     {
-        "id": "37cdc12f.574c9e",
+        "id": "e6e2e92d.d49f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3537.216827392578,
-        "y": 2401.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2444,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "b1c3c9b6.d1dd38"
+                "bcceae66.215ea8"
             ]
         ]
     },
     {
-        "id": "17fb9abf.e94b5d",
+        "id": "15d49e8e.f5c6d1",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3546.707794189453,
-        "y": 2444.4573669433594,
-        "z": "82de8dcf.518d88",
+        "y": 2486.5740356445312,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "ffec1f14.6b38f8"
+                "b6575c89.a4dbd8"
             ]
         ]
     },
     {
-        "id": "77126cff.9c26a4",
+        "id": "456db0bd.6c4e5",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3535.216827392578,
-        "y": 2490.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2533,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "6fe13c0.1437ac4"
+                "f1a4c78.c749938"
             ]
         ]
     },
     {
-        "id": "ffec1f14.6b38f8",
+        "id": "b6575c89.a4dbd8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3700.2792053222656,
-        "y": 2447.7431030273438,
-        "z": "82de8dcf.518d88",
+        "y": 2489.8597717285156,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "6fe13c0.1437ac4",
+        "id": "f1a4c78.c749938",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 3704.216827392578,
-        "y": 2491.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2534,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "8d971e70.183d4",
+        "id": "fa55cad.2f0ddb8",
         "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": 3996.216827392578,
-        "y": 2404.8834533691406,
-        "z": "82de8dcf.518d88",
+        "y": 2447.0001220703125,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "53133799.37d4b",
-                "a86f569d.6ab9f8"
+                "2a55ff3d.a63f58",
+                "a4fedadd.ffdcf"
             ]
         ]
     },
     {
-        "id": "a86f569d.6ab9f8",
+        "id": "a4fedadd.ffdcf",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4219.216827392578,
-        "y": 2359.8834533691406,
-        "z": "82de8dcf.518d88",
+        "y": 2402.0001220703125,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "66c68013.ddb6b8"
+                "2cf5b91c.330536"
             ]
         ]
     },
     {
-        "id": "53133799.37d4b",
+        "id": "2a55ff3d.a63f58",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4221.216827392578,
-        "y": 2423.8834533691406,
-        "z": "82de8dcf.518d88",
+        "y": 2466.0001220703125,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "7ccc7afc.6f2a8c"
+                "f4cfd006.4df4a"
             ]
         ]
     },
     {
-        "id": "7ccc7afc.6f2a8c",
+        "id": "f4cfd006.4df4a",
         "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": 4380.216827392578,
-        "y": 2442.8834533691406,
-        "z": "82de8dcf.518d88",
+        "y": 2485.0001220703125,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "66c68013.ddb6b8",
+        "id": "2cf5b91c.330536",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4384.216827392578,
-        "y": 2356.8834533691406,
-        "z": "82de8dcf.518d88",
+        "y": 2399.0001220703125,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "14b7c942.3a7d87",
-                "705ad60b.9c1b38"
+                "60521985.bf9fa8",
+                "1b11d7f2.c04e4"
             ]
         ]
     },
     {
-        "id": "6b364584.e1350c",
+        "id": "3e3a2fcb.29b168",
         "type": "save",
         "name": "save connectivity resource in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
         "x": 3998.216827392578,
-        "y": 2563.8834533691406,
-        "z": "82de8dcf.518d88",
+        "y": 2606.0001220703125,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "2e817e1e.7658f2",
+        "id": "a24d2064.f8a7c",
         "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": 4043.216827392578,
-        "y": 2473.8834533691406,
-        "z": "82de8dcf.518d88",
+        "y": 2516.0001220703125,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "1f716896.64ed2f",
+        "id": "7f1c08c8.8cc28",
         "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": 4125.216827392578,
-        "y": 2628.8834533691406,
-        "z": "82de8dcf.518d88",
+        "y": 2671.0001220703125,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "221f1c18.663f6c",
+        "id": "b114579a.337d4",
         "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": 3309.216827392578,
-        "y": 2436.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2479,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "37cdc12f.574c9e",
-                "17fb9abf.e94b5d",
-                "77126cff.9c26a4"
+                "e6e2e92d.d49f8",
+                "15d49e8e.f5c6d1",
+                "456db0bd.6c4e5"
             ]
         ]
     },
     {
-        "id": "b3b2ce86.7d813",
+        "id": "8e0a6f3b.01feb",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
         "x": 3270.216827392578,
-        "y": 2380.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2423,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "a001cedc.58f128",
+        "id": "3458f9fd.a9fdce",
         "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": 3327.216827392578,
-        "y": 2099.8832092285156,
-        "z": "82de8dcf.518d88",
+        "y": 2141.9998779296875,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "d5568173.1326d",
-                "27e39e34.e8a4aa"
+                "c48f1e5.b50d76",
+                "40db2833.3d6058"
             ]
         ]
     },
     {
-        "id": "27e39e34.e8a4aa",
+        "id": "40db2833.3d6058",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3550.216827392578,
-        "y": 2085.8832092285156,
-        "z": "82de8dcf.518d88",
+        "y": 2127.9998779296875,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "ba49d8fd.b81698"
+                "57ecc3e9.705994"
             ]
         ]
     },
     {
-        "id": "d5568173.1326d",
+        "id": "c48f1e5.b50d76",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3552.216827392578,
-        "y": 2118.8832092285156,
-        "z": "82de8dcf.518d88",
+        "y": 2160.9998779296875,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "54689cfb.423da4"
+                "6a189760.03fff"
             ]
         ]
     },
     {
-        "id": "54689cfb.423da4",
+        "id": "6a189760.03fff",
         "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": 3695.216827392578,
-        "y": 2115.8832092285156,
-        "z": "82de8dcf.518d88",
+        "y": 2157.9998779296875,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "ba49d8fd.b81698",
+        "id": "57ecc3e9.705994",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3698.216827392578,
-        "y": 2078.8832092285156,
-        "z": "82de8dcf.518d88",
+        "y": 2120.9998779296875,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "e65b9c6b.1cea38",
-                "e0207e5b.773f7"
+                "7ef10f50.4a98b",
+                "d3e48892.7c0638"
             ]
         ]
     },
     {
-        "id": "e65b9c6b.1cea38",
+        "id": "7ef10f50.4a98b",
         "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": 3892.216827392578,
-        "y": 2081.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2124,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "ac7f0ae7.0820f",
+        "id": "341eac77.d5f56c",
         "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": 3955.216827392578,
-        "y": 2713.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2756,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "eb66de49.8a6178"
+                "1d1b2999.e8eaf6"
             ]
         ]
     },
     {
-        "id": "eb66de49.8a6178",
+        "id": "1d1b2999.e8eaf6",
         "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": 4161.216827392578,
-        "y": 2713.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2756,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "a3eb7777.2808e"
+                "2587a419.edf304"
             ]
         ]
     },
     {
-        "id": "a3eb7777.2808e",
+        "id": "2587a419.edf304",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4378.502471923828,
-        "y": 2712.705108642578,
-        "z": "82de8dcf.518d88",
+        "y": 2754.82177734375,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "90bfeab5.6e04"
+                "596e064d.3e4868"
             ]
         ]
     },
     {
-        "id": "e0207e5b.773f7",
+        "id": "d3e48892.7c0638",
         "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": 3914.216827392578,
-        "y": 2149.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2192,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "ff3d2407.61718",
-                "f34e14e1.674a08",
-                "f7ebc3eb.0fe87"
+                "5d04022c.52094c",
+                "4363a204.88356c",
+                "d1632f49.e8bfd8"
             ]
         ]
     },
     {
-        "id": "ff3d2407.61718",
+        "id": "5d04022c.52094c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4109.716949462891,
-        "y": 2101.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2144,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "e4f3177f.7fd418"
+                "16d6f161.b988af"
             ]
         ]
     },
     {
-        "id": "f34e14e1.674a08",
+        "id": "4363a204.88356c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4101.716949462891,
-        "y": 2156.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2199,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "7e75e0e1.a6768"
+                "5ac71d3b.31ff94"
             ]
         ]
     },
     {
-        "id": "f7ebc3eb.0fe87",
+        "id": "d1632f49.e8bfd8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4106.716949462891,
-        "y": 2213.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2256,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "917fd40f.ec43b"
+                "8e2e62d9.6dcb8"
             ]
         ]
     },
     {
-        "id": "917fd40f.ec43b",
+        "id": "8e2e62d9.6dcb8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4258.716949462891,
-        "y": 2214.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2257,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "7e75e0e1.a6768",
+        "id": "5ac71d3b.31ff94",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4269.716949462891,
-        "y": 2159.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2202,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "e4f3177f.7fd418",
+        "id": "16d6f161.b988af",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -2858,356 +2858,356 @@
         "comments": "",
         "outputs": 1,
         "x": 4254.099273681641,
-        "y": 2099.5390014648438,
-        "z": "82de8dcf.518d88",
+        "y": 2141.6556701660156,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "96db4a5c.6d74f"
+                "7d886bfd.e9ca4c"
             ]
         ]
     },
     {
-        "id": "14b7c942.3a7d87",
+        "id": "60521985.bf9fa8",
         "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": 4554.216827392578,
-        "y": 2317.8834533691406,
-        "z": "82de8dcf.518d88",
+        "y": 2360.0001220703125,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "705ad60b.9c1b38",
+        "id": "1b11d7f2.c04e4",
         "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": 4555.216827392578,
-        "y": 2422.8834533691406,
-        "z": "82de8dcf.518d88",
+        "y": 2465.0001220703125,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "fe24857d.ec88f8",
+        "id": "f5d8e7ee.5dd5b8",
         "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": 4550.216827392578,
-        "y": 2371.8834533691406,
-        "z": "82de8dcf.518d88",
+        "y": 2414.0001220703125,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "90bfeab5.6e04",
+        "id": "596e064d.3e4868",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4585.334014892578,
-        "y": 2702.2237854003906,
-        "z": "82de8dcf.518d88",
+        "y": 2744.3404541015625,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "d29ec4c3.e3026",
-                "3dd34bd3.f84b34",
-                "855f6bda.886bb"
+                "1d1ef4b9.b52cc3",
+                "aa09325d.47c72",
+                "f212860e.85526"
             ]
         ]
     },
     {
-        "id": "d29ec4c3.e3026",
+        "id": "1d1ef4b9.b52cc3",
         "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": 4800.334014892578,
-        "y": 2664.2237854003906,
-        "z": "82de8dcf.518d88",
+        "y": 2706.3404541015625,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "3dd34bd3.f84b34",
+        "id": "aa09325d.47c72",
         "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": 4797.334014892578,
-        "y": 2703.2237854003906,
-        "z": "82de8dcf.518d88",
+        "y": 2745.3404541015625,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "498fc826.7744e"
+                "391393be.95d72c"
             ]
         ]
     },
     {
-        "id": "855f6bda.886bb",
+        "id": "f212860e.85526",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 4752.834014892578,
-        "y": 2745.2237854003906,
-        "z": "82de8dcf.518d88",
+        "y": 2787.3404541015625,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "498fc826.7744e",
+        "id": "391393be.95d72c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4977.834014892578,
-        "y": 2702.2237854003906,
-        "z": "82de8dcf.518d88",
+        "y": 2744.3404541015625,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "3dffa556.ecd0ba"
+                "520819a9.ab1618"
             ]
         ]
     },
     {
-        "id": "3dffa556.ecd0ba",
+        "id": "520819a9.ab1618",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5135.834014892578,
-        "y": 2702.2237854003906,
-        "z": "82de8dcf.518d88",
+        "y": 2744.3404541015625,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "e57a350c.677e18"
+                "3a6f0d92.f64ee2"
             ]
         ]
     },
     {
-        "id": "e57a350c.677e18",
+        "id": "3a6f0d92.f64ee2",
         "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": 5342.834014892578,
-        "y": 2702.2237854003906,
-        "z": "82de8dcf.518d88",
+        "y": 2744.3404541015625,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "321528be.3d7ae",
+        "id": "35d3101c.ddb4c",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4836.216827392578,
-        "y": 2117.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2160,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "e56d9c92.9b763"
+                "461a66b2.13a6c8"
             ]
         ]
     },
     {
-        "id": "e56d9c92.9b763",
+        "id": "461a66b2.13a6c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5013.216827392578,
-        "y": 2109.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2152,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "251b7dfd.9c2dea",
-                "f747044b.58f4e"
+                "6cbb0705.4a3c5",
+                "670f0182.9fd968"
             ]
         ]
     },
     {
-        "id": "96db4a5c.6d74f",
+        "id": "7d886bfd.e9ca4c",
         "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": 4438.216827392578,
-        "y": 2113.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2156,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "3dedc7fb.152e08"
+                "e2222250.60ef7"
             ]
         ]
     },
     {
-        "id": "3dedc7fb.152e08",
+        "id": "e2222250.60ef7",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4633.216827392578,
-        "y": 2113.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2156,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "321528be.3d7ae",
-                "b22cff66.f669e8"
+                "35d3101c.ddb4c",
+                "768c39b6.117ae"
             ]
         ]
     },
     {
-        "id": "f747044b.58f4e",
+        "id": "670f0182.9fd968",
         "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": 5221.216827392578,
-        "y": 2116.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2159,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "1f813de4.828122",
-                "d83bccad.38e8b8",
-                "c46088f8.fb1e"
+                "4e714dda.e8064c",
+                "6d43e638.f020f8",
+                "33cdbe70.d704f2"
             ]
         ]
     },
     {
-        "id": "cd687e81.f269c8",
+        "id": "9bab22e5.a35978",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5015.216827392578,
-        "y": 2182.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2225,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "44576406.503604"
+                "3c5a22cd.c5b5a6"
             ]
         ]
     },
     {
-        "id": "b22cff66.f669e8",
+        "id": "768c39b6.117ae",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
         "x": 4838.216827392578,
-        "y": 2190.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2233,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "cd687e81.f269c8"
+                "9bab22e5.a35978"
             ]
         ]
     },
     {
-        "id": "251b7dfd.9c2dea",
+        "id": "6cbb0705.4a3c5",
         "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": 5251.216827392578,
-        "y": 2064.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2107,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "44576406.503604",
+        "id": "3c5a22cd.c5b5a6",
         "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": 5250.216827392578,
-        "y": 2306.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2349,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "1f813de4.828122",
+        "id": "4e714dda.e8064c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5431.216827392578,
-        "y": 2107.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2150,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "9f1d5683.34bf48"
+                "c3b341d5.27524"
             ]
         ]
     },
     {
-        "id": "d83bccad.38e8b8",
+        "id": "6d43e638.f020f8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5423.216827392578,
-        "y": 2162.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2205,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "3d8c6a19.63c47e"
+                "5319e635.03496"
             ]
         ]
     },
     {
-        "id": "c46088f8.fb1e",
+        "id": "33cdbe70.d704f2",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5428.216827392578,
-        "y": 2219.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2262,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "868d602e.d270d8"
+                "bf85165f.b30b4"
             ]
         ]
     },
     {
-        "id": "868d602e.d270d8",
+        "id": "bf85165f.b30b4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5580.216827392578,
-        "y": 2220.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2263,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "3d8c6a19.63c47e",
+        "id": "5319e635.03496",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5591.216827392578,
-        "y": 2165.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2208,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "9f1d5683.34bf48",
+        "id": "c3b341d5.27524",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -3215,284 +3215,284 @@
         "comments": "",
         "outputs": 1,
         "x": 5575.599151611328,
-        "y": 2105.5390014648438,
-        "z": "82de8dcf.518d88",
+        "y": 2147.6556701660156,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "580e8311.7470f4"
+                "5a4d43b1.7dbc0c"
             ]
         ]
     },
     {
-        "id": "580e8311.7470f4",
+        "id": "5a4d43b1.7dbc0c",
         "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": 5790.216827392578,
-        "y": 2101.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2144,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "77955a17.d633ac",
+        "id": "83634982.62f32",
         "type": "set",
         "name": "set LEAF stuff",
         "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' 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\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
         "comments": "",
         "x": 3288.883331298828,
-        "y": 1711.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1754,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "88408865.7d27f8",
+        "id": "51304efd.d01998",
         "type": "comment",
         "name": "This is it (should be)",
         "info": "",
         "comments": "",
         "x": 4510.883331298828,
-        "y": 994.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1037,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "d43945c8.bc5bc",
+        "id": "8cad1e9f.c00c5",
         "type": "comment",
         "name": "This is it (should be)",
         "info": "",
         "comments": "",
         "x": 4502.883331298828,
-        "y": 1084.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1127,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "1e4146ab.95c211",
+        "id": "a78c5989.f5207",
         "type": "set",
         "name": "set ROOT stuff",
         "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' 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\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
         "comments": "",
         "x": 3269.883331298828,
-        "y": 2567.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2610,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "893317d2.3ef5f",
+        "id": "5f144ff2.8e6388",
         "type": "save",
         "name": "save connectivityA relationship to UNI-LEAF, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
         "comments": "",
         "outputs": 1,
         "x": 3401.883331298828,
-        "y": 1817.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1860,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "fd0edd2e.c98978",
+        "id": "f39161b8.c95518",
         "type": "save",
         "name": "save LEAF UNI in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-p-interface-short`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n",
         "comments": "",
         "outputs": 1,
         "x": 3308.883331298828,
-        "y": 1764.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1807,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "98563074.1e7ea",
+        "id": "8af2638e.140428",
         "type": "execute",
         "name": "execute UUID generator for ethernet-service-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 2426.883331298828,
-        "y": 142.88333129882812,
-        "z": "82de8dcf.518d88",
+        "y": 185,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "c475408d.68ef",
+        "id": "b2d6bb83.745318",
         "type": "set",
         "name": "set new ethernet-service-name",
         "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
         "comments": "",
         "x": 2360.883331298828,
-        "y": 178.88333129882812,
-        "z": "82de8dcf.518d88",
+        "y": 221,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "e109d5f4.51e5d",
+        "id": "efb9627d.c73688",
         "type": "comment",
         "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",
         "info": "",
         "comments": "",
         "x": 2545.883331298828,
-        "y": 105.88333129882812,
-        "z": "82de8dcf.518d88",
+        "y": 148,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "2e92209c.b2514",
+        "id": "7954d1dd.93732",
         "type": "comment",
         "name": "NOT NEEDED ANYMORE?",
         "info": "",
         "comments": "",
         "x": 4036.883331298828,
-        "y": 1795.8833312988281,
-        "z": "82de8dcf.518d88",
+        "y": 1838,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "cc84986.18b2868",
+        "id": "48007645.c6e248",
         "type": "comment",
         "name": "NOT NEEDED ANYMORE?",
         "info": "",
         "comments": "",
         "x": 4014.883331298828,
-        "y": 2665.883331298828,
-        "z": "82de8dcf.518d88",
+        "y": 2708,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "e351db25.84cdc8",
+        "id": "e22daf3c.82e7c8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3441.8837890625,
-        "y": 7438.88330078125,
-        "z": "82de8dcf.518d88",
+        "y": 7480.999969482422,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "bbb27c53.89e32",
+        "id": "ba2fa114.256608",
         "type": "comment",
         "name": "START OF DELETE OPERATION",
         "info": "",
         "comments": "",
         "x": 3288.88330078125,
-        "y": 2897.88330078125,
-        "z": "82de8dcf.518d88",
+        "y": 2939.999969482422,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "3023ae1c.6e2482",
+        "id": "cea904e8.518f5",
         "type": "save",
         "name": "delete LEAF uni resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3874.566650390625,
-        "y": 3087.283447265625,
-        "z": "82de8dcf.518d88",
+        "y": 3129.400115966797,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "a4dfc5e6.4600f",
+        "id": "8c6f82a5.234d18",
         "type": "save",
         "name": "get LEAF uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.LEAF.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.leafuni\" >\n",
         "comments": "",
         "outputs": 1,
         "x": 3245.566650390625,
-        "y": 3017.283447265625,
-        "z": "82de8dcf.518d88",
+        "y": 3059.400115966797,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "3c4fb74b.12c308",
-                "cc5ca51c.d55828",
-                "10482aca.fa7bbd"
+                "980e282b.21ebf",
+                "62337ab9.8b1c5c",
+                "ac27f627.a68b4"
             ]
         ]
     },
     {
-        "id": "cc5ca51c.d55828",
+        "id": "62337ab9.8b1c5c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3473.0576171875,
-        "y": 2989.857421875,
-        "z": "82de8dcf.518d88",
+        "y": 3031.974090576172,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "f3fff98e.f3e778"
+                "a4aab25a.3920c"
             ]
         ]
     },
     {
-        "id": "10482aca.fa7bbd",
+        "id": "ac27f627.a68b4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3468.566650390625,
-        "y": 3034.2833862304688,
-        "z": "82de8dcf.518d88",
+        "y": 3076.4000549316406,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "686bd6b1.dd501"
+                "98b8996.e5a3fe8"
             ]
         ]
     },
     {
-        "id": "f3fff98e.f3e778",
+        "id": "a4aab25a.3920c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3635.629150390625,
-        "y": 2989.1431274414062,
-        "z": "82de8dcf.518d88",
+        "y": 3031.259796142578,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "686bd6b1.dd501",
+        "id": "98b8996.e5a3fe8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 3636.566650390625,
-        "y": 3034.2833862304688,
-        "z": "82de8dcf.518d88",
+        "y": 3076.4000549316406,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "3c4fb74b.12c308",
+        "id": "980e282b.21ebf",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3480.566650390625,
-        "y": 3084.283447265625,
-        "z": "82de8dcf.518d88",
+        "y": 3126.400115966797,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "9563229e.3fe02"
+                "50a09dc8.f07414"
             ]
         ]
     },
     {
-        "id": "9563229e.3fe02",
+        "id": "50a09dc8.f07414",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -3500,266 +3500,266 @@
         "comments": "",
         "outputs": 1,
         "x": 3632.88330078125,
-        "y": 3087.88330078125,
-        "z": "82de8dcf.518d88",
+        "y": 3129.999969482422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "f32c210.90e5fe",
-                "3023ae1c.6e2482",
-                "dfd78621.0c4df"
+                "839bae2a.5eaff8",
+                "cea904e8.518f5",
+                "8b478b6f.069ff8"
             ]
         ]
     },
     {
-        "id": "f32c210.90e5fe",
+        "id": "839bae2a.5eaff8",
         "type": "set",
         "name": "set bwToBeDecreased tpid cvlan",
         "xml": "<set>\n<parameter name='bwToBeDecreased' value=\"`$tmp.aai.leafuni.data-source`\" />\n<parameter name='tpid' value='`$tmp.aai.leafuni.tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.leafuni.cvlan`' />\n\n\n",
         "comments": "",
         "x": 3877.566650390625,
-        "y": 3030.283447265625,
-        "z": "82de8dcf.518d88",
+        "y": 3072.400115966797,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "4c9abbae.5d458c",
+        "id": "5a01c9ff.aa79b8",
         "type": "comment",
         "name": "Update ROOT UNI's bw",
         "info": "",
         "comments": "",
         "x": 3833.566650390625,
-        "y": 3193.083251953125,
-        "z": "82de8dcf.518d88",
+        "y": 3235.199920654297,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "547f08e5.b430b",
+        "id": "e327e4d5.a4e2b",
         "type": "save",
         "name": "update ROOT UNI in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
         "comments": "",
         "outputs": 1,
         "x": 4435.566650390625,
-        "y": 3298.083251953125,
-        "z": "82de8dcf.518d88",
+        "y": 3340.199920654297,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "dfd78621.0c4df",
+        "id": "8b478b6f.069ff8",
         "type": "save",
         "name": "get root uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
         "comments": "",
         "outputs": 1,
         "x": 3825.56640625,
-        "y": 3239.083251953125,
-        "z": "82de8dcf.518d88",
+        "y": 3281.199920654297,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "51d31fac.6dab6",
-                "d9c98a3d.c2af8",
-                "e932164d.0b10e8"
+                "b9a017aa.207728",
+                "1cc16855.ddb44",
+                "cca9f79e.b7e85"
             ]
         ]
     },
     {
-        "id": "d9c98a3d.c2af8",
+        "id": "1cc16855.ddb44",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4053.057373046875,
-        "y": 3211.6572265625,
-        "z": "82de8dcf.518d88",
+        "y": 3253.773895263672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "f1a39628.bdc748"
+                "dd7a8720.93a36"
             ]
         ]
     },
     {
-        "id": "e932164d.0b10e8",
+        "id": "cca9f79e.b7e85",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4048.56640625,
-        "y": 3256.0831909179688,
-        "z": "82de8dcf.518d88",
+        "y": 3298.1998596191406,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "dfc7b8eb.48de78"
+                "bfa4184f.a70f18"
             ]
         ]
     },
     {
-        "id": "f1a39628.bdc748",
+        "id": "dd7a8720.93a36",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4215.62890625,
-        "y": 3210.9429321289062,
-        "z": "82de8dcf.518d88",
+        "y": 3253.059600830078,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "dfc7b8eb.48de78",
+        "id": "bfa4184f.a70f18",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 4216.56640625,
-        "y": 3256.0831909179688,
-        "z": "82de8dcf.518d88",
+        "y": 3298.1998596191406,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "dd0cc66d.fbf3a8",
+        "id": "51dfcdd2.a7dd1c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4213.56640625,
-        "y": 3306.083251953125,
-        "z": "82de8dcf.518d88",
+        "y": 3348.199920654297,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "9a3f7682.b82b9",
-                "547f08e5.b430b"
+                "f4f7b843.eb2a48",
+                "e327e4d5.a4e2b"
             ]
         ]
     },
     {
-        "id": "51d31fac.6dab6",
+        "id": "b9a017aa.207728",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4044.56640625,
-        "y": 3306.083251953125,
-        "z": "82de8dcf.518d88",
+        "y": 3348.199920654297,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "dd0cc66d.fbf3a8"
+                "51dfcdd2.a7dd1c"
             ]
         ]
     },
     {
-        "id": "9a3f7682.b82b9",
+        "id": "f4f7b843.eb2a48",
         "type": "set",
         "name": "set new bw",
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",
         "comments": "",
         "x": 4395.567138671875,
-        "y": 3248.083251953125,
-        "z": "82de8dcf.518d88",
+        "y": 3290.199920654297,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "998e4ab7.4d5be",
+        "id": "7302cb88.8e6284",
         "type": "comment",
         "name": "Delete LEAF UNI",
         "info": "",
         "comments": "",
         "x": 3825.88330078125,
-        "y": 2971.88330078125,
-        "z": "82de8dcf.518d88",
+        "y": 3013.999969482422,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "44b90aa0.b32f1c",
+        "id": "5b4e5a5d.18c714",
         "type": "set",
         "name": "set current-provider-id and current-cvlan-id",
         "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
         "comments": "",
         "x": 3311.749969482422,
-        "y": 3750.483367919922,
-        "z": "82de8dcf.518d88",
+        "y": 3792.6000366210938,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "2a719f3a.33348",
+        "id": "a7a1bb48.b43ec8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3444.749969482422,
-        "y": 3798.483367919922,
-        "z": "82de8dcf.518d88",
+        "y": 3840.6000366210938,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "33975a1e.497a26",
+        "id": "7b0989f8.4cdbd",
         "type": "switchNode",
         "name": "switch found-connectivity?",
         "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3266.749969482422,
-        "y": 3850.283416748047,
-        "z": "82de8dcf.518d88",
+        "y": 3892.4000854492188,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "6169e5ef.6af5c4",
-                "e3565ed9.a6bae8"
+                "723122ee.60b394",
+                "1f79397f.9ef707"
             ]
         ]
     },
     {
-        "id": "6169e5ef.6af5c4",
+        "id": "723122ee.60b394",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3459.749969482422,
-        "y": 3851.283416748047,
-        "z": "82de8dcf.518d88",
+        "y": 3893.4000854492188,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "3f7c202a.f0897"
+                "fc2d1c85.b4eee"
             ]
         ]
     },
     {
-        "id": "3f7c202a.f0897",
+        "id": "fc2d1c85.b4eee",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"LEAF CONN DOES NOT EXIST BUT IT SHOULD BE.\" />\n\n",
         "comments": "",
         "x": 3603.749969482422,
-        "y": 3847.483367919922,
-        "z": "82de8dcf.518d88",
+        "y": 3889.6000366210938,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "e3565ed9.a6bae8",
+        "id": "1f79397f.9ef707",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3463.749969482422,
-        "y": 3895.283416748047,
-        "z": "82de8dcf.518d88",
+        "y": 3937.4000854492188,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "c54729aa.dea04"
+                "6275f59c.0890b4"
             ]
         ]
     },
     {
-        "id": "c54729aa.dea04",
+        "id": "6275f59c.0890b4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -3767,165 +3767,165 @@
         "comments": "",
         "outputs": 1,
         "x": 3602.749969482422,
-        "y": 3890.283416748047,
-        "z": "82de8dcf.518d88",
+        "y": 3932.4000854492188,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "563cd7a4.5a9238",
-                "f2c9af7.5a8ebd",
-                "2a4d2a1b.ff481e"
+                "810f11d9.c59a7",
+                "852c933b.a9e98",
+                "dd94c766.3611e8"
             ]
         ]
     },
     {
-        "id": "563cd7a4.5a9238",
+        "id": "810f11d9.c59a7",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 3853.149627685547,
-        "y": 3898.800018310547,
-        "z": "82de8dcf.518d88",
+        "y": 3940.9166870117188,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "ec034714.60ea58"
+                "4f7025f7.9e0214"
             ]
         ]
     },
     {
-        "id": "ec034714.60ea58",
+        "id": "4f7025f7.9e0214",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4075.149627685547,
-        "y": 3876.800018310547,
-        "z": "82de8dcf.518d88",
+        "y": 3918.9166870117188,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "e531db92.56031"
+                "c1dfdbf7.de4f68"
             ]
         ]
     },
     {
-        "id": "e531db92.56031",
+        "id": "c1dfdbf7.de4f68",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4235.149139404297,
-        "y": 3856.800018310547,
-        "z": "82de8dcf.518d88",
+        "y": 3898.9166870117188,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "d94f5698.a9e22"
+                "811e3163.5710b"
             ]
         ]
     },
     {
-        "id": "717ee9f8.5f5168",
+        "id": "7642582a.7718e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4388.149658203125,
-        "y": 3837.800048828125,
-        "z": "82de8dcf.518d88",
+        "y": 3879.916717529297,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "44024f46.b6d6d",
-                "8cf84976.9daac8"
+                "b019880c.9753e",
+                "f61cef0c.bbc238"
             ]
         ]
     },
     {
-        "id": "44024f46.b6d6d",
+        "id": "b019880c.9753e",
         "type": "set",
         "name": "set tmp.stillHasUni to TRUE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",
         "comments": "",
         "x": 4584.649871826172,
-        "y": 3805.883270263672,
-        "z": "82de8dcf.518d88",
+        "y": 3847.9999389648438,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "f2c9af7.5a8ebd",
+        "id": "852c933b.a9e98",
         "type": "set",
         "name": "set tmp.stillHasUn tmp.keepVPNBs to FALSE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='false' />\n<parameter name='tmp.keepVPNBs' value='false' />\n",
         "comments": "",
         "x": 3959.64990234375,
-        "y": 3817.88330078125,
-        "z": "82de8dcf.518d88",
+        "y": 3859.999969482422,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "2a4d2a1b.ff481e",
+        "id": "dd94c766.3611e8",
         "type": "switchNode",
         "name": "switch tmp.keepVPNBs?",
         "xml": "\n<switch test=\"`$tmp.keepVPNBs`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3767.64990234375,
-        "y": 4238.883544921875,
-        "z": "82de8dcf.518d88",
+        "y": 4281.000213623047,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "39fb0c16.c2b2c4",
-                "808499cb.5bf588"
+                "73d16500.5c0ae4",
+                "d3a70ceb.c50b78"
             ]
         ]
     },
     {
-        "id": "8cf84976.9daac8",
+        "id": "f61cef0c.bbc238",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 4552.88330078125,
-        "y": 3873.88330078125,
-        "z": "82de8dcf.518d88",
+        "y": 3915.999969482422,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "808499cb.5bf588",
+        "id": "d3a70ceb.c50b78",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 154.65066528320312,
-        "y": 5302.8837890625,
-        "z": "82de8dcf.518d88",
+        "y": 5345.000457763672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "7018ac1a.7a3c7c"
+                "4a51985e.972e68"
             ]
         ]
     },
     {
-        "id": "39fb0c16.c2b2c4",
+        "id": "73d16500.5c0ae4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3988.650634765625,
-        "y": 4340.883544921875,
-        "z": "82de8dcf.518d88",
+        "y": 4383.000213623047,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "a235b563.2e3c2"
+                "25f72ad2.47990e"
             ]
         ]
     },
     {
-        "id": "a235b563.2e3c2",
+        "id": "25f72ad2.47990e",
         "type": "block",
         "name": "block",
         "xml": "<block>",
@@ -3933,208 +3933,208 @@
         "comments": "",
         "outputs": 1,
         "x": 4131.650634765625,
-        "y": 4336.883544921875,
-        "z": "82de8dcf.518d88",
+        "y": 4379.000213623047,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "ca74ec50.92ce48",
-                "76172197.657ac",
-                "2a3f4733.a29bc",
-                "c850b8e4.0504c8",
-                "46570b89.8afbb4",
-                "819543bf.270a9",
-                "ca7e6690.5ab92",
-                "26004944.36227e"
+                "6e8bafff.64fc88",
+                "dcf23a76.fb4f5",
+                "f889b68d.197d9",
+                "69806916.62139",
+                "32064458.33cdf4",
+                "9c7a66fb.560d48",
+                "2b19eccb.73cf0c",
+                "987f769f.1ba7f8"
             ]
         ]
     },
     {
-        "id": "9d4f67a6.1fc128",
+        "id": "316316fc.4e3ac2",
         "type": "comment",
         "name": "keepVPNBs == false, then check tmp.stillHasUni",
-        "info": "(2) keepVPNBs == false, means there are no other UNIs in this\nsame domain and same connectivity that share the same OLT node.\n\ncheck if tmp.stillHasUni is True or False?\n\nif TRUE --> means this domain (connectivity) still has other UNIs\n- delete VPNBs\n- delete LEAF UNI in AAI -- DONE\n- upadte bw in ROOT UNI -- DONE\n- delete LEAF UNI in LEAF ethernet service PNC\n- change ROOT conn status to Modified\n\nif FALSE --> means this domain (connectivity) has no other UNIs\n\nif MMstillHasUni == TRUE, means scenario (3), else, means scenario (4)\n\n(3) & (4) both:\n- delete VPNBs\n- delete LEAF connectivity\n- delete LEAF Ethernet Service from PNC\n\n(3) only:\n- change ROOT conn status to Modified\n- Keep the middle-man-conn and DON'T delete\n\n(4) only:\n- delete ROOT UNI\n- delete ROOT conn from AAI\n- delete ROOT Ethernet Service from PNC\n- delete middle-man-conn from AAI\n\n",
+        "info": "(2) keepVPNBs == false, means there are no other UNIs in this\nsame domain and same connectivity that share the same OLT node.\n\ncheck if tmp.stillHasUni is True or False?\n\nif TRUE --> means this domain (connectivity) still has other UNIs\n- delete VPNBs\n- delete LEAF UNI in AAI -- DONE\n- upadte bw in ROOT UNI -- DONE\n- delete LEAF UNI in LEAF ethernet service PNC\n- change ROOT conn status to Modified\n--- mark LEAF connectivity as Modified because the underlay OTN tunnel list of this connectivity is now different\n\nif FALSE --> means this domain (connectivity) has no other UNIs\n\nif MMstillHasUni == TRUE, means scenario (3), else, means scenario (4)\n\n(3) & (4) both:\n- delete VPNBs\n- delete LEAF connectivity\n- delete LEAF Ethernet Service from PNC\n\n(3) only:\n- change ROOT conn status to Modified\n- Keep the middle-man-conn and DON'T delete\n\n(4) only:\n- delete ROOT UNI\n- delete ROOT conn from AAI\n- delete ROOT Ethernet Service from PNC\n- delete middle-man-conn from AAI\n\n",
         "comments": "",
         "x": 181,
-        "y": 5258.8837890625,
-        "z": "82de8dcf.518d88",
+        "y": 5301.000457763672,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "cbdd9201.8f12c8",
+        "id": "32c3f6b1.304972",
         "type": "comment",
         "name": "There are still other UNIs in this connectivity that share same OLT node. Only update bw of the vpn-bindings involved",
         "info": "(1) keepVPNBs == true, means there are still other UNIs in this\nsame domain and same connectivity that share the same OLT node.\n\n- Only update bw of the vpn-bindings involved -- DONE\n- upadte bw in ROOT UNI -- DONE\n- change ROOT conn status to Modified -- DONE\n- delete LEAF UNI in AAI -- DONE\n- delete LEAF UNI in LEAF ethernet service PNC -- DONE\n- DON'T delete the connectivities of LEAF and ROOT -- DONE\nAlso update the ethernet services",
         "comments": "",
         "x": 4007.884033203125,
-        "y": 4303.883544921875,
-        "z": "82de8dcf.518d88",
+        "y": 4346.000213623047,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "a3d91414.090028",
+        "id": "7adbe8ea.ad8838",
         "type": "set",
         "name": "set srcTtp OTN layer",
         "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",
         "comments": "",
         "x": 4820.667724609375,
-        "y": 4494.6669921875,
-        "z": "82de8dcf.518d88",
+        "y": 4536.783660888672,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "8bf6af15.0a9a48",
+        "id": "ee3b3067.d425a8",
         "type": "switchNode",
         "name": "switch provider-id domainA",
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5165.667724609375,
-        "y": 4356.6669921875,
-        "z": "82de8dcf.518d88",
+        "y": 4398.783660888672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "8859d6ca.2f75b8"
+                "76f6067d.796678"
             ]
         ]
     },
     {
-        "id": "c067ba23.0c8be",
+        "id": "fc93f53c.f481d",
         "type": "for",
         "name": "for netwidx..allNetworksList_length",
         "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
         "comments": "",
         "outputs": 1,
         "x": 4872.667724609375,
-        "y": 4350.6669921875,
-        "z": "82de8dcf.518d88",
+        "y": 4392.783660888672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "8bf6af15.0a9a48"
+                "ee3b3067.d425a8"
             ]
         ]
     },
     {
-        "id": "2da7141c.ae03fc",
+        "id": "3f4440b0.d66f8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5127.667724609375,
-        "y": 4307.6669921875,
-        "z": "82de8dcf.518d88",
+        "y": 4349.783660888672,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "1cbc0879.d4095",
+        "id": "27f65669.8e0af2",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
         "comments": "",
         "x": 4816.667724609375,
-        "y": 4402.6669921875,
-        "z": "82de8dcf.518d88",
+        "y": 4444.783660888672,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "faedf550.ca72d",
+        "id": "410c70eb.214758",
         "type": "set",
         "name": "set tmp.pce-src-node",
         "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' 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<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' 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                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",
         "comments": "",
         "x": 4824.667724609375,
-        "y": 4447.6669921875,
-        "z": "82de8dcf.518d88",
+        "y": 4489.783660888672,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "1b550765.eaf4d1",
+        "id": "e258b42d.2c46d8",
         "type": "set",
         "name": "unset otnTopoIdSrc",
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
         "comments": "",
         "x": 4821.667724609375,
-        "y": 4300.6669921875,
-        "z": "82de8dcf.518d88",
+        "y": 4342.783660888672,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "8859d6ca.2f75b8",
+        "id": "76f6067d.796678",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5074.667724609375,
-        "y": 4424.6669921875,
-        "z": "82de8dcf.518d88",
+        "y": 4466.783660888672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "b9fd6938.f76ca8"
+                "acca9da1.cc4618"
             ]
         ]
     },
     {
-        "id": "b9fd6938.f76ca8",
+        "id": "acca9da1.cc4618",
         "type": "switchNode",
         "name": "switch te-topo-id",
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5259.667724609375,
-        "y": 4423.6669921875,
-        "z": "82de8dcf.518d88",
+        "y": 4465.783660888672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "d7c2d227.430278"
+                "f448b4f8.c120e"
             ]
         ]
     },
     {
-        "id": "d7c2d227.430278",
+        "id": "f448b4f8.c120e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5451.667724609375,
-        "y": 4426.6669921875,
-        "z": "82de8dcf.518d88",
+        "y": 4468.783660888672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "9062d4ad.31e34"
+                "19985725.a5eca1"
             ]
         ]
     },
     {
-        "id": "9062d4ad.31e34",
+        "id": "19985725.a5eca1",
         "type": "set",
         "name": "set otnTopoIdSrc",
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
         "x": 5623.667724609375,
-        "y": 4422.6669921875,
-        "z": "82de8dcf.518d88",
+        "y": 4464.783660888672,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "c312f389.231768",
+        "id": "ab4edace.9f77f",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4999.667724609375,
-        "y": 4537.6669921875,
-        "z": "82de8dcf.518d88",
+        "y": 4579.783660888672,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "ca74ec50.92ce48",
+        "id": "6e8bafff.64fc88",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -4142,232 +4142,232 @@
         "comments": "",
         "outputs": 1,
         "x": 4516.667724609375,
-        "y": 4322.6669921875,
-        "z": "82de8dcf.518d88",
+        "y": 4364.783660888672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "3f12b93a.0cf81e",
-                "24786620.817bb2",
-                "1cbc0879.d4095",
-                "faedf550.ca72d",
-                "a3d91414.090028",
-                "c067ba23.0c8be",
-                "c312f389.231768"
+                "30c992c8.4db58e",
+                "c2728b20.458338",
+                "27f65669.8e0af2",
+                "410c70eb.214758",
+                "7adbe8ea.ad8838",
+                "fc93f53c.f481d",
+                "ab4edace.9f77f"
             ]
         ]
     },
     {
-        "id": "1877ba6b.c5c236",
+        "id": "2e6e6c8a.c892fc",
         "type": "comment",
         "name": "The following section is to find srcTtp OTN layer (its long name)",
         "info": "The following section is to find srcTtp OTN layer (its long name)",
         "comments": "",
         "x": 4501.667724609375,
-        "y": 4256.6669921875,
-        "z": "82de8dcf.518d88",
+        "y": 4298.783660888672,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "24786620.817bb2",
+        "id": "c2728b20.458338",
         "type": "get-resource",
         "name": "get-resource network-resources-list",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
         "comments": "",
         "outputs": 1,
         "x": 4880.667724609375,
-        "y": 4243.6669921875,
-        "z": "82de8dcf.518d88",
+        "y": 4285.783660888672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "c082f0f0.3fe63",
-                "8aa79b73.5d91b",
-                "2da7141c.ae03fc"
+                "cd41e347.c8a4d",
+                "5bcb3237.45bf24",
+                "3f4440b0.d66f8"
             ]
         ]
     },
     {
-        "id": "c082f0f0.3fe63",
+        "id": "cd41e347.c8a4d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5116.667724609375,
-        "y": 4226.6669921875,
-        "z": "82de8dcf.518d88",
+        "y": 4268.783660888672,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "8aa79b73.5d91b",
+        "id": "5bcb3237.45bf24",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5113.667724609375,
-        "y": 4267.6669921875,
-        "z": "82de8dcf.518d88",
+        "y": 4309.783660888672,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "3f12b93a.0cf81e",
+        "id": "30c992c8.4db58e",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
         "comments": "",
         "x": 4829.667724609375,
-        "y": 4200.6669921875,
-        "z": "82de8dcf.518d88",
+        "y": 4242.783660888672,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "76172197.657ac",
+        "id": "dcf23a76.fb4f5",
         "type": "set",
         "name": "unset tmp.aai.all-vpn-bindings",
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
         "comments": "",
         "x": 4336.667724609375,
-        "y": 4655.06689453125,
-        "z": "82de8dcf.518d88",
+        "y": 4697.183563232422,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "d9693eef.d5133",
+        "id": "f549a24.b4e97e",
         "type": "comment",
         "name": "find all OTNs that have srcTtpOtnLayer and decrease their bandwidth",
         "info": "",
         "comments": "",
         "x": 4459.968017578125,
-        "y": 4694.06689453125,
-        "z": "82de8dcf.518d88",
+        "y": 4736.183563232422,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "2a3f4733.a29bc",
+        "id": "f889b68d.197d9",
         "type": "save",
         "name": "get all-vpn-bindings from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
         "comments": "",
         "outputs": 1,
         "x": 4357.968017578125,
-        "y": 4729.06689453125,
-        "z": "82de8dcf.518d88",
+        "y": 4771.183563232422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "e8babd58.4782b",
-                "e0bbecb2.837888",
-                "bb53595.0530328"
+                "f7fe6bc0.f9d1a8",
+                "b939c13a.bd148",
+                "63930841.13965"
             ]
         ]
     },
     {
-        "id": "e8babd58.4782b",
+        "id": "f7fe6bc0.f9d1a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4562.968017578125,
-        "y": 4726.06689453125,
-        "z": "82de8dcf.518d88",
+        "y": 4768.183563232422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "8299b116.2a1f1"
+                "85787fa.a0f0d8"
             ]
         ]
     },
     {
-        "id": "e0bbecb2.837888",
+        "id": "b939c13a.bd148",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4546.458984375,
-        "y": 4787.640930175781,
-        "z": "82de8dcf.518d88",
+        "y": 4829.757598876953,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "af952dc7.60185"
+                "c496c4d4.109c78"
             ]
         ]
     },
     {
-        "id": "bb53595.0530328",
+        "id": "63930841.13965",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4543.968017578125,
-        "y": 4831.06689453125,
-        "z": "82de8dcf.518d88",
+        "y": 4873.183563232422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "a2d64007.4e8e68"
+                "bb1ebaa9.c2fac"
             ]
         ]
     },
     {
-        "id": "8299b116.2a1f1",
+        "id": "85787fa.a0f0d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4730.96826171875,
-        "y": 4721.06689453125,
-        "z": "82de8dcf.518d88",
+        "y": 4763.183563232422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "575eea2a.c26ae4"
+                "6a7a29b4.6659c"
             ]
         ]
     },
     {
-        "id": "af952dc7.60185",
+        "id": "c496c4d4.109c78",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4709.0303955078125,
-        "y": 4787.926666259766,
-        "z": "82de8dcf.518d88",
+        "y": 4830.0433349609375,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "a2d64007.4e8e68",
+        "id": "bb1ebaa9.c2fac",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 4710.968017578125,
-        "y": 4830.06689453125,
-        "z": "82de8dcf.518d88",
+        "y": 4872.183563232422,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "575eea2a.c26ae4",
+        "id": "6a7a29b4.6659c",
         "type": "for",
         "name": "for vpnidx in all-vpn-bindings",
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 4968.96826171875,
-        "y": 4726.06689453125,
-        "z": "82de8dcf.518d88",
+        "y": 4768.183563232422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "b0cdcdcc.86b948"
+                "2e12f618.b174b2"
             ]
         ]
     },
     {
-        "id": "b0cdcdcc.86b948",
+        "id": "2e12f618.b174b2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4375,74 +4375,74 @@
         "comments": "",
         "outputs": 1,
         "x": 5202.968017578125,
-        "y": 4733.06689453125,
-        "z": "82de8dcf.518d88",
+        "y": 4775.183563232422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "fe17da41.8d7458"
+                "1b37b556.addac3"
             ]
         ]
     },
     {
-        "id": "63f7f511.d89814",
+        "id": "3df57bb4.1a97cc",
         "type": "comment",
         "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
         "info": "",
         "comments": "",
         "x": 5188.784423828125,
-        "y": 4955.2333984375,
-        "z": "82de8dcf.518d88",
+        "y": 4997.350067138672,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "fe17da41.8d7458",
+        "id": "1b37b556.addac3",
         "type": "switchNode",
         "name": "switch ops-note is srcTtpOtnLayer",
         "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 5221.784423828125,
-        "y": 5023.2333984375,
-        "z": "82de8dcf.518d88",
+        "y": 5065.350067138672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "adceca9b.52be78",
-                "6371c80.a864db8"
+                "c62dd674.fd73f",
+                "37627bf2.c03934"
             ]
         ]
     },
     {
-        "id": "6371c80.a864db8",
+        "id": "37627bf2.c03934",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5465.784454345703,
-        "y": 4995.233184814453,
-        "z": "82de8dcf.518d88",
+        "y": 5037.349853515625,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "adceca9b.52be78",
+        "id": "c62dd674.fd73f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5346.784423828125,
-        "y": 4921.233154296875,
-        "z": "82de8dcf.518d88",
+        "y": 4963.349822998047,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "eabe2b02.0bc13"
+                "a5ecb13c.9c7548"
             ]
         ]
     },
     {
-        "id": "eabe2b02.0bc13",
+        "id": "a5ecb13c.9c7548",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4450,213 +4450,213 @@
         "comments": "",
         "outputs": 1,
         "x": 5473.767822265625,
-        "y": 4859.649658203125,
-        "z": "82de8dcf.518d88",
+        "y": 4901.766326904297,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "b15dfc5.1130d",
-                "7054ba61.11f874",
-                "e5483e65.23a9a"
+                "78a5ede3.09cc54",
+                "aecf8872.1d5c4",
+                "657d43b1.13c254"
             ]
         ]
     },
     {
-        "id": "771d8350.1c0644",
+        "id": "9d348107.818aa",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 5709.8173828125,
-        "y": 4743.64990234375,
-        "z": "82de8dcf.518d88",
+        "y": 4785.766571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "3a42df45.8a578"
+                "99f28c5d.95abe8"
             ]
         ]
     },
     {
-        "id": "3a42df45.8a578",
+        "id": "99f28c5d.95abe8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5901.8173828125,
-        "y": 4732.650146484375,
-        "z": "82de8dcf.518d88",
+        "y": 4774.766815185547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "f5feb746.9bcea8"
+                "9a75bdf9.10641"
             ]
         ]
     },
     {
-        "id": "b15dfc5.1130d",
+        "id": "78a5ede3.09cc54",
         "type": "set",
         "name": "unset tmp.aai.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
         "comments": "",
         "x": 5658.334228515625,
-        "y": 4633.866943359375,
-        "z": "82de8dcf.518d88",
+        "y": 4675.983612060547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "7054ba61.11f874",
+        "id": "aecf8872.1d5c4",
         "type": "set",
         "name": "set tmp.aai.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
         "comments": "",
         "x": 5650.334228515625,
-        "y": 4682.866943359375,
-        "z": "82de8dcf.518d88",
+        "y": 4724.983612060547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "e5483e65.23a9a",
+        "id": "657d43b1.13c254",
         "type": "save",
         "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $bwToBeDecreased`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
         "x": 5881.751220703125,
-        "y": 4864.032958984375,
-        "z": "82de8dcf.518d88",
+        "y": 4906.149627685547,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "c01f7460.fab75",
+        "id": "f1c96228.a5339",
         "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.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
         "comments": "",
         "outputs": 1,
         "x": 5833.401123046875,
-        "y": 4911.349853515625,
-        "z": "82de8dcf.518d88",
+        "y": 4953.466522216797,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "a637b405.b076f",
+        "id": "75d6304c.089cd8",
         "type": "comment",
         "name": "decrease the bw of the-vpn-binding and change status to modified",
         "info": "decrease the bw of the-vpn-binding\nchange status to modified\n",
         "comments": "",
         "x": 5905.751220703125,
-        "y": 4825.032958984375,
-        "z": "82de8dcf.518d88",
+        "y": 4867.149627685547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "f5feb746.9bcea8",
+        "id": "9a75bdf9.10641",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6083.8173828125,
-        "y": 4711.650146484375,
-        "z": "82de8dcf.518d88",
+        "y": 4753.766815185547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "4f7dc832.d994c8"
+                "b5ad886.81af5f8"
             ]
         ]
     },
     {
-        "id": "4f7dc832.d994c8",
+        "id": "b5ad886.81af5f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 6245.8173828125,
-        "y": 4700.650146484375,
-        "z": "82de8dcf.518d88",
+        "y": 4742.766815185547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "f7240b03.b46408",
-                "a1eea84d.7200b"
+                "6f94f7eb.f4d818",
+                "269fac18.2bb21c"
             ]
         ]
     },
     {
-        "id": "f7240b03.b46408",
+        "id": "6f94f7eb.f4d818",
         "type": "set",
         "name": "unset tmp.the-connectivity",
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",
         "comments": "",
         "x": 6442.8173828125,
-        "y": 4629.650146484375,
-        "z": "82de8dcf.518d88",
+        "y": 4671.766815185547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "a1eea84d.7200b",
+        "id": "269fac18.2bb21c",
         "type": "set",
         "name": "set tmp.the-connectivity",
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />\n",
         "comments": "",
         "x": 6440.2841796875,
-        "y": 4728.866943359375,
-        "z": "82de8dcf.518d88",
+        "y": 4770.983612060547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "ce0d81bd.d28a7",
+        "id": "a984d0c7.8574d",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3097.800048828125,
-        "y": 3187.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 3229.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "7f04acf4.5afc3c",
+        "id": "49347bae.3e2974",
         "type": "switchNode",
         "name": "switch found-middle-man?",
         "xml": "<switch test='`$found-middle-man`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2974.800048828125,
-        "y": 3297.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 3339.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "d1c2eeb4.215af8",
-                "f1f6bb53.ccd5d8"
+                "7b835f88.3b076",
+                "7490c0ec.4dda5"
             ]
         ]
     },
     {
-        "id": "d1c2eeb4.215af8",
+        "id": "7b835f88.3b076",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3158.800048828125,
-        "y": 3276.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 3318.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "d53b6d30.115bd"
+                "5b141b7a.8f28f4"
             ]
         ]
     },
     {
-        "id": "d53b6d30.115bd",
+        "id": "5b141b7a.8f28f4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4664,43 +4664,43 @@
         "comments": "",
         "outputs": 1,
         "x": 3301.800048828125,
-        "y": 3276.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 3318.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "5f773b5f.84092c"
+                "94596646.a7e4f"
             ]
         ]
     },
     {
-        "id": "5f773b5f.84092c",
+        "id": "94596646.a7e4f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"LEAF CONN DOES NOT EXIST BUT IT SHOULD BE.\" />\n\n",
         "comments": "",
         "x": 3477.800048828125,
-        "y": 3274.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 3316.800018310547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "f1f6bb53.ccd5d8",
+        "id": "7490c0ec.4dda5",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3156.800048828125,
-        "y": 3331.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 3373.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "e42ba1d9.fa7b7"
+                "a3855d70.dbb87"
             ]
         ]
     },
     {
-        "id": "e42ba1d9.fa7b7",
+        "id": "a3855d70.dbb87",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4708,216 +4708,216 @@
         "comments": "",
         "outputs": 1,
         "x": 3003.800048828125,
-        "y": 3464.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 3506.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "44b90aa0.b32f1c",
-                "2a719f3a.33348",
-                "33975a1e.497a26",
-                "c19f56be.5aa798",
-                "eb35e3d0.6d25d",
-                "5aebe180.f62f68"
+                "5b4e5a5d.18c714",
+                "a7a1bb48.b43ec8",
+                "7b0989f8.4cdbd",
+                "b98b1ba5.429c1",
+                "37657916.72f08e",
+                "cc0c619e.32de58"
             ]
         ]
     },
     {
-        "id": "5c85f7ca.d8c4a",
+        "id": "a5a62e88.7d802",
         "type": "comment",
         "name": "Find LEAF connectivity",
         "info": "",
         "comments": "",
         "x": 3225.88330078125,
-        "y": 3704.88330078125,
-        "z": "82de8dcf.518d88",
+        "y": 3746.999969482422,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "c19f56be.5aa798",
+        "id": "b98b1ba5.429c1",
         "type": "set",
         "name": "set tmp.MMstillHasUni to FALSE",
         "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='false' />\n",
         "comments": "",
         "x": 3308.333251953125,
-        "y": 3477.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 3519.800018310547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "eb35e3d0.6d25d",
+        "id": "37657916.72f08e",
         "type": "for",
         "name": "for each relationship of middle-man-conn",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 3306.8330078125,
-        "y": 3523.60009765625,
-        "z": "82de8dcf.518d88",
+        "y": 3565.716766357422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "ca4bb58e.913108"
+                "1a4c3937.32a93f"
             ]
         ]
     },
     {
-        "id": "ca4bb58e.913108",
+        "id": "1a4c3937.32a93f",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3569.8330078125,
-        "y": 3518.60009765625,
-        "z": "82de8dcf.518d88",
+        "y": 3560.716766357422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "468a474d.40c4d8"
+                "95d80a37.7eef5"
             ]
         ]
     },
     {
-        "id": "468a474d.40c4d8",
+        "id": "95d80a37.7eef5",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3729.83251953125,
-        "y": 3498.60009765625,
-        "z": "82de8dcf.518d88",
+        "y": 3540.716766357422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "e61de8ad.7030f"
+                "9608373.19689c8"
             ]
         ]
     },
     {
-        "id": "3444ada9.d2b992",
+        "id": "d9ea756c.06e5e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4498.833740234375,
-        "y": 3533.60009765625,
-        "z": "82de8dcf.518d88",
+        "y": 3575.716766357422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "7b31b3f.9c4444c",
-                "31b46b09.5b560c",
-                "a9c3a9a9.0f7c28"
+                "29278691.db117a",
+                "29bad35d.650d14",
+                "a6af6c62.1a6b5"
             ]
         ]
     },
     {
-        "id": "7b31b3f.9c4444c",
+        "id": "29278691.db117a",
         "type": "set",
         "name": "set tmp.MMstillHasUni to TRUE",
         "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='true' />\n",
         "comments": "",
         "x": 4738.334228515625,
-        "y": 3482.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 3524.800018310547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "31b46b09.5b560c",
+        "id": "29bad35d.650d14",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 4671.567657470703,
-        "y": 3555.683380126953,
-        "z": "82de8dcf.518d88",
+        "y": 3597.800048828125,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "dbe78677.7f04b8",
+        "id": "4465f9ec.e3dbb",
         "type": "comment",
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",
         "info": "",
         "comments": "",
         "x": 4432.88427734375,
-        "y": 5085.883544921875,
-        "z": "82de8dcf.518d88",
+        "y": 5128.000213623047,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "c850b8e4.0504c8",
+        "id": "69806916.62139",
         "type": "set",
         "name": "set tmp.leafconn.",
         "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",
         "comments": "",
         "x": 4331.317138671875,
-        "y": 5137.800048828125,
-        "z": "82de8dcf.518d88",
+        "y": 5179.916717529297,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "ca7e6690.5ab92",
+        "id": "2b19eccb.73cf0c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4482.317138671875,
-        "y": 5580.800048828125,
-        "z": "82de8dcf.518d88",
+        "y": 5622.916717529297,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "26004944.36227e",
+        "id": "987f769f.1ba7f8",
         "type": "switchNode",
         "name": "switch found-root-connectivity",
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4297.317138671875,
-        "y": 5647.800048828125,
-        "z": "82de8dcf.518d88",
+        "y": 5689.916717529297,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "c57768ca.7a8088",
-                "7224490d.b02598"
+                "c7979e94.4deb18",
+                "5e8c956f.69a854"
             ]
         ]
     },
     {
-        "id": "c57768ca.7a8088",
+        "id": "c7979e94.4deb18",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4562.317138671875,
-        "y": 5632.800048828125,
-        "z": "82de8dcf.518d88",
+        "y": 5674.916717529297,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "25615183.2d4bd6"
+                "4a28d2a5.936924"
             ]
         ]
     },
     {
-        "id": "7224490d.b02598",
+        "id": "5e8c956f.69a854",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4558.317138671875,
-        "y": 5680.800048828125,
-        "z": "82de8dcf.518d88",
+        "y": 5722.916717529297,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "5dcdd7b9.89499"
+                "213fbf95.d03c8"
             ]
         ]
     },
     {
-        "id": "25615183.2d4bd6",
+        "id": "4a28d2a5.936924",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4925,116 +4925,116 @@
         "comments": "",
         "outputs": 1,
         "x": 4718.317138671875,
-        "y": 5628.800048828125,
-        "z": "82de8dcf.518d88",
+        "y": 5670.916717529297,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "9b98cd10.6cfb68"
+                "a96c5a1a.d66bf"
             ]
         ]
     },
     {
-        "id": "5dcdd7b9.89499",
+        "id": "213fbf95.d03c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
         "comments": "",
         "x": 4706.317138671875,
-        "y": 5675.800048828125,
-        "z": "82de8dcf.518d88",
+        "y": 5717.916717529297,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "f97c958c.da83b8",
+        "id": "4e8315f.b9446ec",
         "type": "set",
         "name": "set tmp.rootconn.",
         "xml": "<set>\n<parameter name='tmp.rootconn.' value=\"`$tmp.aai.ROOT.connectivity.`\" />\n\n\n",
         "comments": "",
         "x": 5138.3173828125,
-        "y": 5570.800048828125,
-        "z": "82de8dcf.518d88",
+        "y": 5612.916717529297,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "903178c6.839788",
+        "id": "aa7d5d8.eb8bca",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.leafconn.access-provider-id + '-clientId-' +\n                                                   $tmp.leafconn.access-client-id + '-topologyId-' +\n                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.leafconn.access-node-id`\" />\n",
         "comments": "",
         "x": 4540.734130859375,
-        "y": 5167.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5209.200408935547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "46570b89.8afbb4",
+        "id": "32064458.33cdf4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4311.734130859375,
-        "y": 5256.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5298.200408935547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "903178c6.839788",
-                "42c91ccf.e64244"
+                "aa7d5d8.eb8bca",
+                "3165c974.539e06"
             ]
         ]
     },
     {
-        "id": "42c91ccf.e64244",
+        "id": "3165c974.539e06",
         "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": 4547.734130859375,
-        "y": 5249.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5291.200408935547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "30eabd9c.98c532",
-                "66fbb0fb.26a3f",
-                "fbd21163.a12cd8"
+                "4cddcbba.102194",
+                "d5cd17da.64e6a",
+                "9d33157c.077f3"
             ]
         ]
     },
     {
-        "id": "30eabd9c.98c532",
+        "id": "4cddcbba.102194",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4743.2342529296875,
-        "y": 5201.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5243.200408935547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "26c5ac0c.2065fc"
+                "658952ec.d50f2c"
             ]
         ]
     },
     {
-        "id": "66fbb0fb.26a3f",
+        "id": "d5cd17da.64e6a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4735.2342529296875,
-        "y": 5256.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5298.200408935547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "a0a0372d.9d324"
+                "f87d3f72.db25b"
             ]
         ]
     },
     {
-        "id": "26c5ac0c.2065fc",
+        "id": "658952ec.d50f2c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5042,219 +5042,219 @@
         "comments": "",
         "outputs": 1,
         "x": 4887.6165771484375,
-        "y": 5200.739410400391,
-        "z": "82de8dcf.518d88",
+        "y": 5242.8560791015625,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "40d1dc2e.899afc"
+                "5e03d50d.e31174"
             ]
         ]
     },
     {
-        "id": "40d1dc2e.899afc",
+        "id": "5e03d50d.e31174",
         "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": 5071.734130859375,
-        "y": 5199.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5241.200408935547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "137e1346.633fe5"
+                "81fcac6e.c2cbb"
             ]
         ]
     },
     {
-        "id": "137e1346.633fe5",
+        "id": "81fcac6e.c2cbb",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5266.734130859375,
-        "y": 5199.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5241.200408935547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "19ce94ba.82e9d3"
+                "23740bd0.c54174"
             ]
         ]
     },
     {
-        "id": "fbd21163.a12cd8",
+        "id": "9d33157c.077f3",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4740.2342529296875,
-        "y": 5313.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5355.200408935547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "4a6cd196.293db"
+                "d477847d.474a8"
             ]
         ]
     },
     {
-        "id": "4a6cd196.293db",
+        "id": "d477847d.474a8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4892.2342529296875,
-        "y": 5314.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5356.200408935547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "a0a0372d.9d324",
+        "id": "f87d3f72.db25b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4903.2342529296875,
-        "y": 5257.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5299.200408935547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "1398b0a6.59adbf",
+        "id": "e3023af7.680d7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5648.734130859375,
-        "y": 5203.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5245.200408935547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "ac703b64.91e208",
-                "60a60a9a.326334",
-                "feb4d66b.8d20f"
+                "31c1897e.fbb116",
+                "b906e4f7.66368",
+                "ac0e0ca2.883cb"
             ]
         ]
     },
     {
-        "id": "19ce94ba.82e9d3",
+        "id": "23740bd0.c54174",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5469.734130859375,
-        "y": 5203.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5245.200408935547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "1398b0a6.59adbf"
+                "e3023af7.680d7"
             ]
         ]
     },
     {
-        "id": "60a60a9a.326334",
+        "id": "b906e4f7.66368",
         "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": 5854.734130859375,
-        "y": 5216.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5258.200408935547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "9885a0c6.ee00f8",
-                "a77a3d25.4123b",
-                "3b9ca266.b8d5f6"
+                "df7977a7.075b8",
+                "f17bde95.882498",
+                "61e2d23e.358d1c"
             ]
         ]
     },
     {
-        "id": "ac703b64.91e208",
+        "id": "31c1897e.fbb116",
         "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": 5884.734130859375,
-        "y": 5164.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5206.200408935547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "9885a0c6.ee00f8",
+        "id": "df7977a7.075b8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6064.734130859375,
-        "y": 5207.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5249.200408935547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "fd819e5.0208ae"
+                "7ac6fe75.62b4e"
             ]
         ]
     },
     {
-        "id": "a77a3d25.4123b",
+        "id": "f17bde95.882498",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6056.734130859375,
-        "y": 5262.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5304.200408935547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "9503eaf8.25455"
+                "671c9934.2cd48"
             ]
         ]
     },
     {
-        "id": "3b9ca266.b8d5f6",
+        "id": "61e2d23e.358d1c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6061.734130859375,
-        "y": 5319.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5361.200408935547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "2f6c8ed.964c6f2"
+                "a6615570.50c968"
             ]
         ]
     },
     {
-        "id": "2f6c8ed.964c6f2",
+        "id": "a6615570.50c968",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 6213.734130859375,
-        "y": 5320.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5362.200408935547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "9503eaf8.25455",
+        "id": "671c9934.2cd48",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 6224.734130859375,
-        "y": 5265.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5307.200408935547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "fd819e5.0208ae",
+        "id": "7ac6fe75.62b4e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5262,82 +5262,82 @@
         "comments": "",
         "outputs": 1,
         "x": 6209.116455078125,
-        "y": 5204.739410400391,
-        "z": "82de8dcf.518d88",
+        "y": 5246.8560791015625,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "fdf4316f.fecc18"
+                "6989c737.25d068"
             ]
         ]
     },
     {
-        "id": "fdf4316f.fecc18",
+        "id": "6989c737.25d068",
         "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": 6423.734130859375,
-        "y": 5201.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5243.200408935547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "feb4d66b.8d20f",
+        "id": "ac0e0ca2.883cb",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 5804.734130859375,
-        "y": 5280.083740234375,
-        "z": "82de8dcf.518d88",
+        "y": 5322.200408935547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "819543bf.270a9",
+        "id": "9c7a66fb.560d48",
         "type": "execute",
         "name": "execute RestApiCallNode Delete LEAF UNI of ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.LEAF.uni-p-interface-long`\" />\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": 4453.234375,
-        "y": 5360.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5402.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "fe68d2f2.044a28",
-                "9d6b0bdc.79122"
+                "1e28e096.7499f7",
+                "cc9e5694.f9d17"
             ]
         ]
     },
     {
-        "id": "fe68d2f2.044a28",
+        "id": "1e28e096.7499f7",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4813.734130859375,
-        "y": 5368.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5410.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "dd8bd538.48e76"
+                "906e379.3b93848"
             ]
         ]
     },
     {
-        "id": "dd8bd538.48e76",
+        "id": "906e379.3b93848",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 4971.734130859375,
-        "y": 5368.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5410.800018310547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "17aac5bf.8ce3ca",
+        "id": "90be5ca9.028288",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -5345,97 +5345,97 @@
         "comments": "",
         "outputs": 1,
         "x": 4975.234130859375,
-        "y": 5408.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5450.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "9d6b0bdc.79122",
+        "id": "cc9e5694.f9d17",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4817.734130859375,
-        "y": 5408.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5450.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "17aac5bf.8ce3ca"
+                "90be5ca9.028288"
             ]
         ]
     },
     {
-        "id": "67f63093.820248",
+        "id": "921095c8.3bc23",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5126.451171875,
-        "y": 5622.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5664.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "9523ac21.fb27e8",
-                "ee545a84.5a0b8"
+                "fb4f4697.4dc5f",
+                "7ea31674.99e1d8"
             ]
         ]
     },
     {
-        "id": "ee545a84.5a0b8",
+        "id": "7ea31674.99e1d8",
         "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": 5368.450927734375,
-        "y": 5572.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5614.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "3e67e67b.64c0f2",
-                "83fa1a94.1fdef",
-                "8d7d3b80.341b3"
+                "10743e5b.0b6182",
+                "5598183a.212ab",
+                "9c9074e9.bbaff8"
             ]
         ]
     },
     {
-        "id": "3e67e67b.64c0f2",
+        "id": "10743e5b.0b6182",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5563.951171875,
-        "y": 5506.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5548.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "4b842a3.ce68254"
+                "767943d2.64a144"
             ]
         ]
     },
     {
-        "id": "83fa1a94.1fdef",
+        "id": "5598183a.212ab",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5559.951171875,
-        "y": 5562.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5604.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "fe24638.108ff2"
+                "74a77564.40268c"
             ]
         ]
     },
     {
-        "id": "4b842a3.ce68254",
+        "id": "767943d2.64a144",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5443,114 +5443,114 @@
         "comments": "",
         "outputs": 1,
         "x": 5708.3333740234375,
-        "y": 5524.339019775391,
-        "z": "82de8dcf.518d88",
+        "y": 5566.4556884765625,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "471b8aca.2d2d8c"
+                "10049f5.85364e1"
             ]
         ]
     },
     {
-        "id": "471b8aca.2d2d8c",
+        "id": "10049f5.85364e1",
         "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": 5892.450927734375,
-        "y": 5522.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5564.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "835403d4.ab8a4"
+                "72e5612b.857e68"
             ]
         ]
     },
     {
-        "id": "8d7d3b80.341b3",
+        "id": "9c9074e9.bbaff8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5569.951171875,
-        "y": 5607.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5649.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "dbe8e8e2.82532"
+                "952a99b1.f3f0e"
             ]
         ]
     },
     {
-        "id": "dbe8e8e2.82532",
+        "id": "952a99b1.f3f0e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5748.951171875,
-        "y": 5623.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5665.800018310547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "fe24638.108ff2",
+        "id": "74a77564.40268c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5730.951171875,
-        "y": 5575.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5617.800018310547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "23127469.8e053c",
+        "id": "f64c3a10.6bbc38",
         "type": "execute",
         "name": "execute RestApiCallNode Delete UNI of ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.rootconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.ROOT.uni-p-interface-long`\" />\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": 5279.951171875,
-        "y": 5678.282958984375,
-        "z": "82de8dcf.518d88",
+        "y": 5720.399627685547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "2dc53207.e6e746",
-                "5dfbf094.3dd5e"
+                "cd722628.03685",
+                "76458c1b.1a62ac"
             ]
         ]
     },
     {
-        "id": "2dc53207.e6e746",
+        "id": "cd722628.03685",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5628.451171875,
-        "y": 5660.282958984375,
-        "z": "82de8dcf.518d88",
+        "y": 5702.399627685547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "d62622e9.977188"
+                "d04dd9dc.2f2dc8"
             ]
         ]
     },
     {
-        "id": "d62622e9.977188",
+        "id": "d04dd9dc.2f2dc8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 5884.451171875,
-        "y": 5663.282958984375,
-        "z": "82de8dcf.518d88",
+        "y": 5705.399627685547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "b15c93b0.c4d298",
+        "id": "1006a530.30b813",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -5558,190 +5558,190 @@
         "comments": "",
         "outputs": 1,
         "x": 5836.951171875,
-        "y": 5704.282958984375,
-        "z": "82de8dcf.518d88",
+        "y": 5746.399627685547,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "5dfbf094.3dd5e",
+        "id": "76458c1b.1a62ac",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5638.451171875,
-        "y": 5709.282958984375,
-        "z": "82de8dcf.518d88",
+        "y": 5751.399627685547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "b15c93b0.c4d298"
+                "1006a530.30b813"
             ]
         ]
     },
     {
-        "id": "9523ac21.fb27e8",
+        "id": "fb4f4697.4dc5f",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.rootconn.access-provider-id + '-clientId-' +\n                                                   $tmp.rootconn.access-client-id + '-topologyId-' +\n                                                   $tmp.rootconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.rootconn.access-node-id`\" />\n",
         "comments": "",
         "x": 5361.450927734375,
-        "y": 5490.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5532.800018310547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "835403d4.ab8a4",
+        "id": "72e5612b.857e68",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6087.450927734375,
-        "y": 5522.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5564.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "44025b35.70e694"
+                "3625dda5.38707a"
             ]
         ]
     },
     {
-        "id": "defb6a74.ad63a8",
+        "id": "402ab8f9.3aa18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 6469.450927734375,
-        "y": 5526.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5568.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "f54f4ae0.ec5cf",
-                "af149106.171db",
-                "c5fc8f53.576908"
+                "4697e13e.13b02",
+                "6c3ba6ac.e7c21",
+                "34e0c57a.0e712a"
             ]
         ]
     },
     {
-        "id": "44025b35.70e694",
+        "id": "3625dda5.38707a",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6290.450927734375,
-        "y": 5526.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5568.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "defb6a74.ad63a8"
+                "402ab8f9.3aa18"
             ]
         ]
     },
     {
-        "id": "af149106.171db",
+        "id": "6c3ba6ac.e7c21",
         "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": 6675.450927734375,
-        "y": 5539.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5581.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "c7dae6ee.db5f08",
-                "40d56e1d.9aacd",
-                "1547569.25d2329"
+                "2e31a205.2611fe",
+                "c9f11bf6.38bb98",
+                "99cec3e1.6d2f68"
             ]
         ]
     },
     {
-        "id": "f54f4ae0.ec5cf",
+        "id": "4697e13e.13b02",
         "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": 6705.450927734375,
-        "y": 5487.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5529.800018310547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "c7dae6ee.db5f08",
+        "id": "2e31a205.2611fe",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6885.450927734375,
-        "y": 5530.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5572.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "f0410cd5.fae628"
+                "2ba283a1.e08d44"
             ]
         ]
     },
     {
-        "id": "40d56e1d.9aacd",
+        "id": "c9f11bf6.38bb98",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6877.450927734375,
-        "y": 5585.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5627.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "76b0a417.e1276c"
+                "3af9cd94.f12ff2"
             ]
         ]
     },
     {
-        "id": "1547569.25d2329",
+        "id": "99cec3e1.6d2f68",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6882.450927734375,
-        "y": 5642.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5684.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "b3783d48.7ea6c8"
+                "c501098b.50507"
             ]
         ]
     },
     {
-        "id": "b3783d48.7ea6c8",
+        "id": "c501098b.50507",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 7034.450927734375,
-        "y": 5643.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5685.800018310547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "76b0a417.e1276c",
+        "id": "3af9cd94.f12ff2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 7045.450927734375,
-        "y": 5588.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5630.800018310547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "f0410cd5.fae628",
+        "id": "2ba283a1.e08d44",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5749,38 +5749,38 @@
         "comments": "",
         "outputs": 1,
         "x": 7029.833251953125,
-        "y": 5528.339019775391,
-        "z": "82de8dcf.518d88",
+        "y": 5570.4556884765625,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "4ccba011.1ac588"
+                "bca9e0da.72619"
             ]
         ]
     },
     {
-        "id": "4ccba011.1ac588",
+        "id": "bca9e0da.72619",
         "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": 7244.450927734375,
-        "y": 5524.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5566.800018310547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "c5fc8f53.576908",
+        "id": "34e0c57a.0e712a",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 6625.450927734375,
-        "y": 5603.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 5645.800018310547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "e61de8ad.7030f",
+        "id": "9608373.19689c8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5788,77 +5788,77 @@
         "comments": "",
         "outputs": 1,
         "x": 3854.88330078125,
-        "y": 3492.88330078125,
-        "z": "82de8dcf.518d88",
+        "y": 3534.999969482422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "f1f60f7b.897558",
-                "9394ecba.bbac2"
+                "6e45c64.2629238",
+                "354c7fc8.6d8de"
             ]
         ]
     },
     {
-        "id": "f1f60f7b.897558",
+        "id": "6e45c64.2629238",
         "type": "set",
         "name": "set tmp.mmUNI-id-long",
         "xml": "<set>\n<parameter name='tmp.mmUNI-id-long' value='`$middle-man-conn.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",
         "comments": "",
         "x": 4045.466552734375,
-        "y": 3435.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 3477.800018310547,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "9394ecba.bbac2",
+        "id": "354c7fc8.6d8de",
         "type": "switchNode",
         "name": "switch tmp.mmUNI-id-long != ROOT UNI",
         "xml": "\n<switch test=\"`$tmp.mmUNI-id-long != $tmp.ROOT.uni-p-interface-long`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4092.466552734375,
-        "y": 3506.683349609375,
-        "z": "82de8dcf.518d88",
+        "y": 3548.800018310547,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "62b44b4b.e9462c",
-                "2e901346.daa35c"
+                "6bdb2c16.23fc7c",
+                "5820e4e6.95b47c"
             ]
         ]
     },
     {
-        "id": "62b44b4b.e9462c",
+        "id": "6bdb2c16.23fc7c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4330.884033203125,
-        "y": 3465.88330078125,
-        "z": "82de8dcf.518d88",
+        "y": 3507.999969482422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "646ee476.4b949c"
+                "d4fcba65.f8c8f"
             ]
         ]
     },
     {
-        "id": "2e901346.daa35c",
+        "id": "5820e4e6.95b47c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4337.884246826172,
-        "y": 3522.883270263672,
-        "z": "82de8dcf.518d88",
+        "y": 3564.9999389648438,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "3444ada9.d2b992"
+                "d9ea756c.06e5e"
             ]
         ]
     },
     {
-        "id": "646ee476.4b949c",
+        "id": "d4fcba65.f8c8f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5866,126 +5866,126 @@
         "comments": "",
         "outputs": 1,
         "x": 4458.884521484375,
-        "y": 3461.88330078125,
-        "z": "82de8dcf.518d88",
+        "y": 3503.999969482422,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "5aebe180.f62f68",
+        "id": "cc0c619e.32de58",
         "type": "set",
         "name": "set tmp.MMonlyHasROOT to TRUE",
         "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='true' />\n",
         "comments": "",
         "x": 3314.083251953125,
-        "y": 3420.283447265625,
-        "z": "82de8dcf.518d88",
+        "y": 3462.400115966797,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "a9c3a9a9.0f7c28",
+        "id": "a6af6c62.1a6b5",
         "type": "set",
         "name": "set tmp.MMonlyHasROOT to FALSE",
         "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='false' />\n",
         "comments": "",
         "x": 4727.9169921875,
-        "y": 3426.283447265625,
-        "z": "82de8dcf.518d88",
+        "y": 3468.400115966797,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "d94f5698.a9e22",
+        "id": "811e3163.5710b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4407.6669921875,
-        "y": 3942.5,
-        "z": "82de8dcf.518d88",
+        "y": 3984.616668701172,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "eb39fbed.f65188",
-                "716ce6ad.3df158"
+                "aa9298d8.acde8",
+                "a5e5763f.58bb2"
             ]
         ]
     },
     {
-        "id": "eb39fbed.f65188",
+        "id": "aa9298d8.acde8",
         "type": "set",
         "name": "set tmp.uni.id",
         "xml": "<set>\n<parameter name='tmp.uni.id' value='`$tmp.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",
         "comments": "",
         "x": 4580.5498046875,
-        "y": 3938.15966796875,
-        "z": "82de8dcf.518d88",
+        "y": 3980.276336669922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "716ce6ad.3df158",
+        "id": "a5e5763f.58bb2",
         "type": "save",
         "name": "get uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.uni.id\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4583.5498046875,
-        "y": 3985.15966796875,
-        "z": "82de8dcf.518d88",
+        "y": 4027.276336669922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "7301217f.c40fd8",
-                "4b487020.1f862",
-                "98e316f7.2a6e38"
+                "4df6bcf4.a4f44c",
+                "89771ed8.977b78",
+                "d1de1d5b.be978"
             ]
         ]
     },
     {
-        "id": "7301217f.c40fd8",
+        "id": "4df6bcf4.a4f44c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4755.5498046875,
-        "y": 3969.15966796875,
-        "z": "82de8dcf.518d88",
+        "y": 4011.276336669922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "8014e6ef.ba6a4"
+                "f65d0563.51b9e"
             ]
         ]
     },
     {
-        "id": "4b487020.1f862",
+        "id": "89771ed8.977b78",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4756.040771484375,
-        "y": 4014.7337036132812,
-        "z": "82de8dcf.518d88",
+        "y": 4056.850372314453,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "98e316f7.2a6e38",
+        "id": "d1de1d5b.be978",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4756.5498046875,
-        "y": 4055.15966796875,
-        "z": "82de8dcf.518d88",
+        "y": 4097.276336669922,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "8014e6ef.ba6a4",
+        "id": "f65d0563.51b9e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -5993,165 +5993,165 @@
         "comments": "",
         "outputs": 1,
         "x": 4916.5498046875,
-        "y": 3965.15966796875,
-        "z": "82de8dcf.518d88",
+        "y": 4007.276336669922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "6c53b06a.be741",
-                "6040c967.bc9a38",
-                "6b2c883f.aecd1"
+                "41e51ce8.c7bbd4",
+                "9fcba756.d0c298",
+                "99817ef0.1be558"
             ]
         ]
     },
     {
-        "id": "6986f860.3fd24",
+        "id": "d2f62a11.bbccd",
         "type": "comment",
         "name": "find the node part of the uni.id (uni-tp-id-node-part)",
         "info": "",
         "comments": "",
         "x": 5249.5498046875,
-        "y": 3896.15966796875,
-        "z": "82de8dcf.518d88",
+        "y": 3938.276336669922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "6040c967.bc9a38",
+        "id": "9fcba756.d0c298",
         "type": "execute",
         "name": "execute split 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.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
         "x": 5184.5498046875,
-        "y": 3953.15966796875,
-        "z": "82de8dcf.518d88",
+        "y": 3995.276336669922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "93771b2e.0a5438",
-                "494eca03.1cc0f4"
+                "ad91a307.53dc18",
+                "66b6c9a.ce41eb8"
             ]
         ]
     },
     {
-        "id": "494eca03.1cc0f4",
+        "id": "66b6c9a.ce41eb8",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5407.5498046875,
-        "y": 3939.15966796875,
-        "z": "82de8dcf.518d88",
+        "y": 3981.276336669922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "4a647e39.1988"
+                "f5696a58.3dcae"
             ]
         ]
     },
     {
-        "id": "93771b2e.0a5438",
+        "id": "ad91a307.53dc18",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5409.5498046875,
-        "y": 3972.15966796875,
-        "z": "82de8dcf.518d88",
+        "y": 4014.276336669922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "3ee6f9fa.cfa80e"
+                "cd5f81cd.b325a8"
             ]
         ]
     },
     {
-        "id": "4a647e39.1988",
+        "id": "f5696a58.3dcae",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5555.5498046875,
-        "y": 3932.15966796875,
-        "z": "82de8dcf.518d88",
+        "y": 3974.276336669922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "d5960946.db6608"
+                "520c18e.4c672e8"
             ]
         ]
     },
     {
-        "id": "3ee6f9fa.cfa80e",
+        "id": "cd5f81cd.b325a8",
         "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": 5552.5498046875,
-        "y": 3969.15966796875,
-        "z": "82de8dcf.518d88",
+        "y": 4011.276336669922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "d5960946.db6608",
+        "id": "520c18e.4c672e8",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.uni.pnf-name' value=\"`$param-prefix-uni-pnfName[0] + '-' +\n                                                   $param-prefix-uni-pnfName[1] + '-' +\n                                                   $param-prefix-uni-pnfName[2] + '-' +\n                                                   $param-prefix-uni-pnfName[3] + '-' +\n                                                   $param-prefix-uni-pnfName[4] + '-' +\n                                                   $param-prefix-uni-pnfName[5] + '-' +\n                                                   $param-prefix-uni-pnfName[6] + '-' +\n                                                   $param-prefix-uni-pnfName[7] + '-' +\n                                                   $param-prefix-uni-pnfName[8]`\" />\n",
         "comments": "",
         "x": 5732.5498046875,
-        "y": 3932.15966796875,
-        "z": "82de8dcf.518d88",
+        "y": 3974.276336669922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "6c53b06a.be741",
+        "id": "41e51ce8.c7bbd4",
         "type": "switchNode",
         "name": "switch uni-tp-id-node-part is the same as the LEAF node",
         "xml": "<switch test='`$tmp.uni.pnf-name == $tmp.LEAF.pnf-name-long`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5228.5498046875,
-        "y": 4087.15966796875,
-        "z": "82de8dcf.518d88",
+        "y": 4129.276336669922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "f825463f.981388",
-                "3533ce81.16ad12"
+                "f5a5405e.ab64e8",
+                "39efe4c8.977e5c"
             ]
         ]
     },
     {
-        "id": "f825463f.981388",
+        "id": "f5a5405e.ab64e8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5509.5498046875,
-        "y": 4064.15966796875,
-        "z": "82de8dcf.518d88",
+        "y": 4106.276336669922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "1f58973d.a6a451"
+                "76dcdb2b.58523c"
             ]
         ]
     },
     {
-        "id": "3533ce81.16ad12",
+        "id": "39efe4c8.977e5c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5502.5498046875,
-        "y": 4123.15966796875,
-        "z": "82de8dcf.518d88",
+        "y": 4165.276336669922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "2ae9f04c.19c548"
+                "e34b9d00.f34da8"
             ]
         ]
     },
     {
-        "id": "1f58973d.a6a451",
+        "id": "76dcdb2b.58523c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -6159,14 +6159,14 @@
         "comments": "",
         "outputs": 1,
         "x": 5639.5498046875,
-        "y": 4068.15966796875,
-        "z": "82de8dcf.518d88",
+        "y": 4110.276336669922,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "2ae9f04c.19c548",
+        "id": "e34b9d00.f34da8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -6174,276 +6174,276 @@
         "comments": "",
         "outputs": 1,
         "x": 5644.5498046875,
-        "y": 4122.15966796875,
-        "z": "82de8dcf.518d88",
+        "y": 4164.276336669922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "9dd58da7.f05d6",
-                "c9296d7d.c80358"
+                "d870e573.0525d",
+                "daec44c5.c4ca2"
             ]
         ]
     },
     {
-        "id": "9dd58da7.f05d6",
+        "id": "d870e573.0525d",
         "type": "set",
         "name": "set no-pce-call",
         "xml": "<set>\n<parameter name='no-pce-call' value=\"true\" />\n",
         "comments": "",
         "x": 5836.5498046875,
-        "y": 4089.15966796875,
-        "z": "82de8dcf.518d88",
+        "y": 4131.276336669922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "985a0c89.e3f6d",
+        "id": "77e6d570.0136ec",
         "type": "set",
         "name": "set middle-man-conn",
         "xml": "<set>\n<parameter name='middle-man-conn.' value='`$tmp.aai.all-connectivities.connectivity[$connidx].`' />\n",
         "comments": "",
         "x": 5852.5498046875,
-        "y": 4141.15966796875,
-        "z": "82de8dcf.518d88",
+        "y": 4183.276336669922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "c9296d7d.c80358",
+        "id": "daec44c5.c4ca2",
         "type": "set",
         "name": "set tmp.stillHasUni and tmp.keepVPNBs to TRUE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n<parameter name='tmp.keepVPNBs' value='true' />\n",
         "comments": "",
         "x": 5870.83349609375,
-        "y": 4210.75,
-        "z": "82de8dcf.518d88",
+        "y": 4252.866668701172,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "6b2c883f.aecd1",
+        "id": "99817ef0.1be558",
         "type": "set",
         "name": "set tmp.stillHasUni to TRUE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",
         "comments": "",
         "x": 5147.533203125,
-        "y": 4036.64990234375,
-        "z": "82de8dcf.518d88",
+        "y": 4078.766571044922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "7018ac1a.7a3c7c",
+        "id": "4a51985e.972e68",
         "type": "switchNode",
         "name": "switch tmp.stillHasUni?",
         "xml": "\n<switch test=\"`$tmp.stillHasUni`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 383.7339172363281,
-        "y": 5306.849609375,
-        "z": "82de8dcf.518d88",
+        "y": 5348.966278076172,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "d6a83452.cab528",
-                "a3cdb153.e05c2"
+                "35e41a11.58bd1e",
+                "8fea1632.f2d7a"
             ]
         ]
     },
     {
-        "id": "23ec2dfc.6ca3ea",
+        "id": "2a89b0c9.686c5",
         "type": "save",
         "name": "get root uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
         "comments": "",
         "outputs": 1,
         "x": 4288.516357421875,
-        "y": 5470.7333984375,
-        "z": "82de8dcf.518d88",
+        "y": 5512.850067138672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "89ccdd98.c0add8",
-                "ffd72856.632858",
-                "d24e2f90.29ea68"
+                "11eb64db.01f3fb",
+                "edc304ba.5ec56",
+                "e3707812.01b138"
             ]
         ]
     },
     {
-        "id": "e3a3ebb5.52e4d",
+        "id": "8fd56902.a16fd8",
         "type": "comment",
         "name": "Update ROOT UNI's bw -- ALREADY DONE",
         "info": "",
         "comments": "",
         "x": 4286.516845703125,
-        "y": 5422.733642578125,
-        "z": "82de8dcf.518d88",
+        "y": 5464.850311279297,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "c0e896d2.f14fd",
+        "id": "fe5a805b.6befb8",
         "type": "save",
         "name": "update ROOT UNI in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
         "comments": "",
         "outputs": 1,
         "x": 4903.5166015625,
-        "y": 5540.733642578125,
-        "z": "82de8dcf.518d88",
+        "y": 5582.850311279297,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "ffd72856.632858",
+        "id": "edc304ba.5ec56",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4506.007568359375,
-        "y": 5441.3076171875,
-        "z": "82de8dcf.518d88",
+        "y": 5483.424285888672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "fe177ef1.d06678"
+                "d06cf255.10cad"
             ]
         ]
     },
     {
-        "id": "d24e2f90.29ea68",
+        "id": "e3707812.01b138",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4501.5166015625,
-        "y": 5485.733581542969,
-        "z": "82de8dcf.518d88",
+        "y": 5527.850250244141,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "632ed866.3f04b8"
+                "c2ada4d7.cf23a"
             ]
         ]
     },
     {
-        "id": "fe177ef1.d06678",
+        "id": "d06cf255.10cad",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4668.5791015625,
-        "y": 5440.593322753906,
-        "z": "82de8dcf.518d88",
+        "y": 5482.709991455078,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "632ed866.3f04b8",
+        "id": "c2ada4d7.cf23a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 4669.5166015625,
-        "y": 5485.733581542969,
-        "z": "82de8dcf.518d88",
+        "y": 5527.850250244141,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "df87890d.bcb5c",
+        "id": "487370c3.c16b7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4666.5166015625,
-        "y": 5535.733642578125,
-        "z": "82de8dcf.518d88",
+        "y": 5577.850311279297,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "2ff88b2d.295934",
-                "c0e896d2.f14fd"
+                "6c262f9d.59d16",
+                "fe5a805b.6befb8"
             ]
         ]
     },
     {
-        "id": "89ccdd98.c0add8",
+        "id": "11eb64db.01f3fb",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4497.5166015625,
-        "y": 5535.733642578125,
-        "z": "82de8dcf.518d88",
+        "y": 5577.850311279297,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "df87890d.bcb5c"
+                "487370c3.c16b7"
             ]
         ]
     },
     {
-        "id": "2ff88b2d.295934",
+        "id": "6c262f9d.59d16",
         "type": "set",
         "name": "set new bw",
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",
         "comments": "",
         "x": 4859.517578125,
-        "y": 5460.733642578125,
-        "z": "82de8dcf.518d88",
+        "y": 5502.850311279297,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "5d7f9ad7.0f862c",
+        "id": "472764ad.0e5da4",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
         "x": 5288.216796875,
-        "y": 5398.500244140625,
-        "z": "82de8dcf.518d88",
+        "y": 5440.616912841797,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "9b98cd10.6cfb68",
+        "id": "a96c5a1a.d66bf",
         "type": "save",
         "name": "update ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
         "x": 5314,
-        "y": 5440.700439453125,
-        "z": "82de8dcf.518d88",
+        "y": 5482.817108154297,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "d6a83452.cab528",
+        "id": "35e41a11.58bd1e",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 567.8836059570312,
-        "y": 5357.88330078125,
-        "z": "82de8dcf.518d88",
+        "y": 5399.999969482422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "e5624f1d.dbf4b8"
+                "49ab1cdc.2b3dfc"
             ]
         ]
     },
     {
-        "id": "a3cdb153.e05c2",
+        "id": "8fea1632.f2d7a",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 550.883544921875,
-        "y": 5279.88330078125,
-        "z": "82de8dcf.518d88",
+        "y": 5321.999969482422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "daa6681.3df0a98"
+                "44e1ece4.47debc"
             ]
         ]
     },
     {
-        "id": "7731a568.885cdc",
+        "id": "71bd2e28.fdc428",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -6451,120 +6451,121 @@
         "comments": "",
         "outputs": 1,
         "x": 679.8833923339844,
-        "y": 4366.883026123047,
-        "z": "82de8dcf.518d88",
+        "y": 4408.999694824219,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "a5f98ac5.68fe98",
-                "74d156ed.4e9f",
-                "6135bf6.f11f5c",
-                "8458698c.d1be5",
-                "6cf7c0fc.18d4e8"
+                "ab47ddf.140532",
+                "d3485e4a.cbde48",
+                "964a9d6b.511ef",
+                "58993466.bcba34",
+                "b72e55ab.bc6bd8",
+                "8d45971b.519e08"
             ]
         ]
     },
     {
-        "id": "a5f98ac5.68fe98",
+        "id": "ab47ddf.140532",
         "type": "set",
         "name": "set tmp.leafconn.",
         "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",
         "comments": "",
         "x": 931.5667419433594,
-        "y": 4344.932830810547,
-        "z": "82de8dcf.518d88",
+        "y": 4387.049499511719,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "155b7716.d28d91",
+        "id": "83fd3013.a6f008",
         "type": "comment",
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",
         "info": "",
         "comments": "",
         "x": 1033.1338806152344,
-        "y": 4293.016326904297,
-        "z": "82de8dcf.518d88",
+        "y": 4335.132995605469,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "11c710da.f1a09f",
+        "id": "8b20d7ab.715e18",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.leafconn.access-provider-id + '-clientId-' +\n                                                   $tmp.leafconn.access-client-id + '-topologyId-' +\n                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.leafconn.access-node-id`\" />\n",
         "comments": "",
         "x": 1140.9837341308594,
-        "y": 4374.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4416.333190917969,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "74d156ed.4e9f",
+        "id": "d3485e4a.cbde48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 911.9837341308594,
-        "y": 4463.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4505.333190917969,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "11c710da.f1a09f",
-                "dd611a8.40420e8"
+                "8b20d7ab.715e18",
+                "3ddce0eb.9cdfd8"
             ]
         ]
     },
     {
-        "id": "dd611a8.40420e8",
+        "id": "3ddce0eb.9cdfd8",
         "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": 1147.9837341308594,
-        "y": 4456.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4498.333190917969,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "2cc9d43.2a3e32c",
-                "16f9c9a2.f3e64e",
-                "bd113683.3f90e8"
+                "c4f933ed.6c6328",
+                "c8f61cf.a6fdde",
+                "31635596.d79712"
             ]
         ]
     },
     {
-        "id": "2cc9d43.2a3e32c",
+        "id": "c4f933ed.6c6328",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1343.4838562011719,
-        "y": 4408.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4450.333190917969,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "30afce54.3b0e7a"
+                "40098ed2.4f4dd"
             ]
         ]
     },
     {
-        "id": "16f9c9a2.f3e64e",
+        "id": "c8f61cf.a6fdde",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1335.4838562011719,
-        "y": 4463.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4505.333190917969,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "ca51c401.6ecfa8"
+                "8f4995e7.00e5b8"
             ]
         ]
     },
     {
-        "id": "30afce54.3b0e7a",
+        "id": "40098ed2.4f4dd",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -6572,180 +6573,180 @@
         "comments": "",
         "outputs": 1,
         "x": 1487.8661804199219,
-        "y": 4407.8721923828125,
-        "z": "82de8dcf.518d88",
+        "y": 4449.988861083984,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "4c495354.afa6a4"
+                "4b557dbd.14d794"
             ]
         ]
     },
     {
-        "id": "4c495354.afa6a4",
+        "id": "4b557dbd.14d794",
         "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": 1671.9837341308594,
-        "y": 4406.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4448.333190917969,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "72a0b2fc.d6eab4"
+                "a0958afe.9d1b"
             ]
         ]
     },
     {
-        "id": "72a0b2fc.d6eab4",
+        "id": "a0958afe.9d1b",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1866.9837341308594,
-        "y": 4406.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4448.333190917969,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "3067a2de.bf9096"
+                "31026a11.2a4bde"
             ]
         ]
     },
     {
-        "id": "bd113683.3f90e8",
+        "id": "31635596.d79712",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1340.4838562011719,
-        "y": 4520.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4562.333190917969,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "c72ac013.478f"
+                "c3c84b5.76fc5b8"
             ]
         ]
     },
     {
-        "id": "c72ac013.478f",
+        "id": "c3c84b5.76fc5b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1492.4838562011719,
-        "y": 4521.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4563.333190917969,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "ca51c401.6ecfa8",
+        "id": "8f4995e7.00e5b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1503.4838562011719,
-        "y": 4464.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4506.333190917969,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "fae6bda1.4d6a28",
+        "id": "ca7cc65e.e299b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2248.9837341308594,
-        "y": 4410.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4452.333190917969,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "5ada214d.6d6df",
-                "230404bc.0330d4",
-                "8f5a3f0d.286f38"
+                "7e1000fc.f7ace",
+                "10f0f2b8.28ecdd",
+                "1cf608fc.280f8f"
             ]
         ]
     },
     {
-        "id": "3067a2de.bf9096",
+        "id": "31026a11.2a4bde",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2069.9837341308594,
-        "y": 4410.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4452.333190917969,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "fae6bda1.4d6a28"
+                "ca7cc65e.e299b"
             ]
         ]
     },
     {
-        "id": "6135bf6.f11f5c",
+        "id": "964a9d6b.511ef",
         "type": "execute",
         "name": "execute RestApiCallNode Delete LEAF UNI of ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.LEAF.uni-p-interface-long`\" />\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": 1053.4839782714844,
-        "y": 4567.816131591797,
-        "z": "82de8dcf.518d88",
+        "y": 4609.932800292969,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "63ad904f.f883c",
-                "612437fd.ee8ae"
+                "a14b7306.f0f088",
+                "edc3d42b.21d3d"
             ]
         ]
     },
     {
-        "id": "612437fd.ee8ae",
+        "id": "edc3d42b.21d3d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1417.9837341308594,
-        "y": 4615.816131591797,
-        "z": "82de8dcf.518d88",
+        "y": 4657.932800292969,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "7222d332.cab804"
+                "7d2a7da9.46fdfc"
             ]
         ]
     },
     {
-        "id": "63ad904f.f883c",
+        "id": "a14b7306.f0f088",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1413.9837341308594,
-        "y": 4575.816131591797,
-        "z": "82de8dcf.518d88",
+        "y": 4617.932800292969,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "ffb15b5f.69bdb"
+                "db3e9725.884648"
             ]
         ]
     },
     {
-        "id": "ffb15b5f.69bdb",
+        "id": "db3e9725.884648",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 1571.9837341308594,
-        "y": 4575.816131591797,
-        "z": "82de8dcf.518d88",
+        "y": 4617.932800292969,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "7222d332.cab804",
+        "id": "7d2a7da9.46fdfc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -6753,113 +6754,113 @@
         "comments": "",
         "outputs": 1,
         "x": 1575.4837341308594,
-        "y": 4615.816131591797,
-        "z": "82de8dcf.518d88",
+        "y": 4657.932800292969,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "230404bc.0330d4",
+        "id": "10f0f2b8.28ecdd",
         "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": 2454.9837341308594,
-        "y": 4423.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4465.333190917969,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "999c0ecf.dd9428",
-                "cadc4a62.3f428",
-                "9a118cc2.6cef58"
+                "25e5e61.acf541a",
+                "12a14aa1.cf2fb5",
+                "c1a2b3a0.8c75c"
             ]
         ]
     },
     {
-        "id": "5ada214d.6d6df",
+        "id": "7e1000fc.f7ace",
         "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": 2484.9837341308594,
-        "y": 4371.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4413.333190917969,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "999c0ecf.dd9428",
+        "id": "25e5e61.acf541a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2664.9837341308594,
-        "y": 4414.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4456.333190917969,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "fb522408.bea2a8"
+                "5696d51e.dbfe64"
             ]
         ]
     },
     {
-        "id": "cadc4a62.3f428",
+        "id": "12a14aa1.cf2fb5",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2656.9837341308594,
-        "y": 4469.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4511.333190917969,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "ad21cc41.8772b"
+                "8d572a45.011df8"
             ]
         ]
     },
     {
-        "id": "9a118cc2.6cef58",
+        "id": "c1a2b3a0.8c75c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2661.9837341308594,
-        "y": 4526.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4568.333190917969,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "e3096426.02dcf"
+                "dddace6e.f9e9f"
             ]
         ]
     },
     {
-        "id": "e3096426.02dcf",
+        "id": "dddace6e.f9e9f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2813.9837341308594,
-        "y": 4527.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4569.333190917969,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "ad21cc41.8772b",
+        "id": "8d572a45.011df8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2824.9837341308594,
-        "y": 4472.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4514.333190917969,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "fb522408.bea2a8",
+        "id": "5696d51e.dbfe64",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -6867,101 +6868,101 @@
         "comments": "",
         "outputs": 1,
         "x": 2809.3660583496094,
-        "y": 4411.8721923828125,
-        "z": "82de8dcf.518d88",
+        "y": 4453.988861083984,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "6e503f35.5790c"
+                "e4cea83c.4d71a"
             ]
         ]
     },
     {
-        "id": "6e503f35.5790c",
+        "id": "e4cea83c.4d71a",
         "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": 3023.9837341308594,
-        "y": 4408.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4450.333190917969,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "8f5a3f0d.286f38",
+        "id": "1cf608fc.280f8f",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 2404.9837341308594,
-        "y": 4487.216522216797,
-        "z": "82de8dcf.518d88",
+        "y": 4529.333190917969,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "8458698c.d1be5",
+        "id": "58993466.bcba34",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 1082.5667419433594,
-        "y": 4787.932830810547,
-        "z": "82de8dcf.518d88",
+        "y": 4830.049499511719,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "6cf7c0fc.18d4e8",
+        "id": "b72e55ab.bc6bd8",
         "type": "switchNode",
         "name": "switch found-root-connectivity",
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 897.5667419433594,
-        "y": 4854.932830810547,
-        "z": "82de8dcf.518d88",
+        "y": 4897.049499511719,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "31c266e8.6cad22",
-                "45786f9e.46f928"
+                "191ee334.0f09fd",
+                "b8911820.2c8f68"
             ]
         ]
     },
     {
-        "id": "31c266e8.6cad22",
+        "id": "191ee334.0f09fd",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1162.5667419433594,
-        "y": 4839.932830810547,
-        "z": "82de8dcf.518d88",
+        "y": 4882.049499511719,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "25e4293a.b5a0de"
+                "328aa2d2.c36a96"
             ]
         ]
     },
     {
-        "id": "45786f9e.46f928",
+        "id": "b8911820.2c8f68",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1158.5667419433594,
-        "y": 4887.932830810547,
-        "z": "82de8dcf.518d88",
+        "y": 4930.049499511719,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "9325c5b6.3d913"
+                "88b54a6f.ba3898"
             ]
         ]
     },
     {
-        "id": "25e4293a.b5a0de",
+        "id": "328aa2d2.c36a96",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -6969,66 +6970,66 @@
         "comments": "",
         "outputs": 1,
         "x": 1318.5667419433594,
-        "y": 4835.932830810547,
-        "z": "82de8dcf.518d88",
+        "y": 4878.049499511719,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "51a35a4f.5fbc64"
+                "4a7a1b00.5fe524"
             ]
         ]
     },
     {
-        "id": "9325c5b6.3d913",
+        "id": "88b54a6f.ba3898",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
         "comments": "",
         "x": 1306.5667419433594,
-        "y": 4882.932830810547,
-        "z": "82de8dcf.518d88",
+        "y": 4925.049499511719,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "c5019df.72c63e",
+        "id": "d5cdb27.e4e575",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
         "x": 1587.4664001464844,
-        "y": 4786.633026123047,
-        "z": "82de8dcf.518d88",
+        "y": 4828.749694824219,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "51a35a4f.5fbc64",
+        "id": "4a7a1b00.5fe524",
         "type": "save",
         "name": "update ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
         "x": 1613.2496032714844,
-        "y": 4828.833221435547,
-        "z": "82de8dcf.518d88",
+        "y": 4870.949890136719,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "cbb82af5.87b298",
+        "id": "1003b628.8cf272",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-delete-VPNBs",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 1026.8833923339844,
-        "y": 4102.199920654297,
-        "z": "82de8dcf.518d88",
+        "y": 4144.316589355469,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "daa6681.3df0a98",
+        "id": "44e1ece4.47debc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -7036,17 +7037,17 @@
         "comments": "",
         "outputs": 1,
         "x": 632.8834228515625,
-        "y": 4106.883056640625,
-        "z": "82de8dcf.518d88",
+        "y": 4148.999725341797,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "cbb82af5.87b298",
-                "7731a568.885cdc"
+                "1003b628.8cf272",
+                "71bd2e28.fdc428"
             ]
         ]
     },
     {
-        "id": "e5624f1d.dbf4b8",
+        "id": "49ab1cdc.2b3dfc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -7054,175 +7055,175 @@
         "comments": "",
         "outputs": 1,
         "x": 716.3333740234375,
-        "y": 5359.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5401.516571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "16338b46.5dad65",
-                "de535c52.af9d48",
-                "78064cf.4874bb4",
-                "b5448cca.f23df8"
+                "723c2903.f58428",
+                "98b88954.793148",
+                "b393338f.3c0a5",
+                "119574e6.129413"
             ]
         ]
     },
     {
-        "id": "16338b46.5dad65",
+        "id": "723c2903.f58428",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-delete-VPNBs",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 1067.7166748046875,
-        "y": 5290.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5332.516571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "de535c52.af9d48",
+        "id": "98b88954.793148",
         "type": "save",
         "name": "delete LEAF connectivity resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n",
         "comments": "",
         "outputs": 1,
         "x": 978.7166748046875,
-        "y": 5359.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5401.516571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "78064cf.4874bb4",
+        "id": "b393338f.3c0a5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 869.88330078125,
-        "y": 5594.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5636.516571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "69415165.a30268",
-                "38b5cafd.d5079e",
-                "6a408110.2a2dc"
+                "df7f814b.30dca",
+                "680a6c2d.c81304",
+                "f02d2a13.d0aa48"
             ]
         ]
     },
     {
-        "id": "f703a5f3.1124f8",
+        "id": "c8c4cb96.f9d8b",
         "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": 2585.882568359375,
-        "y": 5481.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5523.516571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "2bcfefd4.8f246",
-                "6262f33a.13ed54",
-                "5f5183a2.3dd5bc"
+                "43900724.7021a8",
+                "b5fd98a.36736e8",
+                "3c26b3f8.230acc"
             ]
         ]
     },
     {
-        "id": "17938acf.263b45",
+        "id": "de9e1e1d.dcbc3",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 2535.882568359375,
-        "y": 5545.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5587.516571044922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "434194f6.d45944",
+        "id": "d2b1cccb.1f5468",
         "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": 2615.882568359375,
-        "y": 5429.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5471.516571044922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "2bcfefd4.8f246",
+        "id": "43900724.7021a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2795.882568359375,
-        "y": 5472.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5514.516571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "f6e068a.7d61a18"
+                "dc7a8a3b.a925f8"
             ]
         ]
     },
     {
-        "id": "6262f33a.13ed54",
+        "id": "b5fd98a.36736e8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2787.882568359375,
-        "y": 5527.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5569.516571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "2a0eede1.27db52"
+                "c1ab7307.8305a8"
             ]
         ]
     },
     {
-        "id": "5f5183a2.3dd5bc",
+        "id": "3c26b3f8.230acc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2792.882568359375,
-        "y": 5584.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5626.516571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "612a7284.deceac"
+                "f1d869f8.b644e"
             ]
         ]
     },
     {
-        "id": "612a7284.deceac",
+        "id": "f1d869f8.b644e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2944.882568359375,
-        "y": 5585.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5627.516571044922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "2a0eede1.27db52",
+        "id": "c1ab7307.8305a8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2955.882568359375,
-        "y": 5530.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5572.516571044922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "f6e068a.7d61a18",
+        "id": "dc7a8a3b.a925f8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -7230,86 +7231,86 @@
         "comments": "",
         "outputs": 1,
         "x": 2940.264892578125,
-        "y": 5470.055572509766,
-        "z": "82de8dcf.518d88",
+        "y": 5512.1722412109375,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "d3b91b08.9e326"
+                "99f651cc.e3a158"
             ]
         ]
     },
     {
-        "id": "d3b91b08.9e326",
+        "id": "99f651cc.e3a158",
         "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": 3154.882568359375,
-        "y": 5466.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5508.516571044922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "69415165.a30268",
+        "id": "df7f814b.30dca",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.the-connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.the-connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.the-connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.the-connectivity.access-node-id`\" />\n",
         "comments": "",
         "x": 1151.88330078125,
-        "y": 5463.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5505.516571044922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "5cd94a05.12a97c",
+        "id": "1d552db6.d6aaca",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1362.3834228515625,
-        "y": 5602.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5644.516571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "6b54e983.54f23"
+                "2d69161c.7523aa"
             ]
         ]
     },
     {
-        "id": "7cfb8601.d6c8b8",
+        "id": "d7946986.6d0968",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1365.3834228515625,
-        "y": 5490.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5532.516571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "43d9e97c.41e918"
+                "b24f95b.8630968"
             ]
         ]
     },
     {
-        "id": "c076204a.7c8658",
+        "id": "9ea8b87c.75f8b",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1357.3834228515625,
-        "y": 5545.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5587.516571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "697ce13c.463e78"
+                "d1cfde55.05efd"
             ]
         ]
     },
     {
-        "id": "43d9e97c.41e918",
+        "id": "b24f95b.8630968",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -7317,182 +7318,182 @@
         "comments": "",
         "outputs": 1,
         "x": 1499.765625,
-        "y": 5485.0556640625,
-        "z": "82de8dcf.518d88",
+        "y": 5527.172332763672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "9ea73f48.e6dc88"
+                "57f5a4ed.934544"
             ]
         ]
     },
     {
-        "id": "6b54e983.54f23",
+        "id": "2d69161c.7523aa",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1514.3834228515625,
-        "y": 5603.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5645.516571044922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "697ce13c.463e78",
+        "id": "d1cfde55.05efd",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1525.3834228515625,
-        "y": 5546.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5588.516571044922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "9ea73f48.e6dc88",
+        "id": "57f5a4ed.934544",
         "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": 1686.8828125,
-        "y": 5486.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5528.516571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "8867a67f.02b388"
+                "489e94a0.cb0724"
             ]
         ]
     },
     {
-        "id": "8867a67f.02b388",
+        "id": "489e94a0.cb0724",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1914.8828125,
-        "y": 5479.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5521.516571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "bfd4d2af.8ab0b8"
+                "70d2a39a.39c914"
             ]
         ]
     },
     {
-        "id": "38b5cafd.d5079e",
+        "id": "680a6c2d.c81304",
         "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": 1169.88330078125,
-        "y": 5538.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5580.516571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "5cd94a05.12a97c",
-                "7cfb8601.d6c8b8",
-                "c076204a.7c8658"
+                "1d552db6.d6aaca",
+                "d7946986.6d0968",
+                "9ea8b87c.75f8b"
             ]
         ]
     },
     {
-        "id": "bfd4d2af.8ab0b8",
+        "id": "70d2a39a.39c914",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2120.8828125,
-        "y": 5476.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5518.516571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "b0cdfdee.4e9418"
+                "11f0110f.f1cbd7"
             ]
         ]
     },
     {
-        "id": "b0cdfdee.4e9418",
+        "id": "11f0110f.f1cbd7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2335.8822021484375,
-        "y": 5479.39990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5521.516571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "434194f6.d45944",
-                "f703a5f3.1124f8",
-                "17938acf.263b45"
+                "d2b1cccb.1f5468",
+                "c8c4cb96.f9d8b",
+                "de9e1e1d.dcbc3"
             ]
         ]
     },
     {
-        "id": "6a408110.2a2dc",
+        "id": "f02d2a13.d0aa48",
         "type": "execute",
         "name": "execute RestApiCallNode Delete LEAF ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.the-connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 1293.6500244140625,
-        "y": 5687.7998046875,
-        "z": "82de8dcf.518d88",
+        "y": 5729.916473388672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "d58ed713.3cd0d",
-                "e5f89511.dafe58"
+                "73cc7454.46b21c",
+                "983cf462.7773e"
             ]
         ]
     },
     {
-        "id": "d58ed713.3cd0d",
+        "id": "73cc7454.46b21c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1640.1500244140625,
-        "y": 5680.7998046875,
-        "z": "82de8dcf.518d88",
+        "y": 5722.916473388672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "8ee30019.6f667"
+                "d64e37c.99aa9c8"
             ]
         ]
     },
     {
-        "id": "e5f89511.dafe58",
+        "id": "983cf462.7773e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1644.1500244140625,
-        "y": 5720.7998046875,
-        "z": "82de8dcf.518d88",
+        "y": 5762.916473388672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "3308ecad.5ad59c"
+                "63d68d1b.26356c"
             ]
         ]
     },
     {
-        "id": "8ee30019.6f667",
+        "id": "d64e37c.99aa9c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 1798.1500244140625,
-        "y": 5680.7998046875,
-        "z": "82de8dcf.518d88",
+        "y": 5722.916473388672,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "3308ecad.5ad59c",
+        "id": "63d68d1b.26356c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -7500,63 +7501,63 @@
         "comments": "",
         "outputs": 1,
         "x": 1801.6500244140625,
-        "y": 5720.7998046875,
-        "z": "82de8dcf.518d88",
+        "y": 5762.916473388672,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "b5448cca.f23df8",
+        "id": "119574e6.129413",
         "type": "switchNode",
         "name": "switch tmp.MMstillHasUni?",
         "xml": "\n<switch test=\"`$tmp.MMstillHasUni`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 913.183349609375,
-        "y": 5849.60009765625,
-        "z": "82de8dcf.518d88",
+        "y": 5891.716766357422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "59551d1d.12689c",
-                "5a5ae31.cb9b99c"
+                "20383b77.9d13bc",
+                "9b5788ce.9c9408"
             ]
         ]
     },
     {
-        "id": "59551d1d.12689c",
+        "id": "20383b77.9d13bc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1105.183349609375,
-        "y": 5826.60009765625,
-        "z": "82de8dcf.518d88",
+        "y": 5868.716766357422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "2e2794d8.3df39c"
+                "c8a5ff15.a0cc5"
             ]
         ]
     },
     {
-        "id": "5a5ae31.cb9b99c",
+        "id": "9b5788ce.9c9408",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1093.3500366210938,
-        "y": 5999.2001953125,
-        "z": "82de8dcf.518d88",
+        "y": 6041.316864013672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "6dce893f.c421c"
+                "80ab1272.8cacd"
             ]
         ]
     },
     {
-        "id": "2e2794d8.3df39c",
+        "id": "c8a5ff15.a0cc5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -7564,80 +7565,80 @@
         "comments": "",
         "outputs": 1,
         "x": 1253.35009765625,
-        "y": 5826.2001953125,
-        "z": "82de8dcf.518d88",
+        "y": 5868.316864013672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "b4e9d461.c3c1a",
-                "2f3efa95.41d3ce"
+                "b646edcc.5849d8",
+                "7aaef741.32dd88"
             ]
         ]
     },
     {
-        "id": "b4e9d461.c3c1a",
+        "id": "b646edcc.5849d8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 1675.199951171875,
-        "y": 5797.60009765625,
-        "z": "82de8dcf.518d88",
+        "y": 5839.716766357422,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "2f3efa95.41d3ce",
+        "id": "7aaef741.32dd88",
         "type": "switchNode",
         "name": "switch found-root-connectivity",
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 1490.199951171875,
-        "y": 5864.60009765625,
-        "z": "82de8dcf.518d88",
+        "y": 5906.716766357422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "aadc3189.147b98",
-                "9801a2d7.df3f98"
+                "f0373e80.9f5c1",
+                "17b9923a.e6ff36"
             ]
         ]
     },
     {
-        "id": "aadc3189.147b98",
+        "id": "f0373e80.9f5c1",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1755.199951171875,
-        "y": 5849.60009765625,
-        "z": "82de8dcf.518d88",
+        "y": 5891.716766357422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "aaac06aa.f3d728"
+                "ea0794c3.5caad8"
             ]
         ]
     },
     {
-        "id": "9801a2d7.df3f98",
+        "id": "17b9923a.e6ff36",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1751.199951171875,
-        "y": 5897.60009765625,
-        "z": "82de8dcf.518d88",
+        "y": 5939.716766357422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "7656a3d7.b7266c"
+                "f785b40a.2c0f08"
             ]
         ]
     },
     {
-        "id": "aaac06aa.f3d728",
+        "id": "ea0794c3.5caad8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -7645,52 +7646,52 @@
         "comments": "",
         "outputs": 1,
         "x": 1911.199951171875,
-        "y": 5845.60009765625,
-        "z": "82de8dcf.518d88",
+        "y": 5887.716766357422,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "2673ca00.ba724e"
+                "c184cafd.df5108"
             ]
         ]
     },
     {
-        "id": "7656a3d7.b7266c",
+        "id": "f785b40a.2c0f08",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
         "comments": "",
         "x": 1899.199951171875,
-        "y": 5892.60009765625,
-        "z": "82de8dcf.518d88",
+        "y": 5934.716766357422,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "2673ca00.ba724e",
+        "id": "c184cafd.df5108",
         "type": "save",
         "name": "update ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
         "x": 2219.8826904296875,
-        "y": 5839.50048828125,
-        "z": "82de8dcf.518d88",
+        "y": 5881.617156982422,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "bfaf6549.13fe88",
+        "id": "c1da52d9.9cf468",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
         "x": 2194.0994873046875,
-        "y": 5797.30029296875,
-        "z": "82de8dcf.518d88",
+        "y": 5839.416961669922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "6dce893f.c421c",
+        "id": "80ab1272.8cacd",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -7698,242 +7699,242 @@
         "comments": "",
         "outputs": 1,
         "x": 1230.916748046875,
-        "y": 5998.5,
-        "z": "82de8dcf.518d88",
+        "y": 6040.616668701172,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "75d82528.4dd5bc",
-                "24c2da43.974556"
+                "49431e5b.e46588",
+                "1475339.a9ed04c"
             ]
         ]
     },
     {
-        "id": "75d82528.4dd5bc",
+        "id": "49431e5b.e46588",
         "type": "for",
         "name": "for each relationship of middle-man-conn",
         "xml": "<for index='rel-index' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 1544.23291015625,
-        "y": 5992.7001953125,
-        "z": "82de8dcf.518d88",
+        "y": 6034.816864013672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "29eb94d3.70f2dc"
+                "f57bdc9.9ead4a"
             ]
         ]
     },
     {
-        "id": "29eb94d3.70f2dc",
+        "id": "f57bdc9.9ead4a",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1844.566650390625,
-        "y": 5987.700134277344,
-        "z": "82de8dcf.518d88",
+        "y": 6029.816802978516,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "522c88bc.33b518"
+                "ba35dccb.3b6bb8"
             ]
         ]
     },
     {
-        "id": "522c88bc.33b518",
+        "id": "ba35dccb.3b6bb8",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2024.2332763671875,
-        "y": 5987.700225830078,
-        "z": "82de8dcf.518d88",
+        "y": 6029.81689453125,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "9dde3a26.bf1a48"
+                "86341ec4.ccb728"
             ]
         ]
     },
     {
-        "id": "9dde3a26.bf1a48",
+        "id": "86341ec4.ccb728",
         "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 = $middle-man-conn.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": 2224.233154296875,
-        "y": 5987.7001953125,
-        "z": "82de8dcf.518d88",
+        "y": 6029.816864013672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "af210146.805c98",
-                "1304e1a7.407dde",
-                "83b6e70e.c6339"
+                "73b15a95.c45e6c",
+                "577c89f1.70257",
+                "ebf7b15b.49862"
             ]
         ]
     },
     {
-        "id": "af210146.805c98",
+        "id": "73b15a95.c45e6c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2431.23291015625,
-        "y": 6037.7001953125,
-        "z": "82de8dcf.518d88",
+        "y": 6079.816864013672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "bfbb5b5d.76ea48"
+                "d5e5b35.6604c5"
             ]
         ]
     },
     {
-        "id": "24e402f2.8a6b26",
+        "id": "925dd5ef.2fc678",
         "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": 2408.466552734375,
-        "y": 6221.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6264.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "3ff65d5b.44eb62",
-                "d09102d1.fb466",
-                "3d724c56.f2b6cc"
+                "42725353.b4a374",
+                "1745f7ad.eada2",
+                "ebfc9334.bdf468"
             ]
         ]
     },
     {
-        "id": "1cd695fe.f2c6f2",
+        "id": "6ac4c475.ce37cc",
         "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": 1607.466552734375,
-        "y": 6136.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6179.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "74367c85.fa02dc"
+                "df9efed7.82417"
             ]
         ]
     },
     {
-        "id": "74367c85.fa02dc",
+        "id": "df9efed7.82417",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1804.466552734375,
-        "y": 6150.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6193.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "572f2125.6367b8",
-                "5931a81f.41a6"
+                "376f554a.32ded2",
+                "e86a8d88.08809"
             ]
         ]
     },
     {
-        "id": "572f2125.6367b8",
+        "id": "376f554a.32ded2",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1972.466552734375,
-        "y": 6143.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6186.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "22fa9a36.31302e"
+                "bc2d7c0c.7cc4a8"
             ]
         ]
     },
     {
-        "id": "22fa9a36.31302e",
+        "id": "bc2d7c0c.7cc4a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2135.466552734375,
-        "y": 6143.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6186.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "24e402f2.8a6b26"
+                "925dd5ef.2fc678"
             ]
         ]
     },
     {
-        "id": "5931a81f.41a6",
+        "id": "e86a8d88.08809",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1988.466552734375,
-        "y": 6439.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6482.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "510edb34.612754"
+                "32fa6a7d.612076"
             ]
         ]
     },
     {
-        "id": "510edb34.612754",
+        "id": "32fa6a7d.612076",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2151.466552734375,
-        "y": 6439.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6482.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "4c0113a.98542ec"
+                "6e62ca.5284a538"
             ]
         ]
     },
     {
-        "id": "4c0113a.98542ec",
+        "id": "6e62ca.5284a538",
         "type": "save",
         "name": "delete uni resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2394.466552734375,
-        "y": 6439.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6482.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "2b555ba8.ce83e4",
+        "id": "91368e45.2e3cd8",
         "type": "save",
         "name": "delete connectivity resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648.466552734375,
-        "y": 6583.89990234375,
-        "z": "82de8dcf.518d88",
+        "x": 1362.466552734375,
+        "y": 7248.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "bfbb5b5d.76ea48",
+        "id": "d5e5b35.6604c5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -7941,258 +7942,259 @@
         "comments": "",
         "outputs": 1,
         "x": 1433.466552734375,
-        "y": 6134.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6177.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "1cd695fe.f2c6f2",
-                "2b555ba8.ce83e4"
+                "6ac4c475.ce37cc",
+                "91368e45.2e3cd8",
+                "5c661b6d.db566c"
             ]
         ]
     },
     {
-        "id": "3ff65d5b.44eb62",
+        "id": "42725353.b4a374",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2619.466552734375,
-        "y": 6223.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6266.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "851525d6.b90c38"
+                "aedd4240.642968"
             ]
         ]
     },
     {
-        "id": "d09102d1.fb466",
+        "id": "1745f7ad.eada2",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2619.95751953125,
-        "y": 6269.473937988281,
-        "z": "82de8dcf.518d88",
+        "y": 6311.590606689453,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "74e6774b.c7b358"
+                "6425bc45.5cdfcc"
             ]
         ]
     },
     {
-        "id": "3d724c56.f2b6cc",
+        "id": "ebfc9334.bdf468",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2617.466552734375,
-        "y": 6312.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6355.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "cbe3afce.930cc"
+                "337169e1.665c2e"
             ]
         ]
     },
     {
-        "id": "83b6e70e.c6339",
+        "id": "ebf7b15b.49862",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2455.282958984375,
-        "y": 5938.5,
-        "z": "82de8dcf.518d88",
+        "y": 5980.616668701172,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "1304e1a7.407dde",
+        "id": "577c89f1.70257",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2452.7919921875,
-        "y": 5981.925964355469,
-        "z": "82de8dcf.518d88",
+        "y": 6024.042633056641,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "24c2da43.974556",
+        "id": "1475339.a9ed04c",
         "type": "save",
         "name": "delete middle-man-conn resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1531.400146484375,
-        "y": 6067.2998046875,
-        "z": "82de8dcf.518d88",
+        "y": 6109.416473388672,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "851525d6.b90c38",
+        "id": "aedd4240.642968",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2785.466552734375,
-        "y": 6213.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6256.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "811dd566.85ec38",
-                "6a877b95.f2661c",
-                "66415a60.9e5d9c",
-                "a662df33.5b8808",
-                "502ecc67.91354c"
+                "20a20b24.b18d74",
+                "da0ac321.ebd92",
+                "450533a8.9c748c",
+                "dc80e7d7.692bf8",
+                "7b453ddd.4a4edc"
             ]
         ]
     },
     {
-        "id": "cbe3afce.930cc",
+        "id": "337169e1.665c2e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 2784.466552734375,
-        "y": 6311.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6354.016571044922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "74e6774b.c7b358",
+        "id": "6425bc45.5cdfcc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2782.5289306640625,
-        "y": 6269.759674072266,
-        "z": "82de8dcf.518d88",
+        "y": 6311.8763427734375,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "811dd566.85ec38",
+        "id": "20a20b24.b18d74",
         "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": 3007.466552734375,
-        "y": 5931.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5974.016571044922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "6a877b95.f2661c",
+        "id": "da0ac321.ebd92",
         "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": 3033.466552734375,
-        "y": 6048.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6091.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "3d9fd486.323a64",
-                "c6247afb.9c0a",
-                "83cc8360.81d358"
+                "ab328def.9c2568",
+                "1e0d49ce.54650e",
+                "83f96b0e.23503"
             ]
         ]
     },
     {
-        "id": "66415a60.9e5d9c",
+        "id": "450533a8.9c748c",
         "type": "execute",
         "name": "execute RestApiCallNode Delete OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
         "x": 3136.466552734375,
-        "y": 6315.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6358.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "9c554475.661fc8",
-                "12ed9938.83ebcf"
+                "e189248a.5308d8",
+                "42e13b38.68927c"
             ]
         ]
     },
     {
-        "id": "a662df33.5b8808",
+        "id": "dc80e7d7.692bf8",
         "type": "switchNode",
         "name": "switch connectivity has ethernet service",
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3074.466552734375,
-        "y": 6450.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6493.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "b26d88bf.bd178",
-                "f451c5d.6b3dd38"
+                "75c39310.64e10c",
+                "865b2c0.812e658"
             ]
         ]
     },
     {
-        "id": "502ecc67.91354c",
+        "id": "7b453ddd.4a4edc",
         "type": "save",
         "name": "delete vpn-binding resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",
         "comments": "",
         "outputs": 1,
         "x": 3055.466552734375,
-        "y": 6566.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6609.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "3d9fd486.323a64",
+        "id": "ab328def.9c2568",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3228.9666748046875,
-        "y": 6000.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6043.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "c715af9f.c55108"
+                "7b2173a0.a25f4c"
             ]
         ]
     },
     {
-        "id": "c6247afb.9c0a",
+        "id": "1e0d49ce.54650e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3220.9666748046875,
-        "y": 6055.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6098.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "f990360c.2a7d88"
+                "3e21d08a.9cf2d8"
             ]
         ]
     },
     {
-        "id": "c715af9f.c55108",
+        "id": "7b2173a0.a25f4c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -8200,176 +8202,176 @@
         "comments": "",
         "outputs": 1,
         "x": 3363.348876953125,
-        "y": 5995.5556640625,
-        "z": "82de8dcf.518d88",
+        "y": 6037.672332763672,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "cf5a3a9d.68d89"
+                "d783eb8.e8d4418"
             ]
         ]
     },
     {
-        "id": "83cc8360.81d358",
+        "id": "83f96b0e.23503",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3225.9666748046875,
-        "y": 6112.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6155.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "ee6f1ffb.7dcfe"
+                "39d187f7.387c08"
             ]
         ]
     },
     {
-        "id": "ee6f1ffb.7dcfe",
+        "id": "39d187f7.387c08",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3377.9666748046875,
-        "y": 6113.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6156.016571044922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "f990360c.2a7d88",
+        "id": "3e21d08a.9cf2d8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3388.9666748046875,
-        "y": 6056.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6099.016571044922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "f451c5d.6b3dd38",
+        "id": "865b2c0.812e658",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3327.466552734375,
-        "y": 6428.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6471.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "e38cfd76.3f8a2"
+                "772ac851.ed388"
             ]
         ]
     },
     {
-        "id": "b26d88bf.bd178",
+        "id": "75c39310.64e10c",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
         "x": 3327.466552734375,
-        "y": 6484.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6527.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "cf5a3a9d.68d89",
+        "id": "d783eb8.e8d4418",
         "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": 3550.466064453125,
-        "y": 5996.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6039.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "fe7eff92.d565e"
+                "22737809.d5a598"
             ]
         ]
     },
     {
-        "id": "fe7eff92.d565e",
+        "id": "22737809.d5a598",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3791.466064453125,
-        "y": 5987.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6030.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "a5619f8.2b7e86"
+                "8e816736.3f1518"
             ]
         ]
     },
     {
-        "id": "e38cfd76.3f8a2",
+        "id": "772ac851.ed388",
         "type": "execute",
         "name": "execute RestApiCallNode Delete ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 3677.466064453125,
-        "y": 6418.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6461.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "1d52efad.f9e5d",
-                "d7169143.c010d8"
+                "7e278410.d4a45c",
+                "5323d43d.ae4a94"
             ]
         ]
     },
     {
-        "id": "9c554475.661fc8",
+        "id": "e189248a.5308d8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3443.966064453125,
-        "y": 6340.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6383.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "238545c1.5c8b2a"
+                "a38fc7bd.ddbeb"
             ]
         ]
     },
     {
-        "id": "12ed9938.83ebcf",
+        "id": "42e13b38.68927c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3444.966064453125,
-        "y": 6285.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6328.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "bb0795de.a47f18"
+                "ca98e797.f9c13"
             ]
         ]
     },
     {
-        "id": "238545c1.5c8b2a",
+        "id": "a38fc7bd.ddbeb",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete OTN tunnel rest api\" />\n",
         "comments": "",
         "x": 3615.966064453125,
-        "y": 6338.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6381.016571044922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "bb0795de.a47f18",
+        "id": "ca98e797.f9c13",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -8377,80 +8379,80 @@
         "comments": "",
         "outputs": 1,
         "x": 3612.466064453125,
-        "y": 6287.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6330.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "36cf22b4.4935d6",
+        "id": "63dcc10.1e934c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4148.4658203125,
-        "y": 5936.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5979.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "b5cbacbc.c392",
-                "ea40936a.af6178",
-                "6eb0462c.852488"
+                "cb51edb2.a6957",
+                "7da0f639.3db538",
+                "dfe02514.308cd"
             ]
         ]
     },
     {
-        "id": "a5619f8.2b7e86",
+        "id": "8e816736.3f1518",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3997.466064453125,
-        "y": 5984.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6027.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "36cf22b4.4935d6"
+                "63dcc10.1e934c"
             ]
         ]
     },
     {
-        "id": "1d52efad.f9e5d",
+        "id": "7e278410.d4a45c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4009.966064453125,
-        "y": 6392.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6435.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "6bd1cb72.9cf9b4"
+                "21b3d920.ac879e"
             ]
         ]
     },
     {
-        "id": "d7169143.c010d8",
+        "id": "5323d43d.ae4a94",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4013.966064453125,
-        "y": 6432.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6475.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "e4332941.104e"
+                "da782471.0e218"
             ]
         ]
     },
     {
-        "id": "e4332941.104e",
+        "id": "da782471.0e218",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -8458,135 +8460,135 @@
         "comments": "",
         "outputs": 1,
         "x": 4201.466064453125,
-        "y": 6436.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6479.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "6bd1cb72.9cf9b4",
+        "id": "21b3d920.ac879e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 4197.966064453125,
-        "y": 6396.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6439.016571044922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "ea40936a.af6178",
+        "id": "7da0f639.3db538",
         "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": 4354.4658203125,
-        "y": 5949.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5992.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "914dea7f.0edbe",
-                "82561c7b.09ef28",
-                "b047cbfd.3b9618"
+                "2a4fa91b.b928a6",
+                "3708f6c9.39ed2a",
+                "7ad7cb3f.866b74"
             ]
         ]
     },
     {
-        "id": "b5cbacbc.c392",
+        "id": "cb51edb2.a6957",
         "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": 4384.4658203125,
-        "y": 5897.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5940.016571044922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "914dea7f.0edbe",
+        "id": "2a4fa91b.b928a6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4564.4658203125,
-        "y": 5940.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5983.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "c318baba.3a4cc8"
+                "bee63261.4dfe28"
             ]
         ]
     },
     {
-        "id": "82561c7b.09ef28",
+        "id": "3708f6c9.39ed2a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4556.4658203125,
-        "y": 5995.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6038.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "b8e7878b.f1ad7"
+                "9ceb2b97.8189"
             ]
         ]
     },
     {
-        "id": "b047cbfd.3b9618",
+        "id": "7ad7cb3f.866b74",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4561.4658203125,
-        "y": 6052.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6095.016571044922,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "c15a7782.9625b"
+                "84d1d52.6203b28"
             ]
         ]
     },
     {
-        "id": "6eb0462c.852488",
+        "id": "dfe02514.308cd",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 4304.4658203125,
-        "y": 6013.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6056.016571044922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "c15a7782.9625b",
+        "id": "84d1d52.6203b28",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4713.4658203125,
-        "y": 6053.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6096.016571044922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "b8e7878b.f1ad7",
+        "id": "9ceb2b97.8189",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4724.4658203125,
-        "y": 5998.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 6041.016571044922,
+        "z": "d1eceead.adafe",
         "wires": []
     },
     {
-        "id": "c318baba.3a4cc8",
+        "id": "bee63261.4dfe28",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -8594,23 +8596,558 @@
         "comments": "",
         "outputs": 1,
         "x": 4708.84814453125,
-        "y": 5938.555572509766,
-        "z": "82de8dcf.518d88",
+        "y": 5980.6722412109375,
+        "z": "d1eceead.adafe",
         "wires": [
             [
-                "42376e75.44b2d8"
+                "595ecbb0.cd7dfc"
             ]
         ]
     },
     {
-        "id": "42376e75.44b2d8",
+        "id": "595ecbb0.cd7dfc",
         "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": 4923.4658203125,
-        "y": 5934.89990234375,
-        "z": "82de8dcf.518d88",
+        "y": 5977.016571044922,
+        "z": "d1eceead.adafe",
         "wires": []
+    },
+    {
+        "id": "e8d2c16f.36acb",
+        "type": "set",
+        "name": "set pnf-name",
+        "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",
+        "comments": "",
+        "x": 1659.2332763671875,
+        "y": 6774.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": []
+    },
+    {
+        "id": "656fa541.af35f4",
+        "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": 1685.2332763671875,
+        "y": 6891.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "35de354f.e14d62",
+                "aedf728e.4bd508",
+                "d65aa6c1.4a58e"
+            ]
+        ]
+    },
+    {
+        "id": "35de354f.e14d62",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1880.7333984375,
+        "y": 6843.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "5345535d.1f34d4"
+            ]
+        ]
+    },
+    {
+        "id": "aedf728e.4bd508",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1872.7333984375,
+        "y": 6898.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "20bec1fa.80674e"
+            ]
+        ]
+    },
+    {
+        "id": "5345535d.1f34d4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2015.1156005859375,
+        "y": 6838.272430419922,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "eb473582.da829"
+            ]
+        ]
+    },
+    {
+        "id": "d65aa6c1.4a58e",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1877.7333984375,
+        "y": 6955.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "15a64cb6.b20343"
+            ]
+        ]
+    },
+    {
+        "id": "15a64cb6.b20343",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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": 2029.7333984375,
+        "y": 6956.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": []
+    },
+    {
+        "id": "20bec1fa.80674e",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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": 2040.7333984375,
+        "y": 6899.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": []
+    },
+    {
+        "id": "eb473582.da829",
+        "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": 2202.2327880859375,
+        "y": 6839.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "b73dec8d.f89198"
+            ]
+        ]
+    },
+    {
+        "id": "b73dec8d.f89198",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2443.2327880859375,
+        "y": 6830.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "1ceb2f26.68ec79"
+            ]
+        ]
+    },
+    {
+        "id": "8e7e1d35.45d4c8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2800.2325439453125,
+        "y": 6779.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "a1ade3fe.d4148",
+                "2a08582e.e9a11",
+                "a2d9c162.524c1"
+            ]
+        ]
+    },
+    {
+        "id": "1ceb2f26.68ec79",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2649.2327880859375,
+        "y": 6827.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "8e7e1d35.45d4c8"
+            ]
+        ]
+    },
+    {
+        "id": "2a08582e.e9a11",
+        "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": 3006.2325439453125,
+        "y": 6792.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "cc4e4323.ff0c8",
+                "37454266.958e06",
+                "fc54918e.b07f78"
+            ]
+        ]
+    },
+    {
+        "id": "a2d9c162.524c1",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 2956.2325439453125,
+        "y": 6856.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": []
+    },
+    {
+        "id": "a1ade3fe.d4148",
+        "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": 3036.2325439453125,
+        "y": 6740.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": []
+    },
+    {
+        "id": "cc4e4323.ff0c8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3216.2325439453125,
+        "y": 6783.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "e3f7ab37.cd3338"
+            ]
+        ]
+    },
+    {
+        "id": "37454266.958e06",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3208.2325439453125,
+        "y": 6838.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "c423f303.cf0fc"
+            ]
+        ]
+    },
+    {
+        "id": "fc54918e.b07f78",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3213.2325439453125,
+        "y": 6895.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "f7cc4fee.3d03d8"
+            ]
+        ]
+    },
+    {
+        "id": "f7cc4fee.3d03d8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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": 3365.2325439453125,
+        "y": 6896.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": []
+    },
+    {
+        "id": "c423f303.cf0fc",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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": 3376.2325439453125,
+        "y": 6841.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": []
+    },
+    {
+        "id": "e3f7ab37.cd3338",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3360.6148681640625,
+        "y": 6781.2723388671875,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "a32f770f.0bf93"
+            ]
+        ]
+    },
+    {
+        "id": "a32f770f.0bf93",
+        "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": 3575.2325439453125,
+        "y": 6777.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": []
+    },
+    {
+        "id": "5c661b6d.db566c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1451.2332763671875,
+        "y": 6902.616668701172,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "e8d2c16f.36acb",
+                "656fa541.af35f4",
+                "f25051a6.fa4e28"
+            ]
+        ]
+    },
+    {
+        "id": "f25051a6.fa4e28",
+        "type": "switchNode",
+        "name": "switch connectivity has ethernet service",
+        "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1733.433349609375,
+        "y": 7043.816864013672,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "81385ecf.138098",
+                "de989c54.09997"
+            ]
+        ]
+    },
+    {
+        "id": "de989c54.09997",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1986.433349609375,
+        "y": 7021.816864013672,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "78a6b529.99c6a4"
+            ]
+        ]
+    },
+    {
+        "id": "81385ecf.138098",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1986.433349609375,
+        "y": 7077.816864013672,
+        "z": "d1eceead.adafe",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "78a6b529.99c6a4",
+        "type": "execute",
+        "name": "execute RestApiCallNode Delete ethernet Service without token",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2336.432861328125,
+        "y": 7011.816864013672,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "a19873b6.a4d6e",
+                "94634cdd.23be6"
+            ]
+        ]
+    },
+    {
+        "id": "a19873b6.a4d6e",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2668.932861328125,
+        "y": 6985.816864013672,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "2dad16ef.224d22"
+            ]
+        ]
+    },
+    {
+        "id": "94634cdd.23be6",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2672.932861328125,
+        "y": 7025.816864013672,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "4ffd9da0.18218c"
+            ]
+        ]
+    },
+    {
+        "id": "4ffd9da0.18218c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2860.432861328125,
+        "y": 7029.816864013672,
+        "z": "d1eceead.adafe",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2dad16ef.224d22",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
+        "comments": "",
+        "x": 2856.932861328125,
+        "y": 6989.816864013672,
+        "z": "d1eceead.adafe",
+        "wires": []
+    },
+    {
+        "id": "8d45971b.519e08",
+        "type": "execute",
+        "name": "execute RestApiCallNode Delete Underlay OTN tunnel from the LEAF ethernet Service",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/underlay/otn-tunnels=' + $tmp.underlayOTN`\" />\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": 1089.25,
+        "y": 4729.39990234375,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "5dcba2e4.9fe114",
+                "1fae83d7.8f54e4"
+            ]
+        ]
+    },
+    {
+        "id": "5dcba2e4.9fe114",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1517.749755859375,
+        "y": 4717.39990234375,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "504ce75b.b6442"
+            ]
+        ]
+    },
+    {
+        "id": "1fae83d7.8f54e4",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1521.749755859375,
+        "y": 4757.39990234375,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "2463a8bc.d76748"
+            ]
+        ]
+    },
+    {
+        "id": "504ce75b.b6442",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
+        "comments": "",
+        "x": 1675.749755859375,
+        "y": 4717.39990234375,
+        "z": "d1eceead.adafe",
+        "wires": []
+    },
+    {
+        "id": "2463a8bc.d76748",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1679.249755859375,
+        "y": 4757.39990234375,
+        "z": "d1eceead.adafe",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete-VPNBs.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete-VPNBs.xml
index a155f743..2e224beb 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete-VPNBs.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete-VPNBs.xml
@@ -57,72 +57,101 @@
                 <!--                                             $tmp.source.ttp-id`" />-->
                 <parameter name='tmp.srcTtpOtnLayer' value="`$tmp.pce-src-node`" />
             </set>
-            <block>
-                <set>
-                    <parameter name='tmp.aai.all-vpn-bindings.' value='' />
-                </set>
-                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                              resource="vpn-bindings"
-                              key="selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings"
-                              local-only="false"
-                              pfx="tmp.aai.all-vpn-bindings" >
-                    <outcome value='success'>
-                        <block atomic="true">
-                            <for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >
-                                <block atomic='true'>
-                                    <switch test="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `">
-                                        <outcome value='true'>
-                                            <block atomic="true">
-                                                <set>
-                                                    <parameter name='tmp.aai.vpn-binding.' value="" />
-                                                </set>
-                                                <set>
-                                                    <parameter name='tmp.aai.vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
-                                                </set>
-                                                <set>
-                                                    <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +
+            <for index='rel-index' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >
+                <switch test='`$middle-man-conn.relationship-list.relationship[$rel-index].related-to`'>
+                    <outcome value='connectivity'>
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                      resource="connectivity"
+                                      key="connectivity.connectivity-id = $middle-man-conn.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"
+                                      local-only="false"
+                                      pfx="tmp.aai.connectivity" >
+                            <outcome value='not-found'></outcome>
+                            <outcome value='failure'></outcome>
+                            <outcome value='success'>
+                                <block>
+                                    <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.ops-note == $tmp.srcTtpOtnLayer `">
+                                                                    <outcome value='true'>
+                                                                        <block atomic="true">
+                                                                            <set>
+                                                                                <parameter name='tmp.underlayOTN' value="`$tmp.aai.vpn-binding.vpn-name`" />
+                                                                            </set>
+                                                                            <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.domain.esr-thirdparty-sdnc' local-only='false' >
+                                                                                          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>
-                                                                                        <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>
+                                                                                        <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.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'>
@@ -140,77 +169,62 @@
                                                                                     </return>
                                                                                 </outcome>
                                                                             </get-resource>
-                                                                            <break/>
+                                                                            <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.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`" />
+                                                                                <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='success'>
+                                                                                    <block atomic="true"></block>
+                                                                                </outcome>
+                                                                                <outcome value='failure'>
+                                                                                    <return status='failure'>
+                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                        <parameter name="error-code" value="500" />
+                                                                                        <parameter name="error-message" value="Error executing delete OTN tunnel rest api" />
+                                                                                    </return>
+                                                                                </outcome>
+                                                                            </execute>
+                                                                            <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='false'></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.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`" />
-                                                    <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 delete OTN tunnel rest api" />
-                                                        </return>
-                                                    </outcome>
-                                                    <outcome value='success'>
-                                                        <block atomic="true"></block>
-                                                    </outcome>
-                                                </execute>
-                                                <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='false'></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>
                                 </block>
-                            </for>
-                        </block>
-                    </outcome>
-                    <outcome value='not-found'>
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="error-code" value="500" />
-                            <parameter name="error-message" value="`'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>
-                </get-resource>
-            </block>
+                </switch>
+            </for>
         </block>
     </method>
 </service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
index 91889bb4..dcc3d696 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
@@ -1260,6 +1260,31 @@
                                                                                                                                                             <block atomic="true"></block>
                                                                                                                                                         </outcome>
                                                                                                                                                     </execute>
+                                                                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/underlay/otn-tunnels=' + $tmp.underlayOTN`" />
+                                                                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                                                                                        <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->
+                                                                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                                                                                                        <parameter name="format" value="json"/>
+                                                                                                                                                        <parameter name="httpMethod" value="delete"/>
+                                                                                                                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                                                                                        <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                                                                                        <outcome value='failure'>
+                                                                                                                                                            <return status='failure'>
+                                                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                                                <parameter name="error-message" value="Error executing delete ethernet service rest api" />
+                                                                                                                                                            </return>
+                                                                                                                                                        </outcome>
+                                                                                                                                                        <outcome value='success'>
+                                                                                                                                                            <block atomic="true"></block>
+                                                                                                                                                        </outcome>
+                                                                                                                                                    </execute>
                                                                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' ></call>
                                                                                                                                                     <switch test="`$found-root-connectivity`">
                                                                                                                                                         <outcome value='true'>
@@ -1609,6 +1634,121 @@
                                                                                                                                                                                             </outcome>
                                                                                                                                                                                         </switch>
                                                                                                                                                                                     </for>
+                                                                                                                                                                                    <block atomic="true">
+                                                                                                                                                                                        <set>
+                                                                                                                                                                                            <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +
+                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +
+                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +
+                                                   $tmp.aai.connectivity.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.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>
+                                                                                                                                                                                        <switch test='`$tmp.aai.connectivity.etht-svc-name`'>
+                                                                                                                                                                                            <outcome value='Other'>
+                                                                                                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`" />
+                                                                                                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                                                                                                                                    <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->
+                                                                                                                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                                                                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                                                                                                                                                    <parameter name="format" value="json"/>
+                                                                                                                                                                                                    <parameter name="httpMethod" value="delete"/>
+                                                                                                                                                                                                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                                                                                                                                    <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                                                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                                                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                                                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                                                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                                                                                                                                    <outcome value='failure'>
+                                                                                                                                                                                                        <return status='failure'>
+                                                                                                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                                                                                                            <parameter name="error-message" value="Error executing delete ethernet service rest api" />
+                                                                                                                                                                                                        </return>
+                                                                                                                                                                                                    </outcome>
+                                                                                                                                                                                                    <outcome value='success'>
+                                                                                                                                                                                                        <block atomic="true"></block>
+                                                                                                                                                                                                    </outcome>
+                                                                                                                                                                                                </execute>
+                                                                                                                                                                                            </outcome>
+                                                                                                                                                                                            <outcome value=''></outcome>
+                                                                                                                                                                                        </switch>
+                                                                                                                                                                                    </block>
                                                                                                                                                                                     <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
                                                                                                                                                                                             key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'></delete>
                                                                                                                                                                                 </block>
-- 
2.16.6