From 2c4d878572be86786419130d35da41e58593be8c Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Wed, 29 Sep 2021 17:20:32 -0400
Subject: Support individual CLL deletion, and UNI removal from Ethernet
 Service, and adjusting the bandwidth of OTN tunnels and UNIs accordingly.

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

Former-commit-id: 68c418849f4636b0e960a80fa3604519723167cf
---
 ...cll-vnf-topology-operation-cll-F1-Activate.json | 2603 +++---
 ...ll-vnf-topology-operation-cll-delete-VPNBs.json |  966 +++
 ...-API_cll-vnf-topology-operation-cll-delete.json | 8583 ++++++++++++++++++--
 ...-API_cll-vnf-topology-operation-cll-modify.json | 5452 +++++++------
 .../src/main/resources/graph.versions              |    1 +
 ..._cll-vnf-topology-operation-cll-F1-Activate.xml |   24 +-
 ...cll-vnf-topology-operation-cll-delete-VPNBs.xml |  216 +
 ...E-API_cll-vnf-topology-operation-cll-delete.xml | 1828 ++++-
 ...E-API_cll-vnf-topology-operation-cll-modify.xml |  278 +-
 9 files changed, 15087 insertions(+), 4864 deletions(-)
 create mode 100644 platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete-VPNBs.json
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete-VPNBs.xml

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

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
index 795a7416..4ba32b46 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
@@ -1,223 +1,199 @@
 [
     {
-        "id": "2395bbe0.4b8ec4",
+        "id": "6467c9b6.3ea7b",
         "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": 361,
-        "y": 348,
-        "z": "ed7c1675.7a56b",
+        "x": 415.8833312988281,
+        "y": 377,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "7a4b4c32.339f0c",
-                "476b558f.0cf4e4",
-                "c5f863d4.faa76"
+                "1c0c6fa0.017178",
+                "ec984d7b.605098",
+                "25450eba.0fd99a"
             ]
         ]
     },
     {
-        "id": "7a4b4c32.339f0c",
+        "id": "1c0c6fa0.017178",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 549,
-        "y": 361,
-        "z": "ed7c1675.7a56b",
+        "x": 603.8833312988281,
+        "y": 390,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "477b4d49.40f0ec"
+                "fcdf737f.3ba08"
             ]
         ]
     },
     {
-        "id": "476b558f.0cf4e4",
+        "id": "ec984d7b.605098",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 549.490966796875,
-        "y": 406.57403564453125,
-        "z": "ed7c1675.7a56b",
+        "x": 611.374267578125,
+        "y": 432.57403564453125,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
-            [
-                "9391f816.87a258"
-            ]
+            []
         ]
     },
     {
-        "id": "c5f863d4.faa76",
+        "id": "25450eba.0fd99a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 547,
-        "y": 450,
-        "z": "ed7c1675.7a56b",
+        "x": 601.8833312988281,
+        "y": 479,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "7e716c79.c4ee54"
+                "f645589d.ed3d98"
             ]
         ]
     },
     {
-        "id": "477b4d49.40f0ec",
+        "id": "fcdf737f.3ba08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 722,
-        "y": 359,
-        "z": "ed7c1675.7a56b",
+        "x": 776.8833312988281,
+        "y": 388,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "de48ad25.e4a568"
+                "6641b1bb.011df8"
             ]
         ]
     },
     {
-        "id": "9391f816.87a258",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return 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": 712.0623779296875,
-        "y": 406.8597717285156,
-        "z": "ed7c1675.7a56b",
-        "wires": []
-    },
-    {
-        "id": "7e716c79.c4ee54",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 714,
-        "y": 449,
-        "z": "ed7c1675.7a56b",
-        "wires": []
-    },
-    {
-        "id": "de48ad25.e4a568",
+        "id": "6641b1bb.011df8",
         "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": 951,
-        "y": 360,
-        "z": "ed7c1675.7a56b",
+        "x": 1005.8833312988281,
+        "y": 389,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "1fd8993c.e83297"
+                "42fd94e4.9f459c"
             ]
         ]
     },
     {
-        "id": "1fd8993c.e83297",
+        "id": "42fd94e4.9f459c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1166,
-        "y": 361,
-        "z": "ed7c1675.7a56b",
+        "x": 1220.8833312988281,
+        "y": 390,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "33755ee2.127952"
+                "341f3db4.7e268a"
             ]
         ]
     },
     {
-        "id": "edb565df.2fd588",
+        "id": "802e937a.3ac",
         "type": "switchNode",
         "name": "switch vpnuuid is for this slice",
         "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1420,
-        "y": 283,
-        "z": "ed7c1675.7a56b",
+        "x": 1474.8833312988281,
+        "y": 312,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "d9f77b89.2576a8",
-                "d1a41641.7e8658"
+                "ccfe4ade.41ae98",
+                "912c0faa.e5e1c8"
             ]
         ]
     },
     {
-        "id": "d9f77b89.2576a8",
+        "id": "ccfe4ade.41ae98",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1637,
-        "y": 262,
-        "z": "ed7c1675.7a56b",
+        "x": 1691.8833312988281,
+        "y": 291,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "33755ee2.127952"
+                "341f3db4.7e268a"
             ]
         ]
     },
     {
-        "id": "d1a41641.7e8658",
+        "id": "912c0faa.e5e1c8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1637,
-        "y": 311,
-        "z": "ed7c1675.7a56b",
+        "x": 1691.8833312988281,
+        "y": 340,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "33755ee2.127952",
+        "id": "341f3db4.7e268a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1821,
-        "y": 348,
-        "z": "ed7c1675.7a56b",
+        "x": 1875.8833312988281,
+        "y": 377,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "9647ef19.c8c25",
-                "b3842f71.731b38",
-                "ca01ca51.23bb98"
+                "b1ca96f9.f78f38",
+                "2c3b3231.83c2be",
+                "4660bf61.473a18"
             ]
         ]
     },
     {
-        "id": "48081245.456c3c",
+        "id": "377c3031.0fc7c",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 180,
-        "y": 89,
-        "z": "ed7c1675.7a56b",
+        "x": 234.88333129882812,
+        "y": 118,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "226f6982.562f5e"
+                "8b8ba227.5e7638"
             ]
         ]
     },
     {
-        "id": "226f6982.562f5e",
+        "id": "8b8ba227.5e7638",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -225,3560 +201,3545 @@
         "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": 464.2856903076172,
-        "y": 150.23810863494873,
-        "z": "ed7c1675.7a56b",
+        "x": 519.1690216064453,
+        "y": 179.23810863494873,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f533e2ec.f849f"
+                "6c55ded0.30c498"
             ]
         ]
     },
     {
-        "id": "f533e2ec.f849f",
+        "id": "6c55ded0.30c498",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-F1-Activate",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-F1-Activate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 470.42860412597656,
-        "y": 235.00003051757812,
-        "z": "ed7c1675.7a56b",
+        "x": 525.3119354248047,
+        "y": 264.0000305175781,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "15848be5.af4ba4"
+                "b63c19cf.5911b8"
             ]
         ]
     },
     {
-        "id": "15848be5.af4ba4",
+        "id": "b63c19cf.5911b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 780.238037109375,
-        "y": 226.66668701171875,
-        "z": "ed7c1675.7a56b",
+        "x": 835.1213684082031,
+        "y": 255.66668701171875,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "2395bbe0.4b8ec4",
-                "5c62cbf5.952894",
-                "4957906b.cb3908",
-                "25a3d5e5.55ea62",
-                "624a734b.81957c"
+                "6467c9b6.3ea7b",
+                "7714415.bcb45c",
+                "2cf2ff05.5ecb98",
+                "ff64d6f0.1d24e",
+                "c19ef147.be92d8"
             ]
         ]
     },
     {
-        "id": "9647ef19.c8c25",
+        "id": "b1ca96f9.f78f38",
         "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": 2038,
-        "y": 286,
-        "z": "ed7c1675.7a56b",
+        "x": 2092.883331298828,
+        "y": 315,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "927e2807.47e1",
+        "id": "f11c1dac.45c748",
         "type": "set",
         "name": "set attachment_param for OTN A",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",
         "comments": "",
-        "x": 4207,
-        "y": 172,
-        "z": "ed7c1675.7a56b",
+        "x": 4261.883331298828,
+        "y": 201,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "71f8cbde.7b70ec",
+        "id": "c95c33ef.381fa8",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4288,
-        "y": 487,
-        "z": "ed7c1675.7a56b",
+        "x": 4342.883331298828,
+        "y": 516,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "dca0592f.f2f0f8",
-                "7abf945b.d3630c"
+                "89c7efd5.cb6558",
+                "d5cfec9d.5347f8"
             ]
         ]
     },
     {
-        "id": "dca0592f.f2f0f8",
+        "id": "89c7efd5.cb6558",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4597.5,
-        "y": 456,
-        "z": "ed7c1675.7a56b",
+        "x": 4652.383331298828,
+        "y": 485,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "4d6d008.1dd328"
+                "beffe966.8b1b08"
             ]
         ]
     },
     {
-        "id": "7abf945b.d3630c",
+        "id": "d5cfec9d.5347f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4602.5,
-        "y": 521,
-        "z": "ed7c1675.7a56b",
+        "x": 4657.383331298828,
+        "y": 550,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "6ddc3bc2.826894"
+                "18fce568.1c292b"
             ]
         ]
     },
     {
-        "id": "4d6d008.1dd328",
+        "id": "beffe966.8b1b08",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4773.5,
-        "y": 456,
-        "z": "ed7c1675.7a56b",
+        "x": 4828.383331298828,
+        "y": 485,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "6ddc3bc2.826894",
+        "id": "18fce568.1c292b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4769,
-        "y": 521,
-        "z": "ed7c1675.7a56b",
+        "x": 4823.883331298828,
+        "y": 550,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "639d74a6.1d8f04",
+        "id": "64fdffc9.427678",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",
         "comments": "",
-        "x": 4152.5,
-        "y": 741,
-        "z": "ed7c1675.7a56b",
+        "x": 4207.383331298828,
+        "y": 770,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "d9456183.6b2d68",
+        "id": "c0e95206.343c2",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4306.5,
-        "y": 789,
-        "z": "ed7c1675.7a56b",
+        "x": 4361.383331298828,
+        "y": 818,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "3efbdf9b.54682",
-                "243cc169.72316e"
+                "7a1edf39.b6a0f8",
+                "b605ddae.9f2b2"
             ]
         ]
     },
     {
-        "id": "3efbdf9b.54682",
+        "id": "7a1edf39.b6a0f8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4652,
-        "y": 770,
-        "z": "ed7c1675.7a56b",
+        "x": 4706.883331298828,
+        "y": 799,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "ba970949.4ab53"
+                "db29824f.2b664"
             ]
         ]
     },
     {
-        "id": "243cc169.72316e",
+        "id": "b605ddae.9f2b2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4656,
-        "y": 810,
-        "z": "ed7c1675.7a56b",
+        "x": 4710.883331298828,
+        "y": 839,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "4891a43f.02e58c"
+                "10ebb808.22b9d8"
             ]
         ]
     },
     {
-        "id": "ba970949.4ab53",
+        "id": "db29824f.2b664",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 4810,
-        "y": 770,
-        "z": "ed7c1675.7a56b",
+        "x": 4864.883331298828,
+        "y": 799,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "4891a43f.02e58c",
+        "id": "10ebb808.22b9d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4813.5,
-        "y": 810,
-        "z": "ed7c1675.7a56b",
+        "x": 4868.383331298828,
+        "y": 839,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "388beb56.7c7234",
-                "eb334e0f.b54c3"
+                "6d35eb39.2fe42c",
+                "b62c3c22.2cb09"
             ]
         ]
     },
     {
-        "id": "388beb56.7c7234",
+        "id": "6d35eb39.2fe42c",
         "type": "save",
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5144,
-        "y": 775,
-        "z": "ed7c1675.7a56b",
+        "x": 5198.883331298828,
+        "y": 804,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "d196af8c.f36ae8",
+        "id": "3f34bcf0.b30eb4",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 5008,
-        "y": 734,
-        "z": "ed7c1675.7a56b",
+        "x": 5062.883331298828,
+        "y": 763,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "eb334e0f.b54c3",
+        "id": "b62c3c22.2cb09",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5071,
-        "y": 821,
-        "z": "ed7c1675.7a56b",
+        "x": 5125.883331298828,
+        "y": 850,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "51361643.15e97",
+        "id": "dc51dde.504a12",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 4145,
-        "y": 220,
-        "z": "ed7c1675.7a56b",
+        "x": 4199.883331298828,
+        "y": 249,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "7074e291.428a74",
+        "id": "25f0cbb9.ff400c",
         "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": 4171,
-        "y": 337,
-        "z": "ed7c1675.7a56b",
+        "x": 4225.883331298828,
+        "y": 366,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "fd9f25cd.b6ab9",
-                "13f82e43.b47822",
-                "a1ba843c.92fa78"
+                "26af6a64.84f75e",
+                "dfaad5e6.3e7388",
+                "d4f19086.9e394"
             ]
         ]
     },
     {
-        "id": "fd9f25cd.b6ab9",
+        "id": "26af6a64.84f75e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4366.5001220703125,
-        "y": 289,
-        "z": "ed7c1675.7a56b",
+        "x": 4421.383453369141,
+        "y": 318,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "10d11922.59185f"
+                "825f4729.b63ee8"
             ]
         ]
     },
     {
-        "id": "13f82e43.b47822",
+        "id": "dfaad5e6.3e7388",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4358.5001220703125,
-        "y": 344,
-        "z": "ed7c1675.7a56b",
+        "x": 4413.383453369141,
+        "y": 373,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "19650434.8dad4c"
+                "92b1984a.bc8b"
             ]
         ]
     },
     {
-        "id": "10d11922.59185f",
+        "id": "825f4729.b63ee8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4510.8824462890625,
-        "y": 288.6556701660156,
-        "z": "ed7c1675.7a56b",
+        "x": 4565.765777587891,
+        "y": 317.6556701660156,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "777ae9c7.6a278"
+                "415768e6.6651f8"
             ]
         ]
     },
     {
-        "id": "391ce87d.ba3df8",
+        "id": "a6a2d3e2.2e526",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5093,
-        "y": 291,
-        "z": "ed7c1675.7a56b",
+        "x": 5147.883331298828,
+        "y": 320,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "65b820ac.17e0d"
+                "e243a570.71b51"
             ]
         ]
     },
     {
-        "id": "777ae9c7.6a278",
+        "id": "415768e6.6651f8",
         "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": 4695,
-        "y": 287,
-        "z": "ed7c1675.7a56b",
+        "x": 4749.883331298828,
+        "y": 316,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f4f1a808.b22bc"
+                "ab4dd1f4.04e1f"
             ]
         ]
     },
     {
-        "id": "f4f1a808.b22bc",
+        "id": "ab4dd1f4.04e1f",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4890,
-        "y": 287,
-        "z": "ed7c1675.7a56b",
+        "x": 4944.883331298828,
+        "y": 316,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "391ce87d.ba3df8"
+                "a6a2d3e2.2e526"
             ]
         ]
     },
     {
-        "id": "a1ba843c.92fa78",
+        "id": "d4f19086.9e394",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4363.5001220703125,
-        "y": 401,
-        "z": "ed7c1675.7a56b",
+        "x": 4418.383453369141,
+        "y": 430,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a6d9e4b5.ea0fd8"
+                "28f88c03.cb5e5c"
             ]
         ]
     },
     {
-        "id": "a6d9e4b5.ea0fd8",
+        "id": "28f88c03.cb5e5c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4515.5001220703125,
-        "y": 402,
-        "z": "ed7c1675.7a56b",
+        "x": 4570.383453369141,
+        "y": 431,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "19650434.8dad4c",
+        "id": "92b1984a.bc8b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4526.5001220703125,
-        "y": 345,
-        "z": "ed7c1675.7a56b",
+        "x": 4581.383453369141,
+        "y": 374,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "5d042a1f.c8fb44",
+        "id": "677439f1.5f7ed",
         "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": 5478,
-        "y": 304,
-        "z": "ed7c1675.7a56b",
+        "x": 5532.883331298828,
+        "y": 333,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "8c0f87c1.0cfa88",
-                "96b96977.b4fed8",
-                "6ce026da.737ea"
+                "e7fd97d3.bbcd08",
+                "38bba5b7.de41b2",
+                "6bf961e8.c56a58"
             ]
         ]
     },
     {
-        "id": "65b820ac.17e0d",
+        "id": "e243a570.71b51",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5272,
-        "y": 291,
-        "z": "ed7c1675.7a56b",
+        "x": 5326.883331298828,
+        "y": 320,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "1918c44c.117ae4",
-                "5d042a1f.c8fb44"
+                "857cacb0.81444",
+                "677439f1.5f7ed"
             ]
         ]
     },
     {
-        "id": "1918c44c.117ae4",
+        "id": "857cacb0.81444",
         "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": 5508,
-        "y": 252,
-        "z": "ed7c1675.7a56b",
+        "x": 5562.883331298828,
+        "y": 281,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "8c0f87c1.0cfa88",
+        "id": "e7fd97d3.bbcd08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5688,
-        "y": 295,
-        "z": "ed7c1675.7a56b",
+        "x": 5742.883331298828,
+        "y": 324,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "e1aae278.d9aab"
+                "60a50433.d26434"
             ]
         ]
     },
     {
-        "id": "96b96977.b4fed8",
+        "id": "38bba5b7.de41b2",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5680,
-        "y": 350,
-        "z": "ed7c1675.7a56b",
+        "x": 5734.883331298828,
+        "y": 379,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a74826f7.daef6"
+                "d9350787.861f1"
             ]
         ]
     },
     {
-        "id": "6ce026da.737ea",
+        "id": "6bf961e8.c56a58",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5685,
-        "y": 407,
-        "z": "ed7c1675.7a56b",
+        "x": 5739.883331298828,
+        "y": 436,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "80c7718d.f0881"
+                "1afc54ba.8ed313"
             ]
         ]
     },
     {
-        "id": "80c7718d.f0881",
+        "id": "1afc54ba.8ed313",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5837,
-        "y": 408,
-        "z": "ed7c1675.7a56b",
+        "x": 5891.883331298828,
+        "y": 437,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "a74826f7.daef6",
+        "id": "d9350787.861f1",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5848,
-        "y": 353,
-        "z": "ed7c1675.7a56b",
+        "x": 5902.883331298828,
+        "y": 382,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "e1aae278.d9aab",
+        "id": "60a50433.d26434",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5832.38232421875,
-        "y": 292.6556701660156,
-        "z": "ed7c1675.7a56b",
+        "x": 5887.265655517578,
+        "y": 321.6556701660156,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "b6fb5857.56d2c"
+                "8367dac2.ac8b98"
             ]
         ]
     },
     {
-        "id": "b6fb5857.56d2c",
+        "id": "8367dac2.ac8b98",
         "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": 6047,
-        "y": 289,
-        "z": "ed7c1675.7a56b",
+        "x": 6101.883331298828,
+        "y": 318,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "881ac3d.2b73cc",
+        "id": "aa2473a.12d4d9",
         "type": "set",
         "name": "set attachment_param for OTN B",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",
         "comments": "",
-        "x": 3614,
-        "y": 1629,
-        "z": "ed7c1675.7a56b",
+        "x": 3668.883331298828,
+        "y": 1658,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "f942fe34.857118",
+        "id": "28a663c6.7433b4",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3677,
-        "y": 1958,
-        "z": "ed7c1675.7a56b",
+        "x": 3731.883331298828,
+        "y": 1987,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "d6aba815.0c0b98",
-                "fb15fc4f.27732"
+                "422a3196.0fb7d",
+                "371e9e8f.f6f942"
             ]
         ]
     },
     {
-        "id": "d6aba815.0c0b98",
+        "id": "422a3196.0fb7d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3972.5,
-        "y": 1925,
-        "z": "ed7c1675.7a56b",
+        "x": 4027.383331298828,
+        "y": 1954,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f7e9b7f6.cb6cf8"
+                "c3084137.121c7"
             ]
         ]
     },
     {
-        "id": "fb15fc4f.27732",
+        "id": "371e9e8f.f6f942",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3977.5,
-        "y": 1990,
-        "z": "ed7c1675.7a56b",
+        "x": 4032.383331298828,
+        "y": 2019,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "e7e93f9f.05e6f8"
+                "c6676165.ac5c"
             ]
         ]
     },
     {
-        "id": "f7e9b7f6.cb6cf8",
+        "id": "c3084137.121c7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4140.5,
-        "y": 1925,
-        "z": "ed7c1675.7a56b",
+        "x": 4195.383331298828,
+        "y": 1954,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "e7e93f9f.05e6f8",
+        "id": "c6676165.ac5c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4151,
-        "y": 1990,
-        "z": "ed7c1675.7a56b",
+        "x": 4205.883331298828,
+        "y": 2019,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "c6f7c9bc.a78ea8",
+        "id": "dfee532c.a1419",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",
         "comments": "",
-        "x": 3553,
-        "y": 1686,
-        "z": "ed7c1675.7a56b",
+        "x": 3607.883331298828,
+        "y": 1715,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "8f243ad6.97dd38",
+        "id": "e52702af.314718",
         "type": "get-resource",
         "name": "get-resource dst pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3573,
-        "y": 1783,
-        "z": "ed7c1675.7a56b",
+        "x": 3627.883331298828,
+        "y": 1812,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a8e6c84d.0f237",
-                "3ee8ddc2.b7378a",
-                "311698c.6883b68"
+                "9ca1c561.5c796",
+                "9cf5cab4.99d6e",
+                "5d5762eb.724c64"
             ]
         ]
     },
     {
-        "id": "a8e6c84d.0f237",
+        "id": "9ca1c561.5c796",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3775.5001220703125,
-        "y": 1736,
-        "z": "ed7c1675.7a56b",
+        "x": 3830.3834533691406,
+        "y": 1765,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "6ef9124f.c91bc4"
+                "502f683e.00cf7"
             ]
         ]
     },
     {
-        "id": "3ee8ddc2.b7378a",
+        "id": "9cf5cab4.99d6e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3767.5001220703125,
-        "y": 1791,
-        "z": "ed7c1675.7a56b",
+        "x": 3822.3834533691406,
+        "y": 1820,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "9b01e4a.2bf7598"
+                "9587c00d.994eb"
             ]
         ]
     },
     {
-        "id": "6ef9124f.c91bc4",
+        "id": "502f683e.00cf7",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3919.8824462890625,
-        "y": 1733.6556701660156,
-        "z": "ed7c1675.7a56b",
+        "x": 3974.7657775878906,
+        "y": 1762.6556701660156,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "8bd570a1.9b5908"
+                "39b96666.82062a"
             ]
         ]
     },
     {
-        "id": "8bd570a1.9b5908",
+        "id": "39b96666.82062a",
         "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": 4104,
-        "y": 1748,
-        "z": "ed7c1675.7a56b",
+        "x": 4158.883331298828,
+        "y": 1777,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "5951fb7a.778dbc"
+                "94ae9a5d.e5d56"
             ]
         ]
     },
     {
-        "id": "311698c.6883b68",
+        "id": "5d5762eb.724c64",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3772.5001220703125,
-        "y": 1848,
-        "z": "ed7c1675.7a56b",
+        "x": 3827.3834533691406,
+        "y": 1877,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "25fe1469.5e13bc"
+                "7a00ac4a.8d918c"
             ]
         ]
     },
     {
-        "id": "25fe1469.5e13bc",
+        "id": "7a00ac4a.8d918c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3924.5001220703125,
-        "y": 1849,
-        "z": "ed7c1675.7a56b",
+        "x": 3979.3834533691406,
+        "y": 1878,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "9b01e4a.2bf7598",
+        "id": "9587c00d.994eb",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3935.5001220703125,
-        "y": 1794,
-        "z": "ed7c1675.7a56b",
+        "x": 3990.3834533691406,
+        "y": 1823,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "a9a3100d.7e9a38",
+        "id": "f1540d0.014217",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4502,
-        "y": 1752,
-        "z": "ed7c1675.7a56b",
+        "x": 4556.883331298828,
+        "y": 1781,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "15a6f6cf.b80121"
+                "c932c6af.938f38"
             ]
         ]
     },
     {
-        "id": "5951fb7a.778dbc",
+        "id": "94ae9a5d.e5d56",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4299,
-        "y": 1748,
-        "z": "ed7c1675.7a56b",
+        "x": 4353.883331298828,
+        "y": 1777,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a9a3100d.7e9a38"
+                "f1540d0.014217"
             ]
         ]
     },
     {
-        "id": "b462757e.f97cf",
+        "id": "2ff151e7.182fee",
         "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": 4887,
-        "y": 1751,
-        "z": "ed7c1675.7a56b",
+        "x": 4941.883331298828,
+        "y": 1780,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f548cd5f.cf97e8",
-                "7bf2c309.936484",
-                "37200156.6e45ae"
+                "40d3a7a.4400bd8",
+                "353377f9.20c718",
+                "f8f22501.0020d8"
             ]
         ]
     },
     {
-        "id": "15a6f6cf.b80121",
+        "id": "c932c6af.938f38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4679,
-        "y": 1744,
-        "z": "ed7c1675.7a56b",
+        "x": 4733.883331298828,
+        "y": 1773,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "24625031.3ccbb",
-                "b462757e.f97cf"
+                "53fc3a7e.05d404",
+                "2ff151e7.182fee"
             ]
         ]
     },
     {
-        "id": "24625031.3ccbb",
+        "id": "53fc3a7e.05d404",
         "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": 4917,
-        "y": 1699,
-        "z": "ed7c1675.7a56b",
+        "x": 4971.883331298828,
+        "y": 1728,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "3717e4c0.7e91fc",
+        "id": "d551b07b.11f68",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5246,
-        "y": 1855,
-        "z": "ed7c1675.7a56b",
+        "x": 5300.883331298828,
+        "y": 1884,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "ebaf4cad.7f7ac",
+        "id": "c19bb319.e0e2b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5257,
-        "y": 1800,
-        "z": "ed7c1675.7a56b",
+        "x": 5311.883331298828,
+        "y": 1829,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "95133e26.a5c4",
+        "id": "2dbaf595.6cfed2",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5241.38232421875,
-        "y": 1739.6556701660156,
-        "z": "ed7c1675.7a56b",
+        "x": 5296.265655517578,
+        "y": 1768.6556701660156,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "74fa69d9.12322"
+                "eaeaf1b8.196fc"
             ]
         ]
     },
     {
-        "id": "74fa69d9.12322",
+        "id": "eaeaf1b8.196fc",
         "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": 5456,
-        "y": 1736,
-        "z": "ed7c1675.7a56b",
+        "x": 5510.883331298828,
+        "y": 1765,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "f548cd5f.cf97e8",
+        "id": "40d3a7a.4400bd8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5097,
-        "y": 1742,
-        "z": "ed7c1675.7a56b",
+        "x": 5151.883331298828,
+        "y": 1771,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "95133e26.a5c4"
+                "2dbaf595.6cfed2"
             ]
         ]
     },
     {
-        "id": "7bf2c309.936484",
+        "id": "353377f9.20c718",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5089,
-        "y": 1797,
-        "z": "ed7c1675.7a56b",
+        "x": 5143.883331298828,
+        "y": 1826,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "ebaf4cad.7f7ac"
+                "c19bb319.e0e2b8"
             ]
         ]
     },
     {
-        "id": "37200156.6e45ae",
+        "id": "f8f22501.0020d8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5094,
-        "y": 1854,
-        "z": "ed7c1675.7a56b",
+        "x": 5148.883331298828,
+        "y": 1883,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "3717e4c0.7e91fc"
+                "d551b07b.11f68"
             ]
         ]
     },
     {
-        "id": "4573661e.19551",
+        "id": "c7d66e95.fb47e",
         "type": "switchNode",
         "name": "switch vpn-binding has dst-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3128,
-        "y": 700,
-        "z": "ed7c1675.7a56b",
+        "x": 3182.883331298828,
+        "y": 729,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "e3a931ba.d41978",
-                "cce98769.66d2f"
+                "4d8bbec2.c0db6",
+                "507d82bd.8807cc"
             ]
         ]
     },
     {
-        "id": "e3a931ba.d41978",
+        "id": "4d8bbec2.c0db6",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3342,
-        "y": 737,
-        "z": "ed7c1675.7a56b",
+        "x": 3396.883331298828,
+        "y": 766,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "83f7a2a0.47e4a"
+                "6524452d.4a2f94"
             ]
         ]
     },
     {
-        "id": "cce98769.66d2f",
+        "id": "507d82bd.8807cc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3344,
-        "y": 675,
-        "z": "ed7c1675.7a56b",
+        "x": 3398.883331298828,
+        "y": 704,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a3a1c771.fa4dc8"
+                "4b590d33.c81684"
             ]
         ]
     },
     {
-        "id": "83f7a2a0.47e4a",
+        "id": "6524452d.4a2f94",
         "type": "switchNode",
         "name": "switch vpn-binding has src-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2922,
-        "y": 1980,
-        "z": "ed7c1675.7a56b",
+        "x": 2976.883331298828,
+        "y": 2009,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "b17cf12.c5b4e9",
-                "375f750c.523c3a"
+                "75800cfe.e64b04",
+                "28895848.af5c18"
             ]
         ]
     },
     {
-        "id": "b17cf12.c5b4e9",
+        "id": "75800cfe.e64b04",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3175,
-        "y": 2014,
-        "z": "ed7c1675.7a56b",
+        "x": 3229.883331298828,
+        "y": 2043,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "b574ded7.ea26d"
+                "34389e65.7f3f0a"
             ]
         ]
     },
     {
-        "id": "375f750c.523c3a",
+        "id": "28895848.af5c18",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3175,
-        "y": 1958,
-        "z": "ed7c1675.7a56b",
+        "x": 3229.883331298828,
+        "y": 1987,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "3eeb971b.8e101"
+                "4c94a377.c6d4e4"
             ]
         ]
     },
     {
-        "id": "b574ded7.ea26d",
+        "id": "34389e65.7f3f0a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3326,
-        "y": 2014,
-        "z": "ed7c1675.7a56b",
+        "x": 3380.883331298828,
+        "y": 2043,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "27c7cf1.51adcb",
+        "id": "ff717106.1f6f7",
         "type": "set",
         "name": "set vpn-bindingA and connectivityA",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",
         "comments": "",
-        "x": 4202,
-        "y": 112,
-        "z": "ed7c1675.7a56b",
+        "x": 4256.883331298828,
+        "y": 141,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "e24e0a9e.a7db8",
+        "id": "98bc8f5e.55646",
         "type": "set",
         "name": "set vpn-bindingB and connectivityB",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",
         "comments": "",
-        "x": 3610,
-        "y": 1571,
-        "z": "ed7c1675.7a56b",
+        "x": 3664.883331298828,
+        "y": 1600,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "6b14e6ca.05c05",
+        "id": "1901ad68.6869bb",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3893,
-        "y": 369,
-        "z": "ed7c1675.7a56b",
+        "x": 3947.883331298828,
+        "y": 398,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "27c7cf1.51adcb",
-                "927e2807.47e1",
-                "51361643.15e97",
-                "7074e291.428a74",
-                "71f8cbde.7b70ec",
-                "41c50446.37f104",
-                "e5881b35.2a2bf8",
-                "ceaa1f2c.697ad"
+                "ff717106.1f6f7",
+                "f11c1dac.45c748",
+                "dc51dde.504a12",
+                "25f0cbb9.ff400c",
+                "c95c33ef.381fa8",
+                "7a0ef184.deb28",
+                "dd4c3392.e1b02",
+                "2a6ffb7c.8797f4"
             ]
         ]
     },
     {
-        "id": "3eeb971b.8e101",
+        "id": "4c94a377.c6d4e4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3326,
-        "y": 1957,
-        "z": "ed7c1675.7a56b",
+        "x": 3380.883331298828,
+        "y": 1986,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "e24e0a9e.a7db8",
-                "881ac3d.2b73cc",
-                "c6f7c9bc.a78ea8",
-                "8f243ad6.97dd38",
-                "f942fe34.857118",
-                "51d22e16.357968",
-                "8caebf31.dc028",
-                "6ccc1a6d.d89cd4"
+                "98bc8f5e.55646",
+                "aa2473a.12d4d9",
+                "dfee532c.a1419",
+                "e52702af.314718",
+                "28a663c6.7433b4",
+                "c984548c.2e537",
+                "88e8f378.a2b808",
+                "1fda4b4a.2131e5"
             ]
         ]
     },
     {
-        "id": "f87bcfd0.50c8c",
+        "id": "d79079df.baf578",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",
         "comments": "",
-        "x": 3564,
-        "y": 2256,
-        "z": "ed7c1675.7a56b",
+        "x": 3618.883331298828,
+        "y": 2285,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "ab6e58b.3c55528",
+        "id": "45ccc628.f5551",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3718,
-        "y": 2304,
-        "z": "ed7c1675.7a56b",
+        "x": 3772.883331298828,
+        "y": 2333,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "eff9a19.776a7e",
-                "ddb717fb.d9a6d8"
+                "6173b4db.203ce4",
+                "7f21396.e7ee248"
             ]
         ]
     },
     {
-        "id": "eff9a19.776a7e",
+        "id": "6173b4db.203ce4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4063.5,
-        "y": 2285,
-        "z": "ed7c1675.7a56b",
+        "x": 4118.383331298828,
+        "y": 2314,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "59a2ea1f.0d3f14"
+                "2b5ddf83.e8a168"
             ]
         ]
     },
     {
-        "id": "ddb717fb.d9a6d8",
+        "id": "7f21396.e7ee248",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4067.5,
-        "y": 2325,
-        "z": "ed7c1675.7a56b",
+        "x": 4122.383331298828,
+        "y": 2354,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "81b55fda.fb8e98"
+                "9fc151.f9cc46b"
             ]
         ]
     },
     {
-        "id": "59a2ea1f.0d3f14",
+        "id": "2b5ddf83.e8a168",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 4221.5,
-        "y": 2285,
-        "z": "ed7c1675.7a56b",
+        "x": 4276.383331298828,
+        "y": 2314,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "81b55fda.fb8e98",
+        "id": "9fc151.f9cc46b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4225,
-        "y": 2325,
-        "z": "ed7c1675.7a56b",
+        "x": 4279.883331298828,
+        "y": 2354,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "1bcc30a0.546397",
-                "1eaaa262.028326"
+                "ec406c4.a093b1",
+                "ba32c60f.0ec53"
             ]
         ]
     },
     {
-        "id": "1bcc30a0.546397",
+        "id": "ec406c4.a093b1",
         "type": "save",
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4565,
-        "y": 2324,
-        "z": "ed7c1675.7a56b",
+        "x": 4619.883331298828,
+        "y": 2353,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "68a7db89.5a89fc",
+        "id": "650aeaf3.da502c",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 4423,
-        "y": 2282,
-        "z": "ed7c1675.7a56b",
+        "x": 4477.883331298828,
+        "y": 2311,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "1eaaa262.028326",
+        "id": "ba32c60f.0ec53",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4494,
-        "y": 2373,
-        "z": "ed7c1675.7a56b",
+        "x": 4548.883331298828,
+        "y": 2402,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "71f36947.989c9",
+        "id": "c8295377.ff6158",
         "type": "set",
         "name": "set attachment_param (gfp-n) for OTN",
         "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",
         "comments": "",
-        "x": 3119,
-        "y": 640,
-        "z": "ed7c1675.7a56b",
+        "x": 3173.883331298828,
+        "y": 669,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "24508e5.8723172",
+        "id": "17d3b71c.0a74f9",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3714,
-        "y": 326,
-        "z": "ed7c1675.7a56b",
+        "x": 3768.883331298828,
+        "y": 355,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "f3eaab4d.9a827",
+        "id": "12dd212a.e5931f",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3271,
-        "y": 1904,
-        "z": "ed7c1675.7a56b",
+        "x": 3325.883331298828,
+        "y": 1933,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "a3a1c771.fa4dc8",
+        "id": "4b590d33.c81684",
         "type": "switchNode",
         "name": "switch vpn-binding has src-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3450,
-        "y": 488,
-        "z": "ed7c1675.7a56b",
+        "x": 3504.883331298828,
+        "y": 517,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "6921df6d.0bad7",
-                "5859006e.3869c8"
+                "e68f7957.57ea98",
+                "90c8120e.55a8c8"
             ]
         ]
     },
     {
-        "id": "5859006e.3869c8",
+        "id": "90c8120e.55a8c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3692,
-        "y": 1077,
-        "z": "ed7c1675.7a56b",
+        "x": 3746.883331298828,
+        "y": 1106,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "6a1db5bd.d7e224"
+                "5f92c041.e2a22"
             ]
         ]
     },
     {
-        "id": "6921df6d.0bad7",
+        "id": "e68f7957.57ea98",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3686,
-        "y": 368,
-        "z": "ed7c1675.7a56b",
+        "x": 3740.883331298828,
+        "y": 397,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "6b14e6ca.05c05"
+                "1901ad68.6869bb"
             ]
         ]
     },
     {
-        "id": "6a1db5bd.d7e224",
+        "id": "5f92c041.e2a22",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3850,
-        "y": 1076,
-        "z": "ed7c1675.7a56b",
+        "x": 3904.883331298828,
+        "y": 1105,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "e8ac2c73.115cc",
-                "de077050.d3ab3",
-                "d36a1b80.8692c8",
-                "73f78d36.ab931c",
-                "8ec0e69e.0bdfb8",
-                "4004366.ff0b5c8"
+                "eb5cd95b.b46698",
+                "bcb9498.a9205b8",
+                "24e13fd8.afe2d8",
+                "57e5431f.63be4c",
+                "8b688219.8ed198",
+                "9c0b0957.1e6c48"
             ]
         ]
     },
     {
-        "id": "de077050.d3ab3",
+        "id": "bcb9498.a9205b8",
         "type": "set",
         "name": "set attachment_param for OTN G",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",
         "comments": "",
-        "x": 4114,
-        "y": 959,
-        "z": "ed7c1675.7a56b",
+        "x": 4168.883331298828,
+        "y": 988,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "8ec0e69e.0bdfb8",
+        "id": "8b688219.8ed198",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4195,
-        "y": 1274,
-        "z": "ed7c1675.7a56b",
+        "x": 4249.883331298828,
+        "y": 1303,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a8d20b89.8deb88",
-                "ebe8f709.819288"
+                "4ea88210.ceec44",
+                "cd5b1128.4dbb9"
             ]
         ]
     },
     {
-        "id": "a8d20b89.8deb88",
+        "id": "4ea88210.ceec44",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4504.5,
-        "y": 1243,
-        "z": "ed7c1675.7a56b",
+        "x": 4559.383331298828,
+        "y": 1272,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f56a0e73.901ac"
+                "9646de5b.fe3c7"
             ]
         ]
     },
     {
-        "id": "ebe8f709.819288",
+        "id": "cd5b1128.4dbb9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4509.5,
-        "y": 1308,
-        "z": "ed7c1675.7a56b",
+        "x": 4564.383331298828,
+        "y": 1337,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "8bcbb353.d66038"
+                "55735b11.27f424"
             ]
         ]
     },
     {
-        "id": "f56a0e73.901ac",
+        "id": "9646de5b.fe3c7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4680.5,
-        "y": 1243,
-        "z": "ed7c1675.7a56b",
+        "x": 4735.383331298828,
+        "y": 1272,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "8bcbb353.d66038",
+        "id": "55735b11.27f424",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4676,
-        "y": 1308,
-        "z": "ed7c1675.7a56b",
+        "x": 4730.883331298828,
+        "y": 1337,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "d36a1b80.8692c8",
+        "id": "24e13fd8.afe2d8",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 4052,
-        "y": 1007,
-        "z": "ed7c1675.7a56b",
+        "x": 4106.883331298828,
+        "y": 1036,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "73f78d36.ab931c",
+        "id": "57e5431f.63be4c",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4078,
-        "y": 1124,
-        "z": "ed7c1675.7a56b",
+        "x": 4132.883331298828,
+        "y": 1153,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "e0243648.484bc",
-                "e14aa09.d5d416",
-                "5447b1d0.03a8b"
+                "1d187a80.e65b15",
+                "370c15e3.9b5fca",
+                "703dc49a.960884"
             ]
         ]
     },
     {
-        "id": "e0243648.484bc",
+        "id": "1d187a80.e65b15",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4273.5001220703125,
-        "y": 1076,
-        "z": "ed7c1675.7a56b",
+        "x": 4328.383453369141,
+        "y": 1105,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "94135ed.07ea02"
+                "5c6509dd.e3a81"
             ]
         ]
     },
     {
-        "id": "e14aa09.d5d416",
+        "id": "370c15e3.9b5fca",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4265.5001220703125,
-        "y": 1131,
-        "z": "ed7c1675.7a56b",
+        "x": 4320.383453369141,
+        "y": 1160,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "1628394b.83cd8f"
+                "ccfe239.f2e7de"
             ]
         ]
     },
     {
-        "id": "94135ed.07ea02",
+        "id": "5c6509dd.e3a81",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4417.8824462890625,
-        "y": 1075.6556701660156,
-        "z": "ed7c1675.7a56b",
+        "x": 4472.765777587891,
+        "y": 1104.6556701660156,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "fdedf72e.2dd36"
+                "35d4ca24.cf236e"
             ]
         ]
     },
     {
-        "id": "fdedf72e.2dd36",
+        "id": "35d4ca24.cf236e",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4602,
-        "y": 1074,
-        "z": "ed7c1675.7a56b",
+        "x": 4656.883331298828,
+        "y": 1103,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f99d2e19.85b668"
+                "c8705d75.001f7"
             ]
         ]
     },
     {
-        "id": "f99d2e19.85b668",
+        "id": "c8705d75.001f7",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4797,
-        "y": 1074,
-        "z": "ed7c1675.7a56b",
+        "x": 4851.883331298828,
+        "y": 1103,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "ff4cc7a8.15eb18"
+                "b9376422.2a71"
             ]
         ]
     },
     {
-        "id": "5447b1d0.03a8b",
+        "id": "703dc49a.960884",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4270.5001220703125,
-        "y": 1188,
-        "z": "ed7c1675.7a56b",
+        "x": 4325.383453369141,
+        "y": 1217,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "74603a77.be9d34"
+                "ece92d94.dd0ac"
             ]
         ]
     },
     {
-        "id": "74603a77.be9d34",
+        "id": "ece92d94.dd0ac",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4422.5001220703125,
-        "y": 1189,
-        "z": "ed7c1675.7a56b",
+        "x": 4477.383453369141,
+        "y": 1218,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "1628394b.83cd8f",
+        "id": "ccfe239.f2e7de",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4433.5001220703125,
-        "y": 1132,
-        "z": "ed7c1675.7a56b",
+        "x": 4488.383453369141,
+        "y": 1161,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "e8ac2c73.115cc",
+        "id": "eb5cd95b.b46698",
         "type": "set",
         "name": "set vpn-bindingG and connectivityG",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",
         "comments": "",
-        "x": 4109,
-        "y": 899,
-        "z": "ed7c1675.7a56b",
+        "x": 4163.883331298828,
+        "y": 928,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "ff4cc7a8.15eb18",
+        "id": "b9376422.2a71",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5000,
-        "y": 1078,
-        "z": "ed7c1675.7a56b",
+        "x": 5054.883331298828,
+        "y": 1107,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "8469558b.e4d748"
+                "d2480516.2fc378"
             ]
         ]
     },
     {
-        "id": "cf8a4c78.37fe58",
+        "id": "9cb817ae.cef538",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5385,
-        "y": 1091,
-        "z": "ed7c1675.7a56b",
+        "x": 5439.883331298828,
+        "y": 1120,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "44cef850.3e64a",
-                "9337c3a8.6f7408",
-                "6a44b1b.7cb45d"
+                "a79825bb.dff1f8",
+                "1395d5f.298062a",
+                "7903ca2c.aa5cc4"
             ]
         ]
     },
     {
-        "id": "8469558b.e4d748",
+        "id": "d2480516.2fc378",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5179,
-        "y": 1078,
-        "z": "ed7c1675.7a56b",
+        "x": 5233.883331298828,
+        "y": 1107,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "82428162.54c128",
-                "cf8a4c78.37fe58"
+                "fbf9e6b6.15b5c",
+                "9cb817ae.cef538"
             ]
         ]
     },
     {
-        "id": "82428162.54c128",
+        "id": "fbf9e6b6.15b5c",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5415,
-        "y": 1039,
-        "z": "ed7c1675.7a56b",
+        "x": 5469.883331298828,
+        "y": 1068,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "44cef850.3e64a",
+        "id": "a79825bb.dff1f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5595,
-        "y": 1082,
-        "z": "ed7c1675.7a56b",
+        "x": 5649.883331298828,
+        "y": 1111,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "ffb7eeb1.dda348"
+                "c7dce557.6dded"
             ]
         ]
     },
     {
-        "id": "9337c3a8.6f7408",
+        "id": "1395d5f.298062a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5587,
-        "y": 1137,
-        "z": "ed7c1675.7a56b",
+        "x": 5641.883331298828,
+        "y": 1166,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "28235dd8.9620aa"
+                "598e647b.5837b4"
             ]
         ]
     },
     {
-        "id": "6a44b1b.7cb45d",
+        "id": "7903ca2c.aa5cc4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5592,
-        "y": 1194,
-        "z": "ed7c1675.7a56b",
+        "x": 5646.883331298828,
+        "y": 1223,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a95b4d04.8ebfb"
+                "e6c7a6e7.b2f038"
             ]
         ]
     },
     {
-        "id": "a95b4d04.8ebfb",
+        "id": "e6c7a6e7.b2f038",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5744,
-        "y": 1195,
-        "z": "ed7c1675.7a56b",
+        "x": 5798.883331298828,
+        "y": 1224,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "28235dd8.9620aa",
+        "id": "598e647b.5837b4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5755,
-        "y": 1140,
-        "z": "ed7c1675.7a56b",
+        "x": 5809.883331298828,
+        "y": 1169,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "ffb7eeb1.dda348",
+        "id": "c7dce557.6dded",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5739.38232421875,
-        "y": 1079.6556701660156,
-        "z": "ed7c1675.7a56b",
+        "x": 5794.265655517578,
+        "y": 1108.6556701660156,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "eb1ea22e.dc12c"
+                "2cfbc0b6.6ae748"
             ]
         ]
     },
     {
-        "id": "eb1ea22e.dc12c",
+        "id": "2cfbc0b6.6ae748",
         "type": "set",
         "name": "set controller domainG data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5954,
-        "y": 1076,
-        "z": "ed7c1675.7a56b",
+        "x": 6008.883331298828,
+        "y": 1105,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "47e1e7c7.6cadf",
+        "id": "fca9cd7.3028eb",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3728,
-        "y": 1017,
-        "z": "ed7c1675.7a56b",
+        "x": 3782.883331298828,
+        "y": 1046,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "b3842f71.731b38",
+        "id": "2c3b3231.83c2be",
         "type": "switchNode",
         "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",
         "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2290,
-        "y": 744,
-        "z": "ed7c1675.7a56b",
+        "x": 2344.883331298828,
+        "y": 773,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "fe4cd4cf.21da1",
-                "8d3265c3.ddab38"
+                "81a947d8.a13a68",
+                "b480f4ae.d59fb8"
             ]
         ]
     },
     {
-        "id": "8d3265c3.ddab38",
+        "id": "b480f4ae.d59fb8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2697,
-        "y": 762,
-        "z": "ed7c1675.7a56b",
+        "x": 2751.883331298828,
+        "y": 791,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "418df61.fe2be08"
+                "23d2aee5.d5b2fa"
             ]
         ]
     },
     {
-        "id": "fe4cd4cf.21da1",
+        "id": "81a947d8.a13a68",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2697,
-        "y": 707,
-        "z": "ed7c1675.7a56b",
+        "x": 2751.883331298828,
+        "y": 736,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "8b0dea0b.e78e98"
+                "773948cf.a686e8"
             ]
         ]
     },
     {
-        "id": "8b0dea0b.e78e98",
+        "id": "773948cf.a686e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2853,
-        "y": 705,
-        "z": "ed7c1675.7a56b",
+        "x": 2907.883331298828,
+        "y": 734,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "71f36947.989c9",
-                "4573661e.19551"
+                "c8295377.ff6158",
+                "c7d66e95.fb47e"
             ]
         ]
     },
     {
-        "id": "418df61.fe2be08",
+        "id": "23d2aee5.d5b2fa",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2830,
-        "y": 763,
-        "z": "ed7c1675.7a56b",
+        "x": 2884.883331298828,
+        "y": 792,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "5c62cbf5.952894",
+        "id": "7714415.bcb45c",
         "type": "set",
         "name": "unset tmp.aai.all-vpn-bindings",
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",
         "comments": "",
-        "x": 1007,
-        "y": 179,
-        "z": "ed7c1675.7a56b",
+        "x": 1061.8833312988281,
+        "y": 208,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "a7fd19a0.011a5",
+        "id": "79981366.647454",
         "type": "comment",
         "name": "CLL new",
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
         "comments": "",
-        "x": 4124,
-        "y": 597,
-        "z": "ed7c1675.7a56b",
+        "x": 4178.883331298828,
+        "y": 626,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "41c50446.37f104",
+        "id": "7a0ef184.deb28",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaf-tunnels-list[$leaftunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`leaf-tunnels-list[$leaftunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`leaf-tunnels-list_length`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4184,
-        "y": 636,
-        "z": "ed7c1675.7a56b",
+        "x": 4238.883331298828,
+        "y": 665,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "4957906b.cb3908",
+        "id": "2cf2ff05.5ecb98",
         "type": "set",
         "name": "unset leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaf-tunnels-list.`' value='' />\n<parameter name='`leaf-tunnels-list_length`' value='0' />\n<parameter name='`leaftunsidx`' value='0' />\n",
         "comments": "",
-        "x": 1000,
-        "y": 87,
-        "z": "ed7c1675.7a56b",
+        "x": 1054.8833312988281,
+        "y": 116,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "5277b309.13aef4",
+        "id": "7871357e.92d2f4",
         "type": "comment",
         "name": "CLL new",
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
         "comments": "",
-        "x": 3536,
-        "y": 2113,
-        "z": "ed7c1675.7a56b",
+        "x": 3590.883331298828,
+        "y": 2142,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "51d22e16.357968",
+        "id": "c984548c.2e537",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`root-tunnels-list[$roottunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`root-tunnels-list[$roottunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`root-tunnels-list_length`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3592,
-        "y": 2162,
-        "z": "ed7c1675.7a56b",
+        "x": 3646.883331298828,
+        "y": 2191,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "8191f581.e3e888",
+        "id": "efee660.b5b7f18",
         "type": "set",
         "name": "unset root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`root-tunnels-list.`' value='' />\n<parameter name='`root-tunnels-list_length`' value='0' />\n<parameter name='`roottunsidx`' value='0' />\n",
         "comments": "",
-        "x": 1000,
-        "y": 126,
-        "z": "ed7c1675.7a56b",
+        "x": 1054.8833312988281,
+        "y": 155,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "25a3d5e5.55ea62",
+        "id": "ff64d6f0.1d24e",
         "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": 1031,
-        "y": 227,
-        "z": "ed7c1675.7a56b",
+        "x": 1085.8833312988281,
+        "y": 256,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "624a734b.81957c",
+        "id": "c19ef147.be92d8",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",
         "comments": "",
         "outputs": 1,
-        "x": 241,
-        "y": 702,
-        "z": "ed7c1675.7a56b",
+        "x": 295.8833312988281,
+        "y": 731,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "2ff4bd45.763852",
-                "237ce68a.9b5a2a",
-                "86bae4d8.c51f3"
+                "4acbe821.0c1ff8",
+                "63a107d4.a006c8",
+                "4bb92513.9b1ebc"
             ]
         ]
     },
     {
-        "id": "2ff4bd45.763852",
+        "id": "4acbe821.0c1ff8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 460,
-        "y": 640,
-        "z": "ed7c1675.7a56b",
+        "x": 514.8833312988281,
+        "y": 669,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "2f347c57.a92144"
+                "d6a121aa.ecf888"
             ]
         ]
     },
     {
-        "id": "237ce68a.9b5a2a",
+        "id": "63a107d4.a006c8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 469.490966796875,
-        "y": 682.5740356445312,
-        "z": "ed7c1675.7a56b",
+        "x": 524.3742980957031,
+        "y": 711.5740356445312,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
-            [
-                "196b18f9.87f4a7"
-            ]
+            []
         ]
     },
     {
-        "id": "86bae4d8.c51f3",
+        "id": "4bb92513.9b1ebc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 458,
-        "y": 729,
-        "z": "ed7c1675.7a56b",
+        "x": 512.8833312988281,
+        "y": 758,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "d6f02bd7.9f988"
+                "f58f94a6.d7fb9"
             ]
         ]
     },
     {
-        "id": "2f347c57.a92144",
+        "id": "d6a121aa.ecf888",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 657,
-        "y": 636,
-        "z": "ed7c1675.7a56b",
+        "x": 711.8833312988281,
+        "y": 665,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "408bfafb.b2f244"
+                "46606d75.f5af5c"
             ]
         ]
     },
     {
-        "id": "196b18f9.87f4a7",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return 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": 623.0623779296875,
-        "y": 685.8597717285156,
-        "z": "ed7c1675.7a56b",
-        "wires": []
-    },
-    {
-        "id": "d6f02bd7.9f988",
+        "id": "f58f94a6.d7fb9",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 627,
-        "y": 730,
-        "z": "ed7c1675.7a56b",
+        "x": 681.8833312988281,
+        "y": 759,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "408bfafb.b2f244",
+        "id": "46606d75.f5af5c",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 880.33349609375,
-        "y": 635.9999389648438,
-        "z": "ed7c1675.7a56b",
+        "x": 935.2168273925781,
+        "y": 664.9999389648438,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "7d8f8b2e.4aa30c"
+                "1dffeedd.2e39d1"
             ]
         ]
     },
     {
-        "id": "7d8f8b2e.4aa30c",
+        "id": "1dffeedd.2e39d1",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1081.0001335144043,
-        "y": 637.000020980835,
-        "z": "ed7c1675.7a56b",
+        "x": 1135.8834648132324,
+        "y": 666.000020980835,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "bd2be559.7e491"
+                "5eeac4ab.784bec"
             ]
         ]
     },
     {
-        "id": "bd2be559.7e491",
+        "id": "5eeac4ab.784bec",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 211,
-        "y": 899,
-        "z": "ed7c1675.7a56b",
+        "x": 265.8833312988281,
+        "y": 928,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "97323d62.80248",
-                "afdba634.5389a8",
-                "c784d901.2500c8"
+                "93ffca07.c36c6",
+                "a6155e5c.4a2e4",
+                "edf3ae2.0898ad"
             ]
         ]
     },
     {
-        "id": "97323d62.80248",
+        "id": "93ffca07.c36c6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 419,
-        "y": 863,
-        "z": "ed7c1675.7a56b",
+        "x": 473.8833312988281,
+        "y": 892,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "dc950dad.bba8c8"
+                "41f16b19.4ea28c"
             ]
         ]
     },
     {
-        "id": "afdba634.5389a8",
+        "id": "a6155e5c.4a2e4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 419.490966796875,
-        "y": 908.5740356445312,
-        "z": "ed7c1675.7a56b",
+        "x": 474.3742980957031,
+        "y": 937.5740356445312,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
-            [
-                "f09199a5.a037f"
-            ]
+            []
         ]
     },
     {
-        "id": "c784d901.2500c8",
+        "id": "edf3ae2.0898ad",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 417,
-        "y": 952,
-        "z": "ed7c1675.7a56b",
+        "x": 471.8833312988281,
+        "y": 981,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a903bba8.c7f45"
+                "77488207.b4a2f4"
             ]
         ]
     },
     {
-        "id": "f09199a5.a037f",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return 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": 582.0623779296875,
-        "y": 908.8597717285156,
-        "z": "ed7c1675.7a56b",
-        "wires": []
-    },
-    {
-        "id": "a903bba8.c7f45",
+        "id": "77488207.b4a2f4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 586,
-        "y": 953,
-        "z": "ed7c1675.7a56b",
+        "x": 640.8833312988281,
+        "y": 982,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "c4e5acdc.5eea4",
+        "id": "1853bc71.11bc54",
         "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": 558,
-        "y": 1447,
-        "z": "ed7c1675.7a56b",
+        "x": 612.8833312988281,
+        "y": 1476,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f2e2cc22.a529f"
+                "aa99b60e.a0ae8"
             ]
         ]
     },
     {
-        "id": "f2e2cc22.a529f",
+        "id": "aa99b60e.a0ae8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 761,
-        "y": 1459,
-        "z": "ed7c1675.7a56b",
+        "x": 815.8833312988281,
+        "y": 1488,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "c09b72f6.aeae98"
+                "6b5b67d6.d9cff8"
             ]
         ]
     },
     {
-        "id": "c09b72f6.aeae98",
+        "id": "6b5b67d6.d9cff8",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 927,
-        "y": 1456,
-        "z": "ed7c1675.7a56b",
+        "x": 981.8833312988281,
+        "y": 1485,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "bfe2cfaf.5416a"
+                "c9be5883.2f43"
             ]
         ]
     },
     {
-        "id": "bfe2cfaf.5416a",
+        "id": "c9be5883.2f43",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1088,
-        "y": 1453,
-        "z": "ed7c1675.7a56b",
+        "x": 1142.8833312988281,
+        "y": 1482,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "ed44bd0b.bb6278",
-                "85af841c.633c5",
-                "785dd3f1.f249ac",
-                "b8d52cff.f0dcb",
-                "4915b2e4.5fd2dc"
+                "8328946b.83ccf",
+                "70436354.fbd2a4",
+                "71db6bb7.f92dd4",
+                "a3af61e2.8efbd8",
+                "1dbcecbe.b5c9a3"
             ]
         ]
     },
     {
-        "id": "85af841c.633c5",
+        "id": "70436354.fbd2a4",
         "type": "set",
         "name": "unset tmp.aai.uni",
         "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
         "comments": "",
-        "x": 1292,
-        "y": 1411,
-        "z": "ed7c1675.7a56b",
+        "x": 1346.8833312988281,
+        "y": 1440,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "ed44bd0b.bb6278",
+        "id": "8328946b.83ccf",
         "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.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1289,
-        "y": 1456,
-        "z": "ed7c1675.7a56b",
+        "x": 1343.8833312988281,
+        "y": 1485,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "6b32d7eb.72211",
-                "7343128c.f923b4",
-                "b9b05d3.e5ae12"
+                "95cc35e2.dbd57",
+                "6243e8b2.6e7d68",
+                "ea238384.cd0de8"
             ]
         ]
     },
     {
-        "id": "7343128c.f923b4",
+        "id": "6243e8b2.6e7d68",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1484.490966796875,
-        "y": 1429.573974609375,
-        "z": "ed7c1675.7a56b",
+        "x": 1539.3742980957031,
+        "y": 1458.573974609375,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "5dcee0f6.9162a8"
+                "60cc7ad4.175214"
             ]
         ]
     },
     {
-        "id": "b9b05d3.e5ae12",
+        "id": "ea238384.cd0de8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1480,
-        "y": 1473.9999389648438,
-        "z": "ed7c1675.7a56b",
+        "x": 1534.8833312988281,
+        "y": 1502.9999389648438,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "b7ed6a74.25237"
+                "33a586e8.574ea2"
             ]
         ]
     },
     {
-        "id": "5dcee0f6.9162a8",
+        "id": "60cc7ad4.175214",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1647.0625,
-        "y": 1428.8596801757812,
-        "z": "ed7c1675.7a56b",
+        "x": 1701.9458312988281,
+        "y": 1457.8596801757812,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "b7ed6a74.25237",
+        "id": "33a586e8.574ea2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1648,
-        "y": 1473.9999389648438,
-        "z": "ed7c1675.7a56b",
+        "x": 1702.8833312988281,
+        "y": 1502.9999389648438,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "dfdfa822.c47e1",
+        "id": "3ed2826e.143bbe",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1650,
-        "y": 1520.9999389648438,
-        "z": "ed7c1675.7a56b",
+        "x": 1704.8833312988281,
+        "y": 1549.9999389648438,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "6b32d7eb.72211",
+        "id": "95cc35e2.dbd57",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1481,
-        "y": 1520.9999389648438,
-        "z": "ed7c1675.7a56b",
+        "x": 1535.8833312988281,
+        "y": 1549.9999389648438,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "dfdfa822.c47e1"
+                "3ed2826e.143bbe"
             ]
         ]
     },
     {
-        "id": "9ed7a6be.5472c",
+        "id": "a3b35ff6.7d4a88",
         "type": "switchNode",
         "name": "switch conn type",
         "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 170.5,
-        "y": 1118,
-        "z": "ed7c1675.7a56b",
+        "x": 225.38333129882812,
+        "y": 1147,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "3e9a846b.aac024",
-                "fd2eac9f.aa3be8",
-                "81d85b97.ec18c"
+                "53e42336.cf6874",
+                "64e5ac9.b8c59d4",
+                "29d673d9.3ef8bc"
             ]
         ]
     },
     {
-        "id": "3d4d11fc.e19976",
+        "id": "fdb5b362.28d2e8",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 281.5,
-        "y": 1474,
-        "z": "ed7c1675.7a56b",
+        "x": 336.3833312988281,
+        "y": 1503,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "3e9a846b.aac024",
+        "id": "53e42336.cf6874",
         "type": "outcome",
         "name": "leaf",
         "xml": "<outcome value='leaf'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 156.5,
-        "y": 1364,
-        "z": "ed7c1675.7a56b",
+        "x": 211.38333129882812,
+        "y": 1393,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "186f4361.0093b5"
+                "2d911faf.b625f"
             ]
         ]
     },
     {
-        "id": "fd2eac9f.aa3be8",
+        "id": "64e5ac9.b8c59d4",
         "type": "outcome",
         "name": "root",
         "xml": "<outcome value='root'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 157.5,
-        "y": 1422,
-        "z": "ed7c1675.7a56b",
+        "x": 212.38333129882812,
+        "y": 1451,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a8f57470.dafb1"
+                "c8a49fba.48732"
             ]
         ]
     },
     {
-        "id": "81d85b97.ec18c",
+        "id": "29d673d9.3ef8bc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 159.5,
-        "y": 1476,
-        "z": "ed7c1675.7a56b",
+        "x": 214.38333129882812,
+        "y": 1505,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "3d4d11fc.e19976"
+                "fdb5b362.28d2e8"
             ]
         ]
     },
     {
-        "id": "17f45567.72d3f3",
+        "id": "893647bf.8d35f8",
         "type": "comment",
         "name": "CLL new",
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
         "comments": "",
-        "x": 1265,
-        "y": 1684,
-        "z": "ed7c1675.7a56b",
+        "x": 1319.8833312988281,
+        "y": 1713,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "785dd3f1.f249ac",
+        "id": "71db6bb7.f92dd4",
         "type": "set",
         "name": "set ethernet-srv-end-points-list array",
         "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1356,
-        "y": 1738,
-        "z": "ed7c1675.7a56b",
+        "x": 1410.8833312988281,
+        "y": 1767,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "a8f57470.dafb1",
+        "id": "c8a49fba.48732",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 273.5,
-        "y": 1418,
-        "z": "ed7c1675.7a56b",
+        "x": 328.3833312988281,
+        "y": 1447,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "6d0b5941.55c8f8",
-                "c4e5acdc.5eea4",
-                "3e47dbd3.f7afc4",
-                "c378a6a3.2e4c8",
-                "901c32b.8d67fd",
-                "d142c0f2.700e98",
-                "b2e88ff.3380b7",
-                "3026fc23.0fd5f4",
-                "f24a5646.1c02c8",
-                "db09832f.86c758",
-                "3c14b8ea.b96268",
-                "c7cb304b.f39168"
+                "c9ed31d4.2a59a",
+                "1853bc71.11bc54",
+                "e2c4a442.f42cf",
+                "7b94a56a.0cc0c4",
+                "14d69ea3.c37079",
+                "e39ba7bd.aed5d8",
+                "9e9fd2d9.fce4a8",
+                "3e44ba6b.3875e6",
+                "de368aef.16cb",
+                "61a182f0.95ec2c",
+                "fae7aeca.a940b8",
+                "f92bafd0.7c69c8"
             ]
         ]
     },
     {
-        "id": "186f4361.0093b5",
+        "id": "2d911faf.b625f",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 286.5,
-        "y": 1360,
-        "z": "ed7c1675.7a56b",
+        "x": 341.3833312988281,
+        "y": 1389,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "c4e5acdc.5eea4",
-                "b5d90017.45ce98",
-                "913d2a70.ccfd3",
-                "c378a6a3.2e4c8",
-                "901c32b.8d67fd",
-                "d142c0f2.700e98",
-                "b2e88ff.3380b7",
-                "3026fc23.0fd5f4",
-                "f24a5646.1c02c8",
-                "db09832f.86c758",
-                "3c14b8ea.b96268",
-                "c7cb304b.f39168"
+                "1853bc71.11bc54",
+                "30a75a3e.13e116",
+                "878444f9.a47b7",
+                "7b94a56a.0cc0c4",
+                "14d69ea3.c37079",
+                "e39ba7bd.aed5d8",
+                "9e9fd2d9.fce4a8",
+                "3e44ba6b.3875e6",
+                "de368aef.16cb",
+                "61a182f0.95ec2c",
+                "fae7aeca.a940b8",
+                "f92bafd0.7c69c8"
             ]
         ]
     },
     {
-        "id": "b5d90017.45ce98",
+        "id": "30a75a3e.13e116",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 577.5,
-        "y": 1240,
-        "z": "ed7c1675.7a56b",
+        "x": 632.3833312988281,
+        "y": 1269,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "6d0b5941.55c8f8",
+        "id": "c9ed31d4.2a59a",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 594.5,
-        "y": 1334,
-        "z": "ed7c1675.7a56b",
+        "x": 649.3833312988281,
+        "y": 1363,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "c378a6a3.2e4c8",
+        "id": "7b94a56a.0cc0c4",
         "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": 521,
-        "y": 1703,
-        "z": "ed7c1675.7a56b",
+        "x": 575.8833312988281,
+        "y": 1732,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "3613e1a4.3cd206"
+                "bd67d795.2e839"
             ]
         ]
     },
     {
-        "id": "3613e1a4.3cd206",
+        "id": "bd67d795.2e839",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 753,
-        "y": 1702,
-        "z": "ed7c1675.7a56b",
+        "x": 807.8833312988281,
+        "y": 1731,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "c46d21fc.7c5088"
+                "148b77ab.48b7a"
             ]
         ]
     },
     {
-        "id": "c46d21fc.7c5088",
+        "id": "148b77ab.48b7a",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 965,
-        "y": 1703,
-        "z": "ed7c1675.7a56b",
+        "x": 1019.8833312988281,
+        "y": 1732,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "41d3d62e.c810a8"
+                "90ccd6ae.a26198"
             ]
         ]
     },
     {
-        "id": "41d3d62e.c810a8",
+        "id": "90ccd6ae.a26198",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 221,
-        "y": 1859,
-        "z": "ed7c1675.7a56b",
+        "x": 275.8833312988281,
+        "y": 1888,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "24bb38a6.cf0a88",
-                "80203aa0.6c8a6"
+                "8f4c1c14.35a72",
+                "c6a7aee9.6724"
             ]
         ]
     },
     {
-        "id": "80203aa0.6c8a6",
+        "id": "c6a7aee9.6724",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 456,
-        "y": 1846,
-        "z": "ed7c1675.7a56b",
+        "x": 510.8833312988281,
+        "y": 1875,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "24bb38a6.cf0a88",
+        "id": "8f4c1c14.35a72",
         "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": 446,
-        "y": 1907,
-        "z": "ed7c1675.7a56b",
+        "x": 500.8833312988281,
+        "y": 1936,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "e7df9a86.a02dd8",
-                "d754cb82.42f37",
-                "80509f91.59bce8"
+                "2e648939.1db066",
+                "6fc34533.3f02e4",
+                "f4ca0a98.2172d"
             ]
         ]
     },
     {
-        "id": "d754cb82.42f37",
+        "id": "6fc34533.3f02e4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 659.490966796875,
-        "y": 1891.5740356445312,
-        "z": "ed7c1675.7a56b",
+        "x": 714.3742980957031,
+        "y": 1920.5740356445312,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "31b91fbf.39fff8"
+                "24a8c225.12e4ae"
             ]
         ]
     },
     {
-        "id": "80509f91.59bce8",
+        "id": "f4ca0a98.2172d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 655,
-        "y": 1936,
-        "z": "ed7c1675.7a56b",
+        "x": 709.8833312988281,
+        "y": 1965,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "312541a.87b29be"
+                "a2a9b29c.7bdb18"
             ]
         ]
     },
     {
-        "id": "e7df9a86.a02dd8",
+        "id": "2e648939.1db066",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 657,
-        "y": 1996,
-        "z": "ed7c1675.7a56b",
+        "x": 711.8833312988281,
+        "y": 2025,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f19203b2.563a88"
+                "6e035263.0ab9c4"
             ]
         ]
     },
     {
-        "id": "31b91fbf.39fff8",
+        "id": "24a8c225.12e4ae",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 822.0625,
-        "y": 1890.8597412109375,
-        "z": "ed7c1675.7a56b",
+        "x": 876.9458312988281,
+        "y": 1919.8597412109375,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "312541a.87b29be",
+        "id": "a2a9b29c.7bdb18",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 823,
-        "y": 1936,
-        "z": "ed7c1675.7a56b",
+        "x": 877.8833312988281,
+        "y": 1965,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "f19203b2.563a88",
+        "id": "6e035263.0ab9c4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 826,
-        "y": 1995,
-        "z": "ed7c1675.7a56b",
+        "x": 880.8833312988281,
+        "y": 2024,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "70164d90.2f08c4",
-                "27824a25.86f05e"
+                "fc704734.f5a92",
+                "534cefd0.094168"
             ]
         ]
     },
     {
-        "id": "b2e88ff.3380b7",
+        "id": "9e9fd2d9.fce4a8",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",
         "comments": "",
-        "x": 225,
-        "y": 2494,
-        "z": "ed7c1675.7a56b",
+        "x": 279.8833312988281,
+        "y": 2523,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "3026fc23.0fd5f4",
+        "id": "3e44ba6b.3875e6",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 368,
-        "y": 2554,
-        "z": "ed7c1675.7a56b",
+        "x": 422.8833312988281,
+        "y": 2583,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a9d1707f.7a88c8",
-                "8ab460b7.633638"
+                "b4c4bd8d.d5bdc",
+                "c813638c.89d0f"
             ]
         ]
     },
     {
-        "id": "a9d1707f.7a88c8",
+        "id": "b4c4bd8d.d5bdc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 680.5,
-        "y": 2531,
-        "z": "ed7c1675.7a56b",
+        "x": 735.3833312988281,
+        "y": 2560,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "8ab460b7.633638",
+        "id": "c813638c.89d0f",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 684.5,
-        "y": 2571,
-        "z": "ed7c1675.7a56b",
+        "x": 739.3833312988281,
+        "y": 2600,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "7ddc0654.bb96f8"
+                "3e668730.81c5e8"
             ]
         ]
     },
     {
-        "id": "a1d8045c.1b61e8",
+        "id": "1c6aee6c.a3a53a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 860.5,
-        "y": 2535,
-        "z": "ed7c1675.7a56b",
+        "x": 915.3833312988281,
+        "y": 2564,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "7ddc0654.bb96f8",
+        "id": "3e668730.81c5e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 876,
-        "y": 2589,
-        "z": "ed7c1675.7a56b",
+        "x": 930.8833312988281,
+        "y": 2618,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "1eddd66c.da478a"
+                "e6168d7c.f871d"
             ]
         ]
     },
     {
-        "id": "cee3e55d.189dc",
+        "id": "59cef6d7.b8a21",
         "type": "save",
         "name": "update vpn-binding 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.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1171.5,
-        "y": 2558,
-        "z": "ed7c1675.7a56b",
+        "x": 1226.3833312988281,
+        "y": 2587,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "bb915427.f0582",
+        "id": "b5303ab1.d78928",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 2638.5,
-        "y": 1909,
-        "z": "ed7c1675.7a56b",
+        "x": 2693.383331298828,
+        "y": 1938,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "1eddd66c.da478a",
+        "id": "e6168d7c.f871d",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1133.5,
-        "y": 2600,
-        "z": "ed7c1675.7a56b",
+        "x": 1188.3833312988281,
+        "y": 2629,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "913d2a70.ccfd3",
+        "id": "878444f9.a47b7",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
         "comments": "",
-        "x": 543.5,
-        "y": 1278,
-        "z": "ed7c1675.7a56b",
+        "x": 598.3833312988281,
+        "y": 1307,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "3e47dbd3.f7afc4",
+        "id": "e2c4a442.f42cf",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
         "comments": "",
-        "x": 556.5,
-        "y": 1374,
-        "z": "ed7c1675.7a56b",
+        "x": 611.3833312988281,
+        "y": 1403,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "e5881b35.2a2bf8",
+        "id": "dd4c3392.e1b02",
         "type": "save",
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4293,
-        "y": 550,
-        "z": "ed7c1675.7a56b",
+        "x": 4347.883331298828,
+        "y": 579,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "4004366.ff0b5c8",
+        "id": "9c0b0957.1e6c48",
         "type": "save",
         "name": "update vpn-binding G resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingG.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingG.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4196,
-        "y": 1369,
-        "z": "ed7c1675.7a56b",
+        "x": 4250.883331298828,
+        "y": 1398,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "8caebf31.dc028",
+        "id": "88e8f378.a2b808",
         "type": "save",
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3690,
-        "y": 2041,
-        "z": "ed7c1675.7a56b",
+        "x": 3744.883331298828,
+        "y": 2070,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "dc950dad.bba8c8",
+        "id": "41f16b19.4ea28c",
         "type": "switchNode",
         "name": "switch connectivity is not already Activated (i.e. is either Created or Modified)",
         "xml": "<switch test=\"`$tmp.aai.connectivity.operational-status != 'Activated' `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 791,
-        "y": 849,
-        "z": "ed7c1675.7a56b",
+        "x": 845.8833312988281,
+        "y": 878,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "28d7875f.122df",
-                "47ffeb93.7b808c"
+                "7bf4aa70.c75d74",
+                "a798281b.2c68d8"
             ]
         ]
     },
     {
-        "id": "28d7875f.122df",
+        "id": "7bf4aa70.c75d74",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1154,
-        "y": 872,
-        "z": "ed7c1675.7a56b",
+        "x": 1208.8833312988281,
+        "y": 901,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f3fb6a94.133bb"
+                "e5a55559.f1ecf"
             ]
         ]
     },
     {
-        "id": "47ffeb93.7b808c",
+        "id": "a798281b.2c68d8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1154,
-        "y": 821,
-        "z": "ed7c1675.7a56b",
+        "x": 1208.8833312988281,
+        "y": 850,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "3da0dc2.736e6a4"
+                "486913c4.08fb54"
             ]
         ]
     },
     {
-        "id": "f3fb6a94.133bb",
+        "id": "e5a55559.f1ecf",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1310,
-        "y": 870,
-        "z": "ed7c1675.7a56b",
+        "x": 1364.8833312988281,
+        "y": 899,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "9ed7a6be.5472c"
+                "a3b35ff6.7d4a88"
             ]
         ]
     },
     {
-        "id": "3da0dc2.736e6a4",
+        "id": "486913c4.08fb54",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1287,
-        "y": 822,
-        "z": "ed7c1675.7a56b",
+        "x": 1341.8833312988281,
+        "y": 851,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "ca01ca51.23bb98",
+        "id": "4660bf61.473a18",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
         "comments": "",
-        "x": 2047,
-        "y": 220,
-        "z": "ed7c1675.7a56b",
+        "x": 2101.883331298828,
+        "y": 249,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "6ccc1a6d.d89cd4",
+        "id": "1fda4b4a.2131e5",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3589,
-        "y": 2201,
-        "z": "ed7c1675.7a56b",
+        "x": 3643.883331298828,
+        "y": 2230,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "ceaa1f2c.697ad",
+        "id": "2a6ffb7c.8797f4",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4179,
-        "y": 674,
-        "z": "ed7c1675.7a56b",
+        "x": 4233.883331298828,
+        "y": 703,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "b8d52cff.f0dcb",
+        "id": "a3af61e2.8efbd8",
         "type": "set",
         "name": "set ethernet-srv-end-points-list array",
         "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1353,
-        "y": 1780,
-        "z": "ed7c1675.7a56b",
+        "x": 1407.8833312988281,
+        "y": 1809,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "901c32b.8d67fd",
+        "id": "14d69ea3.c37079",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
         "comments": "",
-        "x": 532,
-        "y": 1514,
-        "z": "ed7c1675.7a56b",
+        "x": 586.8833312988281,
+        "y": 1543,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "d142c0f2.700e98",
+        "id": "e39ba7bd.aed5d8",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenameclleths`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 563,
-        "y": 1554,
-        "z": "ed7c1675.7a56b",
+        "x": 617.8833312988281,
+        "y": 1583,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "70164d90.2f08c4",
+        "id": "fc704734.f5a92",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1111,
-        "y": 1962,
-        "z": "ed7c1675.7a56b",
+        "x": 1165.8833312988281,
+        "y": 1991,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "27824a25.86f05e",
+        "id": "534cefd0.094168",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1114,
-        "y": 2004,
-        "z": "ed7c1675.7a56b",
+        "x": 1168.8833312988281,
+        "y": 2033,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "f24a5646.1c02c8",
+        "id": "de368aef.16cb",
         "type": "set",
         "name": "unset otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otn-tunnels-name-list.`' value='' />\n<parameter name='`otn-tunnels-name-list_length`' value='0' />\n<parameter name='`otntunsidx`' value='0' />\n",
         "comments": "",
-        "x": 557,
-        "y": 1644,
-        "z": "ed7c1675.7a56b",
+        "x": 611.8833312988281,
+        "y": 1673,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "db09832f.86c758",
+        "id": "61a182f0.95ec2c",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
         "comments": "",
-        "x": 312,
-        "y": 2023,
-        "z": "ed7c1675.7a56b",
+        "x": 366.8833312988281,
+        "y": 2052,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "3c14b8ea.b96268",
+        "id": "fae7aeca.a940b8",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamecllotns`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 320,
-        "y": 2080,
-        "z": "ed7c1675.7a56b",
+        "x": 374.8833312988281,
+        "y": 2109,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "4915b2e4.5fd2dc",
+        "id": "1dbcecbe.b5c9a3",
         "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.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1331,
-        "y": 1629,
-        "z": "ed7c1675.7a56b",
+        "x": 1385.8833312988281,
+        "y": 1658,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "bfcf3bba.b5daa",
-                "9b18409e.c203c8"
+                "2facd73.aebb428",
+                "7c34f1f3.22e088"
             ]
         ]
     },
     {
-        "id": "9b18409e.c203c8",
+        "id": "7c34f1f3.22e088",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1554,
-        "y": 1584,
-        "z": "ed7c1675.7a56b",
+        "x": 1608.8833312988281,
+        "y": 1613,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "5afaf397.e20c3c"
+                "7e28ac3f.b53f7c"
             ]
         ]
     },
     {
-        "id": "bfcf3bba.b5daa",
+        "id": "2facd73.aebb428",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1556,
-        "y": 1648,
-        "z": "ed7c1675.7a56b",
+        "x": 1610.8833312988281,
+        "y": 1677,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f7de9867.a0fd38"
+                "c1661a7d.0e642"
             ]
         ]
     },
     {
-        "id": "5afaf397.e20c3c",
+        "id": "7e28ac3f.b53f7c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1719,
-        "y": 1581,
-        "z": "ed7c1675.7a56b",
+        "x": 1773.8833312988281,
+        "y": 1610,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "cdcfe3c8.962368"
+                "a55c6cbe.f3cef"
             ]
         ]
     },
     {
-        "id": "f7de9867.a0fd38",
+        "id": "c1661a7d.0e642",
         "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": 1718,
-        "y": 1644,
-        "z": "ed7c1675.7a56b",
+        "x": 1772.8833312988281,
+        "y": 1673,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "cdcfe3c8.962368",
+        "id": "a55c6cbe.f3cef",
         "type": "set",
         "name": "set tmp.uni-node-id-short",
         "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -3]`' />\n",
         "comments": "",
-        "x": 1939,
-        "y": 1595,
-        "z": "ed7c1675.7a56b",
+        "x": 1993.8833312988281,
+        "y": 1624,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "6d07bcb7.ffff34",
+        "id": "a3eb9377.85c18",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1484,
-        "y": 2320,
-        "z": "ed7c1675.7a56b",
+        "x": 1538.8833312988281,
+        "y": 2349,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "9547fb43.8165f"
+                "fcb0361d.62eb48"
             ]
         ]
     },
     {
-        "id": "261f721d.19cda6",
+        "id": "dcd8db20.d12b7",
         "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.domainConn.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 1869,
-        "y": 2333,
-        "z": "ed7c1675.7a56b",
+        "x": 1923.8833312988281,
+        "y": 2362,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a4fad359.d63e7",
-                "d7202a06.97a2a8",
-                "d2a1d22e.b2ed6"
+                "62f93408.d79154",
+                "c38cc9d8.7f1bc",
+                "576ffe09.c4abd8"
             ]
         ]
     },
     {
-        "id": "9547fb43.8165f",
+        "id": "fcb0361d.62eb48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1663,
-        "y": 2320,
-        "z": "ed7c1675.7a56b",
+        "x": 1717.8833312988281,
+        "y": 2349,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "9b0cdae9.5834e8",
-                "261f721d.19cda6"
+                "90857791.e16908",
+                "dcd8db20.d12b7"
             ]
         ]
     },
     {
-        "id": "9b0cdae9.5834e8",
+        "id": "90857791.e16908",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainConn id",
         "xml": "<set>\n<parameter name='tmp.domainConn.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 1899,
-        "y": 2281,
-        "z": "ed7c1675.7a56b",
+        "x": 1953.8833312988281,
+        "y": 2310,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "a4fad359.d63e7",
+        "id": "62f93408.d79154",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2079,
-        "y": 2324,
-        "z": "ed7c1675.7a56b",
+        "x": 2133.883331298828,
+        "y": 2353,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "ce2ed097.248ac"
+                "2c548a06.655d4e"
             ]
         ]
     },
     {
-        "id": "d7202a06.97a2a8",
+        "id": "c38cc9d8.7f1bc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2071,
-        "y": 2379,
-        "z": "ed7c1675.7a56b",
+        "x": 2125.883331298828,
+        "y": 2408,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "15f2754c.6e5b2b"
+                "99196e80.99674"
             ]
         ]
     },
     {
-        "id": "d2a1d22e.b2ed6",
+        "id": "576ffe09.c4abd8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2076,
-        "y": 2436,
-        "z": "ed7c1675.7a56b",
+        "x": 2130.883331298828,
+        "y": 2465,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "fe7bb44f.f58b7"
+                "ea704904.f61c3"
             ]
         ]
     },
     {
-        "id": "fe7bb44f.f58b7",
+        "id": "ea704904.f61c3",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2228,
-        "y": 2437,
-        "z": "ed7c1675.7a56b",
+        "x": 2282.883331298828,
+        "y": 2466,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "15f2754c.6e5b2b",
+        "id": "99196e80.99674",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2239,
-        "y": 2382,
-        "z": "ed7c1675.7a56b",
+        "x": 2293.883331298828,
+        "y": 2411,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "ce2ed097.248ac",
+        "id": "2c548a06.655d4e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2223.38232421875,
-        "y": 2321.6556701660156,
-        "z": "ed7c1675.7a56b",
+        "x": 2278.265655517578,
+        "y": 2350.6556701660156,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "1c2a2a5a.6d8256"
+                "55de506e.ab2138"
             ]
         ]
     },
     {
-        "id": "1c2a2a5a.6d8256",
+        "id": "55de506e.ab2138",
         "type": "set",
         "name": "set controller domainConn data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value=\"`$tmp.aai.domainConn.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": 2438,
-        "y": 2318,
-        "z": "ed7c1675.7a56b",
+        "x": 2492.883331298828,
+        "y": 2347,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "9710382e.112c58",
+        "id": "2eeb0084.f61b88",
         "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.pnf-name-forUrl\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 562,
-        "y": 2366,
-        "z": "ed7c1675.7a56b",
+        "x": 616.8833312988281,
+        "y": 2395,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "afc311a9.64a498",
-                "1b364ee.7270531",
-                "aa64b78b.7ab17"
+                "21d8f2c9.3cd2be",
+                "32ff82a0.3bb24e",
+                "21eb3441.66cbb4"
             ]
         ]
     },
     {
-        "id": "afc311a9.64a498",
+        "id": "21d8f2c9.3cd2be",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 757.5001220703125,
-        "y": 2318,
-        "z": "ed7c1675.7a56b",
+        "x": 812.3834533691406,
+        "y": 2347,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "7cd619d5.a4e8c"
+                "2571d7b1.c4fb5"
             ]
         ]
     },
     {
-        "id": "1b364ee.7270531",
+        "id": "32ff82a0.3bb24e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 749.5001220703125,
-        "y": 2373,
-        "z": "ed7c1675.7a56b",
+        "x": 804.3834533691406,
+        "y": 2402,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "7127ee10.2a0b4"
+                "b0a2917a.ecde4"
             ]
         ]
     },
     {
-        "id": "7cd619d5.a4e8c",
+        "id": "2571d7b1.c4fb5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 901.8824462890625,
-        "y": 2317.6556701660156,
-        "z": "ed7c1675.7a56b",
+        "x": 956.7657775878906,
+        "y": 2346.6556701660156,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "fd5a5a0.ad9b128"
+                "a50320.52c78ce"
             ]
         ]
     },
     {
-        "id": "fd5a5a0.ad9b128",
+        "id": "a50320.52c78ce",
         "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": 1086,
-        "y": 2316,
-        "z": "ed7c1675.7a56b",
+        "x": 1140.8833312988281,
+        "y": 2345,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "8c513405.b809e8"
+                "b3deb273.cebb88"
             ]
         ]
     },
     {
-        "id": "8c513405.b809e8",
+        "id": "b3deb273.cebb88",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1281,
-        "y": 2316,
-        "z": "ed7c1675.7a56b",
+        "x": 1335.8833312988281,
+        "y": 2345,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "6d07bcb7.ffff34"
+                "a3eb9377.85c18"
             ]
         ]
     },
     {
-        "id": "aa64b78b.7ab17",
+        "id": "21eb3441.66cbb4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 754.5001220703125,
-        "y": 2430,
-        "z": "ed7c1675.7a56b",
+        "x": 809.3834533691406,
+        "y": 2459,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "22a641d1.a7babe"
+                "f2a9e7b0.6a4ff8"
             ]
         ]
     },
     {
-        "id": "22a641d1.a7babe",
+        "id": "f2a9e7b0.6a4ff8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 906.5001220703125,
-        "y": 2431,
-        "z": "ed7c1675.7a56b",
+        "x": 961.3834533691406,
+        "y": 2460,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "7127ee10.2a0b4",
+        "id": "b0a2917a.ecde4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 917.5001220703125,
-        "y": 2374,
-        "z": "ed7c1675.7a56b",
+        "x": 972.3834533691406,
+        "y": 2403,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "41c682cf.a83f2c",
+        "id": "e821cf32.5b22f",
         "type": "set",
         "name": "set tmp.pnf-name-forUrl",
         "xml": "<set>\n\n<parameter name='tmp.pnf-name-forUrl' 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": 552,
-        "y": 2278,
-        "z": "ed7c1675.7a56b",
+        "x": 606.8833312988281,
+        "y": 2307,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "c7cb304b.f39168",
+        "id": "f92bafd0.7c69c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 297,
-        "y": 2409,
-        "z": "ed7c1675.7a56b",
+        "x": 351.8833312988281,
+        "y": 2438,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "41c682cf.a83f2c",
-                "9710382e.112c58"
+                "e821cf32.5b22f",
+                "2eeb0084.f61b88"
             ]
         ]
     },
     {
-        "id": "d390d070.3dc4c",
+        "id": "a832f3b6.8874e",
         "type": "comment",
         "name": "Temporary skipping this check - to support multiple instances in one slice",
         "info": "",
         "comments": "",
-        "x": 1511.9666748046875,
-        "y": 226.88333129882812,
-        "z": "ed7c1675.7a56b",
+        "x": 1566.8500061035156,
+        "y": 255.88333129882812,
+        "z": "3f6a2e0f.b66c8a",
+        "wires": []
+    },
+    {
+        "id": "f645589d.ed3d98",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "comments": "",
+        "x": 768.8833312988281,
+        "y": 478,
+        "z": "3f6a2e0f.b66c8a",
         "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-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
new file mode 100644
index 00000000..de9383d3
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete-VPNBs.json
@@ -0,0 +1,966 @@
+[
+    {
+        "id": "a88af18.67fae9",
+        "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",
+        "wires": [
+            [
+                "d17bb726.fa65e8"
+            ]
+        ]
+    },
+    {
+        "id": "d17bb726.fa65e8",
+        "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",
+        "wires": [
+            [
+                "141e9731.53d429"
+            ]
+        ]
+    },
+    {
+        "id": "5a075e5f.de06b8",
+        "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",
+        "wires": [
+            [
+                "bfab05fb.6c1fd",
+                "66b97fa3.09fba8",
+                "a61f3fb8.28c2b"
+            ]
+        ]
+    },
+    {
+        "id": "141e9731.53d429",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3122.316619873047,
+        "y": 756.88330078125,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "6ba56bd3.970cc4",
+                "5a075e5f.de06b8",
+                "f743ac29.02b56"
+            ]
+        ]
+    },
+    {
+        "id": "6ba56bd3.970cc4",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "bfab05fb.6c1fd",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3538.316619873047,
+        "y": 760.88330078125,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "9395b4f9.f11e08"
+            ]
+        ]
+    },
+    {
+        "id": "66b97fa3.09fba8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3530.316619873047,
+        "y": 815.88330078125,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "6a113c41.2b7f84"
+            ]
+        ]
+    },
+    {
+        "id": "a61f3fb8.28c2b",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3535.316619873047,
+        "y": 872.88330078125,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "ae24d388.debf2"
+            ]
+        ]
+    },
+    {
+        "id": "ae24d388.debf2",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "6a113c41.2b7f84",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "9395b4f9.f11e08",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3682.698944091797,
+        "y": 758.5389709472656,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "e30efe2.36b498"
+            ]
+        ]
+    },
+    {
+        "id": "e30efe2.36b498",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "f743ac29.02b56",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 3278.316619873047,
+        "y": 833.88330078125,
+        "z": "347519d8.005516",
+        "wires": []
+    },
+    {
+        "id": "98d7bf6.4dfe7c",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "61820fcc.882e",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2694.316619873047,
+        "y": 1020.88330078125,
+        "z": "347519d8.005516",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5b3a4445.ce6224",
+        "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",
+        "wires": [
+            [
+                "a88af18.67fae9"
+            ]
+        ]
+    },
+    {
+        "id": "132ce225.b79cae",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "5cdb5a7a.54733c",
+        "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",
+        "wires": [
+            [
+                "6c0f168f.8aad68",
+                "cd12f0b4.568798",
+                "80b1b093.b4332"
+            ]
+        ]
+    },
+    {
+        "id": "6c0f168f.8aad68",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2275.816619873047,
+        "y": 743.88330078125,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "99130a65.69efe8"
+            ]
+        ]
+    },
+    {
+        "id": "cd12f0b4.568798",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2267.816619873047,
+        "y": 798.88330078125,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "80ce6dda.3e5e5"
+            ]
+        ]
+    },
+    {
+        "id": "99130a65.69efe8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2420.198944091797,
+        "y": 743.5389709472656,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "5b3a4445.ce6224"
+            ]
+        ]
+    },
+    {
+        "id": "80b1b093.b4332",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2272.816619873047,
+        "y": 855.88330078125,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "b4d035fe.9cf0b"
+            ]
+        ]
+    },
+    {
+        "id": "b4d035fe.9cf0b",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "80ce6dda.3e5e5",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "cbce5afd.0d149",
+        "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",
+        "wires": [
+            [
+                "38dfa115.008496",
+                "f31653a0.9143e8"
+            ]
+        ]
+    },
+    {
+        "id": "38dfa115.008496",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2522.816619873047,
+        "y": 955.88330078125,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "98d7bf6.4dfe7c"
+            ]
+        ]
+    },
+    {
+        "id": "f31653a0.9143e8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2527.816619873047,
+        "y": 1020.88330078125,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "61820fcc.882e"
+            ]
+        ]
+    },
+    {
+        "id": "30af1423.cd4b6c",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d0b44cbe.a16a5",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1822.3166198730469,
+        "y": 941.88330078125,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "132ce225.b79cae",
+                "5cdb5a7a.54733c",
+                "cbce5afd.0d149",
+                "30af1423.cd4b6c",
+                "b097652b.150d7",
+                "e258ce61.c84d28"
+            ]
+        ]
+    },
+    {
+        "id": "b097652b.150d7",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "e258ce61.c84d28",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "3c24f82.dfab088",
+        "type": "comment",
+        "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
+        "info": "",
+        "comments": "",
+        "x": 1023.5003967285156,
+        "y": 746.39990234375,
+        "z": "347519d8.005516",
+        "wires": []
+    },
+    {
+        "id": "570ad10f.ad92f8",
+        "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",
+        "wires": [
+            [
+                "f405b75.e7a9fc8",
+                "4e9de096.f468b",
+                "9757d76.73f10a8"
+            ]
+        ]
+    },
+    {
+        "id": "f405b75.e7a9fc8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1126.5003967285156,
+        "y": 778.39990234375,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "5de56166.922018"
+            ]
+        ]
+    },
+    {
+        "id": "4e9de096.f468b",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1109.9913635253906,
+        "y": 839.9739379882812,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "a1062ebe.b15808"
+            ]
+        ]
+    },
+    {
+        "id": "9757d76.73f10a8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1107.5003967285156,
+        "y": 883.39990234375,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "10e74f8b.3fb4a8"
+            ]
+        ]
+    },
+    {
+        "id": "5de56166.922018",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1294.5006408691406,
+        "y": 773.39990234375,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "fdc657b.398c8a8"
+            ]
+        ]
+    },
+    {
+        "id": "a1062ebe.b15808",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "10e74f8b.3fb4a8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "fdc657b.398c8a8",
+        "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",
+        "wires": [
+            [
+                "5a8644f1.6f626c"
+            ]
+        ]
+    },
+    {
+        "id": "5a8644f1.6f626c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1150.5004577636719,
+        "y": 1006.39990234375,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "71241a5.135ba64"
+            ]
+        ]
+    },
+    {
+        "id": "71241a5.135ba64",
+        "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",
+        "wires": [
+            [
+                "4253fbea.3b4874",
+                "6cef3566.dab14c"
+            ]
+        ]
+    },
+    {
+        "id": "4253fbea.3b4874",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1616.3168640136719,
+        "y": 1000.56591796875,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "d0b44cbe.a16a5"
+            ]
+        ]
+    },
+    {
+        "id": "6cef3566.dab14c",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1627.3168640136719,
+        "y": 1043.56591796875,
+        "z": "347519d8.005516",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3070392b.33f8c6",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "45e829a.7cbd958",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "304ed1d7.4f9efe",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 663.9999694824219,
+        "y": 737.2333984375,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "45e829a.7cbd958",
+                "570ad10f.ad92f8"
+            ]
+        ]
+    },
+    {
+        "id": "7df4e9d5.2bc648",
+        "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",
+        "wires": [
+            [
+                "a43c232c.85575"
+            ]
+        ]
+    },
+    {
+        "id": "561ea33d.a2ffb4",
+        "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",
+        "wires": [
+            [
+                "7df4e9d5.2bc648"
+            ]
+        ]
+    },
+    {
+        "id": "2e515252.bebdb6",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1477.9999694824219,
+        "y": 406.283203125,
+        "z": "347519d8.005516",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "36a9a792.12dcb8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "2a69687a.5611c",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "f3c1922.734777",
+        "type": "set",
+        "name": "unset otnTopoIdSrc",
+        "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
+        "comments": "",
+        "x": 1171.9999694824219,
+        "y": 399.283203125,
+        "z": "347519d8.005516",
+        "wires": []
+    },
+    {
+        "id": "a43c232c.85575",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1424.9999694824219,
+        "y": 523.283203125,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "f8e0e906.2dd5c"
+            ]
+        ]
+    },
+    {
+        "id": "f8e0e906.2dd5c",
+        "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",
+        "wires": [
+            [
+                "8c6726fe.7433a8"
+            ]
+        ]
+    },
+    {
+        "id": "cc1b4364.1c9f18",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 866.9999694824219,
+        "y": 421.283203125,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "7c0eef33.a4cac8",
+                "ba37203f.b37c18",
+                "36a9a792.12dcb8",
+                "2a69687a.5611c",
+                "3070392b.33f8c6",
+                "561ea33d.a2ffb4",
+                "304ed1d7.4f9efe"
+            ]
+        ]
+    },
+    {
+        "id": "59a1e33e.932044",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "ba37203f.b37c18",
+        "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",
+        "wires": [
+            [
+                "c06f47ba.39269",
+                "e8314c16.79663",
+                "2e515252.bebdb6"
+            ]
+        ]
+    },
+    {
+        "id": "c06f47ba.39269",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1466.9999694824219,
+        "y": 325.283203125,
+        "z": "347519d8.005516",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e8314c16.79663",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1463.9999694824219,
+        "y": 366.283203125,
+        "z": "347519d8.005516",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7c0eef33.a4cac8",
+        "type": "set",
+        "name": "unset parameters",
+        "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
+        "comments": "",
+        "x": 1179.9999694824219,
+        "y": 299.283203125,
+        "z": "347519d8.005516",
+        "wires": []
+    },
+    {
+        "id": "8c6726fe.7433a8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1801.9999694824219,
+        "y": 525.283203125,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "99c0dc88.ef82e8"
+            ]
+        ]
+    },
+    {
+        "id": "99c0dc88.ef82e8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "d2cbaaf0.8cf72",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 154.88333129882812,
+        "y": 89.88333129882812,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "a811003b.ca91f8"
+            ]
+        ]
+    },
+    {
+        "id": "a811003b.ca91f8",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 439.1690216064453,
+        "y": 151.12143993377686,
+        "z": "347519d8.005516",
+        "wires": [
+            [
+                "5803201b.e752d"
+            ]
+        ]
+    },
+    {
+        "id": "5803201b.e752d",
+        "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",
+        "wires": [
+            [
+                "cc1b4364.1c9f18"
+            ]
+        ]
+    }
+]
\ 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 5af3b36c..fb09dbd8 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": "931a69bb.dae57",
+        "id": "d1a7bbc1.540ca8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 158,
-        "y": 111,
-        "z": "de2a2b68.0a5d7",
+        "x": 171.88333129882812,
+        "y": 131.88333129882812,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "631f62d5.74088c"
+                "6b49e250.7dcf1c"
             ]
         ]
     },
     {
-        "id": "631f62d5.74088c",
+        "id": "6b49e250.7dcf1c",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1110 +22,8595 @@
         "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": 289.2856903076172,
-        "y": 160.23810863494873,
-        "z": "de2a2b68.0a5d7",
+        "x": 456.1690216064453,
+        "y": 193.12143993377686,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "b7a67e25.a3d65"
+                "7d29f447.50c89c"
             ]
         ]
     },
     {
-        "id": "b7a67e25.a3d65",
+        "id": "7d29f447.50c89c",
         "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": 292.4286193847656,
-        "y": 245.00003242492676,
-        "z": "de2a2b68.0a5d7",
+        "x": 462.3119354248047,
+        "y": 277.88336181640625,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "bcc86fda.38b13"
+                "eaada3e3.80126"
             ]
         ]
     },
     {
-        "id": "bcc86fda.38b13",
+        "id": "eaada3e3.80126",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 442.238037109375,
-        "y": 374.6666564941406,
-        "z": "de2a2b68.0a5d7",
+        "x": 811.8833312988281,
+        "y": 336.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "f53defcd.3a7dd",
-                "c20e131e.73b7b",
-                "d160ef14.daae98"
+                "48b97bf1.34ba04",
+                "4cae2f6c.f9579",
+                "47d3b263.d1c534"
             ]
         ]
     },
     {
-        "id": "f53defcd.3a7dd",
+        "id": "48b97bf1.34ba04",
         "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": 716.5716552734375,
-        "y": 641.59716796875,
-        "z": "de2a2b68.0a5d7",
+        "x": 1113.2168273925781,
+        "y": 607.8136291503906,
+        "z": "82de8dcf.518d88",
         "wires": []
     },
     {
-        "id": "c20e131e.73b7b",
+        "id": "4cae2f6c.f9579",
         "type": "save",
         "name": "get service-instance from aai",
-        "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--vnf-topology-operation-input.service-information.service-instance-id-->",
+        "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": 768,
-        "y": 412,
-        "z": "de2a2b68.0a5d7",
+        "x": 1134.6452941894531,
+        "y": 310.2166442871094,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "73ebc7bf.bf03e8",
-                "4161fc92.ab54b4",
-                "f0a5f72e.4756d"
+                "eecf5ed7.260848",
+                "c7a2a22f.bd7b1",
+                "44494afd.f0c474"
             ]
         ]
     },
     {
-        "id": "73ebc7bf.bf03e8",
+        "id": "eecf5ed7.260848",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 966,
-        "y": 350,
-        "z": "de2a2b68.0a5d7",
+        "x": 1359.6452941894531,
+        "y": 168.21664428710938,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "9fe92008.1b7c9"
+                "cddb4078.0dee18"
             ]
         ]
     },
     {
-        "id": "4161fc92.ab54b4",
+        "id": "c7a2a22f.bd7b1",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 996.490966796875,
-        "y": 392.57403564453125,
-        "z": "de2a2b68.0a5d7",
+        "x": 1355.1362609863281,
+        "y": 237.79067993164062,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "8782adc7.ab141"
+                "7789aaf8.1fe7d4"
             ]
         ]
     },
     {
-        "id": "f0a5f72e.4756d",
+        "id": "44494afd.f0c474",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 985,
-        "y": 439,
-        "z": "de2a2b68.0a5d7",
+        "x": 1343.6452941894531,
+        "y": 284.2166442871094,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "ecf8d005.e02b48"
+                "64127148.01c618"
             ]
         ]
     },
     {
-        "id": "8782adc7.ab141",
+        "id": "1679e3cd.763d6c",
+        "type": "comment",
+        "name": "new for TransportSlicing",
+        "info": "",
+        "comments": "",
+        "x": 1113.6452941894531,
+        "y": 198.21664428710938,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "47d3b263.d1c534",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "cddb4078.0dee18",
+        "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",
+        "wires": [
+            [
+                "6a54ba66.1cde8c",
+                "7bb2b732.d43ff8"
+            ]
+        ]
+    },
+    {
+        "id": "7789aaf8.1fe7d4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1150.0623779296875,
-        "y": 395.8597717285156,
-        "z": "de2a2b68.0a5d7",
+        "x": 1509.9457092285156,
+        "y": 240.74310302734375,
+        "z": "82de8dcf.518d88",
         "wires": []
     },
     {
-        "id": "ecf8d005.e02b48",
+        "id": "64127148.01c618",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1154,
-        "y": 440,
-        "z": "de2a2b68.0a5d7",
+        "x": 1513.8833312988281,
+        "y": 284.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": []
     },
     {
-        "id": "5b569a16.745f1c",
-        "type": "for",
-        "name": "for each relationship",
-        "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
+        "id": "6a54ba66.1cde8c",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1184,
-        "y": 346,
-        "z": "de2a2b68.0a5d7",
+        "x": 1804.8833312988281,
+        "y": 201.88333129882812,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "25ca27fd.dbc988"
+                "d1e88455.43ef2"
             ]
         ]
     },
     {
-        "id": "25ca27fd.dbc988",
-        "type": "switchNode",
-        "name": "switch related-to",
-        "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
+        "id": "7bb2b732.d43ff8",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1407.33349609375,
-        "y": 345.99993896484375,
-        "z": "de2a2b68.0a5d7",
+        "x": 1814.8833312988281,
+        "y": 128.88333129882812,
+        "z": "82de8dcf.518d88",
         "wires": [
-            [
-                "f6a0c4df.5c0238"
-            ]
+            []
         ]
     },
     {
-        "id": "f6a0c4df.5c0238",
-        "type": "outcome",
-        "name": "connectivity",
-        "xml": "<outcome value='connectivity'>\n",
+        "id": "d1e88455.43ef2",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1587.0001220703125,
-        "y": 346.0000305175781,
-        "z": "de2a2b68.0a5d7",
+        "x": 1797.8833312988281,
+        "y": 276.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "b1afa8c.9d08258"
+                "8390a16b.5a156",
+                "341b8f1.ea5ec7",
+                "1d2c9241.740b2e",
+                "4208fd35.4a6c74",
+                "e351db25.84cdc8"
             ]
         ]
     },
     {
-        "id": "d160ef14.daae98",
-        "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": 734,
-        "y": 360,
-        "z": "de2a2b68.0a5d7",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b1afa8c.9d08258",
+        "id": "2db9f3bd.0d65e4",
         "type": "save",
-        "name": "get connectivity from aai",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
+        "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": 1787,
-        "y": 346,
-        "z": "de2a2b68.0a5d7",
+        "x": 2283.883331298828,
+        "y": 327.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "c3a2010c.f5d48",
-                "fb144142.e9ac68",
-                "ba20a9b3.14be2"
+                "11f248b6.2b0fe7",
+                "fd3681a1.487b1",
+                "9338a88f.aebeb"
             ]
         ]
     },
     {
-        "id": "c3a2010c.f5d48",
+        "id": "11f248b6.2b0fe7",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1958,
-        "y": 299,
-        "z": "de2a2b68.0a5d7",
+        "x": 2499.883331298828,
+        "y": 394.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "9386fbbc.1d2048"
+                "7fe5ebf8.de6a64"
             ]
         ]
     },
     {
-        "id": "fb144142.e9ac68",
+        "id": "fd3681a1.487b1",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2039.490966796875,
-        "y": 1139.5740356445312,
-        "z": "de2a2b68.0a5d7",
+        "x": 2500.374298095703,
+        "y": 294.4573059082031,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "9e1c850d.74d728"
+                "6e8f233d.c6dbd4"
             ]
         ]
     },
     {
-        "id": "ba20a9b3.14be2",
+        "id": "9338a88f.aebeb",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2037,
-        "y": 1183,
-        "z": "de2a2b68.0a5d7",
+        "x": 2495.883331298828,
+        "y": 343.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "c9b57000.53acb8"
+                "8a3025a0.71b76"
             ]
         ]
     },
     {
-        "id": "9e1c850d.74d728",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
+        "id": "8390a16b.5a156",
+        "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",
+        "wires": [
+            [
+                "7858ac8a.d0ed24",
+                "2db9f3bd.0d65e4",
+                "98563074.1e7ea",
+                "c475408d.68ef"
+            ]
+        ]
+    },
+    {
+        "id": "7858ac8a.d0ed24",
+        "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": 2202.0623779296875,
-        "y": 1139.8597717285156,
-        "z": "de2a2b68.0a5d7",
+        "x": 2280.883331298828,
+        "y": 246.88333129882812,
+        "z": "82de8dcf.518d88",
         "wires": []
     },
     {
-        "id": "c9b57000.53acb8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "id": "4208fd35.4a6c74",
+        "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": 2206,
-        "y": 1184,
-        "z": "de2a2b68.0a5d7",
+        "x": 1974.8833312988281,
+        "y": 258.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": []
     },
     {
-        "id": "ad889722.664b08",
-        "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",
+        "id": "341b8f1.ea5ec7",
+        "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": 3062,
-        "y": 386,
-        "z": "de2a2b68.0a5d7",
+        "x": 2017.8833312988281,
+        "y": 117.88333129882812,
+        "z": "82de8dcf.518d88",
         "wires": [
-            [
-                "640b0e20.b1d3e",
-                "ce9c63b.0255a2",
-                "7ad6314d.3b89c8"
-            ]
+            []
+        ]
+    },
+    {
+        "id": "1d2c9241.740b2e",
+        "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",
+        "wires": [
+            []
         ]
     },
     {
-        "id": "e28a48f8.db57f8",
+        "id": "a3743fb5.49e31",
+        "type": "comment",
+        "name": "The following two nodes are for PCE",
+        "info": "",
+        "comments": "",
+        "x": 2054.883331298828,
+        "y": 70.88333129882812,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "a5956784.1c6ce8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "6e8f233d.c6dbd4",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "8a3025a0.71b76",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "7fe5ebf8.de6a64",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3439,
-        "y": 378,
-        "z": "de2a2b68.0a5d7",
+        "x": 2680.820831298828,
+        "y": 397.0235900878906,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "1c93c389.0c8c2c",
-                "c798ad9c.1234b",
-                "fd7fa756.f7d6e8",
-                "270a4545.e66b22",
-                "d4768fc2.d5865"
+                "27474730.1479c8"
             ]
         ]
     },
     {
-        "id": "640b0e20.b1d3e",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "27474730.1479c8",
+        "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": 3273,
-        "y": 388,
-        "z": "de2a2b68.0a5d7",
+        "x": 2973.820831298828,
+        "y": 344.0235900878906,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "e28a48f8.db57f8"
+                "bdd221b3.05669",
+                "9c61f989.c8eaf8",
+                "fabffff4.e28138"
             ]
         ]
     },
     {
-        "id": "ce9c63b.0255a2",
+        "id": "9c61f989.c8eaf8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3273.490966796875,
-        "y": 433.57403564453125,
-        "z": "de2a2b68.0a5d7",
+        "x": 3247.311798095703,
+        "y": 236.59756469726562,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "714cc291.22ce0c"
+                "1e4b4cbe.e5dbab"
             ]
         ]
     },
     {
-        "id": "7ad6314d.3b89c8",
+        "id": "1e4b4cbe.e5dbab",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "fabffff4.e28138",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3271,
-        "y": 477,
-        "z": "de2a2b68.0a5d7",
+        "x": 3242.820831298828,
+        "y": 286.0235900878906,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "525b4279.2df8f4"
+                "3e91db11.95e81c"
             ]
         ]
     },
     {
-        "id": "525b4279.2df8f4",
+        "id": "3e91db11.95e81c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3438,
-        "y": 476,
-        "z": "de2a2b68.0a5d7",
-        "wires": []
-    },
-    {
-        "id": "714cc291.22ce0c",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return 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": 3436.0623779296875,
-        "y": 433.8597717285156,
-        "z": "de2a2b68.0a5d7",
+        "x": 3424.820831298828,
+        "y": 286.0235900878906,
+        "z": "82de8dcf.518d88",
         "wires": []
     },
     {
-        "id": "c57d1cb2.40bd38",
-        "type": "for",
-        "name": "for each relationship",
-        "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
+        "id": "bdd221b3.05669",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2261,
-        "y": 301,
-        "z": "de2a2b68.0a5d7",
+        "x": 3246.820831298828,
+        "y": 337.0235900878906,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "9dbcf55e.4925c8"
+                "8cb6a22.c9637e"
             ]
         ]
     },
     {
-        "id": "9dbcf55e.4925c8",
-        "type": "switchNode",
-        "name": "switch related-to",
-        "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
-        "comments": "",
+        "id": "8cb6a22.c9637e",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 2458,
-        "y": 315,
-        "z": "de2a2b68.0a5d7",
+        "x": 3426.820831298828,
+        "y": 337.0235900878906,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "b564f315.834a2",
-                "e7d69f06.780b38"
+                "6f3506c3.cf97d8"
             ]
         ]
     },
     {
-        "id": "b564f315.834a2",
-        "type": "outcome",
-        "name": "vpn-binding",
-        "xml": "<outcome value='vpn-binding'>\n",
+        "id": "6f3506c3.cf97d8",
+        "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": 2626,
-        "y": 308,
-        "z": "de2a2b68.0a5d7",
+        "x": 2992.883331298828,
+        "y": 471.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "491489ec.617558"
+                "5a58fe79.709e",
+                "5401f43b.ed03f4"
             ]
         ]
     },
     {
-        "id": "491489ec.617558",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "5401f43b.ed03f4",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
         "outputs": 1,
-        "x": 2789,
-        "y": 308,
-        "z": "de2a2b68.0a5d7",
+        "x": 3302.883331298828,
+        "y": 478.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
-            [
-                "ad889722.664b08"
-            ]
+            []
         ]
     },
     {
-        "id": "1c93c389.0c8c2c",
-        "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": 3661,
-        "y": 96,
-        "z": "de2a2b68.0a5d7",
-        "wires": []
-    },
-    {
-        "id": "c798ad9c.1234b",
-        "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",
+        "id": "5a58fe79.709e",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3687,
-        "y": 213,
-        "z": "de2a2b68.0a5d7",
+        "x": 3301.883331298828,
+        "y": 532.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "76dc6e0a.1ab268",
-                "826ceead.c2f69",
-                "d5b03fc8.b6e088"
+                "126c6f21.417e99"
             ]
         ]
     },
     {
-        "id": "76dc6e0a.1ab268",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "24e00055.8ca808",
+        "type": "outcome",
+        "name": "network-policy",
+        "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3882.5001220703125,
-        "y": 165,
-        "z": "de2a2b68.0a5d7",
+        "x": 4046.883331298828,
+        "y": 486.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "feb1370b.46393"
+                "8c1020d2.e3fc88"
             ]
         ]
     },
     {
-        "id": "826ceead.c2f69",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
+        "id": "8c1020d2.e3fc88",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 3874.5001220703125,
-        "y": 220,
-        "z": "de2a2b68.0a5d7",
+        "x": 4223.883209228516,
+        "y": 479.8832092285156,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "f38f34bb.7a9748"
+                "709d8f82.9f2e1",
+                "cef8768a.ac6e48"
             ]
         ]
     },
     {
-        "id": "feb1370b.46393",
+        "id": "126c6f21.417e99",
         "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 4026.8824462890625,
-        "y": 164.65567016601562,
-        "z": "de2a2b68.0a5d7",
+        "x": 3465.883331298828,
+        "y": 458.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "21f3a77a.346fa8"
+                "f0253be2.ef6388",
+                "d30875df.4619e8"
             ]
         ]
     },
     {
-        "id": "21f3a77a.346fa8",
+        "id": "f0253be2.ef6388",
         "type": "for",
-        "name": "for each relationship",
-        "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
+        "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": 4211,
-        "y": 163,
-        "z": "de2a2b68.0a5d7",
+        "x": 3746.883331298828,
+        "y": 414.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "a51bf440.0c5b6"
+                "6ce9e370.67b09c"
             ]
         ]
     },
     {
-        "id": "a51bf440.0c5b6",
+        "id": "6ce9e370.67b09c",
         "type": "switchNode",
         "name": "switch related-to",
-        "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
+        "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4406,
-        "y": 163,
-        "z": "de2a2b68.0a5d7",
+        "x": 4008.883331298828,
+        "y": 414.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "34e2f8df.de6cf8"
+                "24e00055.8ca808"
             ]
         ]
     },
     {
-        "id": "d5b03fc8.b6e088",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "709d8f82.9f2e1",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "cef8768a.ac6e48",
+        "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",
+        "wires": [
+            [
+                "442d2e35.9513b",
+                "6b7a340a.d73c24",
+                "1cf09fd1.237e88"
+            ]
+        ]
+    },
+    {
+        "id": "1cf09fd1.237e88",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3879.5001220703125,
-        "y": 277,
-        "z": "de2a2b68.0a5d7",
+        "x": 4708.883331298828,
+        "y": 377.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "8eb64fc1.c84cd"
+                "830d3a39.a47178"
             ]
         ]
     },
     {
-        "id": "8eb64fc1.c84cd",
+        "id": "830d3a39.a47178",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return 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",
+        "xml": "<return 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": 4031.5001220703125,
-        "y": 278,
-        "z": "de2a2b68.0a5d7",
+        "x": 4857.454864501953,
+        "y": 378.1690979003906,
+        "z": "82de8dcf.518d88",
         "wires": []
     },
     {
-        "id": "f38f34bb.7a9748",
+        "id": "4e42818f.48a268",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return 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",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4042.5001220703125,
-        "y": 221,
-        "z": "de2a2b68.0a5d7",
+        "x": 4856.392364501953,
+        "y": 422.3093566894531,
+        "z": "82de8dcf.518d88",
         "wires": []
     },
     {
-        "id": "41c68962.37006",
-        "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' >",
+        "id": "6b7a340a.d73c24",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4697.392364501953,
+        "y": 422.3093566894531,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "4e42818f.48a268"
+            ]
+        ]
+    },
+    {
+        "id": "442d2e35.9513b",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4994,
-        "y": 180,
-        "z": "de2a2b68.0a5d7",
+        "x": 4704.392364501953,
+        "y": 501.3093566894531,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "b0076b13.2e399",
-                "f818e30c.1ed2d",
-                "cd5ca056.adec1"
+                "dd05e839.54d638"
             ]
         ]
     },
     {
-        "id": "fb2612bc.a6aea8",
+        "id": "dd05e839.54d638",
         "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
         "outputs": 1,
-        "x": 4788,
-        "y": 167,
-        "z": "de2a2b68.0a5d7",
+        "x": 4843.392364501953,
+        "y": 501.3093566894531,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "a86d0a2.d48def8",
-                "41c68962.37006",
-                "3b61ff6d.8dced"
+                "d5c9a2a0.f0c188",
+                "585ee28c.970d44"
             ]
         ]
     },
     {
-        "id": "a86d0a2.d48def8",
+        "id": "d5c9a2a0.f0c188",
         "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",
+        "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": 5024,
-        "y": 128,
-        "z": "de2a2b68.0a5d7",
+        "x": 5048.883331298828,
+        "y": 498.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": []
     },
     {
-        "id": "b0076b13.2e399",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "585ee28c.970d44",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "d30875df.4619e8",
+        "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": 5204,
-        "y": 171,
-        "z": "de2a2b68.0a5d7",
+        "x": 3563.883331298828,
+        "y": 530.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "9a62192a.51df38"
+                "bcf8f8b2.ee17c"
             ]
         ]
     },
     {
-        "id": "f818e30c.1ed2d",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "bcf8f8b2.ee17c",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5196,
-        "y": 226,
-        "z": "de2a2b68.0a5d7",
+        "x": 3843.883331298828,
+        "y": 530.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "cb7716d3.6ef01"
+                "f92213c8.e6e61"
             ]
         ]
     },
     {
-        "id": "cd5ca056.adec1",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "f92213c8.e6e61",
+        "type": "outcome",
+        "name": "logical-link",
+        "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5201,
-        "y": 283,
-        "z": "de2a2b68.0a5d7",
+        "x": 2256.8834533691406,
+        "y": 783.8834533691406,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "6a7cfa93.2ccb4c"
+                "f147a584.43d0d8"
             ]
         ]
     },
     {
-        "id": "6a7cfa93.2ccb4c",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return 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",
+        "id": "f147a584.43d0d8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2433.883331298828,
+        "y": 776.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "5a35df58.3972",
+                "2dab28b6.2641a"
+            ]
+        ]
+    },
+    {
+        "id": "5a35df58.3972",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "2dab28b6.2641a",
+        "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",
+        "wires": [
+            [
+                "ffb30860.4224d",
+                "abeb5cc2.3015b",
+                "e13761ad.544c58"
+            ]
+        ]
+    },
+    {
+        "id": "ffb30860.4224d",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2957.374298095703,
+        "y": 767.4573059082031,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "bd849955.1204b"
+            ]
+        ]
+    },
+    {
+        "id": "abeb5cc2.3015b",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2945.883331298828,
+        "y": 811.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "33701bc2.b5a40c"
+            ]
+        ]
+    },
+    {
+        "id": "bd849955.1204b",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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": 5353,
-        "y": 284,
-        "z": "de2a2b68.0a5d7",
+        "x": 3105.945831298828,
+        "y": 767.7430725097656,
+        "z": "82de8dcf.518d88",
         "wires": []
     },
     {
-        "id": "cb7716d3.6ef01",
+        "id": "33701bc2.b5a40c",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return 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",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 5364,
-        "y": 229,
-        "z": "de2a2b68.0a5d7",
+        "x": 3104.883331298828,
+        "y": 811.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": []
     },
     {
-        "id": "9a62192a.51df38",
+        "id": "e13761ad.544c58",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2952.883331298828,
+        "y": 890.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "d2f3b92.5263348"
+            ]
+        ]
+    },
+    {
+        "id": "d2f3b92.5263348",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5348.38232421875,
-        "y": 168.65567016601562,
-        "z": "de2a2b68.0a5d7",
+        "x": 3091.883331298828,
+        "y": 890.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "1e654428.bcfdbc"
+                "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"
             ]
         ]
     },
     {
-        "id": "34e2f8df.de6cf8",
-        "type": "outcome",
-        "name": "esr-thirdparty-sdnc",
-        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "id": "4165b419.5fd914",
+        "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": 4609,
-        "y": 167,
-        "z": "de2a2b68.0a5d7",
+        "x": 3405.883331298828,
+        "y": 696.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
-            [
-                "fb2612bc.a6aea8"
-            ]
+            []
+        ]
+    },
+    {
+        "id": "ef467ac0.6f7c18",
+        "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",
+        "wires": [
+            []
         ]
     },
     {
-        "id": "1e654428.bcfdbc",
+        "id": "c8da4017.620ba8",
         "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",
+        "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": 5563,
-        "y": 165,
-        "z": "de2a2b68.0a5d7",
+        "x": 3343.883331298828,
+        "y": 791.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": []
     },
     {
-        "id": "3b61ff6d.8dced",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
+        "id": "f9d1859a.061ab8",
+        "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": 4944,
-        "y": 244,
-        "z": "de2a2b68.0a5d7",
+        "x": 3318.883331298828,
+        "y": 854.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": []
     },
     {
-        "id": "10401b5c.b05865",
-        "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",
+        "id": "3e963f23.c2be88",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "f9ae4741.757498",
+        "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",
+        "wires": [
+            [
+                "d029c3a1.942f48",
+                "34db9b18.f85a0c",
+                "a8f47dda.1a0bb8"
+            ]
+        ]
+    },
+    {
+        "id": "2907fb26.565cec",
+        "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",
+        "wires": [
+            [
+                "ad570631.23385",
+                "75596bb2.8de11c",
+                "ae6194f6.92ada8"
+            ]
+        ]
+    },
+    {
+        "id": "d029c3a1.942f48",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4322,
-        "y": 593,
-        "z": "de2a2b68.0a5d7",
+        "x": 3536.883331298828,
+        "y": 841.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "7f6c606d.64ab48",
-                "c3eb517a.b7781"
+                "9c52bc0.78abb48"
             ]
         ]
     },
     {
-        "id": "7f6c606d.64ab48",
+        "id": "34db9b18.f85a0c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4668.5,
-        "y": 586,
-        "z": "de2a2b68.0a5d7",
+        "x": 3532.392364501953,
+        "y": 891.3093566894531,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "8c5003e.5a8698"
+                "946c30bd.bd527"
             ]
         ]
     },
     {
-        "id": "c3eb517a.b7781",
+        "id": "a8f47dda.1a0bb8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4672.5,
-        "y": 626,
-        "z": "de2a2b68.0a5d7",
+        "x": 3536.392364501953,
+        "y": 944.3093566894531,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "19571e12.890ec2"
+                "1dcb46a1.3c7d49"
             ]
         ]
     },
     {
-        "id": "19571e12.890ec2",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "9c52bc0.78abb48",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "outputs": 1,
-        "x": 4830,
-        "y": 626,
-        "z": "de2a2b68.0a5d7",
-        "wires": [
-            []
-        ]
+        "x": 3685.454864501953,
+        "y": 841.1690979003906,
+        "z": "82de8dcf.518d88",
+        "wires": []
     },
     {
-        "id": "8c5003e.5a8698",
+        "id": "946c30bd.bd527",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return 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",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4826.5,
-        "y": 586,
-        "z": "de2a2b68.0a5d7",
+        "x": 3675.392364501953,
+        "y": 891.3093566894531,
+        "z": "82de8dcf.518d88",
         "wires": []
     },
     {
-        "id": "fd7fa756.f7d6e8",
-        "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`\" />",
+        "id": "ad570631.23385",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3790,
-        "y": 480,
-        "z": "de2a2b68.0a5d7",
+        "x": 3547.883331298828,
+        "y": 1014.8832092285156,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "7d0f2c32.be1c14",
-                "d337892f.188d2"
+                "5f295173.cbbf5"
             ]
         ]
     },
     {
-        "id": "7d0f2c32.be1c14",
+        "id": "75596bb2.8de11c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4122.5,
-        "y": 450,
-        "z": "de2a2b68.0a5d7",
+        "x": 3543.392364501953,
+        "y": 1064.3092346191406,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "bcce4236.8aab4"
+                "355d767e.1de55a"
             ]
         ]
     },
     {
-        "id": "d337892f.188d2",
+        "id": "ae6194f6.92ada8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4127.5,
-        "y": 515,
-        "z": "de2a2b68.0a5d7",
+        "x": 3544.392364501953,
+        "y": 1117.3092346191406,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "fe33b47b.c7292"
+                "a436621f.a466c"
             ]
         ]
     },
     {
-        "id": "bcce4236.8aab4",
+        "id": "5f295173.cbbf5",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return 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",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "355d767e.1de55a",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4298.5,
-        "y": 450,
-        "z": "de2a2b68.0a5d7",
+        "x": 3686.392364501953,
+        "y": 1064.3092346191406,
+        "z": "82de8dcf.518d88",
         "wires": []
     },
     {
-        "id": "fe33b47b.c7292",
+        "id": "1dcb46a1.3c7d49",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
-        "comments": "",
         "outputs": 1,
-        "x": 4294,
-        "y": 515,
-        "z": "de2a2b68.0a5d7",
+        "x": 3697.883331298828,
+        "y": 943.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
-            []
+            [
+                "f5b5d495.086d"
+            ]
+        ]
+    },
+    {
+        "id": "a436621f.a466c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3697.883331298828,
+        "y": 1116.8832092285156,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "43e5bf6b.ff29a8"
+            ]
         ]
     },
     {
-        "id": "270a4545.e66b22",
+        "id": "f5b5d495.086d",
         "type": "switchNode",
-        "name": "switch connectivity has ethernet service",
-        "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
+        "name": "switch nr type",
+        "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3728,
-        "y": 615,
-        "z": "de2a2b68.0a5d7",
+        "x": 3869.883331298828,
+        "y": 943.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "9b17a7a2.876",
-                "67f91d39.722cb4"
+                "55f80e1b.2635f",
+                "43049869.5a7d88"
             ]
         ]
     },
     {
-        "id": "67f91d39.722cb4",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "43e5bf6b.ff29a8",
+        "type": "switchNode",
+        "name": "switch nr type",
+        "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3981,
-        "y": 593,
-        "z": "de2a2b68.0a5d7",
+        "x": 3870.883331298828,
+        "y": 1116.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "10401b5c.b05865"
+                "f9772113.de9e58",
+                "79517b7a.195d94"
             ]
         ]
     },
     {
-        "id": "9b17a7a2.876",
+        "id": "55f80e1b.2635f",
         "type": "outcome",
-        "name": "Null",
-        "xml": "<outcome value=''>\n",
+        "name": "ROOT",
+        "xml": "<outcome value='ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3981,
-        "y": 649,
-        "z": "de2a2b68.0a5d7",
+        "x": 4045.883331298828,
+        "y": 922.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
-            []
+            [
+                "d9c9bf69.d54ef8"
+            ]
         ]
     },
     {
-        "id": "9c7846e0.04a7f",
-        "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",
+        "id": "43049869.5a7d88",
+        "type": "outcome",
+        "name": "LEAF",
+        "xml": "<outcome value='LEAF'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2277,
-        "y": 1030,
-        "z": "de2a2b68.0a5d7",
+        "x": 4047.883331298828,
+        "y": 976.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
-            []
+            [
+                "5ac63627.c33ff"
+            ]
         ]
     },
     {
-        "id": "d4768fc2.d5865",
-        "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",
+        "id": "f9772113.de9e58",
+        "type": "outcome",
+        "name": "ROOT",
+        "xml": "<outcome value='ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3709,
-        "y": 731,
-        "z": "de2a2b68.0a5d7",
+        "x": 4046.883331298828,
+        "y": 1086.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
-            []
+            [
+                "35523eeb.15287a"
+            ]
         ]
     },
     {
-        "id": "e7d69f06.780b38",
+        "id": "79517b7a.195d94",
         "type": "outcome",
-        "name": "uni",
-        "xml": "<outcome value='uni'>\n",
+        "name": "LEAF",
+        "xml": "<outcome value='LEAF'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2642,
-        "y": 710,
-        "z": "de2a2b68.0a5d7",
+        "x": 4048.883331298828,
+        "y": 1140.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "f282643f.862928"
+                "377b88b8.aaeb48"
             ]
         ]
     },
     {
-        "id": "f282643f.862928",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "eba0d9fe.14aff8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "b156164c.4afee",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "c46834b2.126828",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "67f1e499.325a54",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "fa18abdb.1f3b58",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
         "outputs": 1,
-        "x": 2805,
-        "y": 710,
-        "z": "de2a2b68.0a5d7",
+        "x": 3579.883331298828,
+        "y": 1561.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "7484e145.9ae3a8"
+                "acfe7f1b.815bb8"
             ]
         ]
     },
     {
-        "id": "7484e145.9ae3a8",
-        "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",
+        "id": "504369a4.383c58",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3048,
-        "y": 710,
-        "z": "de2a2b68.0a5d7",
+        "x": 3589.374298095703,
+        "y": 1604.4573669433594,
+        "z": "82de8dcf.518d88",
         "wires": [
-            []
+            [
+                "2cc2d2a0.0189de"
+            ]
         ]
     },
     {
-        "id": "9386fbbc.1d2048",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "48dc6834.fa2a",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2087,
-        "y": 299,
-        "z": "de2a2b68.0a5d7",
+        "x": 3577.883331298828,
+        "y": 1650.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "c57d1cb2.40bd38",
-                "9c7846e0.04a7f"
+                "5165f4d1.561cf4"
             ]
         ]
     },
     {
-        "id": "9fe92008.1b7c9",
-        "type": "switchNode",
-        "name": "switch has any relationship",
-        "xml": "<switch test=\"`$tmp.aai.service-instance.relationship-list.relationship_length != ''`\">\n",
+        "id": "a5821370.c906a8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "94a806e9.b63df",
+        "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": 1162,
-        "y": 234,
-        "z": "de2a2b68.0a5d7",
+        "x": 3322.883331298828,
+        "y": 1588.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "9d9cab47.ce0658"
+                "fa18abdb.1f3b58",
+                "504369a4.383c58",
+                "48dc6834.fa2a"
             ]
         ]
     },
     {
-        "id": "9d9cab47.ce0658",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "26f3b8c8.1692a",
+        "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",
+        "wires": [
+            [
+                "e1766e3b.d98f7",
+                "2b2fec17.7ad784"
+            ]
+        ]
+    },
+    {
+        "id": "2b2fec17.7ad784",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1391,
-        "y": 230,
-        "z": "de2a2b68.0a5d7",
+        "x": 3546.883331298828,
+        "y": 1244.8833312988281,
+        "z": "82de8dcf.518d88",
         "wires": [
             [
-                "5b569a16.745f1c"
+                "9fa24ca4.2bf57"
             ]
         ]
+    },
+    {
+        "id": "e1766e3b.d98f7",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3548.883331298828,
+        "y": 1277.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "43f11543.33be3c"
+            ]
+        ]
+    },
+    {
+        "id": "acfe7f1b.815bb8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3752.549835205078,
+        "y": 1560.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "72fd24ba.a9210c",
+                "abb77544.4a8348"
+            ]
+        ]
+    },
+    {
+        "id": "2cc2d2a0.0189de",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "5165f4d1.561cf4",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "72fd24ba.a9210c",
+        "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",
+        "wires": [
+            [
+                "e6b87836.bef2f8",
+                "b8a921ef.444378"
+            ]
+        ]
+    },
+    {
+        "id": "b8a921ef.444378",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4239.883331298828,
+        "y": 1499.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "54ec9e81.9a2fc"
+            ]
+        ]
+    },
+    {
+        "id": "e6b87836.bef2f8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4241.883331298828,
+        "y": 1563.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "27ce4c05.8bf1dc"
+            ]
+        ]
+    },
+    {
+        "id": "27ce4c05.8bf1dc",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "54ec9e81.9a2fc",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4404.883331298828,
+        "y": 1496.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "f6774ff2.abd22",
+                "bb24ac55.01a618"
+            ]
+        ]
+    },
+    {
+        "id": "2e1ea98e.240716",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "19e24364.492f0d",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "aefdb41a.15ed9",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "43f11543.33be3c",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "9fa24ca4.2bf57",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3694.883331298828,
+        "y": 1237.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "fc422c00.a0a738",
+                "4c9af5cc.7cdc6c"
+            ]
+        ]
+    },
+    {
+        "id": "fc422c00.a0a738",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "abb77544.4a8348",
+        "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",
+        "wires": [
+            [
+                "af71b606.ad1ca8"
+            ]
+        ]
+    },
+    {
+        "id": "af71b606.ad1ca8",
+        "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",
+        "wires": [
+            [
+                "1586191.cb5c467"
+            ]
+        ]
+    },
+    {
+        "id": "1586191.cb5c467",
+        "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",
+        "wires": [
+            [
+                "2efd1433.a69a04"
+            ]
+        ]
+    },
+    {
+        "id": "4c9af5cc.7cdc6c",
+        "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",
+        "wires": [
+            [
+                "f48c8915.33d9e8",
+                "cce55dcf.842618",
+                "5e74a015.2ca67"
+            ]
+        ]
+    },
+    {
+        "id": "f48c8915.33d9e8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4079.3834533691406,
+        "y": 1256.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "5a7d862f.3b4ad8"
+            ]
+        ]
+    },
+    {
+        "id": "cce55dcf.842618",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4071.3834533691406,
+        "y": 1311.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "9061c72.32ffe38"
+            ]
+        ]
+    },
+    {
+        "id": "5e74a015.2ca67",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4076.3834533691406,
+        "y": 1368.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "6b55247c.21dab4"
+            ]
+        ]
+    },
+    {
+        "id": "6b55247c.21dab4",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "9061c72.32ffe38",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "5a7d862f.3b4ad8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4223.765777587891,
+        "y": 1254.5390014648438,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "d89a976.d88e5e8"
+            ]
+        ]
+    },
+    {
+        "id": "d89a976.d88e5e8",
+        "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",
+        "wires": [
+            [
+                "155fb221.0dbf8e"
+            ]
+        ]
+    },
+    {
+        "id": "bb24ac55.01a618",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "f6774ff2.abd22",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "1f2d63dd.89956c",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "2efd1433.a69a04",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4599.000518798828,
+        "y": 1829.2236633300781,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "9738e3.11ec3f2",
+                "b90b51f7.bc063",
+                "e565f202.9406"
+            ]
+        ]
+    },
+    {
+        "id": "9738e3.11ec3f2",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "b90b51f7.bc063",
+        "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",
+        "wires": [
+            [
+                "2d0e3a15.1426a6"
+            ]
+        ]
+    },
+    {
+        "id": "e565f202.9406",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 4766.500518798828,
+        "y": 1872.2236633300781,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "2d0e3a15.1426a6",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4991.500518798828,
+        "y": 1829.2236633300781,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "a863747c.f65e78"
+            ]
+        ]
+    },
+    {
+        "id": "60c94053.2751c",
+        "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",
+        "wires": [
+            [
+                "de3b61b0.e43d2"
+            ]
+        ]
+    },
+    {
+        "id": "de3b61b0.e43d2",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4982.883331298828,
+        "y": 1264.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "b2f44bdb.9dc5e8",
+                "1f8e5eff.5b4f51"
+            ]
+        ]
+    },
+    {
+        "id": "155fb221.0dbf8e",
+        "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",
+        "wires": [
+            [
+                "60c94053.2751c",
+                "ecc099ad.aafee8"
+            ]
+        ]
+    },
+    {
+        "id": "ecc099ad.aafee8",
+        "type": "outcome",
+        "name": "network-resource",
+        "xml": "<outcome value='network-resource'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 4808.883331298828,
+        "y": 1346.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "e5e04393.9d571"
+            ]
+        ]
+    },
+    {
+        "id": "e5e04393.9d571",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4985.883331298828,
+        "y": 1338.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "39969cdd.a78634"
+            ]
+        ]
+    },
+    {
+        "id": "a863747c.f65e78",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5149.500518798828,
+        "y": 1829.2236633300781,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "9ec1944.f167b68"
+            ]
+        ]
+    },
+    {
+        "id": "9ec1944.f167b68",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "1f8e5eff.5b4f51",
+        "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",
+        "wires": [
+            [
+                "1422dd1f.ed1903",
+                "306288e7.8d0b68",
+                "adc4d006.c9a618"
+            ]
+        ]
+    },
+    {
+        "id": "b2f44bdb.9dc5e8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "1422dd1f.ed1903",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5400.883331298828,
+        "y": 1262.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "9be58098.9885c8"
+            ]
+        ]
+    },
+    {
+        "id": "306288e7.8d0b68",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5392.883331298828,
+        "y": 1317.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "ddbc66fb.291808"
+            ]
+        ]
+    },
+    {
+        "id": "adc4d006.c9a618",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5397.883331298828,
+        "y": 1374.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "f026a629.a20b28"
+            ]
+        ]
+    },
+    {
+        "id": "f026a629.a20b28",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "ddbc66fb.291808",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "9be58098.9885c8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5545.265655517578,
+        "y": 1260.5390014648438,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "b1324a29.092c8"
+            ]
+        ]
+    },
+    {
+        "id": "39969cdd.a78634",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "b1324a29.092c8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "e7c33475.7e91e8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "5025b50.00b0f4c",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "d9c9bf69.d54ef8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4168.883331298828,
+        "y": 916.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "eba0d9fe.14aff8",
+                "e7c33475.7e91e8"
+            ]
+        ]
+    },
+    {
+        "id": "5ac63627.c33ff",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4174.883331298828,
+        "y": 980.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "b156164c.4afee",
+                "5025b50.00b0f4c"
+            ]
+        ]
+    },
+    {
+        "id": "35523eeb.15287a",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4174.883331298828,
+        "y": 1086.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "c46834b2.126828",
+                "7dcc31dd.14e278"
+            ]
+        ]
+    },
+    {
+        "id": "377b88b8.aaeb48",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4177.883331298828,
+        "y": 1139.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "67f1e499.325a54",
+                "e00fdb48.f91848"
+            ]
+        ]
+    },
+    {
+        "id": "7dcc31dd.14e278",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "e00fdb48.f91848",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "b1c3c9b6.d1dd38",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3709.883331298828,
+        "y": 2400.883331298828,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "8d971e70.183d4",
+                "ac7f0ae7.0820f"
+            ]
+        ]
+    },
+    {
+        "id": "37cdc12f.574c9e",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3537.216827392578,
+        "y": 2401.883331298828,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "b1c3c9b6.d1dd38"
+            ]
+        ]
+    },
+    {
+        "id": "17fb9abf.e94b5d",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3546.707794189453,
+        "y": 2444.4573669433594,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "ffec1f14.6b38f8"
+            ]
+        ]
+    },
+    {
+        "id": "77126cff.9c26a4",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3535.216827392578,
+        "y": 2490.883331298828,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "6fe13c0.1437ac4"
+            ]
+        ]
+    },
+    {
+        "id": "ffec1f14.6b38f8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "6fe13c0.1437ac4",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "8d971e70.183d4",
+        "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",
+        "wires": [
+            [
+                "53133799.37d4b",
+                "a86f569d.6ab9f8"
+            ]
+        ]
+    },
+    {
+        "id": "a86f569d.6ab9f8",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4219.216827392578,
+        "y": 2359.8834533691406,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "66c68013.ddb6b8"
+            ]
+        ]
+    },
+    {
+        "id": "53133799.37d4b",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4221.216827392578,
+        "y": 2423.8834533691406,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "7ccc7afc.6f2a8c"
+            ]
+        ]
+    },
+    {
+        "id": "7ccc7afc.6f2a8c",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "66c68013.ddb6b8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4384.216827392578,
+        "y": 2356.8834533691406,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "14b7c942.3a7d87",
+                "705ad60b.9c1b38"
+            ]
+        ]
+    },
+    {
+        "id": "6b364584.e1350c",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2e817e1e.7658f2",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1f716896.64ed2f",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "221f1c18.663f6c",
+        "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",
+        "wires": [
+            [
+                "37cdc12f.574c9e",
+                "17fb9abf.e94b5d",
+                "77126cff.9c26a4"
+            ]
+        ]
+    },
+    {
+        "id": "b3b2ce86.7d813",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "a001cedc.58f128",
+        "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",
+        "wires": [
+            [
+                "d5568173.1326d",
+                "27e39e34.e8a4aa"
+            ]
+        ]
+    },
+    {
+        "id": "27e39e34.e8a4aa",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3550.216827392578,
+        "y": 2085.8832092285156,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "ba49d8fd.b81698"
+            ]
+        ]
+    },
+    {
+        "id": "d5568173.1326d",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3552.216827392578,
+        "y": 2118.8832092285156,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "54689cfb.423da4"
+            ]
+        ]
+    },
+    {
+        "id": "54689cfb.423da4",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "ba49d8fd.b81698",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3698.216827392578,
+        "y": 2078.8832092285156,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "e65b9c6b.1cea38",
+                "e0207e5b.773f7"
+            ]
+        ]
+    },
+    {
+        "id": "e65b9c6b.1cea38",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "ac7f0ae7.0820f",
+        "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",
+        "wires": [
+            [
+                "eb66de49.8a6178"
+            ]
+        ]
+    },
+    {
+        "id": "eb66de49.8a6178",
+        "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",
+        "wires": [
+            [
+                "a3eb7777.2808e"
+            ]
+        ]
+    },
+    {
+        "id": "a3eb7777.2808e",
+        "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",
+        "wires": [
+            [
+                "90bfeab5.6e04"
+            ]
+        ]
+    },
+    {
+        "id": "e0207e5b.773f7",
+        "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",
+        "wires": [
+            [
+                "ff3d2407.61718",
+                "f34e14e1.674a08",
+                "f7ebc3eb.0fe87"
+            ]
+        ]
+    },
+    {
+        "id": "ff3d2407.61718",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4109.716949462891,
+        "y": 2101.883331298828,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "e4f3177f.7fd418"
+            ]
+        ]
+    },
+    {
+        "id": "f34e14e1.674a08",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4101.716949462891,
+        "y": 2156.883331298828,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "7e75e0e1.a6768"
+            ]
+        ]
+    },
+    {
+        "id": "f7ebc3eb.0fe87",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4106.716949462891,
+        "y": 2213.883331298828,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "917fd40f.ec43b"
+            ]
+        ]
+    },
+    {
+        "id": "917fd40f.ec43b",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "7e75e0e1.a6768",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "e4f3177f.7fd418",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4254.099273681641,
+        "y": 2099.5390014648438,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "96db4a5c.6d74f"
+            ]
+        ]
+    },
+    {
+        "id": "14b7c942.3a7d87",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "705ad60b.9c1b38",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "fe24857d.ec88f8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "90bfeab5.6e04",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4585.334014892578,
+        "y": 2702.2237854003906,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "d29ec4c3.e3026",
+                "3dd34bd3.f84b34",
+                "855f6bda.886bb"
+            ]
+        ]
+    },
+    {
+        "id": "d29ec4c3.e3026",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "3dd34bd3.f84b34",
+        "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",
+        "wires": [
+            [
+                "498fc826.7744e"
+            ]
+        ]
+    },
+    {
+        "id": "855f6bda.886bb",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 4752.834014892578,
+        "y": 2745.2237854003906,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "498fc826.7744e",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4977.834014892578,
+        "y": 2702.2237854003906,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "3dffa556.ecd0ba"
+            ]
+        ]
+    },
+    {
+        "id": "3dffa556.ecd0ba",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5135.834014892578,
+        "y": 2702.2237854003906,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "e57a350c.677e18"
+            ]
+        ]
+    },
+    {
+        "id": "e57a350c.677e18",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "321528be.3d7ae",
+        "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",
+        "wires": [
+            [
+                "e56d9c92.9b763"
+            ]
+        ]
+    },
+    {
+        "id": "e56d9c92.9b763",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5013.216827392578,
+        "y": 2109.883331298828,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "251b7dfd.9c2dea",
+                "f747044b.58f4e"
+            ]
+        ]
+    },
+    {
+        "id": "96db4a5c.6d74f",
+        "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",
+        "wires": [
+            [
+                "3dedc7fb.152e08"
+            ]
+        ]
+    },
+    {
+        "id": "3dedc7fb.152e08",
+        "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",
+        "wires": [
+            [
+                "321528be.3d7ae",
+                "b22cff66.f669e8"
+            ]
+        ]
+    },
+    {
+        "id": "f747044b.58f4e",
+        "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",
+        "wires": [
+            [
+                "1f813de4.828122",
+                "d83bccad.38e8b8",
+                "c46088f8.fb1e"
+            ]
+        ]
+    },
+    {
+        "id": "cd687e81.f269c8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5015.216827392578,
+        "y": 2182.883331298828,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "44576406.503604"
+            ]
+        ]
+    },
+    {
+        "id": "b22cff66.f669e8",
+        "type": "outcome",
+        "name": "network-resource",
+        "xml": "<outcome value='network-resource'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 4838.216827392578,
+        "y": 2190.883331298828,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "cd687e81.f269c8"
+            ]
+        ]
+    },
+    {
+        "id": "251b7dfd.9c2dea",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "44576406.503604",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "1f813de4.828122",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5431.216827392578,
+        "y": 2107.883331298828,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "9f1d5683.34bf48"
+            ]
+        ]
+    },
+    {
+        "id": "d83bccad.38e8b8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5423.216827392578,
+        "y": 2162.883331298828,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "3d8c6a19.63c47e"
+            ]
+        ]
+    },
+    {
+        "id": "c46088f8.fb1e",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5428.216827392578,
+        "y": 2219.883331298828,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "868d602e.d270d8"
+            ]
+        ]
+    },
+    {
+        "id": "868d602e.d270d8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "3d8c6a19.63c47e",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "9f1d5683.34bf48",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5575.599151611328,
+        "y": 2105.5390014648438,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "580e8311.7470f4"
+            ]
+        ]
+    },
+    {
+        "id": "580e8311.7470f4",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "77955a17.d633ac",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "88408865.7d27f8",
+        "type": "comment",
+        "name": "This is it (should be)",
+        "info": "",
+        "comments": "",
+        "x": 4510.883331298828,
+        "y": 994.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "d43945c8.bc5bc",
+        "type": "comment",
+        "name": "This is it (should be)",
+        "info": "",
+        "comments": "",
+        "x": 4502.883331298828,
+        "y": 1084.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "1e4146ab.95c211",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "893317d2.3ef5f",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fd0edd2e.c98978",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "98563074.1e7ea",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c475408d.68ef",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "e109d5f4.51e5d",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "2e92209c.b2514",
+        "type": "comment",
+        "name": "NOT NEEDED ANYMORE?",
+        "info": "",
+        "comments": "",
+        "x": 4036.883331298828,
+        "y": 1795.8833312988281,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "cc84986.18b2868",
+        "type": "comment",
+        "name": "NOT NEEDED ANYMORE?",
+        "info": "",
+        "comments": "",
+        "x": 4014.883331298828,
+        "y": 2665.883331298828,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "e351db25.84cdc8",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "bbb27c53.89e32",
+        "type": "comment",
+        "name": "START OF DELETE OPERATION",
+        "info": "",
+        "comments": "",
+        "x": 3288.88330078125,
+        "y": 2897.88330078125,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "3023ae1c.6e2482",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a4dfc5e6.4600f",
+        "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",
+        "wires": [
+            [
+                "3c4fb74b.12c308",
+                "cc5ca51c.d55828",
+                "10482aca.fa7bbd"
+            ]
+        ]
+    },
+    {
+        "id": "cc5ca51c.d55828",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3473.0576171875,
+        "y": 2989.857421875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "f3fff98e.f3e778"
+            ]
+        ]
+    },
+    {
+        "id": "10482aca.fa7bbd",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3468.566650390625,
+        "y": 3034.2833862304688,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "686bd6b1.dd501"
+            ]
+        ]
+    },
+    {
+        "id": "f3fff98e.f3e778",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "686bd6b1.dd501",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "3c4fb74b.12c308",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3480.566650390625,
+        "y": 3084.283447265625,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "9563229e.3fe02"
+            ]
+        ]
+    },
+    {
+        "id": "9563229e.3fe02",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 3632.88330078125,
+        "y": 3087.88330078125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "f32c210.90e5fe",
+                "3023ae1c.6e2482",
+                "dfd78621.0c4df"
+            ]
+        ]
+    },
+    {
+        "id": "f32c210.90e5fe",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "4c9abbae.5d458c",
+        "type": "comment",
+        "name": "Update ROOT UNI's bw",
+        "info": "",
+        "comments": "",
+        "x": 3833.566650390625,
+        "y": 3193.083251953125,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "547f08e5.b430b",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "dfd78621.0c4df",
+        "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",
+        "wires": [
+            [
+                "51d31fac.6dab6",
+                "d9c98a3d.c2af8",
+                "e932164d.0b10e8"
+            ]
+        ]
+    },
+    {
+        "id": "d9c98a3d.c2af8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4053.057373046875,
+        "y": 3211.6572265625,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "f1a39628.bdc748"
+            ]
+        ]
+    },
+    {
+        "id": "e932164d.0b10e8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4048.56640625,
+        "y": 3256.0831909179688,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "dfc7b8eb.48de78"
+            ]
+        ]
+    },
+    {
+        "id": "f1a39628.bdc748",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "dfc7b8eb.48de78",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "dd0cc66d.fbf3a8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4213.56640625,
+        "y": 3306.083251953125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "9a3f7682.b82b9",
+                "547f08e5.b430b"
+            ]
+        ]
+    },
+    {
+        "id": "51d31fac.6dab6",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4044.56640625,
+        "y": 3306.083251953125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "dd0cc66d.fbf3a8"
+            ]
+        ]
+    },
+    {
+        "id": "9a3f7682.b82b9",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "998e4ab7.4d5be",
+        "type": "comment",
+        "name": "Delete LEAF UNI",
+        "info": "",
+        "comments": "",
+        "x": 3825.88330078125,
+        "y": 2971.88330078125,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "44b90aa0.b32f1c",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "2a719f3a.33348",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "33975a1e.497a26",
+        "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",
+        "wires": [
+            [
+                "6169e5ef.6af5c4",
+                "e3565ed9.a6bae8"
+            ]
+        ]
+    },
+    {
+        "id": "6169e5ef.6af5c4",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3459.749969482422,
+        "y": 3851.283416748047,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "3f7c202a.f0897"
+            ]
+        ]
+    },
+    {
+        "id": "3f7c202a.f0897",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "e3565ed9.a6bae8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3463.749969482422,
+        "y": 3895.283416748047,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "c54729aa.dea04"
+            ]
+        ]
+    },
+    {
+        "id": "c54729aa.dea04",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 3602.749969482422,
+        "y": 3890.283416748047,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "563cd7a4.5a9238",
+                "f2c9af7.5a8ebd",
+                "2a4d2a1b.ff481e"
+            ]
+        ]
+    },
+    {
+        "id": "563cd7a4.5a9238",
+        "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",
+        "wires": [
+            [
+                "ec034714.60ea58"
+            ]
+        ]
+    },
+    {
+        "id": "ec034714.60ea58",
+        "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",
+        "wires": [
+            [
+                "e531db92.56031"
+            ]
+        ]
+    },
+    {
+        "id": "e531db92.56031",
+        "type": "outcome",
+        "name": "uni",
+        "xml": "<outcome value='uni'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4235.149139404297,
+        "y": 3856.800018310547,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "d94f5698.a9e22"
+            ]
+        ]
+    },
+    {
+        "id": "717ee9f8.5f5168",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4388.149658203125,
+        "y": 3837.800048828125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "44024f46.b6d6d",
+                "8cf84976.9daac8"
+            ]
+        ]
+    },
+    {
+        "id": "44024f46.b6d6d",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "f2c9af7.5a8ebd",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "2a4d2a1b.ff481e",
+        "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",
+        "wires": [
+            [
+                "39fb0c16.c2b2c4",
+                "808499cb.5bf588"
+            ]
+        ]
+    },
+    {
+        "id": "8cf84976.9daac8",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 4552.88330078125,
+        "y": 3873.88330078125,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "808499cb.5bf588",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 154.65066528320312,
+        "y": 5302.8837890625,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "7018ac1a.7a3c7c"
+            ]
+        ]
+    },
+    {
+        "id": "39fb0c16.c2b2c4",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3988.650634765625,
+        "y": 4340.883544921875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "a235b563.2e3c2"
+            ]
+        ]
+    },
+    {
+        "id": "a235b563.2e3c2",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4131.650634765625,
+        "y": 4336.883544921875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "ca74ec50.92ce48",
+                "76172197.657ac",
+                "2a3f4733.a29bc",
+                "c850b8e4.0504c8",
+                "46570b89.8afbb4",
+                "819543bf.270a9",
+                "ca7e6690.5ab92",
+                "26004944.36227e"
+            ]
+        ]
+    },
+    {
+        "id": "9d4f67a6.1fc128",
+        "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",
+        "comments": "",
+        "x": 181,
+        "y": 5258.8837890625,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "cbdd9201.8f12c8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "a3d91414.090028",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "8bf6af15.0a9a48",
+        "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",
+        "wires": [
+            [
+                "8859d6ca.2f75b8"
+            ]
+        ]
+    },
+    {
+        "id": "c067ba23.0c8be",
+        "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",
+        "wires": [
+            [
+                "8bf6af15.0a9a48"
+            ]
+        ]
+    },
+    {
+        "id": "2da7141c.ae03fc",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5127.667724609375,
+        "y": 4307.6669921875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1cbc0879.d4095",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "faedf550.ca72d",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "1b550765.eaf4d1",
+        "type": "set",
+        "name": "unset otnTopoIdSrc",
+        "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
+        "comments": "",
+        "x": 4821.667724609375,
+        "y": 4300.6669921875,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "8859d6ca.2f75b8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5074.667724609375,
+        "y": 4424.6669921875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "b9fd6938.f76ca8"
+            ]
+        ]
+    },
+    {
+        "id": "b9fd6938.f76ca8",
+        "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",
+        "wires": [
+            [
+                "d7c2d227.430278"
+            ]
+        ]
+    },
+    {
+        "id": "d7c2d227.430278",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5451.667724609375,
+        "y": 4426.6669921875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "9062d4ad.31e34"
+            ]
+        ]
+    },
+    {
+        "id": "9062d4ad.31e34",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "c312f389.231768",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ca74ec50.92ce48",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4516.667724609375,
+        "y": 4322.6669921875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "3f12b93a.0cf81e",
+                "24786620.817bb2",
+                "1cbc0879.d4095",
+                "faedf550.ca72d",
+                "a3d91414.090028",
+                "c067ba23.0c8be",
+                "c312f389.231768"
+            ]
+        ]
+    },
+    {
+        "id": "1877ba6b.c5c236",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "24786620.817bb2",
+        "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",
+        "wires": [
+            [
+                "c082f0f0.3fe63",
+                "8aa79b73.5d91b",
+                "2da7141c.ae03fc"
+            ]
+        ]
+    },
+    {
+        "id": "c082f0f0.3fe63",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5116.667724609375,
+        "y": 4226.6669921875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8aa79b73.5d91b",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5113.667724609375,
+        "y": 4267.6669921875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3f12b93a.0cf81e",
+        "type": "set",
+        "name": "unset parameters",
+        "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
+        "comments": "",
+        "x": 4829.667724609375,
+        "y": 4200.6669921875,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "76172197.657ac",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "d9693eef.d5133",
+        "type": "comment",
+        "name": "find all OTNs that have srcTtpOtnLayer and decrease their bandwidth",
+        "info": "",
+        "comments": "",
+        "x": 4459.968017578125,
+        "y": 4694.06689453125,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "2a3f4733.a29bc",
+        "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",
+        "wires": [
+            [
+                "e8babd58.4782b",
+                "e0bbecb2.837888",
+                "bb53595.0530328"
+            ]
+        ]
+    },
+    {
+        "id": "e8babd58.4782b",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4562.968017578125,
+        "y": 4726.06689453125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "8299b116.2a1f1"
+            ]
+        ]
+    },
+    {
+        "id": "e0bbecb2.837888",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4546.458984375,
+        "y": 4787.640930175781,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "af952dc7.60185"
+            ]
+        ]
+    },
+    {
+        "id": "bb53595.0530328",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4543.968017578125,
+        "y": 4831.06689453125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "a2d64007.4e8e68"
+            ]
+        ]
+    },
+    {
+        "id": "8299b116.2a1f1",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4730.96826171875,
+        "y": 4721.06689453125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "575eea2a.c26ae4"
+            ]
+        ]
+    },
+    {
+        "id": "af952dc7.60185",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "a2d64007.4e8e68",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "575eea2a.c26ae4",
+        "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",
+        "wires": [
+            [
+                "b0cdcdcc.86b948"
+            ]
+        ]
+    },
+    {
+        "id": "b0cdcdcc.86b948",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 5202.968017578125,
+        "y": 4733.06689453125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "fe17da41.8d7458"
+            ]
+        ]
+    },
+    {
+        "id": "63f7f511.d89814",
+        "type": "comment",
+        "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
+        "info": "",
+        "comments": "",
+        "x": 5188.784423828125,
+        "y": 4955.2333984375,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "fe17da41.8d7458",
+        "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",
+        "wires": [
+            [
+                "adceca9b.52be78",
+                "6371c80.a864db8"
+            ]
+        ]
+    },
+    {
+        "id": "6371c80.a864db8",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5465.784454345703,
+        "y": 4995.233184814453,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "adceca9b.52be78",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5346.784423828125,
+        "y": 4921.233154296875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "eabe2b02.0bc13"
+            ]
+        ]
+    },
+    {
+        "id": "eabe2b02.0bc13",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 5473.767822265625,
+        "y": 4859.649658203125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "b15dfc5.1130d",
+                "7054ba61.11f874",
+                "e5483e65.23a9a"
+            ]
+        ]
+    },
+    {
+        "id": "771d8350.1c0644",
+        "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",
+        "wires": [
+            [
+                "3a42df45.8a578"
+            ]
+        ]
+    },
+    {
+        "id": "3a42df45.8a578",
+        "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",
+        "wires": [
+            [
+                "f5feb746.9bcea8"
+            ]
+        ]
+    },
+    {
+        "id": "b15dfc5.1130d",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "7054ba61.11f874",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "e5483e65.23a9a",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c01f7460.fab75",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a637b405.b076f",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "f5feb746.9bcea8",
+        "type": "outcome",
+        "name": "connectivity",
+        "xml": "<outcome value='connectivity'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 6083.8173828125,
+        "y": 4711.650146484375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "4f7dc832.d994c8"
+            ]
+        ]
+    },
+    {
+        "id": "4f7dc832.d994c8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 6245.8173828125,
+        "y": 4700.650146484375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "f7240b03.b46408",
+                "a1eea84d.7200b"
+            ]
+        ]
+    },
+    {
+        "id": "f7240b03.b46408",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "a1eea84d.7200b",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "ce0d81bd.d28a7",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7f04acf4.5afc3c",
+        "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",
+        "wires": [
+            [
+                "d1c2eeb4.215af8",
+                "f1f6bb53.ccd5d8"
+            ]
+        ]
+    },
+    {
+        "id": "d1c2eeb4.215af8",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3158.800048828125,
+        "y": 3276.683349609375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "d53b6d30.115bd"
+            ]
+        ]
+    },
+    {
+        "id": "d53b6d30.115bd",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 3301.800048828125,
+        "y": 3276.683349609375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "5f773b5f.84092c"
+            ]
+        ]
+    },
+    {
+        "id": "5f773b5f.84092c",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "f1f6bb53.ccd5d8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3156.800048828125,
+        "y": 3331.683349609375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "e42ba1d9.fa7b7"
+            ]
+        ]
+    },
+    {
+        "id": "e42ba1d9.fa7b7",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 3003.800048828125,
+        "y": 3464.683349609375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "44b90aa0.b32f1c",
+                "2a719f3a.33348",
+                "33975a1e.497a26",
+                "c19f56be.5aa798",
+                "eb35e3d0.6d25d",
+                "5aebe180.f62f68"
+            ]
+        ]
+    },
+    {
+        "id": "5c85f7ca.d8c4a",
+        "type": "comment",
+        "name": "Find LEAF connectivity",
+        "info": "",
+        "comments": "",
+        "x": 3225.88330078125,
+        "y": 3704.88330078125,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "c19f56be.5aa798",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "eb35e3d0.6d25d",
+        "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",
+        "wires": [
+            [
+                "ca4bb58e.913108"
+            ]
+        ]
+    },
+    {
+        "id": "ca4bb58e.913108",
+        "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",
+        "wires": [
+            [
+                "468a474d.40c4d8"
+            ]
+        ]
+    },
+    {
+        "id": "468a474d.40c4d8",
+        "type": "outcome",
+        "name": "uni",
+        "xml": "<outcome value='uni'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3729.83251953125,
+        "y": 3498.60009765625,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "e61de8ad.7030f"
+            ]
+        ]
+    },
+    {
+        "id": "3444ada9.d2b992",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4498.833740234375,
+        "y": 3533.60009765625,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "7b31b3f.9c4444c",
+                "31b46b09.5b560c",
+                "a9c3a9a9.0f7c28"
+            ]
+        ]
+    },
+    {
+        "id": "7b31b3f.9c4444c",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "31b46b09.5b560c",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 4671.567657470703,
+        "y": 3555.683380126953,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "dbe78677.7f04b8",
+        "type": "comment",
+        "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",
+        "info": "",
+        "comments": "",
+        "x": 4432.88427734375,
+        "y": 5085.883544921875,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "c850b8e4.0504c8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "ca7e6690.5ab92",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "26004944.36227e",
+        "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",
+        "wires": [
+            [
+                "c57768ca.7a8088",
+                "7224490d.b02598"
+            ]
+        ]
+    },
+    {
+        "id": "c57768ca.7a8088",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4562.317138671875,
+        "y": 5632.800048828125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "25615183.2d4bd6"
+            ]
+        ]
+    },
+    {
+        "id": "7224490d.b02598",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4558.317138671875,
+        "y": 5680.800048828125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "5dcdd7b9.89499"
+            ]
+        ]
+    },
+    {
+        "id": "25615183.2d4bd6",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 4718.317138671875,
+        "y": 5628.800048828125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "9b98cd10.6cfb68"
+            ]
+        ]
+    },
+    {
+        "id": "5dcdd7b9.89499",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "f97c958c.da83b8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "903178c6.839788",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "46570b89.8afbb4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4311.734130859375,
+        "y": 5256.083740234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "903178c6.839788",
+                "42c91ccf.e64244"
+            ]
+        ]
+    },
+    {
+        "id": "42c91ccf.e64244",
+        "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",
+        "wires": [
+            [
+                "30eabd9c.98c532",
+                "66fbb0fb.26a3f",
+                "fbd21163.a12cd8"
+            ]
+        ]
+    },
+    {
+        "id": "30eabd9c.98c532",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4743.2342529296875,
+        "y": 5201.083740234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "26c5ac0c.2065fc"
+            ]
+        ]
+    },
+    {
+        "id": "66fbb0fb.26a3f",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4735.2342529296875,
+        "y": 5256.083740234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "a0a0372d.9d324"
+            ]
+        ]
+    },
+    {
+        "id": "26c5ac0c.2065fc",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4887.6165771484375,
+        "y": 5200.739410400391,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "40d1dc2e.899afc"
+            ]
+        ]
+    },
+    {
+        "id": "40d1dc2e.899afc",
+        "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",
+        "wires": [
+            [
+                "137e1346.633fe5"
+            ]
+        ]
+    },
+    {
+        "id": "137e1346.633fe5",
+        "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",
+        "wires": [
+            [
+                "19ce94ba.82e9d3"
+            ]
+        ]
+    },
+    {
+        "id": "fbd21163.a12cd8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4740.2342529296875,
+        "y": 5313.083740234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "4a6cd196.293db"
+            ]
+        ]
+    },
+    {
+        "id": "4a6cd196.293db",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "a0a0372d.9d324",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "1398b0a6.59adbf",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5648.734130859375,
+        "y": 5203.083740234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "ac703b64.91e208",
+                "60a60a9a.326334",
+                "feb4d66b.8d20f"
+            ]
+        ]
+    },
+    {
+        "id": "19ce94ba.82e9d3",
+        "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",
+        "wires": [
+            [
+                "1398b0a6.59adbf"
+            ]
+        ]
+    },
+    {
+        "id": "60a60a9a.326334",
+        "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",
+        "wires": [
+            [
+                "9885a0c6.ee00f8",
+                "a77a3d25.4123b",
+                "3b9ca266.b8d5f6"
+            ]
+        ]
+    },
+    {
+        "id": "ac703b64.91e208",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "9885a0c6.ee00f8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 6064.734130859375,
+        "y": 5207.083740234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "fd819e5.0208ae"
+            ]
+        ]
+    },
+    {
+        "id": "a77a3d25.4123b",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 6056.734130859375,
+        "y": 5262.083740234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "9503eaf8.25455"
+            ]
+        ]
+    },
+    {
+        "id": "3b9ca266.b8d5f6",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 6061.734130859375,
+        "y": 5319.083740234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "2f6c8ed.964c6f2"
+            ]
+        ]
+    },
+    {
+        "id": "2f6c8ed.964c6f2",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "9503eaf8.25455",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "fd819e5.0208ae",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 6209.116455078125,
+        "y": 5204.739410400391,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "fdf4316f.fecc18"
+            ]
+        ]
+    },
+    {
+        "id": "fdf4316f.fecc18",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "feb4d66b.8d20f",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 5804.734130859375,
+        "y": 5280.083740234375,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "819543bf.270a9",
+        "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",
+        "wires": [
+            [
+                "fe68d2f2.044a28",
+                "9d6b0bdc.79122"
+            ]
+        ]
+    },
+    {
+        "id": "fe68d2f2.044a28",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4813.734130859375,
+        "y": 5368.683349609375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "dd8bd538.48e76"
+            ]
+        ]
+    },
+    {
+        "id": "dd8bd538.48e76",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "17aac5bf.8ce3ca",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 4975.234130859375,
+        "y": 5408.683349609375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9d6b0bdc.79122",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4817.734130859375,
+        "y": 5408.683349609375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "17aac5bf.8ce3ca"
+            ]
+        ]
+    },
+    {
+        "id": "67f63093.820248",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5126.451171875,
+        "y": 5622.683349609375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "9523ac21.fb27e8",
+                "ee545a84.5a0b8"
+            ]
+        ]
+    },
+    {
+        "id": "ee545a84.5a0b8",
+        "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",
+        "wires": [
+            [
+                "3e67e67b.64c0f2",
+                "83fa1a94.1fdef",
+                "8d7d3b80.341b3"
+            ]
+        ]
+    },
+    {
+        "id": "3e67e67b.64c0f2",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5563.951171875,
+        "y": 5506.683349609375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "4b842a3.ce68254"
+            ]
+        ]
+    },
+    {
+        "id": "83fa1a94.1fdef",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5559.951171875,
+        "y": 5562.683349609375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "fe24638.108ff2"
+            ]
+        ]
+    },
+    {
+        "id": "4b842a3.ce68254",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5708.3333740234375,
+        "y": 5524.339019775391,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "471b8aca.2d2d8c"
+            ]
+        ]
+    },
+    {
+        "id": "471b8aca.2d2d8c",
+        "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",
+        "wires": [
+            [
+                "835403d4.ab8a4"
+            ]
+        ]
+    },
+    {
+        "id": "8d7d3b80.341b3",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5569.951171875,
+        "y": 5607.683349609375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "dbe8e8e2.82532"
+            ]
+        ]
+    },
+    {
+        "id": "dbe8e8e2.82532",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "fe24638.108ff2",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "23127469.8e053c",
+        "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",
+        "wires": [
+            [
+                "2dc53207.e6e746",
+                "5dfbf094.3dd5e"
+            ]
+        ]
+    },
+    {
+        "id": "2dc53207.e6e746",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5628.451171875,
+        "y": 5660.282958984375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "d62622e9.977188"
+            ]
+        ]
+    },
+    {
+        "id": "d62622e9.977188",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "b15c93b0.c4d298",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 5836.951171875,
+        "y": 5704.282958984375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5dfbf094.3dd5e",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5638.451171875,
+        "y": 5709.282958984375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "b15c93b0.c4d298"
+            ]
+        ]
+    },
+    {
+        "id": "9523ac21.fb27e8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "835403d4.ab8a4",
+        "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",
+        "wires": [
+            [
+                "44025b35.70e694"
+            ]
+        ]
+    },
+    {
+        "id": "defb6a74.ad63a8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 6469.450927734375,
+        "y": 5526.683349609375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "f54f4ae0.ec5cf",
+                "af149106.171db",
+                "c5fc8f53.576908"
+            ]
+        ]
+    },
+    {
+        "id": "44025b35.70e694",
+        "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",
+        "wires": [
+            [
+                "defb6a74.ad63a8"
+            ]
+        ]
+    },
+    {
+        "id": "af149106.171db",
+        "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",
+        "wires": [
+            [
+                "c7dae6ee.db5f08",
+                "40d56e1d.9aacd",
+                "1547569.25d2329"
+            ]
+        ]
+    },
+    {
+        "id": "f54f4ae0.ec5cf",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "c7dae6ee.db5f08",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 6885.450927734375,
+        "y": 5530.683349609375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "f0410cd5.fae628"
+            ]
+        ]
+    },
+    {
+        "id": "40d56e1d.9aacd",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 6877.450927734375,
+        "y": 5585.683349609375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "76b0a417.e1276c"
+            ]
+        ]
+    },
+    {
+        "id": "1547569.25d2329",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 6882.450927734375,
+        "y": 5642.683349609375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "b3783d48.7ea6c8"
+            ]
+        ]
+    },
+    {
+        "id": "b3783d48.7ea6c8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "76b0a417.e1276c",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "f0410cd5.fae628",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 7029.833251953125,
+        "y": 5528.339019775391,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "4ccba011.1ac588"
+            ]
+        ]
+    },
+    {
+        "id": "4ccba011.1ac588",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "c5fc8f53.576908",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 6625.450927734375,
+        "y": 5603.683349609375,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "e61de8ad.7030f",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3854.88330078125,
+        "y": 3492.88330078125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "f1f60f7b.897558",
+                "9394ecba.bbac2"
+            ]
+        ]
+    },
+    {
+        "id": "f1f60f7b.897558",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "9394ecba.bbac2",
+        "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",
+        "wires": [
+            [
+                "62b44b4b.e9462c",
+                "2e901346.daa35c"
+            ]
+        ]
+    },
+    {
+        "id": "62b44b4b.e9462c",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4330.884033203125,
+        "y": 3465.88330078125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "646ee476.4b949c"
+            ]
+        ]
+    },
+    {
+        "id": "2e901346.daa35c",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4337.884246826172,
+        "y": 3522.883270263672,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "3444ada9.d2b992"
+            ]
+        ]
+    },
+    {
+        "id": "646ee476.4b949c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4458.884521484375,
+        "y": 3461.88330078125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5aebe180.f62f68",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "a9c3a9a9.0f7c28",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "d94f5698.a9e22",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4407.6669921875,
+        "y": 3942.5,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "eb39fbed.f65188",
+                "716ce6ad.3df158"
+            ]
+        ]
+    },
+    {
+        "id": "eb39fbed.f65188",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "716ce6ad.3df158",
+        "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",
+        "wires": [
+            [
+                "7301217f.c40fd8",
+                "4b487020.1f862",
+                "98e316f7.2a6e38"
+            ]
+        ]
+    },
+    {
+        "id": "7301217f.c40fd8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4755.5498046875,
+        "y": 3969.15966796875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "8014e6ef.ba6a4"
+            ]
+        ]
+    },
+    {
+        "id": "4b487020.1f862",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4756.040771484375,
+        "y": 4014.7337036132812,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "98e316f7.2a6e38",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4756.5498046875,
+        "y": 4055.15966796875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8014e6ef.ba6a4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 4916.5498046875,
+        "y": 3965.15966796875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "6c53b06a.be741",
+                "6040c967.bc9a38",
+                "6b2c883f.aecd1"
+            ]
+        ]
+    },
+    {
+        "id": "6986f860.3fd24",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "6040c967.bc9a38",
+        "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",
+        "wires": [
+            [
+                "93771b2e.0a5438",
+                "494eca03.1cc0f4"
+            ]
+        ]
+    },
+    {
+        "id": "494eca03.1cc0f4",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5407.5498046875,
+        "y": 3939.15966796875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "4a647e39.1988"
+            ]
+        ]
+    },
+    {
+        "id": "93771b2e.0a5438",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5409.5498046875,
+        "y": 3972.15966796875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "3ee6f9fa.cfa80e"
+            ]
+        ]
+    },
+    {
+        "id": "4a647e39.1988",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5555.5498046875,
+        "y": 3932.15966796875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "d5960946.db6608"
+            ]
+        ]
+    },
+    {
+        "id": "3ee6f9fa.cfa80e",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "d5960946.db6608",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "6c53b06a.be741",
+        "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",
+        "wires": [
+            [
+                "f825463f.981388",
+                "3533ce81.16ad12"
+            ]
+        ]
+    },
+    {
+        "id": "f825463f.981388",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5509.5498046875,
+        "y": 4064.15966796875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "1f58973d.a6a451"
+            ]
+        ]
+    },
+    {
+        "id": "3533ce81.16ad12",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5502.5498046875,
+        "y": 4123.15966796875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "2ae9f04c.19c548"
+            ]
+        ]
+    },
+    {
+        "id": "1f58973d.a6a451",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5639.5498046875,
+        "y": 4068.15966796875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2ae9f04c.19c548",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 5644.5498046875,
+        "y": 4122.15966796875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "9dd58da7.f05d6",
+                "c9296d7d.c80358"
+            ]
+        ]
+    },
+    {
+        "id": "9dd58da7.f05d6",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "985a0c89.e3f6d",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "c9296d7d.c80358",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "6b2c883f.aecd1",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "7018ac1a.7a3c7c",
+        "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",
+        "wires": [
+            [
+                "d6a83452.cab528",
+                "a3cdb153.e05c2"
+            ]
+        ]
+    },
+    {
+        "id": "23ec2dfc.6ca3ea",
+        "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",
+        "wires": [
+            [
+                "89ccdd98.c0add8",
+                "ffd72856.632858",
+                "d24e2f90.29ea68"
+            ]
+        ]
+    },
+    {
+        "id": "e3a3ebb5.52e4d",
+        "type": "comment",
+        "name": "Update ROOT UNI's bw -- ALREADY DONE",
+        "info": "",
+        "comments": "",
+        "x": 4286.516845703125,
+        "y": 5422.733642578125,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "c0e896d2.f14fd",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ffd72856.632858",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4506.007568359375,
+        "y": 5441.3076171875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "fe177ef1.d06678"
+            ]
+        ]
+    },
+    {
+        "id": "d24e2f90.29ea68",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4501.5166015625,
+        "y": 5485.733581542969,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "632ed866.3f04b8"
+            ]
+        ]
+    },
+    {
+        "id": "fe177ef1.d06678",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "632ed866.3f04b8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "df87890d.bcb5c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4666.5166015625,
+        "y": 5535.733642578125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "2ff88b2d.295934",
+                "c0e896d2.f14fd"
+            ]
+        ]
+    },
+    {
+        "id": "89ccdd98.c0add8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4497.5166015625,
+        "y": 5535.733642578125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "df87890d.bcb5c"
+            ]
+        ]
+    },
+    {
+        "id": "2ff88b2d.295934",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "5d7f9ad7.0f862c",
+        "type": "comment",
+        "name": "Update connectivity status to modified",
+        "info": "",
+        "comments": "",
+        "x": 5288.216796875,
+        "y": 5398.500244140625,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "9b98cd10.6cfb68",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d6a83452.cab528",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 567.8836059570312,
+        "y": 5357.88330078125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "e5624f1d.dbf4b8"
+            ]
+        ]
+    },
+    {
+        "id": "a3cdb153.e05c2",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 550.883544921875,
+        "y": 5279.88330078125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "daa6681.3df0a98"
+            ]
+        ]
+    },
+    {
+        "id": "7731a568.885cdc",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 679.8833923339844,
+        "y": 4366.883026123047,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "a5f98ac5.68fe98",
+                "74d156ed.4e9f",
+                "6135bf6.f11f5c",
+                "8458698c.d1be5",
+                "6cf7c0fc.18d4e8"
+            ]
+        ]
+    },
+    {
+        "id": "a5f98ac5.68fe98",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "155b7716.d28d91",
+        "type": "comment",
+        "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",
+        "info": "",
+        "comments": "",
+        "x": 1033.1338806152344,
+        "y": 4293.016326904297,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "11c710da.f1a09f",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "74d156ed.4e9f",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 911.9837341308594,
+        "y": 4463.216522216797,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "11c710da.f1a09f",
+                "dd611a8.40420e8"
+            ]
+        ]
+    },
+    {
+        "id": "dd611a8.40420e8",
+        "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",
+        "wires": [
+            [
+                "2cc9d43.2a3e32c",
+                "16f9c9a2.f3e64e",
+                "bd113683.3f90e8"
+            ]
+        ]
+    },
+    {
+        "id": "2cc9d43.2a3e32c",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1343.4838562011719,
+        "y": 4408.216522216797,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "30afce54.3b0e7a"
+            ]
+        ]
+    },
+    {
+        "id": "16f9c9a2.f3e64e",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1335.4838562011719,
+        "y": 4463.216522216797,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "ca51c401.6ecfa8"
+            ]
+        ]
+    },
+    {
+        "id": "30afce54.3b0e7a",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1487.8661804199219,
+        "y": 4407.8721923828125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "4c495354.afa6a4"
+            ]
+        ]
+    },
+    {
+        "id": "4c495354.afa6a4",
+        "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",
+        "wires": [
+            [
+                "72a0b2fc.d6eab4"
+            ]
+        ]
+    },
+    {
+        "id": "72a0b2fc.d6eab4",
+        "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",
+        "wires": [
+            [
+                "3067a2de.bf9096"
+            ]
+        ]
+    },
+    {
+        "id": "bd113683.3f90e8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1340.4838562011719,
+        "y": 4520.216522216797,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "c72ac013.478f"
+            ]
+        ]
+    },
+    {
+        "id": "c72ac013.478f",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "ca51c401.6ecfa8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "fae6bda1.4d6a28",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2248.9837341308594,
+        "y": 4410.216522216797,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "5ada214d.6d6df",
+                "230404bc.0330d4",
+                "8f5a3f0d.286f38"
+            ]
+        ]
+    },
+    {
+        "id": "3067a2de.bf9096",
+        "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",
+        "wires": [
+            [
+                "fae6bda1.4d6a28"
+            ]
+        ]
+    },
+    {
+        "id": "6135bf6.f11f5c",
+        "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",
+        "wires": [
+            [
+                "63ad904f.f883c",
+                "612437fd.ee8ae"
+            ]
+        ]
+    },
+    {
+        "id": "612437fd.ee8ae",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1417.9837341308594,
+        "y": 4615.816131591797,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "7222d332.cab804"
+            ]
+        ]
+    },
+    {
+        "id": "63ad904f.f883c",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1413.9837341308594,
+        "y": 4575.816131591797,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "ffb15b5f.69bdb"
+            ]
+        ]
+    },
+    {
+        "id": "ffb15b5f.69bdb",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "7222d332.cab804",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1575.4837341308594,
+        "y": 4615.816131591797,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "230404bc.0330d4",
+        "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",
+        "wires": [
+            [
+                "999c0ecf.dd9428",
+                "cadc4a62.3f428",
+                "9a118cc2.6cef58"
+            ]
+        ]
+    },
+    {
+        "id": "5ada214d.6d6df",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "999c0ecf.dd9428",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2664.9837341308594,
+        "y": 4414.216522216797,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "fb522408.bea2a8"
+            ]
+        ]
+    },
+    {
+        "id": "cadc4a62.3f428",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2656.9837341308594,
+        "y": 4469.216522216797,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "ad21cc41.8772b"
+            ]
+        ]
+    },
+    {
+        "id": "9a118cc2.6cef58",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2661.9837341308594,
+        "y": 4526.216522216797,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "e3096426.02dcf"
+            ]
+        ]
+    },
+    {
+        "id": "e3096426.02dcf",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "ad21cc41.8772b",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "fb522408.bea2a8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2809.3660583496094,
+        "y": 4411.8721923828125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "6e503f35.5790c"
+            ]
+        ]
+    },
+    {
+        "id": "6e503f35.5790c",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "8f5a3f0d.286f38",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 2404.9837341308594,
+        "y": 4487.216522216797,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "8458698c.d1be5",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "6cf7c0fc.18d4e8",
+        "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",
+        "wires": [
+            [
+                "31c266e8.6cad22",
+                "45786f9e.46f928"
+            ]
+        ]
+    },
+    {
+        "id": "31c266e8.6cad22",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1162.5667419433594,
+        "y": 4839.932830810547,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "25e4293a.b5a0de"
+            ]
+        ]
+    },
+    {
+        "id": "45786f9e.46f928",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1158.5667419433594,
+        "y": 4887.932830810547,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "9325c5b6.3d913"
+            ]
+        ]
+    },
+    {
+        "id": "25e4293a.b5a0de",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1318.5667419433594,
+        "y": 4835.932830810547,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "51a35a4f.5fbc64"
+            ]
+        ]
+    },
+    {
+        "id": "9325c5b6.3d913",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "c5019df.72c63e",
+        "type": "comment",
+        "name": "Update connectivity status to modified",
+        "info": "",
+        "comments": "",
+        "x": 1587.4664001464844,
+        "y": 4786.633026123047,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "51a35a4f.5fbc64",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "cbb82af5.87b298",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "daa6681.3df0a98",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 632.8834228515625,
+        "y": 4106.883056640625,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "cbb82af5.87b298",
+                "7731a568.885cdc"
+            ]
+        ]
+    },
+    {
+        "id": "e5624f1d.dbf4b8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 716.3333740234375,
+        "y": 5359.39990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "16338b46.5dad65",
+                "de535c52.af9d48",
+                "78064cf.4874bb4",
+                "b5448cca.f23df8"
+            ]
+        ]
+    },
+    {
+        "id": "16338b46.5dad65",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "de535c52.af9d48",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "78064cf.4874bb4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 869.88330078125,
+        "y": 5594.39990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "69415165.a30268",
+                "38b5cafd.d5079e",
+                "6a408110.2a2dc"
+            ]
+        ]
+    },
+    {
+        "id": "f703a5f3.1124f8",
+        "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",
+        "wires": [
+            [
+                "2bcfefd4.8f246",
+                "6262f33a.13ed54",
+                "5f5183a2.3dd5bc"
+            ]
+        ]
+    },
+    {
+        "id": "17938acf.263b45",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 2535.882568359375,
+        "y": 5545.39990234375,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "434194f6.d45944",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "2bcfefd4.8f246",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2795.882568359375,
+        "y": 5472.39990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "f6e068a.7d61a18"
+            ]
+        ]
+    },
+    {
+        "id": "6262f33a.13ed54",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2787.882568359375,
+        "y": 5527.39990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "2a0eede1.27db52"
+            ]
+        ]
+    },
+    {
+        "id": "5f5183a2.3dd5bc",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2792.882568359375,
+        "y": 5584.39990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "612a7284.deceac"
+            ]
+        ]
+    },
+    {
+        "id": "612a7284.deceac",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "2a0eede1.27db52",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "f6e068a.7d61a18",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2940.264892578125,
+        "y": 5470.055572509766,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "d3b91b08.9e326"
+            ]
+        ]
+    },
+    {
+        "id": "d3b91b08.9e326",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "69415165.a30268",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "5cd94a05.12a97c",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1362.3834228515625,
+        "y": 5602.39990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "6b54e983.54f23"
+            ]
+        ]
+    },
+    {
+        "id": "7cfb8601.d6c8b8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1365.3834228515625,
+        "y": 5490.39990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "43d9e97c.41e918"
+            ]
+        ]
+    },
+    {
+        "id": "c076204a.7c8658",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1357.3834228515625,
+        "y": 5545.39990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "697ce13c.463e78"
+            ]
+        ]
+    },
+    {
+        "id": "43d9e97c.41e918",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1499.765625,
+        "y": 5485.0556640625,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "9ea73f48.e6dc88"
+            ]
+        ]
+    },
+    {
+        "id": "6b54e983.54f23",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "697ce13c.463e78",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "9ea73f48.e6dc88",
+        "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",
+        "wires": [
+            [
+                "8867a67f.02b388"
+            ]
+        ]
+    },
+    {
+        "id": "8867a67f.02b388",
+        "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",
+        "wires": [
+            [
+                "bfd4d2af.8ab0b8"
+            ]
+        ]
+    },
+    {
+        "id": "38b5cafd.d5079e",
+        "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",
+        "wires": [
+            [
+                "5cd94a05.12a97c",
+                "7cfb8601.d6c8b8",
+                "c076204a.7c8658"
+            ]
+        ]
+    },
+    {
+        "id": "bfd4d2af.8ab0b8",
+        "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",
+        "wires": [
+            [
+                "b0cdfdee.4e9418"
+            ]
+        ]
+    },
+    {
+        "id": "b0cdfdee.4e9418",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2335.8822021484375,
+        "y": 5479.39990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "434194f6.d45944",
+                "f703a5f3.1124f8",
+                "17938acf.263b45"
+            ]
+        ]
+    },
+    {
+        "id": "6a408110.2a2dc",
+        "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",
+        "wires": [
+            [
+                "d58ed713.3cd0d",
+                "e5f89511.dafe58"
+            ]
+        ]
+    },
+    {
+        "id": "d58ed713.3cd0d",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1640.1500244140625,
+        "y": 5680.7998046875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "8ee30019.6f667"
+            ]
+        ]
+    },
+    {
+        "id": "e5f89511.dafe58",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1644.1500244140625,
+        "y": 5720.7998046875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "3308ecad.5ad59c"
+            ]
+        ]
+    },
+    {
+        "id": "8ee30019.6f667",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "3308ecad.5ad59c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1801.6500244140625,
+        "y": 5720.7998046875,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b5448cca.f23df8",
+        "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",
+        "wires": [
+            [
+                "59551d1d.12689c",
+                "5a5ae31.cb9b99c"
+            ]
+        ]
+    },
+    {
+        "id": "59551d1d.12689c",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1105.183349609375,
+        "y": 5826.60009765625,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "2e2794d8.3df39c"
+            ]
+        ]
+    },
+    {
+        "id": "5a5ae31.cb9b99c",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1093.3500366210938,
+        "y": 5999.2001953125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "6dce893f.c421c"
+            ]
+        ]
+    },
+    {
+        "id": "2e2794d8.3df39c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1253.35009765625,
+        "y": 5826.2001953125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "b4e9d461.c3c1a",
+                "2f3efa95.41d3ce"
+            ]
+        ]
+    },
+    {
+        "id": "b4e9d461.c3c1a",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2f3efa95.41d3ce",
+        "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",
+        "wires": [
+            [
+                "aadc3189.147b98",
+                "9801a2d7.df3f98"
+            ]
+        ]
+    },
+    {
+        "id": "aadc3189.147b98",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1755.199951171875,
+        "y": 5849.60009765625,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "aaac06aa.f3d728"
+            ]
+        ]
+    },
+    {
+        "id": "9801a2d7.df3f98",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1751.199951171875,
+        "y": 5897.60009765625,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "7656a3d7.b7266c"
+            ]
+        ]
+    },
+    {
+        "id": "aaac06aa.f3d728",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1911.199951171875,
+        "y": 5845.60009765625,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "2673ca00.ba724e"
+            ]
+        ]
+    },
+    {
+        "id": "7656a3d7.b7266c",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "2673ca00.ba724e",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "bfaf6549.13fe88",
+        "type": "comment",
+        "name": "Update connectivity status to modified",
+        "info": "",
+        "comments": "",
+        "x": 2194.0994873046875,
+        "y": 5797.30029296875,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "6dce893f.c421c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1230.916748046875,
+        "y": 5998.5,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "75d82528.4dd5bc",
+                "24c2da43.974556"
+            ]
+        ]
+    },
+    {
+        "id": "75d82528.4dd5bc",
+        "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",
+        "wires": [
+            [
+                "29eb94d3.70f2dc"
+            ]
+        ]
+    },
+    {
+        "id": "29eb94d3.70f2dc",
+        "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",
+        "wires": [
+            [
+                "522c88bc.33b518"
+            ]
+        ]
+    },
+    {
+        "id": "522c88bc.33b518",
+        "type": "outcome",
+        "name": "connectivity",
+        "xml": "<outcome value='connectivity'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2024.2332763671875,
+        "y": 5987.700225830078,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "9dde3a26.bf1a48"
+            ]
+        ]
+    },
+    {
+        "id": "9dde3a26.bf1a48",
+        "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",
+        "wires": [
+            [
+                "af210146.805c98",
+                "1304e1a7.407dde",
+                "83b6e70e.c6339"
+            ]
+        ]
+    },
+    {
+        "id": "af210146.805c98",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2431.23291015625,
+        "y": 6037.7001953125,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "bfbb5b5d.76ea48"
+            ]
+        ]
+    },
+    {
+        "id": "24e402f2.8a6b26",
+        "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",
+        "wires": [
+            [
+                "3ff65d5b.44eb62",
+                "d09102d1.fb466",
+                "3d724c56.f2b6cc"
+            ]
+        ]
+    },
+    {
+        "id": "1cd695fe.f2c6f2",
+        "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",
+        "wires": [
+            [
+                "74367c85.fa02dc"
+            ]
+        ]
+    },
+    {
+        "id": "74367c85.fa02dc",
+        "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",
+        "wires": [
+            [
+                "572f2125.6367b8",
+                "5931a81f.41a6"
+            ]
+        ]
+    },
+    {
+        "id": "572f2125.6367b8",
+        "type": "outcome",
+        "name": "vpn-binding",
+        "xml": "<outcome value='vpn-binding'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1972.466552734375,
+        "y": 6143.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "22fa9a36.31302e"
+            ]
+        ]
+    },
+    {
+        "id": "22fa9a36.31302e",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2135.466552734375,
+        "y": 6143.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "24e402f2.8a6b26"
+            ]
+        ]
+    },
+    {
+        "id": "5931a81f.41a6",
+        "type": "outcome",
+        "name": "uni",
+        "xml": "<outcome value='uni'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1988.466552734375,
+        "y": 6439.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "510edb34.612754"
+            ]
+        ]
+    },
+    {
+        "id": "510edb34.612754",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2151.466552734375,
+        "y": 6439.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "4c0113a.98542ec"
+            ]
+        ]
+    },
+    {
+        "id": "4c0113a.98542ec",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2b555ba8.ce83e4",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "bfbb5b5d.76ea48",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1433.466552734375,
+        "y": 6134.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "1cd695fe.f2c6f2",
+                "2b555ba8.ce83e4"
+            ]
+        ]
+    },
+    {
+        "id": "3ff65d5b.44eb62",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2619.466552734375,
+        "y": 6223.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "851525d6.b90c38"
+            ]
+        ]
+    },
+    {
+        "id": "d09102d1.fb466",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2619.95751953125,
+        "y": 6269.473937988281,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "74e6774b.c7b358"
+            ]
+        ]
+    },
+    {
+        "id": "3d724c56.f2b6cc",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2617.466552734375,
+        "y": 6312.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "cbe3afce.930cc"
+            ]
+        ]
+    },
+    {
+        "id": "83b6e70e.c6339",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2455.282958984375,
+        "y": 5938.5,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1304e1a7.407dde",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2452.7919921875,
+        "y": 5981.925964355469,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "24c2da43.974556",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "851525d6.b90c38",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2785.466552734375,
+        "y": 6213.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "811dd566.85ec38",
+                "6a877b95.f2661c",
+                "66415a60.9e5d9c",
+                "a662df33.5b8808",
+                "502ecc67.91354c"
+            ]
+        ]
+    },
+    {
+        "id": "cbe3afce.930cc",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "74e6774b.c7b358",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "811dd566.85ec38",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "6a877b95.f2661c",
+        "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",
+        "wires": [
+            [
+                "3d9fd486.323a64",
+                "c6247afb.9c0a",
+                "83cc8360.81d358"
+            ]
+        ]
+    },
+    {
+        "id": "66415a60.9e5d9c",
+        "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",
+        "wires": [
+            [
+                "9c554475.661fc8",
+                "12ed9938.83ebcf"
+            ]
+        ]
+    },
+    {
+        "id": "a662df33.5b8808",
+        "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",
+        "wires": [
+            [
+                "b26d88bf.bd178",
+                "f451c5d.6b3dd38"
+            ]
+        ]
+    },
+    {
+        "id": "502ecc67.91354c",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3d9fd486.323a64",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3228.9666748046875,
+        "y": 6000.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "c715af9f.c55108"
+            ]
+        ]
+    },
+    {
+        "id": "c6247afb.9c0a",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3220.9666748046875,
+        "y": 6055.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "f990360c.2a7d88"
+            ]
+        ]
+    },
+    {
+        "id": "c715af9f.c55108",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3363.348876953125,
+        "y": 5995.5556640625,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "cf5a3a9d.68d89"
+            ]
+        ]
+    },
+    {
+        "id": "83cc8360.81d358",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3225.9666748046875,
+        "y": 6112.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "ee6f1ffb.7dcfe"
+            ]
+        ]
+    },
+    {
+        "id": "ee6f1ffb.7dcfe",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "f990360c.2a7d88",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "f451c5d.6b3dd38",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3327.466552734375,
+        "y": 6428.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "e38cfd76.3f8a2"
+            ]
+        ]
+    },
+    {
+        "id": "b26d88bf.bd178",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3327.466552734375,
+        "y": 6484.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "cf5a3a9d.68d89",
+        "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",
+        "wires": [
+            [
+                "fe7eff92.d565e"
+            ]
+        ]
+    },
+    {
+        "id": "fe7eff92.d565e",
+        "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",
+        "wires": [
+            [
+                "a5619f8.2b7e86"
+            ]
+        ]
+    },
+    {
+        "id": "e38cfd76.3f8a2",
+        "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",
+        "wires": [
+            [
+                "1d52efad.f9e5d",
+                "d7169143.c010d8"
+            ]
+        ]
+    },
+    {
+        "id": "9c554475.661fc8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3443.966064453125,
+        "y": 6340.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "238545c1.5c8b2a"
+            ]
+        ]
+    },
+    {
+        "id": "12ed9938.83ebcf",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3444.966064453125,
+        "y": 6285.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "bb0795de.a47f18"
+            ]
+        ]
+    },
+    {
+        "id": "238545c1.5c8b2a",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "bb0795de.a47f18",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 3612.466064453125,
+        "y": 6287.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "36cf22b4.4935d6",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4148.4658203125,
+        "y": 5936.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "b5cbacbc.c392",
+                "ea40936a.af6178",
+                "6eb0462c.852488"
+            ]
+        ]
+    },
+    {
+        "id": "a5619f8.2b7e86",
+        "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",
+        "wires": [
+            [
+                "36cf22b4.4935d6"
+            ]
+        ]
+    },
+    {
+        "id": "1d52efad.f9e5d",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4009.966064453125,
+        "y": 6392.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "6bd1cb72.9cf9b4"
+            ]
+        ]
+    },
+    {
+        "id": "d7169143.c010d8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4013.966064453125,
+        "y": 6432.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "e4332941.104e"
+            ]
+        ]
+    },
+    {
+        "id": "e4332941.104e",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 4201.466064453125,
+        "y": 6436.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "6bd1cb72.9cf9b4",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "ea40936a.af6178",
+        "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",
+        "wires": [
+            [
+                "914dea7f.0edbe",
+                "82561c7b.09ef28",
+                "b047cbfd.3b9618"
+            ]
+        ]
+    },
+    {
+        "id": "b5cbacbc.c392",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "914dea7f.0edbe",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4564.4658203125,
+        "y": 5940.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "c318baba.3a4cc8"
+            ]
+        ]
+    },
+    {
+        "id": "82561c7b.09ef28",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4556.4658203125,
+        "y": 5995.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "b8e7878b.f1ad7"
+            ]
+        ]
+    },
+    {
+        "id": "b047cbfd.3b9618",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4561.4658203125,
+        "y": 6052.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "c15a7782.9625b"
+            ]
+        ]
+    },
+    {
+        "id": "6eb0462c.852488",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 4304.4658203125,
+        "y": 6013.89990234375,
+        "z": "82de8dcf.518d88",
+        "wires": []
+    },
+    {
+        "id": "c15a7782.9625b",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "b8e7878b.f1ad7",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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",
+        "wires": []
+    },
+    {
+        "id": "c318baba.3a4cc8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4708.84814453125,
+        "y": 5938.555572509766,
+        "z": "82de8dcf.518d88",
+        "wires": [
+            [
+                "42376e75.44b2d8"
+            ]
+        ]
+    },
+    {
+        "id": "42376e75.44b2d8",
+        "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",
+        "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-modify.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json
index a6c9b05b..ad56b544 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "e621eef4.cd8d48",
+    "id": "d60c3cf9.321a6",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 146,
-    "y": 100,
-    "z": "d1707f77.d9d96",
+    "x": 205.88333129882812,
+    "y": 156.88333129882812,
+    "z": "7062000.f761",
     "wires": [
       [
-        "5137b88e.d87af"
+        "cce5e3d9.59223"
       ]
     ]
   },
   {
-    "id": "5137b88e.d87af",
+    "id": "cce5e3d9.59223",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,7618 +22,7912 @@
     "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": 430.2856903076172,
-    "y": 161.23810863494873,
-    "z": "d1707f77.d9d96",
+    "x": 490.1690216064453,
+    "y": 218.12143993377686,
+    "z": "7062000.f761",
     "wires": [
       [
-        "ce96326b.b535f8"
+        "73cbe8fd.7b7b"
       ]
     ]
   },
   {
-    "id": "ce96326b.b535f8",
+    "id": "73cbe8fd.7b7b",
     "type": "method",
     "name": "method cll-vnf-topology-operation-cll-modify",
     "xml": "<method rpc='cll-vnf-topology-operation-cll-modify' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 436.42860412597656,
-    "y": 246.00003051757812,
-    "z": "d1707f77.d9d96",
+    "x": 496.3119354248047,
+    "y": 302.88336181640625,
+    "z": "7062000.f761",
     "wires": [
       [
-        "b7cce22e.b85eb"
+        "b5475b4e.9dc8a"
       ]
     ]
   },
   {
-    "id": "b7cce22e.b85eb",
+    "id": "b5475b4e.9dc8a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 786,
-    "y": 305,
-    "z": "d1707f77.d9d96",
+    "x": 845.8833312988281,
+    "y": 361.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "42227f1d.ff6a08",
-        "719e39ea.7d4d2",
-        "ad74749f.3bbda"
+        "bacceb8f.95926",
+        "e0024e9e.57e7f8",
+        "6d19a9bc.4fa958"
       ]
     ]
   },
   {
-    "id": "42227f1d.ff6a08",
+    "id": "bacceb8f.95926",
     "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": 1087.33349609375,
-    "y": 575.9302978515625,
-    "z": "d1707f77.d9d96",
+    "x": 1147.2168273925781,
+    "y": 632.8136291503906,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "719e39ea.7d4d2",
+    "id": "e0024e9e.57e7f8",
     "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": 1108.761962890625,
-    "y": 278.33331298828125,
-    "z": "d1707f77.d9d96",
+    "x": 1168.6452941894531,
+    "y": 335.2166442871094,
+    "z": "7062000.f761",
     "wires": [
       [
-        "c1550efc.b74cd",
-        "59d9b8f3.c672f8",
-        "1a9d72a7.1ac33d"
+        "dc9a92d7.7dd0c",
+        "68404646.133ac8",
+        "f6dee010.98fcd"
       ]
     ]
   },
   {
-    "id": "c1550efc.b74cd",
+    "id": "dc9a92d7.7dd0c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1333.761962890625,
-    "y": 136.33331298828125,
-    "z": "d1707f77.d9d96",
+    "x": 1393.6452941894531,
+    "y": 193.21664428710938,
+    "z": "7062000.f761",
     "wires": [
       [
-        "c25ad576.a55988"
+        "d1be34ef.26139"
       ]
     ]
   },
   {
-    "id": "59d9b8f3.c672f8",
+    "id": "68404646.133ac8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1329.2529296875,
-    "y": 205.9073486328125,
-    "z": "d1707f77.d9d96",
+    "x": 1389.1362609863281,
+    "y": 262.7906799316406,
+    "z": "7062000.f761",
     "wires": [
       [
-        "c5236a8e.8fcb78"
+        "c39ebb83.790b68"
       ]
     ]
   },
   {
-    "id": "1a9d72a7.1ac33d",
+    "id": "f6dee010.98fcd",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1317.761962890625,
-    "y": 252.33331298828125,
-    "z": "d1707f77.d9d96",
+    "x": 1377.6452941894531,
+    "y": 309.2166442871094,
+    "z": "7062000.f761",
     "wires": [
       [
-        "cebf9d48.2d23"
+        "f8b91686.4a47a8"
       ]
     ]
   },
   {
-    "id": "742cc4f4.befaf4",
+    "id": "6c16fe1b.61251",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1087.761962890625,
-    "y": 166.33331298828125,
-    "z": "d1707f77.d9d96",
+    "x": 1147.6452941894531,
+    "y": 223.21664428710938,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "ad74749f.3bbda",
+    "id": "6d19a9bc.4fa958",
     "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": 1075.761962890625,
-    "y": 218.33331298828125,
-    "z": "d1707f77.d9d96",
+    "x": 1135.6452941894531,
+    "y": 275.2166442871094,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "c25ad576.a55988",
+    "id": "d1be34ef.26139",
     "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": 1574,
-    "y": 133,
-    "z": "d1707f77.d9d96",
+    "x": 1633.8833312988281,
+    "y": 189.88333129882812,
+    "z": "7062000.f761",
     "wires": [
       [
-        "4f4f6457.1e4aa4",
-        "5da7fc70.28ac2c"
+        "74daedf5.b00d34",
+        "3ddd8ea0.9d48e2"
       ]
     ]
   },
   {
-    "id": "c5236a8e.8fcb78",
+    "id": "c39ebb83.790b68",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 1484.0623779296875,
-    "y": 208.85977172851562,
-    "z": "d1707f77.d9d96",
+    "x": 1543.9457092285156,
+    "y": 265.74310302734375,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "cebf9d48.2d23",
+    "id": "f8b91686.4a47a8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1488,
-    "y": 253,
-    "z": "d1707f77.d9d96",
+    "x": 1547.8833312988281,
+    "y": 309.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "4f4f6457.1e4aa4",
+    "id": "74daedf5.b00d34",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1779,
-    "y": 170,
-    "z": "d1707f77.d9d96",
+    "x": 1838.8833312988281,
+    "y": 226.88333129882812,
+    "z": "7062000.f761",
     "wires": [
       [
-        "25469631.b624fa"
+        "50897ba7.acdc24"
       ]
     ]
   },
   {
-    "id": "5da7fc70.28ac2c",
+    "id": "3ddd8ea0.9d48e2",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1789,
-    "y": 97,
-    "z": "d1707f77.d9d96",
+    "x": 1848.8833312988281,
+    "y": 153.88333129882812,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "25469631.b624fa",
+    "id": "50897ba7.acdc24",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1772,
-    "y": 245,
-    "z": "d1707f77.d9d96",
+    "x": 1831.8833312988281,
+    "y": 301.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "a3f9c066.8f6f98",
-        "a0f7473f.d23fe8",
-        "dc772464.b9eb38",
-        "796beb97.0c4de4",
-        "52d5e6df.7a6948"
+        "25219f6c.9cf818",
+        "166df7f7.8cb52",
+        "35f1defb.605572",
+        "f67d2f30.77ecd8",
+        "2530e84c.0abb78"
       ]
     ]
   },
   {
-    "id": "3f08ab8e.dc612c",
+    "id": "e3fc1b13.141158",
     "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": 2258,
-    "y": 296,
-    "z": "d1707f77.d9d96",
+    "x": 2317.883331298828,
+    "y": 352.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "7db27beb.b640fc",
-        "37eea1d.ba0815e",
-        "9aa976b3.179a58"
+        "792e0cb6.295efc",
+        "9cda4258.33c028",
+        "8ec312be.acb358"
       ]
     ]
   },
   {
-    "id": "7db27beb.b640fc",
+    "id": "792e0cb6.295efc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2474,
-    "y": 363,
-    "z": "d1707f77.d9d96",
+    "x": 2533.883331298828,
+    "y": 419.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "5eea79ce.34755"
+        "d2a1ae9f.45e878"
       ]
     ]
   },
   {
-    "id": "37eea1d.ba0815e",
+    "id": "9cda4258.33c028",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2474.490966796875,
-    "y": 262.573974609375,
-    "z": "d1707f77.d9d96",
+    "x": 2534.374298095703,
+    "y": 319.4573059082031,
+    "z": "7062000.f761",
     "wires": [
       [
-        "2ecbbf0c.1ea018"
+        "5f00fc5b.612da4"
       ]
     ]
   },
   {
-    "id": "9aa976b3.179a58",
+    "id": "8ec312be.acb358",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2470,
-    "y": 312,
-    "z": "d1707f77.d9d96",
+    "x": 2529.883331298828,
+    "y": 368.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "a265198.4abd2e8"
+        "24485e5a.4004d2"
       ]
     ]
   },
   {
-    "id": "a3f9c066.8f6f98",
+    "id": "25219f6c.9cf818",
     "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": 1975,
-    "y": 277,
-    "z": "d1707f77.d9d96",
+    "x": 2034.8833312988281,
+    "y": 333.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "31eb076e.43ecb",
-        "3f08ab8e.dc612c",
-        "2c19139d.1b72fc",
-        "24e6a4ae.ee277c"
+        "e97f59ea.8d55",
+        "e3fc1b13.141158",
+        "dca67cc5.30d2f8",
+        "ce64f5e6.94469"
       ]
     ]
   },
   {
-    "id": "31eb076e.43ecb",
+    "id": "e97f59ea.8d55",
     "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": 2255,
-    "y": 215,
-    "z": "d1707f77.d9d96",
+    "x": 2314.883331298828,
+    "y": 271.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "796beb97.0c4de4",
+    "id": "f67d2f30.77ecd8",
     "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": 1949,
-    "y": 227,
-    "z": "d1707f77.d9d96",
+    "x": 2008.8833312988281,
+    "y": 283.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "a0f7473f.d23fe8",
+    "id": "166df7f7.8cb52",
     "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": 1992,
-    "y": 86,
-    "z": "d1707f77.d9d96",
+    "x": 2051.883331298828,
+    "y": 142.88333129882812,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "dc772464.b9eb38",
+    "id": "35f1defb.605572",
     "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": 2004,
-    "y": 127,
-    "z": "d1707f77.d9d96",
+    "x": 2063.883331298828,
+    "y": 183.88333129882812,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "5c36a24a.1b53d4",
+    "id": "2302212a.18d7a6",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 2029,
-    "y": 39,
-    "z": "d1707f77.d9d96",
+    "x": 2088.883331298828,
+    "y": 95.88333129882812,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "45b74940.f8db1",
+    "id": "67aae728.5fece",
     "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": 1949,
-    "y": 173,
-    "z": "d1707f77.d9d96",
+    "x": 2008.8833312988281,
+    "y": 229.88333129882812,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "2ecbbf0c.1ea018",
+    "id": "5f00fc5b.612da4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 2653,
-    "y": 265,
-    "z": "d1707f77.d9d96",
+    "x": 2712.883331298828,
+    "y": 321.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "a265198.4abd2e8",
+    "id": "24485e5a.4004d2",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2652.9375,
-    "y": 314.1402587890625,
-    "z": "d1707f77.d9d96",
+    "x": 2712.820831298828,
+    "y": 371.0235900878906,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "5eea79ce.34755",
+    "id": "d2a1ae9f.45e878",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2654.9375,
-    "y": 365.1402587890625,
-    "z": "d1707f77.d9d96",
+    "x": 2714.820831298828,
+    "y": 422.0235900878906,
+    "z": "7062000.f761",
     "wires": [
       [
-        "c6a94a58.c561c"
+        "61c50290.a54bf4"
       ]
     ]
   },
   {
-    "id": "c6a94a58.c561c",
+    "id": "61c50290.a54bf4",
     "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": 2947.9375,
-    "y": 312.1402587890625,
-    "z": "d1707f77.d9d96",
+    "x": 3007.820831298828,
+    "y": 369.0235900878906,
+    "z": "7062000.f761",
     "wires": [
       [
-        "ec6a2655.48d45",
-        "712e1966.36d6e8",
-        "3dacde72.866102"
+        "d79412d7.a6c38",
+        "3f6fbc64.721af4",
+        "a6250e3f.f36fa"
       ]
     ]
   },
   {
-    "id": "712e1966.36d6e8",
+    "id": "3f6fbc64.721af4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3221.428466796875,
-    "y": 204.7142333984375,
-    "z": "d1707f77.d9d96",
+    "x": 3281.311798095703,
+    "y": 261.5975646972656,
+    "z": "7062000.f761",
     "wires": [
       [
-        "df2b1006.9eb7f8"
+        "16afc6a3.6b5401"
       ]
     ]
   },
   {
-    "id": "df2b1006.9eb7f8",
+    "id": "16afc6a3.6b5401",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3399,
-    "y": 205,
-    "z": "d1707f77.d9d96",
+    "x": 3458.883331298828,
+    "y": 261.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "3dacde72.866102",
+    "id": "a6250e3f.f36fa",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3216.9375,
-    "y": 254.1402587890625,
-    "z": "d1707f77.d9d96",
+    "x": 3276.820831298828,
+    "y": 311.0235900878906,
+    "z": "7062000.f761",
     "wires": [
       [
-        "5f8f39bd.4229a"
+        "5cebea40.e205d4"
       ]
     ]
   },
   {
-    "id": "5f8f39bd.4229a",
+    "id": "5cebea40.e205d4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3398.9375,
-    "y": 254.1402587890625,
-    "z": "d1707f77.d9d96",
+    "x": 3458.820831298828,
+    "y": 311.0235900878906,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "ec6a2655.48d45",
+    "id": "d79412d7.a6c38",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3220.9375,
-    "y": 305.1402587890625,
-    "z": "d1707f77.d9d96",
+    "x": 3280.820831298828,
+    "y": 362.0235900878906,
+    "z": "7062000.f761",
     "wires": [
       [
-        "6e0b9d94.87db34"
+        "9ae7a072.d1e518"
       ]
     ]
   },
   {
-    "id": "6e0b9d94.87db34",
+    "id": "9ae7a072.d1e518",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3400.9375,
-    "y": 305.1402587890625,
-    "z": "d1707f77.d9d96",
+    "x": 3460.820831298828,
+    "y": 362.0235900878906,
+    "z": "7062000.f761",
     "wires": [
       [
-        "2c8651cc.72086e"
+        "360b8115.051b46"
       ]
     ]
   },
   {
-    "id": "2c8651cc.72086e",
+    "id": "360b8115.051b46",
     "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": 2967,
-    "y": 440,
-    "z": "d1707f77.d9d96",
+    "x": 3026.883331298828,
+    "y": 496.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "870fb1ac.7a3748",
-        "89946234.838048"
+        "28ab4f33.316c8",
+        "e49a7d12.f127b"
       ]
     ]
   },
   {
-    "id": "89946234.838048",
+    "id": "e49a7d12.f127b",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3277,
-    "y": 447,
-    "z": "d1707f77.d9d96",
+    "x": 3336.883331298828,
+    "y": 503.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "870fb1ac.7a3748",
+    "id": "28ab4f33.316c8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3276,
-    "y": 501,
-    "z": "d1707f77.d9d96",
+    "x": 3335.883331298828,
+    "y": 557.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "cd3a7965.655da8"
+        "32ff3e84.f9f78a"
       ]
     ]
   },
   {
-    "id": "df2cd421.7d5bf",
+    "id": "ac20a1c4.b5d88",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4021,
-    "y": 455,
-    "z": "d1707f77.d9d96",
+    "x": 4080.883331298828,
+    "y": 511.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "bcfd0609.c91ee"
+        "eb5b39ae.c0eb7"
       ]
     ]
   },
   {
-    "id": "bcfd0609.c91ee",
+    "id": "eb5b39ae.c0eb7",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4197.9998779296875,
-    "y": 447.9998779296875,
-    "z": "d1707f77.d9d96",
+    "x": 4257.883209228516,
+    "y": 504.8832092285156,
+    "z": "7062000.f761",
     "wires": [
       [
-        "12f46999.b2c5d6",
-        "f8cd059e.d4c72"
+        "c3ea0a96.012838",
+        "42443b39.66d044"
       ]
     ]
   },
   {
-    "id": "cd3a7965.655da8",
+    "id": "32ff3e84.f9f78a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3440,
-    "y": 427,
-    "z": "d1707f77.d9d96",
+    "x": 3499.883331298828,
+    "y": 483.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "bd1bee0.0c5829",
-        "10113dad.89c1ca"
+        "6034bf74.a356a8",
+        "cf462c55.82"
       ]
     ]
   },
   {
-    "id": "bd1bee0.0c5829",
+    "id": "6034bf74.a356a8",
     "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": 3721,
-    "y": 383,
-    "z": "d1707f77.d9d96",
+    "x": 3780.883331298828,
+    "y": 439.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "b08f5d28.99f6d8"
+        "6ceb7138.15694"
       ]
     ]
   },
   {
-    "id": "b08f5d28.99f6d8",
+    "id": "6ceb7138.15694",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3983,
-    "y": 383,
-    "z": "d1707f77.d9d96",
+    "x": 4042.883331298828,
+    "y": 439.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "df2cd421.7d5bf"
+        "ac20a1c4.b5d88"
       ]
     ]
   },
   {
-    "id": "12f46999.b2c5d6",
+    "id": "c3ea0a96.012838",
     "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": 4440.9998779296875,
-    "y": 404.9998779296875,
-    "z": "d1707f77.d9d96",
+    "x": 4500.883209228516,
+    "y": 461.8832092285156,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "f8cd059e.d4c72",
+    "id": "42443b39.66d044",
     "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": 4429.9998779296875,
-    "y": 459.9998779296875,
-    "z": "d1707f77.d9d96",
+    "x": 4489.883209228516,
+    "y": 516.8832092285156,
+    "z": "7062000.f761",
     "wires": [
       [
-        "15139b9.c06bf64",
-        "b4015405.9769",
-        "29def152.0b9dae"
+        "cb5892f8.a134a",
+        "3110dc42.56e8b4",
+        "b948b2e1.478978"
       ]
     ]
   },
   {
-    "id": "29def152.0b9dae",
+    "id": "b948b2e1.478978",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4683,
-    "y": 346,
-    "z": "d1707f77.d9d96",
+    "x": 4742.883331298828,
+    "y": 402.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "220ef3fd.c7b134"
+        "f1bf9a6a.1a4ef8"
       ]
     ]
   },
   {
-    "id": "220ef3fd.c7b134",
+    "id": "f1bf9a6a.1a4ef8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4831.571533203125,
-    "y": 346.2857666015625,
-    "z": "d1707f77.d9d96",
+    "x": 4891.454864501953,
+    "y": 403.1690979003906,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "d3449945.7a9e68",
+    "id": "e719bcf6.a15758",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4830.509033203125,
-    "y": 390.426025390625,
-    "z": "d1707f77.d9d96",
+    "x": 4890.392364501953,
+    "y": 447.3093566894531,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "b4015405.9769",
+    "id": "3110dc42.56e8b4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4671.509033203125,
-    "y": 390.426025390625,
-    "z": "d1707f77.d9d96",
+    "x": 4731.392364501953,
+    "y": 447.3093566894531,
+    "z": "7062000.f761",
     "wires": [
       [
-        "d3449945.7a9e68"
+        "e719bcf6.a15758"
       ]
     ]
   },
   {
-    "id": "15139b9.c06bf64",
+    "id": "cb5892f8.a134a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4678.509033203125,
-    "y": 469.426025390625,
-    "z": "d1707f77.d9d96",
+    "x": 4738.392364501953,
+    "y": 526.3093566894531,
+    "z": "7062000.f761",
     "wires": [
       [
-        "5056b056.87e29"
+        "f905d5a0.4b001"
       ]
     ]
   },
   {
-    "id": "5056b056.87e29",
+    "id": "f905d5a0.4b001",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4817.509033203125,
-    "y": 469.426025390625,
-    "z": "d1707f77.d9d96",
+    "x": 4877.392364501953,
+    "y": 526.3093566894531,
+    "z": "7062000.f761",
     "wires": [
       [
-        "b058eb58.7f931",
-        "9244d790.6180a"
+        "abc9ac08.900428",
+        "808b62f7.887bc"
       ]
     ]
   },
   {
-    "id": "b058eb58.7f931",
+    "id": "abc9ac08.900428",
     "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": 5023,
-    "y": 467,
-    "z": "d1707f77.d9d96",
+    "x": 5082.883331298828,
+    "y": 523.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "9244d790.6180a",
+    "id": "808b62f7.887bc",
     "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": 5022,
-    "y": 513,
-    "z": "d1707f77.d9d96",
+    "x": 5081.883331298828,
+    "y": 569.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "10113dad.89c1ca",
+    "id": "cf462c55.82",
     "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": 3538,
-    "y": 499,
-    "z": "d1707f77.d9d96",
+    "x": 3597.883331298828,
+    "y": 555.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "d6e4de4f.158168"
+        "d512c83a.b4f08"
       ]
     ]
   },
   {
-    "id": "d6e4de4f.158168",
+    "id": "d512c83a.b4f08",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3818,
-    "y": 499,
-    "z": "d1707f77.d9d96",
+    "x": 3877.883331298828,
+    "y": 555.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "aee1198a.c056f"
+        "7f3fc2f9.da6f6c"
       ]
     ]
   },
   {
-    "id": "aee1198a.c056f",
+    "id": "7f3fc2f9.da6f6c",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2231.0001220703125,
-    "y": 752.0001220703125,
-    "z": "d1707f77.d9d96",
+    "x": 2290.8834533691406,
+    "y": 808.8834533691406,
+    "z": "7062000.f761",
     "wires": [
       [
-        "e0dc30a1.49a6b"
+        "c5194935.bd2228"
       ]
     ]
   },
   {
-    "id": "e0dc30a1.49a6b",
+    "id": "c5194935.bd2228",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2408,
-    "y": 745,
-    "z": "d1707f77.d9d96",
+    "x": 2467.883331298828,
+    "y": 801.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "ede7fb40.692cf",
-        "de035f6e.5999f"
+        "d3179b9f.9873a8",
+        "b976f3f3.6f7998"
       ]
     ]
   },
   {
-    "id": "ede7fb40.692cf",
+    "id": "d3179b9f.9873a8",
     "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": 2651,
-    "y": 702,
-    "z": "d1707f77.d9d96",
+    "x": 2710.883331298828,
+    "y": 758.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "de035f6e.5999f",
+    "id": "b976f3f3.6f7998",
     "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": 2640,
-    "y": 757,
-    "z": "d1707f77.d9d96",
+    "x": 2699.883331298828,
+    "y": 813.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "91b15c70.189168",
-        "f983d1cd.751748",
-        "e2731f07.c2a9e8"
+        "78ac5925.ecf5a8",
+        "b7b22856.252df8",
+        "ac6d9ce2.b2e9e"
       ]
     ]
   },
   {
-    "id": "91b15c70.189168",
+    "id": "78ac5925.ecf5a8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2931.490966796875,
-    "y": 735.573974609375,
-    "z": "d1707f77.d9d96",
+    "x": 2991.374298095703,
+    "y": 792.4573059082031,
+    "z": "7062000.f761",
     "wires": [
       [
-        "9ed0117f.e4187"
+        "cd49934.02e89f"
       ]
     ]
   },
   {
-    "id": "f983d1cd.751748",
+    "id": "b7b22856.252df8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2920,
-    "y": 780,
-    "z": "d1707f77.d9d96",
+    "x": 2979.883331298828,
+    "y": 836.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "c1f1f22f.ac3cb"
+        "ed06d18.02143b"
       ]
     ]
   },
   {
-    "id": "9ed0117f.e4187",
+    "id": "cd49934.02e89f",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3080.0625,
-    "y": 735.8597412109375,
-    "z": "d1707f77.d9d96",
+    "x": 3139.945831298828,
+    "y": 792.7430725097656,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "c1f1f22f.ac3cb",
+    "id": "ed06d18.02143b",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3079,
-    "y": 780,
-    "z": "d1707f77.d9d96",
+    "x": 3138.883331298828,
+    "y": 836.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "e2731f07.c2a9e8",
+    "id": "ac6d9ce2.b2e9e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2927,
-    "y": 859,
-    "z": "d1707f77.d9d96",
+    "x": 2986.883331298828,
+    "y": 915.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "7a39b25.5549b4c"
+        "87f4e9d.ba71598"
       ]
     ]
   },
   {
-    "id": "7a39b25.5549b4c",
+    "id": "87f4e9d.ba71598",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3066,
-    "y": 859,
-    "z": "d1707f77.d9d96",
+    "x": 3125.883331298828,
+    "y": 915.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "f25cc9ec.b05168",
-        "a634b8ac.ea4e88",
-        "1bb6ef49.bdd341",
-        "a7071b50.c7486",
-        "e80ddce6.4971e",
-        "32d67853.ec65d",
-        "a4a1e109.208d68",
-        "8e7b1d45.48bf2",
-        "c8257b0d.cf8598",
-        "e4d1916e.82a0f",
-        "e42c5746.0b4288",
-        "e73ce695.7bd48",
-        "9b16af83.d76cd8",
-        "93a3aa4f.0f4e8"
+        "c2cb656b.4adff",
+        "148d0b0c.712fa5",
+        "d89221fb.e3072",
+        "ea9aeb3f.7f8c98",
+        "11e605d7.ecd0fa",
+        "104f2b87.41fe14",
+        "1a00d4a4.ff98a3",
+        "59b35d49.e5c194",
+        "52e7c1a.b628dc",
+        "cdada9b0.2f3a48",
+        "850e2800.badf2",
+        "2b1064a0.eade7c",
+        "a5bcbd5b.23b83",
+        "23879b91.f9cdd4"
       ]
     ]
   },
   {
-    "id": "ae0c8d20.5892e8",
+    "id": "f8061145.abbc7",
     "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": 3380,
-    "y": 665,
-    "z": "d1707f77.d9d96",
+    "x": 3439.883331298828,
+    "y": 721.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "f25cc9ec.b05168",
+    "id": "c2cb656b.4adff",
     "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": 3361,
-    "y": 715,
-    "z": "d1707f77.d9d96",
+    "x": 3420.883331298828,
+    "y": 771.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "93a3aa4f.0f4e8",
+    "id": "23879b91.f9cdd4",
     "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": 3318,
-    "y": 760,
-    "z": "d1707f77.d9d96",
+    "x": 3377.883331298828,
+    "y": 816.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "a634b8ac.ea4e88",
+    "id": "148d0b0c.712fa5",
     "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": 3293,
-    "y": 823,
-    "z": "d1707f77.d9d96",
+    "x": 3352.883331298828,
+    "y": 879.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "1bb6ef49.bdd341",
+    "id": "d89221fb.e3072",
     "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": 3294,
-    "y": 878,
-    "z": "d1707f77.d9d96",
+    "x": 3353.883331298828,
+    "y": 934.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "a7071b50.c7486",
+    "id": "ea9aeb3f.7f8c98",
     "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": 3310,
-    "y": 926,
-    "z": "d1707f77.d9d96",
+    "x": 3369.883331298828,
+    "y": 982.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "6881c546.e37ddc",
-        "f8f6c69f.ac74d8",
-        "d522feff.e8a5a"
+        "842b0094.75a4a",
+        "7eb2f3df.e44f04",
+        "b07921bb.e3808"
       ]
     ]
   },
   {
-    "id": "e80ddce6.4971e",
+    "id": "11e605d7.ecd0fa",
     "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": 3299,
-    "y": 1012.9998779296875,
-    "z": "d1707f77.d9d96",
+    "x": 3358.883331298828,
+    "y": 1069.8832092285156,
+    "z": "7062000.f761",
     "wires": [
       [
-        "9806969b.fc3ae",
-        "65b603dc.721f64",
-        "fd2316c5.747f38"
+        "2d5fb508.bfab52",
+        "cb29efc.c6f4b1",
+        "61b86bd0.897d5c"
       ]
     ]
   },
   {
-    "id": "6881c546.e37ddc",
+    "id": "842b0094.75a4a",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3511,
-    "y": 810,
-    "z": "d1707f77.d9d96",
+    "x": 3570.883331298828,
+    "y": 866.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "8a0e99df.d3a74"
+        "20684afd.b6d766"
       ]
     ]
   },
   {
-    "id": "f8f6c69f.ac74d8",
+    "id": "7eb2f3df.e44f04",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3506.509033203125,
-    "y": 859.426025390625,
-    "z": "d1707f77.d9d96",
+    "x": 3566.392364501953,
+    "y": 916.3093566894531,
+    "z": "7062000.f761",
     "wires": [
       [
-        "34078213.5a26be"
+        "d2041960.fe2c28"
       ]
     ]
   },
   {
-    "id": "d522feff.e8a5a",
+    "id": "b07921bb.e3808",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3510.509033203125,
-    "y": 912.426025390625,
-    "z": "d1707f77.d9d96",
+    "x": 3570.392364501953,
+    "y": 969.3093566894531,
+    "z": "7062000.f761",
     "wires": [
       [
-        "f11965b9.9944c8"
+        "f96f84b2.606d"
       ]
     ]
   },
   {
-    "id": "8a0e99df.d3a74",
+    "id": "20684afd.b6d766",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3659.571533203125,
-    "y": 809.2857666015625,
-    "z": "d1707f77.d9d96",
+    "x": 3719.454864501953,
+    "y": 866.1690979003906,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "34078213.5a26be",
+    "id": "d2041960.fe2c28",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3649.509033203125,
-    "y": 859.426025390625,
-    "z": "d1707f77.d9d96",
+    "x": 3709.392364501953,
+    "y": 916.3093566894531,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "9806969b.fc3ae",
+    "id": "2d5fb508.bfab52",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3522,
-    "y": 982.9998779296875,
-    "z": "d1707f77.d9d96",
+    "x": 3581.883331298828,
+    "y": 1039.8832092285156,
+    "z": "7062000.f761",
     "wires": [
       [
-        "a6e046a6.757e98"
+        "96baba9a.d0e19"
       ]
     ]
   },
   {
-    "id": "65b603dc.721f64",
+    "id": "cb29efc.c6f4b1",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3517.509033203125,
-    "y": 1032.4259033203125,
-    "z": "d1707f77.d9d96",
+    "x": 3577.392364501953,
+    "y": 1089.3092346191406,
+    "z": "7062000.f761",
     "wires": [
       [
-        "45e0f2da.8f444c"
+        "1fb34f72.484a51"
       ]
     ]
   },
   {
-    "id": "fd2316c5.747f38",
+    "id": "61b86bd0.897d5c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3518.509033203125,
-    "y": 1085.4259033203125,
-    "z": "d1707f77.d9d96",
+    "x": 3578.392364501953,
+    "y": 1142.3092346191406,
+    "z": "7062000.f761",
     "wires": [
       [
-        "415f5150.f3e08"
+        "10c44aa8.1e2ead"
       ]
     ]
   },
   {
-    "id": "a6e046a6.757e98",
+    "id": "96baba9a.d0e19",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3670.571533203125,
-    "y": 982.28564453125,
-    "z": "d1707f77.d9d96",
+    "x": 3730.454864501953,
+    "y": 1039.1689758300781,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "45e0f2da.8f444c",
+    "id": "1fb34f72.484a51",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3660.509033203125,
-    "y": 1032.4259033203125,
-    "z": "d1707f77.d9d96",
+    "x": 3720.392364501953,
+    "y": 1089.3092346191406,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "f11965b9.9944c8",
+    "id": "f96f84b2.606d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3672,
-    "y": 912,
-    "z": "d1707f77.d9d96",
+    "x": 3731.883331298828,
+    "y": 968.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "f51320c4.bcfce"
+        "c276b776.1eb8a"
       ]
     ]
   },
   {
-    "id": "415f5150.f3e08",
+    "id": "10c44aa8.1e2ead",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3672,
-    "y": 1084.9998779296875,
-    "z": "d1707f77.d9d96",
+    "x": 3731.883331298828,
+    "y": 1141.8832092285156,
+    "z": "7062000.f761",
     "wires": [
       [
-        "1cfd4758.0338b1"
+        "dfc4c0e1.407a7"
       ]
     ]
   },
   {
-    "id": "f51320c4.bcfce",
+    "id": "c276b776.1eb8a",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3844,
-    "y": 912,
-    "z": "d1707f77.d9d96",
+    "x": 3903.883331298828,
+    "y": 968.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "89f8c0d6.b51fa8",
-        "aead6b27.4c3a7"
+        "680276dd.9e09b8",
+        "fada4cff.fbd328"
       ]
     ]
   },
   {
-    "id": "1cfd4758.0338b1",
+    "id": "dfc4c0e1.407a7",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3845,
-    "y": 1085,
-    "z": "d1707f77.d9d96",
+    "x": 3904.883331298828,
+    "y": 1141.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "5b9b8e64.ed3588",
-        "226da409.894754"
+        "1f020e0e.66975a",
+        "a14ce01a.56f21"
       ]
     ]
   },
   {
-    "id": "89f8c0d6.b51fa8",
+    "id": "680276dd.9e09b8",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4020,
-    "y": 891,
-    "z": "d1707f77.d9d96",
+    "x": 4079.883331298828,
+    "y": 947.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "6cfb261d.1543a8"
+        "2d74202a.0b02c"
       ]
     ]
   },
   {
-    "id": "aead6b27.4c3a7",
+    "id": "fada4cff.fbd328",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4022,
-    "y": 945,
-    "z": "d1707f77.d9d96",
+    "x": 4081.883331298828,
+    "y": 1001.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "5cbc637f.f1f25c"
+        "7e647400.994a6c"
       ]
     ]
   },
   {
-    "id": "5b9b8e64.ed3588",
+    "id": "1f020e0e.66975a",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4021,
-    "y": 1055,
-    "z": "d1707f77.d9d96",
+    "x": 4080.883331298828,
+    "y": 1111.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "1f3d6111.fb3d4f"
+        "45ecb3a3.4434cc"
       ]
     ]
   },
   {
-    "id": "226da409.894754",
+    "id": "a14ce01a.56f21",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4023,
-    "y": 1109,
-    "z": "d1707f77.d9d96",
+    "x": 4082.883331298828,
+    "y": 1165.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "27ea8b3.eb35a74"
+        "c83b931a.caa288"
       ]
     ]
   },
   {
-    "id": "cf6b5beb.abd2a",
+    "id": "698ac3d0.bab4ec",
     "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": 4330,
-    "y": 843,
-    "z": "d1707f77.d9d96",
+    "x": 4389.883331298828,
+    "y": 899.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "ab5b8db7.2c0b2",
+    "id": "d12533f5.293ec",
     "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": 4323,
-    "y": 941,
-    "z": "d1707f77.d9d96",
+    "x": 4382.883331298828,
+    "y": 997.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "d1673a3d.bf2ad",
+    "id": "cfe2458d.e53598",
     "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": 4323,
-    "y": 1028,
-    "z": "d1707f77.d9d96",
+    "x": 4382.883331298828,
+    "y": 1084.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "6f54a53.db0de5c",
+    "id": "e0154f38.db2ba",
     "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": 4327,
-    "y": 1121,
-    "z": "d1707f77.d9d96",
+    "x": 4386.883331298828,
+    "y": 1177.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "1814f478.bad66c",
+    "id": "c5ef28c0.6623d",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3554,
-    "y": 1530,
-    "z": "d1707f77.d9d96",
+    "x": 3613.883331298828,
+    "y": 1586.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "d9e53024.28f5e8"
+        "cf149009.40de5"
       ]
     ]
   },
   {
-    "id": "f9e21eb6.e051f",
+    "id": "892e385b.99fcd8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3563.490966796875,
-    "y": 1572.5740356445312,
-    "z": "d1707f77.d9d96",
+    "x": 3623.374298095703,
+    "y": 1629.4573669433594,
+    "z": "7062000.f761",
     "wires": [
       [
-        "cd9fd29c.16f54"
+        "fcd9fb7.509ae08"
       ]
     ]
   },
   {
-    "id": "13935c82.38c04b",
+    "id": "a241b92b.410968",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3552,
-    "y": 1619,
-    "z": "d1707f77.d9d96",
+    "x": 3611.883331298828,
+    "y": 1675.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "fd85e1a6.4ce26"
+        "3987c181.ee8c26"
       ]
     ]
   },
   {
-    "id": "f8a45af2.8fc23",
+    "id": "277d69d7.fb78d6",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3254,
-    "y": 1492,
-    "z": "d1707f77.d9d96",
+    "x": 3313.883331298828,
+    "y": 1548.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "a4a1e109.208d68",
+    "id": "1a00d4a4.ff98a3",
     "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": 3297,
-    "y": 1557,
-    "z": "d1707f77.d9d96",
+    "x": 3356.883331298828,
+    "y": 1613.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "1814f478.bad66c",
-        "f9e21eb6.e051f",
-        "13935c82.38c04b"
+        "c5ef28c0.6623d",
+        "892e385b.99fcd8",
+        "a241b92b.410968"
       ]
     ]
   },
   {
-    "id": "32d67853.ec65d",
+    "id": "104f2b87.41fe14",
     "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": 3298,
-    "y": 1227,
-    "z": "d1707f77.d9d96",
+    "x": 3357.883331298828,
+    "y": 1283.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "7cda231b.f03dc4",
-        "15924723.6e7491"
+        "a533cbf2.9ff568",
+        "84397dc4.6052e8"
       ]
     ]
   },
   {
-    "id": "15924723.6e7491",
+    "id": "84397dc4.6052e8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3521,
-    "y": 1213,
-    "z": "d1707f77.d9d96",
+    "x": 3580.883331298828,
+    "y": 1269.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "5b420eac.7f2e3"
+        "a3186923.403f7"
       ]
     ]
   },
   {
-    "id": "7cda231b.f03dc4",
+    "id": "a533cbf2.9ff568",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3523,
-    "y": 1246,
-    "z": "d1707f77.d9d96",
+    "x": 3582.883331298828,
+    "y": 1302.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "59d39de3.e2d86c"
+        "fb4a8c19.28b8c8"
       ]
     ]
   },
   {
-    "id": "d9e53024.28f5e8",
+    "id": "cf149009.40de5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3726.66650390625,
-    "y": 1529,
-    "z": "d1707f77.d9d96",
+    "x": 3786.549835205078,
+    "y": 1585.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "dfaba2c2.eca4e8",
-        "4097fc0c.2ebcd4"
+        "d71c8cc2.44ee38",
+        "eeee90c0.e5cea8"
       ]
     ]
   },
   {
-    "id": "cd9fd29c.16f54",
+    "id": "fcd9fb7.509ae08",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3717.0623779296875,
-    "y": 1575.8597717285156,
-    "z": "d1707f77.d9d96",
+    "x": 3776.9457092285156,
+    "y": 1632.7431030273438,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "fd85e1a6.4ce26",
+    "id": "3987c181.ee8c26",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3721,
-    "y": 1620,
-    "z": "d1707f77.d9d96",
+    "x": 3780.883331298828,
+    "y": 1676.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "dfaba2c2.eca4e8",
+    "id": "d71c8cc2.44ee38",
     "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": 3991,
-    "y": 1513,
-    "z": "d1707f77.d9d96",
+    "x": 4050.883331298828,
+    "y": 1569.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "8d48769f.5119e8",
-        "8debbded.83326"
+        "245c145e.ebe6e4",
+        "5de5cc75.c2e844"
       ]
     ]
   },
   {
-    "id": "8debbded.83326",
+    "id": "5de5cc75.c2e844",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4214,
-    "y": 1468,
-    "z": "d1707f77.d9d96",
+    "x": 4273.883331298828,
+    "y": 1524.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "2541c31e.77739c"
+        "a0f9be9b.313468"
       ]
     ]
   },
   {
-    "id": "8d48769f.5119e8",
+    "id": "245c145e.ebe6e4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4216,
-    "y": 1532,
-    "z": "d1707f77.d9d96",
+    "x": 4275.883331298828,
+    "y": 1588.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "2ddc4c0.3ed3fb4"
+        "911806e7.142508"
       ]
     ]
   },
   {
-    "id": "2ddc4c0.3ed3fb4",
+    "id": "911806e7.142508",
     "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": 4378,
-    "y": 1528,
-    "z": "d1707f77.d9d96",
+    "x": 4437.883331298828,
+    "y": 1584.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "2541c31e.77739c",
+    "id": "a0f9be9b.313468",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4379,
-    "y": 1465,
-    "z": "d1707f77.d9d96",
+    "x": 4438.883331298828,
+    "y": 1521.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "147c7198.960c76",
-        "5b133092.209f98"
+        "e1f125c0.caa6f",
+        "a1eca114.4be78"
       ]
     ]
   },
   {
-    "id": "810155a4.74088",
+    "id": "d95b965d.c926c",
     "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": 3993,
-    "y": 1672,
-    "z": "d1707f77.d9d96",
+    "x": 4052.883331298828,
+    "y": 1728.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "c595cb5f.3ebc78",
+    "id": "6b95fc34.5ad8b4",
     "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": 4038,
-    "y": 1582,
-    "z": "d1707f77.d9d96",
+    "x": 4097.883331298828,
+    "y": 1638.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "d29a1dc3.4eeb5",
+    "id": "8335544a.4f7eb",
     "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": 4121,
-    "y": 1720,
-    "z": "d1707f77.d9d96",
+    "x": 4180.883331298828,
+    "y": 1776.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "59d39de3.e2d86c",
+    "id": "fb4a8c19.28b8c8",
     "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": 3666,
-    "y": 1243,
-    "z": "d1707f77.d9d96",
+    "x": 3725.883331298828,
+    "y": 1299.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "5b420eac.7f2e3",
+    "id": "a3186923.403f7",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3669,
-    "y": 1206,
-    "z": "d1707f77.d9d96",
+    "x": 3728.883331298828,
+    "y": 1262.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "c6570a48.d5e8a",
-        "fa28539a.6f35e"
+        "df51c615.6dea38",
+        "42564be7.1576fc"
       ]
     ]
   },
   {
-    "id": "c6570a48.d5e8a",
+    "id": "df51c615.6dea38",
     "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": 3843,
-    "y": 1162,
-    "z": "d1707f77.d9d96",
+    "x": 3902.883331298828,
+    "y": 1218.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "4097fc0c.2ebcd4",
+    "id": "eeee90c0.e5cea8",
     "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": 3945,
-    "y": 1797,
-    "z": "d1707f77.d9d96",
+    "x": 4004.883331298828,
+    "y": 1853.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "55bdaff8.d6fa7"
+        "1b697bac.74bf24"
       ]
     ]
   },
   {
-    "id": "55bdaff8.d6fa7",
+    "id": "1b697bac.74bf24",
     "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": 4151,
-    "y": 1797,
-    "z": "d1707f77.d9d96",
+    "x": 4210.883331298828,
+    "y": 1853.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "13e441a4.daf476"
+        "fad81e7.f76f06"
       ]
     ]
   },
   {
-    "id": "13e441a4.daf476",
+    "id": "fad81e7.f76f06",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4366.28564453125,
-    "y": 1796.82177734375,
-    "z": "d1707f77.d9d96",
+    "x": 4426.168975830078,
+    "y": 1853.7051086425781,
+    "z": "7062000.f761",
     "wires": [
       [
-        "9c1550de.a16d68"
+        "f6db1963.f8cc08"
       ]
     ]
   },
   {
-    "id": "fa28539a.6f35e",
+    "id": "42564be7.1576fc",
     "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": 3858,
-    "y": 1273,
-    "z": "d1707f77.d9d96",
+    "x": 3917.883331298828,
+    "y": 1329.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "b1379be2.7c731",
-        "98821e3.6cffa6",
-        "93a11cc9.4e6df"
+        "3d26932b.7c3bc4",
+        "11ea41e8.6fef1e",
+        "60ff709f.49eb3"
       ]
     ]
   },
   {
-    "id": "b1379be2.7c731",
+    "id": "3d26932b.7c3bc4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4053.5001220703125,
-    "y": 1225,
-    "z": "d1707f77.d9d96",
+    "x": 4113.383453369141,
+    "y": 1281.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "49daba06.206634"
+        "e66646fd.ae97a8"
       ]
     ]
   },
   {
-    "id": "98821e3.6cffa6",
+    "id": "11ea41e8.6fef1e",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4045.5001220703125,
-    "y": 1280,
-    "z": "d1707f77.d9d96",
+    "x": 4105.383453369141,
+    "y": 1336.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "78abfa9e.41d134"
+        "6bc38e9e.a8f668"
       ]
     ]
   },
   {
-    "id": "93a11cc9.4e6df",
+    "id": "60ff709f.49eb3",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4050.5001220703125,
-    "y": 1337,
-    "z": "d1707f77.d9d96",
+    "x": 4110.383453369141,
+    "y": 1393.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "ae2448ff.86872"
+        "1b2700d2.65979f"
       ]
     ]
   },
   {
-    "id": "ae2448ff.86872",
+    "id": "1b2700d2.65979f",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4202.5001220703125,
-    "y": 1338,
-    "z": "d1707f77.d9d96",
+    "x": 4262.383453369141,
+    "y": 1394.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "78abfa9e.41d134",
+    "id": "6bc38e9e.a8f668",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4213.5001220703125,
-    "y": 1283,
-    "z": "d1707f77.d9d96",
+    "x": 4273.383453369141,
+    "y": 1339.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "49daba06.206634",
+    "id": "e66646fd.ae97a8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4197.8824462890625,
-    "y": 1222.6556701660156,
-    "z": "d1707f77.d9d96",
+    "x": 4257.765777587891,
+    "y": 1279.5390014648438,
+    "z": "7062000.f761",
     "wires": [
       [
-        "a244814e.1fdb1"
+        "8c7c1f5.e4db1e"
       ]
     ]
   },
   {
-    "id": "a244814e.1fdb1",
+    "id": "8c7c1f5.e4db1e",
     "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": 4382,
-    "y": 1237,
-    "z": "d1707f77.d9d96",
+    "x": 4441.883331298828,
+    "y": 1293.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "6f66ca5.eff0fb4"
+        "9be30f1d.25d3a8"
       ]
     ]
   },
   {
-    "id": "5b133092.209f98",
+    "id": "a1eca114.4be78",
     "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": 4549,
-    "y": 1423,
-    "z": "d1707f77.d9d96",
+    "x": 4608.883331298828,
+    "y": 1479.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "147c7198.960c76",
+    "id": "e1f125c0.caa6f",
     "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": 4550,
-    "y": 1531,
-    "z": "d1707f77.d9d96",
+    "x": 4609.883331298828,
+    "y": 1587.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "83128f31.28dd3",
+    "id": "b9cba76c.d9c1f8",
     "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": 4551,
-    "y": 1480,
-    "z": "d1707f77.d9d96",
+    "x": 4610.883331298828,
+    "y": 1536.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "9c1550de.a16d68",
+    "id": "f6db1963.f8cc08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4573.1171875,
-    "y": 1797.34033203125,
-    "z": "d1707f77.d9d96",
+    "x": 4633.000518798828,
+    "y": 1854.2236633300781,
+    "z": "7062000.f761",
     "wires": [
       [
-        "3dd5d699.d7912a",
-        "31d244a7.769454",
-        "41228511.9d3d04"
+        "7891783a.b17838",
+        "d094659a.049558",
+        "9c226fb0.3cc118"
       ]
     ]
   },
   {
-    "id": "3dd5d699.d7912a",
+    "id": "7891783a.b17838",
     "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": 4788.1171875,
-    "y": 1759.34033203125,
-    "z": "d1707f77.d9d96",
+    "x": 4848.000518798828,
+    "y": 1816.2236633300781,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "31d244a7.769454",
+    "id": "d094659a.049558",
     "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": 4785.1171875,
-    "y": 1798.34033203125,
-    "z": "d1707f77.d9d96",
+    "x": 4845.000518798828,
+    "y": 1855.2236633300781,
+    "z": "7062000.f761",
     "wires": [
       [
-        "3f687ffd.7ac738"
+        "7580173.08b9968"
       ]
     ]
   },
   {
-    "id": "41228511.9d3d04",
+    "id": "9c226fb0.3cc118",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4740.6171875,
-    "y": 1840.34033203125,
-    "z": "d1707f77.d9d96",
+    "x": 4800.500518798828,
+    "y": 1897.2236633300781,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "3f687ffd.7ac738",
+    "id": "7580173.08b9968",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4965.6171875,
-    "y": 1797.34033203125,
-    "z": "d1707f77.d9d96",
+    "x": 5025.500518798828,
+    "y": 1854.2236633300781,
+    "z": "7062000.f761",
     "wires": [
       [
-        "b1d8da7c.fb9068"
+        "cbf832f4.29b03"
       ]
     ]
   },
   {
-    "id": "73e89a58.b8a2f4",
+    "id": "c301ea5d.736948",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4780,
-    "y": 1241,
-    "z": "d1707f77.d9d96",
+    "x": 4839.883331298828,
+    "y": 1297.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "35399481.176a44"
+        "82c12c36.ef82a"
       ]
     ]
   },
   {
-    "id": "35399481.176a44",
+    "id": "82c12c36.ef82a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4957,
-    "y": 1233,
-    "z": "d1707f77.d9d96",
+    "x": 5016.883331298828,
+    "y": 1289.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "689257af.1e32e8",
-        "cffc6960.3515f8"
+        "99af67bd.f0a288",
+        "27aaa5b6.e5d6a2"
       ]
     ]
   },
   {
-    "id": "6f66ca5.eff0fb4",
+    "id": "9be30f1d.25d3a8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4577,
-    "y": 1237,
-    "z": "d1707f77.d9d96",
+    "x": 4636.883331298828,
+    "y": 1293.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "73e89a58.b8a2f4",
-        "8f00bdd8.7bfea8"
+        "c301ea5d.736948",
+        "d642ceb0.6d61d8"
       ]
     ]
   },
   {
-    "id": "8f00bdd8.7bfea8",
+    "id": "d642ceb0.6d61d8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4783,
-    "y": 1315,
-    "z": "d1707f77.d9d96",
+    "x": 4842.883331298828,
+    "y": 1371.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "54b58f35.b7982"
+        "8d64b35.e02ce5"
       ]
     ]
   },
   {
-    "id": "54b58f35.b7982",
+    "id": "8d64b35.e02ce5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4960,
-    "y": 1307,
-    "z": "d1707f77.d9d96",
+    "x": 5019.883331298828,
+    "y": 1363.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "bd4488b3.a3f2f8"
+        "b7238960.567a78"
       ]
     ]
   },
   {
-    "id": "b1d8da7c.fb9068",
+    "id": "cbf832f4.29b03",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5123.6171875,
-    "y": 1797.34033203125,
-    "z": "d1707f77.d9d96",
+    "x": 5183.500518798828,
+    "y": 1854.2236633300781,
+    "z": "7062000.f761",
     "wires": [
       [
-        "45f3cc43.b8716c"
+        "703f7e18.3396c8"
       ]
     ]
   },
   {
-    "id": "45f3cc43.b8716c",
+    "id": "703f7e18.3396c8",
     "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": 5330.6171875,
-    "y": 1797.34033203125,
-    "z": "d1707f77.d9d96",
+    "x": 5390.500518798828,
+    "y": 1854.2236633300781,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "cffc6960.3515f8",
+    "id": "27aaa5b6.e5d6a2",
     "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": 5165,
-    "y": 1240,
-    "z": "d1707f77.d9d96",
+    "x": 5224.883331298828,
+    "y": 1296.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "4c1fabd5.3f0e34",
-        "7bde9a25.02996c",
-        "405a47f8.a7ca18"
+        "5f4852b0.deaefc",
+        "a3e152bc.1612f",
+        "6a748238.68a734"
       ]
     ]
   },
   {
-    "id": "689257af.1e32e8",
+    "id": "99af67bd.f0a288",
     "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": 5195,
-    "y": 1188,
-    "z": "d1707f77.d9d96",
+    "x": 5254.883331298828,
+    "y": 1244.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "4c1fabd5.3f0e34",
+    "id": "5f4852b0.deaefc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5375,
-    "y": 1231,
-    "z": "d1707f77.d9d96",
+    "x": 5434.883331298828,
+    "y": 1287.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "d4e512d1.26f248"
+        "fce8f611.8c7338"
       ]
     ]
   },
   {
-    "id": "7bde9a25.02996c",
+    "id": "a3e152bc.1612f",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5367,
-    "y": 1286,
-    "z": "d1707f77.d9d96",
+    "x": 5426.883331298828,
+    "y": 1342.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "ecb49f32.439908"
+        "23b3b244.7d6476"
       ]
     ]
   },
   {
-    "id": "405a47f8.a7ca18",
+    "id": "6a748238.68a734",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5372,
-    "y": 1343,
-    "z": "d1707f77.d9d96",
+    "x": 5431.883331298828,
+    "y": 1399.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "3104200a.eb8e7"
+        "a282f316.3a8968"
       ]
     ]
   },
   {
-    "id": "3104200a.eb8e7",
+    "id": "a282f316.3a8968",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5524,
-    "y": 1344,
-    "z": "d1707f77.d9d96",
+    "x": 5583.883331298828,
+    "y": 1400.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "ecb49f32.439908",
+    "id": "23b3b244.7d6476",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5535,
-    "y": 1289,
-    "z": "d1707f77.d9d96",
+    "x": 5594.883331298828,
+    "y": 1345.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "d4e512d1.26f248",
+    "id": "fce8f611.8c7338",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5519.38232421875,
-    "y": 1228.6556701660156,
-    "z": "d1707f77.d9d96",
+    "x": 5579.265655517578,
+    "y": 1285.5390014648438,
+    "z": "7062000.f761",
     "wires": [
       [
-        "7caf8ab2.26a4a4"
+        "a440aece.fb083"
       ]
     ]
   },
   {
-    "id": "bd4488b3.a3f2f8",
+    "id": "b7238960.567a78",
     "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": 5195,
-    "y": 1431,
-    "z": "d1707f77.d9d96",
+    "x": 5254.883331298828,
+    "y": 1487.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "7caf8ab2.26a4a4",
+    "id": "a440aece.fb083",
     "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": 5734,
-    "y": 1225,
-    "z": "d1707f77.d9d96",
+    "x": 5793.883331298828,
+    "y": 1281.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "65bbdfd5.3dc13",
+    "id": "5b9ee810.250ef",
     "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": 4318,
-    "y": 879,
-    "z": "d1707f77.d9d96",
+    "x": 4377.883331298828,
+    "y": 935.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "c089b95e.30fd28",
+    "id": "8e2d81c0.4fd7e8",
     "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": 4309,
-    "y": 977,
-    "z": "d1707f77.d9d96",
+    "x": 4368.883331298828,
+    "y": 1033.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "6cfb261d.1543a8",
+    "id": "2d74202a.0b02c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4143,
-    "y": 885,
-    "z": "d1707f77.d9d96",
+    "x": 4202.883331298828,
+    "y": 941.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "cf6b5beb.abd2a",
-        "65bbdfd5.3dc13"
+        "698ac3d0.bab4ec",
+        "5b9ee810.250ef"
       ]
     ]
   },
   {
-    "id": "5cbc637f.f1f25c",
+    "id": "7e647400.994a6c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4149,
-    "y": 949,
-    "z": "d1707f77.d9d96",
+    "x": 4208.883331298828,
+    "y": 1005.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "ab5b8db7.2c0b2",
-        "c089b95e.30fd28"
+        "d12533f5.293ec",
+        "8e2d81c0.4fd7e8"
       ]
     ]
   },
   {
-    "id": "1f3d6111.fb3d4f",
+    "id": "45ecb3a3.4434cc",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4149,
-    "y": 1055,
-    "z": "d1707f77.d9d96",
+    "x": 4208.883331298828,
+    "y": 1111.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "d1673a3d.bf2ad",
-        "4aa0587f.0931c"
+        "cfe2458d.e53598",
+        "1ea1c70f.8279e9"
       ]
     ]
   },
   {
-    "id": "27ea8b3.eb35a74",
+    "id": "c83b931a.caa288",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4152,
-    "y": 1108,
-    "z": "d1707f77.d9d96",
+    "x": 4211.883331298828,
+    "y": 1164.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       [
-        "6f54a53.db0de5c",
-        "21e23a32.325fde"
+        "e0154f38.db2ba",
+        "85671ae.a18b1e8"
       ]
     ]
   },
   {
-    "id": "4aa0587f.0931c",
+    "id": "1ea1c70f.8279e9",
     "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": 4309,
-    "y": 1068,
-    "z": "d1707f77.d9d96",
+    "x": 4368.883331298828,
+    "y": 1124.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "21e23a32.325fde",
+    "id": "85671ae.a18b1e8",
     "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": 4312,
-    "y": 1159,
-    "z": "d1707f77.d9d96",
+    "x": 4371.883331298828,
+    "y": 1215.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "15f88e7e.38b0fa",
+    "id": "7278edf2.b8b58c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3684,
-    "y": 2369,
-    "z": "d1707f77.d9d96",
+    "x": 3743.883331298828,
+    "y": 2425.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "f975e555.4f0a2",
-        "a7320af4.ed9d8"
+        "3fae525c.90658e",
+        "13c312d5.234edd"
       ]
     ]
   },
   {
-    "id": "8b26e8b4.e3dba",
+    "id": "2fa6509a.e12468",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3511.33349609375,
-    "y": 2370,
-    "z": "d1707f77.d9d96",
+    "x": 3571.216827392578,
+    "y": 2426.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "15f88e7e.38b0fa"
+        "7278edf2.b8b58c"
       ]
     ]
   },
   {
-    "id": "365caf9e.ae04d8",
+    "id": "2125c96e.09934e",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3520.824462890625,
-    "y": 2412.5740356445312,
-    "z": "d1707f77.d9d96",
+    "x": 3580.707794189453,
+    "y": 2469.4573669433594,
+    "z": "7062000.f761",
     "wires": [
       [
-        "10960619.7120e2"
+        "68c9e27f.22495c"
       ]
     ]
   },
   {
-    "id": "f6d27283.d43c08",
+    "id": "be5c9f7d.6c274",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3509.33349609375,
-    "y": 2459,
-    "z": "d1707f77.d9d96",
+    "x": 3569.216827392578,
+    "y": 2515.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "f60d033c.caa1a"
+        "dc663a75.10e1e"
       ]
     ]
   },
   {
-    "id": "10960619.7120e2",
+    "id": "68c9e27f.22495c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3674.3958740234375,
-    "y": 2415.8597717285156,
-    "z": "d1707f77.d9d96",
+    "x": 3734.2792053222656,
+    "y": 2472.7431030273438,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "f60d033c.caa1a",
+    "id": "dc663a75.10e1e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3678.33349609375,
-    "y": 2460,
-    "z": "d1707f77.d9d96",
+    "x": 3738.216827392578,
+    "y": 2516.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "f975e555.4f0a2",
+    "id": "3fae525c.90658e",
     "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": 3970.33349609375,
-    "y": 2373.0001220703125,
-    "z": "d1707f77.d9d96",
+    "x": 4030.216827392578,
+    "y": 2429.8834533691406,
+    "z": "7062000.f761",
     "wires": [
       [
-        "fb51a1db.aad5c",
-        "a0fb7141.f8212"
+        "f8506393.ef4d48",
+        "ae1a7fe2.9ff988"
       ]
     ]
   },
   {
-    "id": "a0fb7141.f8212",
+    "id": "ae1a7fe2.9ff988",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4193.33349609375,
-    "y": 2328.0001220703125,
-    "z": "d1707f77.d9d96",
+    "x": 4253.216827392578,
+    "y": 2384.8834533691406,
+    "z": "7062000.f761",
     "wires": [
       [
-        "db58e724.c5bd7"
+        "bd5252ed.d0e86"
       ]
     ]
   },
   {
-    "id": "fb51a1db.aad5c",
+    "id": "f8506393.ef4d48",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4195.33349609375,
-    "y": 2392.0001220703125,
-    "z": "d1707f77.d9d96",
+    "x": 4255.216827392578,
+    "y": 2448.8834533691406,
+    "z": "7062000.f761",
     "wires": [
       [
-        "c50c321c.8bd388"
+        "7b56fdc4.718894"
       ]
     ]
   },
   {
-    "id": "c50c321c.8bd388",
+    "id": "7b56fdc4.718894",
     "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": 4354.33349609375,
-    "y": 2411.0001220703125,
-    "z": "d1707f77.d9d96",
+    "x": 4414.216827392578,
+    "y": 2467.8834533691406,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "db58e724.c5bd7",
+    "id": "bd5252ed.d0e86",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4358.33349609375,
-    "y": 2325.0001220703125,
-    "z": "d1707f77.d9d96",
+    "x": 4418.216827392578,
+    "y": 2381.8834533691406,
+    "z": "7062000.f761",
     "wires": [
       [
-        "b0670b4d.55e7b8",
-        "6c9ffe8c.9af1e8"
+        "a04df249.3edf9",
+        "4445456b.4ef0dc"
       ]
     ]
   },
   {
-    "id": "299e7ae7.513c9e",
+    "id": "dfb0d610.c67228",
     "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": 3972.33349609375,
-    "y": 2532.0001220703125,
-    "z": "d1707f77.d9d96",
+    "x": 4032.216827392578,
+    "y": 2588.8834533691406,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "cbea16a7.2be638",
+    "id": "a9b19647.ecdf6",
     "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": 4017.33349609375,
-    "y": 2442.0001220703125,
-    "z": "d1707f77.d9d96",
+    "x": 4077.216827392578,
+    "y": 2498.8834533691406,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "3d100357.15f07c",
+    "id": "d1080dc6.5d411",
     "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": 4099.33349609375,
-    "y": 2597.0001220703125,
-    "z": "d1707f77.d9d96",
+    "x": 4159.216827392578,
+    "y": 2653.8834533691406,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "c8257b0d.cf8598",
+    "id": "52e7c1a.b628dc",
     "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": 3283.33349609375,
-    "y": 2405,
-    "z": "d1707f77.d9d96",
+    "x": 3343.216827392578,
+    "y": 2461.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "8b26e8b4.e3dba",
-        "365caf9e.ae04d8",
-        "f6d27283.d43c08"
+        "2fa6509a.e12468",
+        "2125c96e.09934e",
+        "be5c9f7d.6c274"
       ]
     ]
   },
   {
-    "id": "e000777e.059758",
+    "id": "534c4b07.5a4374",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3244.33349609375,
-    "y": 2349,
-    "z": "d1707f77.d9d96",
+    "x": 3304.216827392578,
+    "y": 2405.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "8e7b1d45.48bf2",
+    "id": "59b35d49.e5c194",
     "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": 3301.33349609375,
-    "y": 2067.9998779296875,
-    "z": "d1707f77.d9d96",
+    "x": 3361.216827392578,
+    "y": 2124.8832092285156,
+    "z": "7062000.f761",
     "wires": [
       [
-        "3e16baed.e61f9e",
-        "718c7d79.85c5bc"
+        "8468812d.ab7d98",
+        "832feae1.441b18"
       ]
     ]
   },
   {
-    "id": "718c7d79.85c5bc",
+    "id": "832feae1.441b18",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3524.33349609375,
-    "y": 2053.9998779296875,
-    "z": "d1707f77.d9d96",
+    "x": 3584.216827392578,
+    "y": 2110.8832092285156,
+    "z": "7062000.f761",
     "wires": [
       [
-        "c56ba64b.9ec5c"
+        "45b67ba7.081314"
       ]
     ]
   },
   {
-    "id": "3e16baed.e61f9e",
+    "id": "8468812d.ab7d98",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3526.33349609375,
-    "y": 2086.9998779296875,
-    "z": "d1707f77.d9d96",
+    "x": 3586.216827392578,
+    "y": 2143.8832092285156,
+    "z": "7062000.f761",
     "wires": [
       [
-        "8748d48a.d5e098"
+        "71974a85.bc9554"
       ]
     ]
   },
   {
-    "id": "8748d48a.d5e098",
+    "id": "71974a85.bc9554",
     "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": 3669.33349609375,
-    "y": 2083.9998779296875,
-    "z": "d1707f77.d9d96",
+    "x": 3729.216827392578,
+    "y": 2140.8832092285156,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "c56ba64b.9ec5c",
+    "id": "45b67ba7.081314",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3672.33349609375,
-    "y": 2046.9998779296875,
-    "z": "d1707f77.d9d96",
+    "x": 3732.216827392578,
+    "y": 2103.8832092285156,
+    "z": "7062000.f761",
     "wires": [
       [
-        "883d33bf.bf29f",
-        "dcb0b05e.f2669"
+        "10560f97.9ccdb",
+        "fb974250.3eaa5"
       ]
     ]
   },
   {
-    "id": "883d33bf.bf29f",
+    "id": "10560f97.9ccdb",
     "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": 3866.33349609375,
-    "y": 2050,
-    "z": "d1707f77.d9d96",
+    "x": 3926.216827392578,
+    "y": 2106.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "a7320af4.ed9d8",
+    "id": "13c312d5.234edd",
     "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": 3929.33349609375,
-    "y": 2682,
-    "z": "d1707f77.d9d96",
+    "x": 3989.216827392578,
+    "y": 2738.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "fd321c11.d40e7"
+        "4f9cbec5.496d9"
       ]
     ]
   },
   {
-    "id": "fd321c11.d40e7",
+    "id": "4f9cbec5.496d9",
     "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": 4135.33349609375,
-    "y": 2682,
-    "z": "d1707f77.d9d96",
+    "x": 4195.216827392578,
+    "y": 2738.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "e08d51dc.da4c1"
+        "b238117c.f6854"
       ]
     ]
   },
   {
-    "id": "e08d51dc.da4c1",
+    "id": "b238117c.f6854",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4352.619140625,
-    "y": 2680.82177734375,
-    "z": "d1707f77.d9d96",
+    "x": 4412.502471923828,
+    "y": 2737.705108642578,
+    "z": "7062000.f761",
     "wires": [
       [
-        "10f977b0.bb1b3"
+        "3bbc3c62.de1f1c"
       ]
     ]
   },
   {
-    "id": "dcb0b05e.f2669",
+    "id": "fb974250.3eaa5",
     "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": 3888.33349609375,
-    "y": 2118,
-    "z": "d1707f77.d9d96",
+    "x": 3948.216827392578,
+    "y": 2174.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "c9b4249e.0909d8",
-        "9e2542d0.859f",
-        "4dfd412.b843d4"
+        "8b8a9b87.c8a068",
+        "46f3b355.657d1c",
+        "789bb9ae.3c411"
       ]
     ]
   },
   {
-    "id": "c9b4249e.0909d8",
+    "id": "8b8a9b87.c8a068",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4083.8336181640625,
-    "y": 2070,
-    "z": "d1707f77.d9d96",
+    "x": 4143.716949462891,
+    "y": 2126.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "ade6b82e.1a55d"
+        "288864eb.075f34"
       ]
     ]
   },
   {
-    "id": "9e2542d0.859f",
+    "id": "46f3b355.657d1c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4075.8336181640625,
-    "y": 2125,
-    "z": "d1707f77.d9d96",
+    "x": 4135.716949462891,
+    "y": 2181.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "44f6f51.d8f8c8c"
+        "f82ba322.6474e"
       ]
     ]
   },
   {
-    "id": "4dfd412.b843d4",
+    "id": "789bb9ae.3c411",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4080.8336181640625,
-    "y": 2182,
-    "z": "d1707f77.d9d96",
+    "x": 4140.716949462891,
+    "y": 2238.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "f041c0d3.954d68"
+        "98f52488.0327b8"
       ]
     ]
   },
   {
-    "id": "f041c0d3.954d68",
+    "id": "98f52488.0327b8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4232.8336181640625,
-    "y": 2183,
-    "z": "d1707f77.d9d96",
+    "x": 4292.716949462891,
+    "y": 2239.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "44f6f51.d8f8c8c",
+    "id": "f82ba322.6474e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4243.8336181640625,
-    "y": 2128,
-    "z": "d1707f77.d9d96",
+    "x": 4303.716949462891,
+    "y": 2184.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "ade6b82e.1a55d",
+    "id": "288864eb.075f34",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4228.2159423828125,
-    "y": 2067.6556701660156,
-    "z": "d1707f77.d9d96",
+    "x": 4288.099273681641,
+    "y": 2124.5390014648438,
+    "z": "7062000.f761",
     "wires": [
       [
-        "6075bcd4.2c69ac"
+        "ce45d16c.d5e628"
       ]
     ]
   },
   {
-    "id": "b0670b4d.55e7b8",
+    "id": "a04df249.3edf9",
     "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": 4528.33349609375,
-    "y": 2286.0001220703125,
-    "z": "d1707f77.d9d96",
+    "x": 4588.216827392578,
+    "y": 2342.8834533691406,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "6c9ffe8c.9af1e8",
+    "id": "4445456b.4ef0dc",
     "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": 4529.33349609375,
-    "y": 2391.0001220703125,
-    "z": "d1707f77.d9d96",
+    "x": 4589.216827392578,
+    "y": 2447.8834533691406,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "f79c8df1.ba3188",
+    "id": "c559d0ff.64e92",
     "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": 4524.33349609375,
-    "y": 2340.0001220703125,
-    "z": "d1707f77.d9d96",
+    "x": 4584.216827392578,
+    "y": 2396.8834533691406,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "10f977b0.bb1b3",
+    "id": "3bbc3c62.de1f1c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4559.45068359375,
-    "y": 2670.3404541015625,
-    "z": "d1707f77.d9d96",
+    "x": 4619.334014892578,
+    "y": 2727.2237854003906,
+    "z": "7062000.f761",
     "wires": [
       [
-        "20309de8.4632aa",
-        "f73e5414.3285",
-        "d0b059a0.487158"
+        "f4fc0b3b.90cef8",
+        "6738a6d1.eac328",
+        "94eb5da4.00ce9"
       ]
     ]
   },
   {
-    "id": "20309de8.4632aa",
+    "id": "f4fc0b3b.90cef8",
     "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": 4774.45068359375,
-    "y": 2632.3404541015625,
-    "z": "d1707f77.d9d96",
+    "x": 4834.334014892578,
+    "y": 2689.2237854003906,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "f73e5414.3285",
+    "id": "6738a6d1.eac328",
     "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": 4771.45068359375,
-    "y": 2671.3404541015625,
-    "z": "d1707f77.d9d96",
+    "x": 4831.334014892578,
+    "y": 2728.2237854003906,
+    "z": "7062000.f761",
     "wires": [
       [
-        "e534043d.5bd38"
+        "99dab506.61b3a8"
       ]
     ]
   },
   {
-    "id": "d0b059a0.487158",
+    "id": "94eb5da4.00ce9",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4726.95068359375,
-    "y": 2713.3404541015625,
-    "z": "d1707f77.d9d96",
+    "x": 4786.834014892578,
+    "y": 2770.2237854003906,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "e534043d.5bd38",
+    "id": "99dab506.61b3a8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4951.95068359375,
-    "y": 2670.3404541015625,
-    "z": "d1707f77.d9d96",
+    "x": 5011.834014892578,
+    "y": 2727.2237854003906,
+    "z": "7062000.f761",
     "wires": [
       [
-        "e48a79a9.dd196"
+        "d09db1ae.3d50e8"
       ]
     ]
   },
   {
-    "id": "e48a79a9.dd196",
+    "id": "d09db1ae.3d50e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5109.95068359375,
-    "y": 2670.3404541015625,
-    "z": "d1707f77.d9d96",
+    "x": 5169.834014892578,
+    "y": 2727.2237854003906,
+    "z": "7062000.f761",
     "wires": [
       [
-        "1f6fa1b2.460606"
+        "b4fea58e.4d08b"
       ]
     ]
   },
   {
-    "id": "1f6fa1b2.460606",
+    "id": "b4fea58e.4d08b",
     "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": 5316.95068359375,
-    "y": 2670.3404541015625,
-    "z": "d1707f77.d9d96",
+    "x": 5376.834014892578,
+    "y": 2727.2237854003906,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "a30de028.b28d48",
+    "id": "9cb60767.3dae68",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4810.33349609375,
-    "y": 2086,
-    "z": "d1707f77.d9d96",
+    "x": 4870.216827392578,
+    "y": 2142.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "ef5b074c.536d6"
+        "20305f15.4fc8"
       ]
     ]
   },
   {
-    "id": "ef5b074c.536d6",
+    "id": "20305f15.4fc8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4987.33349609375,
-    "y": 2078,
-    "z": "d1707f77.d9d96",
+    "x": 5047.216827392578,
+    "y": 2134.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "c21d00de.e0733",
-        "82588df6.f2c43"
+        "f06ad939.b3afb8",
+        "eb592a74.9250f"
       ]
     ]
   },
   {
-    "id": "6075bcd4.2c69ac",
+    "id": "ce45d16c.d5e628",
     "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": 4412.33349609375,
-    "y": 2082,
-    "z": "d1707f77.d9d96",
+    "x": 4472.216827392578,
+    "y": 2138.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "9110b39.2ad945"
+        "836b2028.73fa6"
       ]
     ]
   },
   {
-    "id": "9110b39.2ad945",
+    "id": "836b2028.73fa6",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4607.33349609375,
-    "y": 2082,
-    "z": "d1707f77.d9d96",
+    "x": 4667.216827392578,
+    "y": 2138.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "a30de028.b28d48",
-        "8b328cb8.458cf8"
+        "9cb60767.3dae68",
+        "1e4a18fb.74350f"
       ]
     ]
   },
   {
-    "id": "82588df6.f2c43",
+    "id": "eb592a74.9250f",
     "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": 5195.33349609375,
-    "y": 2085,
-    "z": "d1707f77.d9d96",
+    "x": 5255.216827392578,
+    "y": 2141.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "815a30c0.42847",
-        "e73296ce.c3274",
-        "43d82526.bf146c"
+        "b94c1f46.28b1b8",
+        "73a98c16.ea7094",
+        "1e6cb9ce.e34866"
       ]
     ]
   },
   {
-    "id": "14ab331b.3a14dd",
+    "id": "4be3f63c.7d65d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4989.33349609375,
-    "y": 2151,
-    "z": "d1707f77.d9d96",
+    "x": 5049.216827392578,
+    "y": 2207.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "d397e592.0e40b"
+        "573bcde0.7ae984"
       ]
     ]
   },
   {
-    "id": "8b328cb8.458cf8",
+    "id": "1e4a18fb.74350f",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4812.33349609375,
-    "y": 2159,
-    "z": "d1707f77.d9d96",
+    "x": 4872.216827392578,
+    "y": 2215.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "14ab331b.3a14dd"
+        "4be3f63c.7d65d8"
       ]
     ]
   },
   {
-    "id": "c21d00de.e0733",
+    "id": "f06ad939.b3afb8",
     "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": 5225.33349609375,
-    "y": 2033,
-    "z": "d1707f77.d9d96",
+    "x": 5285.216827392578,
+    "y": 2089.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "d397e592.0e40b",
+    "id": "573bcde0.7ae984",
     "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": 5224.33349609375,
-    "y": 2275,
-    "z": "d1707f77.d9d96",
+    "x": 5284.216827392578,
+    "y": 2331.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "815a30c0.42847",
+    "id": "b94c1f46.28b1b8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5405.33349609375,
-    "y": 2076,
-    "z": "d1707f77.d9d96",
+    "x": 5465.216827392578,
+    "y": 2132.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "665156df.6f87a"
+        "9cca84a4.69e27"
       ]
     ]
   },
   {
-    "id": "e73296ce.c3274",
+    "id": "73a98c16.ea7094",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5397.33349609375,
-    "y": 2131,
-    "z": "d1707f77.d9d96",
+    "x": 5457.216827392578,
+    "y": 2187.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "ae5fbc43.dedc3"
+        "e1e079f9.7a9848"
       ]
     ]
   },
   {
-    "id": "43d82526.bf146c",
+    "id": "1e6cb9ce.e34866",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5402.33349609375,
-    "y": 2188,
-    "z": "d1707f77.d9d96",
+    "x": 5462.216827392578,
+    "y": 2244.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "75c235dd.25a9b4"
+        "9609b4db.95e4f"
       ]
     ]
   },
   {
-    "id": "75c235dd.25a9b4",
+    "id": "9609b4db.95e4f",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5554.33349609375,
-    "y": 2189,
-    "z": "d1707f77.d9d96",
+    "x": 5614.216827392578,
+    "y": 2245.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "ae5fbc43.dedc3",
+    "id": "e1e079f9.7a9848",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5565.33349609375,
-    "y": 2134,
-    "z": "d1707f77.d9d96",
+    "x": 5625.216827392578,
+    "y": 2190.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "665156df.6f87a",
+    "id": "9cca84a4.69e27",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5549.7158203125,
-    "y": 2073.6556701660156,
-    "z": "d1707f77.d9d96",
+    "x": 5609.599151611328,
+    "y": 2130.5390014648438,
+    "z": "7062000.f761",
     "wires": [
       [
-        "d81c240c.0e54a"
+        "b8027aff.eb46b"
       ]
     ]
   },
   {
-    "id": "d81c240c.0e54a",
+    "id": "b8027aff.eb46b",
     "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": 5764.33349609375,
-    "y": 2070,
-    "z": "d1707f77.d9d96",
+    "x": 5824.216827392578,
+    "y": 2126.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "e4d1916e.82a0f",
+    "id": "cdada9b0.2f3a48",
     "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": 3263,
-    "y": 1680,
-    "z": "d1707f77.d9d96",
+    "x": 3322.883331298828,
+    "y": 1736.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "40d6ba08.05b09c",
+    "id": "95e31216.278c48",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4485,
-    "y": 963,
-    "z": "d1707f77.d9d96",
+    "x": 4544.883331298828,
+    "y": 1019.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "229afe55.f96f4a",
+    "id": "e1b848f1.cea8f8",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4477,
-    "y": 1053,
-    "z": "d1707f77.d9d96",
+    "x": 4536.883331298828,
+    "y": 1109.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "e42c5746.0b4288",
+    "id": "850e2800.badf2",
     "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": 3244,
-    "y": 2536,
-    "z": "d1707f77.d9d96",
+    "x": 3303.883331298828,
+    "y": 2592.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "e73ce695.7bd48",
+    "id": "2b1064a0.eade7c",
     "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": 3395,
-    "y": 2784,
-    "z": "d1707f77.d9d96",
+    "x": 3454.883331298828,
+    "y": 2840.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "9b16af83.d76cd8",
+    "id": "a5bcbd5b.23b83",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3272,
-    "y": 2894,
-    "z": "d1707f77.d9d96",
+    "x": 3331.883331298828,
+    "y": 2950.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "a884f3f1.0f482",
-        "4d74d9a8.bbfb9"
+        "6b05a347.83dffc",
+        "734dd518.f869ec"
       ]
     ]
   },
   {
-    "id": "a884f3f1.0f482",
+    "id": "6b05a347.83dffc",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3456,
-    "y": 2873,
-    "z": "d1707f77.d9d96",
+    "x": 3515.883331298828,
+    "y": 2929.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "51c791fd.f5a538"
+        "81013cf2.231a08"
       ]
     ]
   },
   {
-    "id": "4d74d9a8.bbfb9",
+    "id": "734dd518.f869ec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2992,
-    "y": 4459,
-    "z": "d1707f77.d9d96",
+    "x": 3051.883331298828,
+    "y": 4515.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "b3f9daed.71701"
+        "adcb6448.ea7478"
       ]
     ]
   },
   {
-    "id": "cc64efe3.d91b48",
+    "id": "68da37f9.05cc18",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3503,
-    "y": 5044,
-    "z": "d1707f77.d9d96",
+    "x": 3562.883331298828,
+    "y": 5100.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "b3fda79b.50166",
-        "d6cce90e.618d6",
-        "1292663a.8513e2",
-        "99c42fc9.238f28",
-        "978af086.86b638"
+        "d849eb29.b778b",
+        "fb71ca0a.fe8928",
+        "c01640bb.f526e8",
+        "298d7f45.2553b",
+        "4ebb86dc.a0713"
       ]
     ]
   },
   {
-    "id": "51c791fd.f5a538",
+    "id": "81013cf2.231a08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6575,
-    "y": 2903,
-    "z": "d1707f77.d9d96",
+    "x": 6634.883331298828,
+    "y": 2959.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "dcfc3248.c259d8",
-        "e0075324.e8eb9",
-        "e518ac23.9dfc28",
-        "537fab21.dec464",
-        "c34912bf.eaaae",
-        "afe65ba5.55b07",
-        "aac07044.b000d8",
-        "b8e3ea6a.2b3c98",
-        "2ef08f21.6201e",
-        "9901809f.3fcb1",
-        "fb2dd54d.4da48",
-        "2cb954fb.0ad334",
-        "328265e5.ceed9a",
-        "c5a55a83.29a8d8",
-        "9aa98499.f86768",
-        "387b0229.0d7006",
-        "4295e286.bfc1e4",
-        "d084e39e.bba608",
-        "a403e16a.cb2408"
+        "8a2aea1.11dcc18",
+        "f98cf202.f36e28",
+        "90c516f3.625c7",
+        "2f838a6e.450ff6",
+        "1aed0e7e.f8efea",
+        "c314ffe6.755b68",
+        "92f41cb.d6037e",
+        "1663311a.25772f",
+        "12533815.a962b",
+        "110e6104.d57bd7",
+        "9037ac75.0bc238",
+        "3017f19.9b8270e",
+        "b384a7be.8178a",
+        "bc57a86f.472ff",
+        "ca7cd34b.bc2bf",
+        "139339a2.2c6a06",
+        "3b830a4d.e803be",
+        "9ce39c8b.582fa",
+        "79c8e0a2.e2d0f"
       ]
     ]
   },
   {
-    "id": "2ef08f21.6201e",
+    "id": "12533815.a962b",
     "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": 6886,
-    "y": 3258,
-    "z": "d1707f77.d9d96",
+    "x": 6945.883331298828,
+    "y": 3314.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "dcfc3248.c259d8",
+    "id": "8a2aea1.11dcc18",
     "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<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\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<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\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": 6840,
-    "y": 3356,
-    "z": "d1707f77.d9d96",
+    "x": 6899.883331298828,
+    "y": 3412.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "e0075324.e8eb9",
+    "id": "f98cf202.f36e28",
     "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": 6976,
-    "y": 3403,
-    "z": "d1707f77.d9d96",
+    "x": 7035.883331298828,
+    "y": 3459.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "9cbf56aa.ad5218",
+    "id": "c27f6f12.2b7db",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 6807,
-    "y": 3207,
-    "z": "d1707f77.d9d96",
+    "x": 6866.883331298828,
+    "y": 3263.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "2b713353.70ef7c",
+    "id": "c8ec9937.7e8ac",
     "type": "comment",
     "name": "create middle man connectivity and ...",
     "info": "1- create middle man connectivity\n2- create relation with all connectivities\n   in the path\n3- put srcTtp (+dstTtp) somewhere in the\n   vpn-binding -> this is for later on to find\n   which OTN tunnel's bandwidth has to be increased.\n5- create UNIs\n4- create relationship to UNIs",
     "comments": "",
-    "x": 7333,
-    "y": 3698,
-    "z": "d1707f77.d9d96",
+    "x": 7392.883331298828,
+    "y": 3754.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "e518ac23.9dfc28",
+    "id": "90c516f3.625c7",
     "type": "execute",
     "name": "execute UUID generator for connectivity middle-man",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-middle-man-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6897,
-    "y": 3737,
-    "z": "d1707f77.d9d96",
+    "x": 6956.883331298828,
+    "y": 3793.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "537fab21.dec464",
+    "id": "2f838a6e.450ff6",
     "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-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\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<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\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": 6845,
-    "y": 3788,
-    "z": "d1707f77.d9d96",
+    "x": 6904.883331298828,
+    "y": 3844.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "c34912bf.eaaae",
+    "id": "1aed0e7e.f8efea",
     "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-middle-man-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-middle-man-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": 6981,
-    "y": 3835,
-    "z": "d1707f77.d9d96",
+    "x": 7040.883331298828,
+    "y": 3891.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "60b2fbe4.e4d04c",
+    "id": "26cc918c.53f13e",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 6838,
-    "y": 3697,
-    "z": "d1707f77.d9d96",
+    "x": 6897.883331298828,
+    "y": 3753.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "fcf93995.6af71",
+    "id": "4f7a1677.0cc04",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 7268,
-    "y": 3894,
-    "z": "d1707f77.d9d96",
+    "x": 7327.883331298828,
+    "y": 3950.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "afe65ba5.55b07",
+    "id": "c314ffe6.755b68",
     "type": "save",
     "name": "get middle-man connectivity from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $prop.connectivity-middle-man-uuid\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"middle-man-conn\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 6859,
-    "y": 3941,
-    "z": "d1707f77.d9d96",
+    "x": 6918.883331298828,
+    "y": 3997.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "68159cb3.0ebba4",
-        "c63fd2a4.712768",
-        "3a361ef1.e7793a"
+        "b94a6109.4587b8",
+        "244569e0.e8b39e",
+        "f408fad5.acd5c"
       ]
     ]
   },
   {
-    "id": "68159cb3.0ebba4",
+    "id": "b94a6109.4587b8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 7106,
-    "y": 3895,
-    "z": "d1707f77.d9d96",
+    "x": 7165.883331298828,
+    "y": 3951.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "fcf93995.6af71"
+        "4f7a1677.0cc04"
       ]
     ]
   },
   {
-    "id": "c63fd2a4.712768",
+    "id": "244569e0.e8b39e",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 7106.490966796875,
-    "y": 3940.5740356445312,
-    "z": "d1707f77.d9d96",
+    "x": 7166.374298095703,
+    "y": 3997.4573669433594,
+    "z": "7062000.f761",
     "wires": [
       [
-        "a1ea132a.743c88"
+        "c4e6aa20.1e07c8"
       ]
     ]
   },
   {
-    "id": "3a361ef1.e7793a",
+    "id": "f408fad5.acd5c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 7104,
-    "y": 3984,
-    "z": "d1707f77.d9d96",
+    "x": 7163.883331298828,
+    "y": 4040.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "b000dcd9.6a6a6"
+        "5ee0d1d0.ddd63"
       ]
     ]
   },
   {
-    "id": "a1ea132a.743c88",
+    "id": "c4e6aa20.1e07c8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 7269.0623779296875,
-    "y": 3940.8597717285156,
-    "z": "d1707f77.d9d96",
+    "x": 7328.945709228516,
+    "y": 3997.7431030273438,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "b000dcd9.6a6a6",
+    "id": "5ee0d1d0.ddd63",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 7273,
-    "y": 3985,
-    "z": "d1707f77.d9d96",
+    "x": 7332.883331298828,
+    "y": 4041.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "9aa98499.f86768",
+    "id": "ca7cd34b.bc2bf",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6916,
-    "y": 4220,
-    "z": "d1707f77.d9d96",
+    "x": 6975.883331298828,
+    "y": 4276.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "387b0229.0d7006",
+    "id": "139339a2.2c6a06",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6919,
-    "y": 4265,
-    "z": "d1707f77.d9d96",
+    "x": 6978.883331298828,
+    "y": 4321.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "d084e39e.bba608",
+    "id": "9ce39c8b.582fa",
     "type": "save",
     "name": "save middle-man-conn 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 = $middle-man-conn.connectivity-id' \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": 6908,
-    "y": 4056,
-    "z": "d1707f77.d9d96",
+    "x": 6967.883331298828,
+    "y": 4112.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "a403e16a.cb2408",
+    "id": "79c8e0a2.e2d0f",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \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.ROOT.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.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6910,
-    "y": 4103,
-    "z": "d1707f77.d9d96",
+    "x": 6969.883331298828,
+    "y": 4159.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "344300f.08239",
+    "id": "a0361928.318ac8",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 6832,
-    "y": 4173,
-    "z": "d1707f77.d9d96",
+    "x": 6891.883331298828,
+    "y": 4229.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "b25b6055.f41fc",
+    "id": "d342acdf.02b8f",
     "type": "save",
     "name": "save middle-man-conn 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 = $middle-man-conn.connectivity-id' \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": 4461.999755859375,
-    "y": 5324,
-    "z": "d1707f77.d9d96",
+    "x": 4521.883087158203,
+    "y": 5380.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "b3fda79b.50166",
+    "id": "d849eb29.b778b",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3718,
-    "y": 5025,
-    "z": "d1707f77.d9d96",
+    "x": 3777.883331298828,
+    "y": 5081.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "980c8526.303db",
-        "36a09550.068efa"
+        "ef9ce74a.0aa3e",
+        "75834f94.5997b"
       ]
     ]
   },
   {
-    "id": "36a09550.068efa",
+    "id": "75834f94.5997b",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3890,
-    "y": 5022,
-    "z": "d1707f77.d9d96",
+    "x": 3949.883331298828,
+    "y": 5078.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "de34c1af.7b7ab"
+        "f997d531.6d1e2"
       ]
     ]
   },
   {
-    "id": "980c8526.303db",
+    "id": "ef9ce74a.0aa3e",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3842,
-    "y": 5869,
-    "z": "d1707f77.d9d96",
+    "x": 3901.883331298828,
+    "y": 5925.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "a5898926.6491f"
+        "7f678eb1.f9d898"
       ]
     ]
   },
   {
-    "id": "8ada44e5.f9f04",
+    "id": "94fb7d78.dd39a8",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3903,
-    "y": 4992,
-    "z": "d1707f77.d9d96",
+    "x": 3962.883331298828,
+    "y": 5048.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "5e264f22.beeb98",
+    "id": "d898a291.dc858",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3913,
-    "y": 5827,
-    "z": "d1707f77.d9d96",
+    "x": 3972.883331298828,
+    "y": 5883.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "aac07044.b000d8",
+    "id": "92f41cb.d6037e",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6916,
-    "y": 4329,
-    "z": "d1707f77.d9d96",
+    "x": 6975.883331298828,
+    "y": 4385.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "de34c1af.7b7ab",
+    "id": "f997d531.6d1e2",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4066,
-    "y": 5024,
-    "z": "d1707f77.d9d96",
+    "x": 4125.883331298828,
+    "y": 5080.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "8283f1ca.0934e",
-        "d88e7d60.d8e85",
-        "d37e54c7.dc098",
-        "74df2b94.0f2054",
-        "e51131c0.7c711",
-        "77a4c18.eb27d4",
-        "b25b6055.f41fc"
+        "baabeea4.9ec638",
+        "fd2de0c3.4119c8",
+        "7962decb.29a4b8",
+        "1df2ddf.d8fc4a2",
+        "bb9baf34.d0edd",
+        "983065a0.b74e08",
+        "d342acdf.02b8f"
       ]
     ]
   },
   {
-    "id": "557f9fe2.05b59",
+    "id": "4b2297b2.c2986",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5509.999755859375,
-    "y": 4949,
-    "z": "d1707f77.d9d96",
+    "x": 5569.883087158203,
+    "y": 5005.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "8283f1ca.0934e",
+    "id": "baabeea4.9ec638",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4456.999755859375,
-    "y": 5627,
-    "z": "d1707f77.d9d96",
+    "x": 4516.883087158203,
+    "y": 5683.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "b8e3ea6a.2b3c98",
+    "id": "1663311a.25772f",
     "type": "save",
     "name": "save connectivityB relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-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.ROOT.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.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6892,
-    "y": 3597,
-    "z": "d1707f77.d9d96",
+    "x": 6951.883331298828,
+    "y": 3653.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "f013f824.788458",
+    "id": "ac7755ab.b0ef2",
     "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": 3376,
-    "y": 1786,
-    "z": "d1707f77.d9d96",
+    "x": 3435.883331298828,
+    "y": 1842.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "61df2559.b0a7f4",
+    "id": "2976ed1.40d8712",
     "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": 3283,
-    "y": 1733,
-    "z": "d1707f77.d9d96",
+    "x": 3342.883331298828,
+    "y": 1789.8833312988281,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "a02e380a.b3cf4",
+    "id": "7c3bd1f7.b32788",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid=tmp.ROOT.uni-p-interface-long",
     "xml": "<set>\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />\n",
     "comments": "",
-    "x": 6942,
-    "y": 3300,
-    "z": "d1707f77.d9d96",
+    "x": 7001.883331298828,
+    "y": 3356.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "9901809f.3fcb1",
+    "id": "110e6104.d57bd7",
     "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": 6889,
-    "y": 2888,
-    "z": "d1707f77.d9d96",
+    "x": 6948.883331298828,
+    "y": 2944.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "fb2dd54d.4da48",
+    "id": "9037ac75.0bc238",
     "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<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\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": 6837,
-    "y": 2936,
-    "z": "d1707f77.d9d96",
+    "x": 6896.883331298828,
+    "y": 2992.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "2cb954fb.0ad334",
+    "id": "3017f19.9b8270e",
     "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": 6965,
-    "y": 2983,
-    "z": "d1707f77.d9d96",
+    "x": 7024.883331298828,
+    "y": 3039.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "d3975532.a6eff",
+    "id": "2b4caca8.ebe43c",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 6802,
-    "y": 2846,
-    "z": "d1707f77.d9d96",
+    "x": 6861.883331298828,
+    "y": 2902.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "328265e5.ceed9a",
+    "id": "b384a7be.8178a",
     "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-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />",
     "comments": "",
     "outputs": 1,
-    "x": 6799,
-    "y": 3074,
-    "z": "d1707f77.d9d96",
+    "x": 6858.883331298828,
+    "y": 3130.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "c5a55a83.29a8d8",
+    "id": "bc57a86f.472ff",
     "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 = $uuid.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": 6892,
-    "y": 3127,
-    "z": "d1707f77.d9d96",
+    "x": 6951.883331298828,
+    "y": 3183.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "24258df6.dd1f32",
+    "id": "a5d38ce2.eac838",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 6783,
-    "y": 3030,
-    "z": "d1707f77.d9d96",
+    "x": 6842.883331298828,
+    "y": 3086.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "9e59bbd5.dc241",
+    "id": "232bd10a.a8b54e",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 6789,
-    "y": 3480,
-    "z": "d1707f77.d9d96",
+    "x": 6848.883331298828,
+    "y": 3536.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "74df2b94.0f2054",
+    "id": "1df2ddf.d8fc4a2",
     "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-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4378.999755859375,
-    "y": 4957,
-    "z": "d1707f77.d9d96",
+    "x": 4438.883087158203,
+    "y": 5013.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "e382f150.3ff898",
+    "id": "5696f41b.05cf84",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4362.999755859375,
-    "y": 4913,
-    "z": "d1707f77.d9d96",
+    "x": 4422.883087158203,
+    "y": 4969.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "b5d28059.1f56c",
+    "id": "462a954a.4cebb4",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5109.999755859375,
-    "y": 4944,
-    "z": "d1707f77.d9d96",
+    "x": 5169.883087158203,
+    "y": 5000.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "9a9628dc.017478",
+    "id": "5bab7896.e13d9",
     "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": 5196.999755859375,
-    "y": 4986,
-    "z": "d1707f77.d9d96",
+    "x": 5256.883087158203,
+    "y": 5042.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "73763019.23312",
+    "id": "ec708b2b.d3c6e",
     "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='`$middle-man-conn.etht-svc-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<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\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": 5144.999755859375,
-    "y": 5034,
-    "z": "d1707f77.d9d96",
+    "x": 5204.883087158203,
+    "y": 5090.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "8700555a.80709",
+    "id": "dea6b450.126ae",
     "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": 5272.999755859375,
-    "y": 5081,
-    "z": "d1707f77.d9d96",
+    "x": 5332.883087158203,
+    "y": 5137.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "77a4c18.eb27d4",
+    "id": "983065a0.b74e08",
     "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 = $uuid.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": 4449.999755859375,
-    "y": 5366,
-    "z": "d1707f77.d9d96",
+    "x": 4509.883087158203,
+    "y": 5422.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "d49ec047.690ff8",
+    "id": "e263a78e.c8cba",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4432.999755859375,
-    "y": 5428,
-    "z": "d1707f77.d9d96",
+    "x": 4492.883087158203,
+    "y": 5484.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "d88e7d60.d8e85",
+    "id": "fd2de0c3.4119c8",
     "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": 4543.999755859375,
-    "y": 5470,
-    "z": "d1707f77.d9d96",
+    "x": 4603.883087158203,
+    "y": 5526.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "b06e730a.cb4f08",
+    "id": "631f5baa.6a836c",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 4991.999755859375,
-    "y": 5523,
-    "z": "d1707f77.d9d96",
+    "x": 5051.883087158203,
+    "y": 5579.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "86caea3e.0715e8",
+    "id": "4505fb5a.3099fc",
     "type": "save",
     "name": "save middle-man-conn 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 = $middle-man-conn.connectivity-id' \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": 4301.999755859375,
-    "y": 6221,
-    "z": "d1707f77.d9d96",
+    "x": 4361.883087158203,
+    "y": 6277.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "54495687.db6e08",
+    "id": "78bf173f.567498",
     "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-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4234.999755859375,
-    "y": 6175,
-    "z": "d1707f77.d9d96",
+    "x": 4294.883087158203,
+    "y": 6231.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "eb729332.c66588",
+    "id": "79075338.970b1c",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4183.999755859375,
-    "y": 6126,
-    "z": "d1707f77.d9d96",
+    "x": 4243.883087158203,
+    "y": 6182.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "d4928728.f80f18",
+    "id": "552d64d8.079684",
     "type": "save",
     "name": "save the-connectivity 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 = $tmp.the-connectivity.connectivity-id' \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": 4967,
-    "y": 6332,
-    "z": "d1707f77.d9d96",
+    "x": 5026.883331298828,
+    "y": 6388.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "d37e54c7.dc098",
+    "id": "7962decb.29a4b8",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4370.999755859375,
-    "y": 5527,
-    "z": "d1707f77.d9d96",
+    "x": 4430.883087158203,
+    "y": 5583.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "94ae8414.9a9908",
-        "bf5ff48.5c73588"
+        "a8868823.64a65",
+        "f3d79a89.da5f"
       ]
     ]
   },
   {
-    "id": "94ae8414.9a9908",
+    "id": "a8868823.64a65",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4581.999755859375,
-    "y": 5527,
-    "z": "d1707f77.d9d96",
+    "x": 4641.883087158203,
+    "y": 5583.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "62e35c20.8fafcc"
+        "8c7e9ec3.edd538"
       ]
     ]
   },
   {
-    "id": "62e35c20.8fafcc",
+    "id": "8c7e9ec3.edd538",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4737.999755859375,
-    "y": 5523,
-    "z": "d1707f77.d9d96",
+    "x": 4797.883087158203,
+    "y": 5579.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "b06e730a.cb4f08",
-        "4dbfd84e.baba9",
-        "22a50e4b.58e402"
+        "631f5baa.6a836c",
+        "e719db8e.3b76c8",
+        "63d85a3d.4103fc"
       ]
     ]
   },
   {
-    "id": "bf5ff48.5c73588",
+    "id": "f3d79a89.da5f",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4577.999755859375,
-    "y": 5575,
-    "z": "d1707f77.d9d96",
+    "x": 4637.883087158203,
+    "y": 5631.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "98134483.cc3d7"
+        "c9509718.d9f2e8"
       ]
     ]
   },
   {
-    "id": "98134483.cc3d7",
+    "id": "c9509718.d9f2e8",
     "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": 4725.999755859375,
-    "y": 5570,
-    "z": "d1707f77.d9d96",
+    "x": 4785.883087158203,
+    "y": 5626.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "f71cc5a0.3af018",
+    "id": "10f1aa00.faee3e",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5233.999755859375,
-    "y": 5152,
-    "z": "d1707f77.d9d96",
+    "x": 5293.883087158203,
+    "y": 5208.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "2c19139d.1b72fc",
+    "id": "dca67cc5.30d2f8",
     "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": 2401,
-    "y": 111,
-    "z": "d1707f77.d9d96",
+    "x": 2460.883331298828,
+    "y": 167.88333129882812,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "24e6a4ae.ee277c",
+    "id": "ce64f5e6.94469",
     "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": 2335,
-    "y": 147,
-    "z": "d1707f77.d9d96",
+    "x": 2394.883331298828,
+    "y": 203.88333129882812,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "f4d12dd6.283218",
+    "id": "10c1b340.47f61d",
     "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": 2520,
-    "y": 74,
-    "z": "d1707f77.d9d96",
+    "x": 2579.883331298828,
+    "y": 130.88333129882812,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "24b292e6.4df33e",
+    "id": "7299a42e.833c84",
     "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": 4268.999755859375,
-    "y": 6287,
-    "z": "d1707f77.d9d96",
+    "x": 4328.883087158203,
+    "y": 6343.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "7a0aa2d.fce125c",
+    "id": "14b14bf.2fcb6b4",
     "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": 4401.999755859375,
-    "y": 6335,
-    "z": "d1707f77.d9d96",
+    "x": 4461.883087158203,
+    "y": 6391.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "50b3cc59.11db24",
+    "id": "787fc902.6b8688",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4220.999755859375,
-    "y": 6393,
-    "z": "d1707f77.d9d96",
+    "x": 4280.883087158203,
+    "y": 6449.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "3d73c45f.10f0ec",
-        "cd840dd8.7d1be8"
+        "17a7dc18.0b8f9c",
+        "f762f.a378f1d18"
       ]
     ]
   },
   {
-    "id": "3d73c45f.10f0ec",
+    "id": "17a7dc18.0b8f9c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4413.999755859375,
-    "y": 6394,
-    "z": "d1707f77.d9d96",
+    "x": 4473.883087158203,
+    "y": 6450.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "bd700c8c.0189e8"
+        "22a4f0b9.5cc3f"
       ]
     ]
   },
   {
-    "id": "bd700c8c.0189e8",
+    "id": "22a4f0b9.5cc3f",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Connectivity should have been created' />\n",
     "comments": "",
-    "x": 4569.999755859375,
-    "y": 6391,
-    "z": "d1707f77.d9d96",
+    "x": 4629.883087158203,
+    "y": 6447.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "cd840dd8.7d1be8",
+    "id": "f762f.a378f1d18",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4417.999755859375,
-    "y": 6438,
-    "z": "d1707f77.d9d96",
+    "x": 4477.883087158203,
+    "y": 6494.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "a8ddf5df.ccbdb"
+        "82673a8f.5388f"
       ]
     ]
   },
   {
-    "id": "a8ddf5df.ccbdb",
+    "id": "82673a8f.5388f",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4556.999755859375,
-    "y": 6433,
-    "z": "d1707f77.d9d96",
+    "x": 4616.883087158203,
+    "y": 6489.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "d4928728.f80f18",
-        "dd8d3775.a881a",
-        "85ecad27.9bfc8",
-        "72e32840.b04238",
-        "704867e2.0c96c8",
-        "27d3e822.44bc48",
-        "e87bb1d8.7deca",
-        "fd00316c.9df6b",
-        "dbdf2c9.87c1b5",
-        "4bb3191b.a6309",
-        "6165612a.74a1f8",
-        "901e2d41.157da8"
+        "552d64d8.079684",
+        "b152a028.0e0e48",
+        "df3932b1.5cfd1",
+        "dd853f0d.c675b",
+        "6a2f520.9e626b",
+        "4ac1ad89.6ecd0c",
+        "5a7c34be.0eee64",
+        "f8b3148.1a90a68",
+        "506cbb81.2befbc",
+        "e29af13.61a371",
+        "1a8fecd4.39509b",
+        "2374b67.d3b424a"
       ]
     ]
   },
   {
-    "id": "e87bb1d8.7deca",
+    "id": "5a7c34be.0eee64",
     "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": 4753.999755859375,
-    "y": 7112,
-    "z": "d1707f77.d9d96",
+    "x": 4813.883087158203,
+    "y": 7168.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "50c2bb1d.1918b4",
-        "5f510bf0.f61244",
-        "bca3f050.7f93f"
+        "8d3fe228.0e9ab8",
+        "92f94e1c.33687",
+        "710bd5c.e65692c"
       ]
     ]
   },
   {
-    "id": "50c2bb1d.1918b4",
+    "id": "8d3fe228.0e9ab8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4958.999755859375,
-    "y": 7109,
-    "z": "d1707f77.d9d96",
+    "x": 5018.883087158203,
+    "y": 7165.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "6803d387.7ac854"
+        "867b5387.a77e68"
       ]
     ]
   },
   {
-    "id": "5f510bf0.f61244",
+    "id": "92f94e1c.33687",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4942.49072265625,
-    "y": 7170.574035644531,
-    "z": "d1707f77.d9d96",
+    "x": 5002.374053955078,
+    "y": 7227.457366943359,
+    "z": "7062000.f761",
     "wires": [
       [
-        "d60db86d.dbd268"
+        "32a9210e.f5a66e"
       ]
     ]
   },
   {
-    "id": "bca3f050.7f93f",
+    "id": "710bd5c.e65692c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4939.999755859375,
-    "y": 7214,
-    "z": "d1707f77.d9d96",
+    "x": 4999.883087158203,
+    "y": 7270.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "1f943971.7bdbb7"
+        "5f13dad2.143724"
       ]
     ]
   },
   {
-    "id": "6803d387.7ac854",
+    "id": "867b5387.a77e68",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5127,
-    "y": 7104,
-    "z": "d1707f77.d9d96",
+    "x": 5186.883331298828,
+    "y": 7160.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "90b83d2f.dffcf"
+        "a6483ec8.fd095"
       ]
     ]
   },
   {
-    "id": "d60db86d.dbd268",
+    "id": "32a9210e.f5a66e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5105.0621337890625,
-    "y": 7170.859771728516,
-    "z": "d1707f77.d9d96",
+    "x": 5164.945465087891,
+    "y": 7227.743103027344,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "1f943971.7bdbb7",
+    "id": "5f13dad2.143724",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5106.999755859375,
-    "y": 7213,
-    "z": "d1707f77.d9d96",
+    "x": 5166.883087158203,
+    "y": 7269.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "90b83d2f.dffcf",
+    "id": "a6483ec8.fd095",
     "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": 5361.999755859375,
-    "y": 7120,
-    "z": "d1707f77.d9d96",
+    "x": 5421.883087158203,
+    "y": 7176.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "495a0b6e.3eb454"
+        "2bfd9e0f.b0b65a"
       ]
     ]
   },
   {
-    "id": "495a0b6e.3eb454",
+    "id": "2bfd9e0f.b0b65a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5598.999755859375,
-    "y": 7116,
-    "z": "d1707f77.d9d96",
+    "x": 5658.883087158203,
+    "y": 7172.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "34e344a3.9ead3c"
+        "f7d1e8ad.4dc7b8"
       ]
     ]
   },
   {
-    "id": "fe37ae21.64a32",
+    "id": "58dab986.f5f5a",
     "type": "switchNode",
     "name": "switch vpnuuid is for this slice",
     "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5865.999755859375,
-    "y": 7082,
-    "z": "d1707f77.d9d96",
+    "x": 5925.883087158203,
+    "y": 7138.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "f98c5893.919c78",
-        "e901664c.c5fec"
+        "25d3132f.f14084",
+        "88844ebd.a9a5b"
       ]
     ]
   },
   {
-    "id": "f98c5893.919c78",
+    "id": "25d3132f.f14084",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6046.999755859375,
-    "y": 7108,
-    "z": "d1707f77.d9d96",
+    "x": 6106.883087158203,
+    "y": 7164.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "34e344a3.9ead3c"
+        "f7d1e8ad.4dc7b8"
       ]
     ]
   },
   {
-    "id": "e901664c.c5fec",
+    "id": "88844ebd.a9a5b",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6045.999755859375,
-    "y": 7061,
-    "z": "d1707f77.d9d96",
+    "x": 6105.883087158203,
+    "y": 7117.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "34e344a3.9ead3c",
+    "id": "f7d1e8ad.4dc7b8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4789.999755859375,
-    "y": 7383,
-    "z": "d1707f77.d9d96",
+    "x": 4849.883087158203,
+    "y": 7439.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "254dab5b.54ef9c"
+        "a21574dc.7f1048"
       ]
     ]
   },
   {
-    "id": "9666a3e2.48dd48",
+    "id": "da2d189.a0c85e8",
     "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": 5638.999755859375,
-    "y": 7288,
-    "z": "d1707f77.d9d96",
+    "x": 5698.883087158203,
+    "y": 7344.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "d1379ae2.1582e8",
+    "id": "9ec2c103.e591",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4851.999755859375,
-    "y": 7059,
-    "z": "d1707f77.d9d96",
+    "x": 4911.883087158203,
+    "y": 7115.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "27d3e822.44bc48",
+    "id": "4ac1ad89.6ecd0c",
     "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": 4735.999755859375,
-    "y": 6908,
-    "z": "d1707f77.d9d96",
+    "x": 4795.883087158203,
+    "y": 6964.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "e580aaa3.2d8a9",
+    "id": "2add06b4.24634a",
     "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": 5080.999755859375,
-    "y": 6739,
-    "z": "d1707f77.d9d96",
+    "x": 5140.883087158203,
+    "y": 6795.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "ef9ad0a5.eedb18"
+        "a410e22f.bcf42"
       ]
     ]
   },
   {
-    "id": "ef9ad0a5.eedb18",
+    "id": "a410e22f.bcf42",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5300.999755859375,
-    "y": 6745,
-    "z": "d1707f77.d9d96",
+    "x": 5360.883087158203,
+    "y": 6801.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "5a7e6348.1665b4"
+        "22269296.bf623e"
       ]
     ]
   },
   {
-    "id": "5a7e6348.1665b4",
+    "id": "22269296.bf623e",
     "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": 5485.999755859375,
-    "y": 6744,
-    "z": "d1707f77.d9d96",
+    "x": 5545.883087158203,
+    "y": 6800.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "da67f694.85343"
+        "66b1e6be.5824e"
       ]
     ]
   },
   {
-    "id": "da67f694.85343",
+    "id": "66b1e6be.5824e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5677.999755859375,
-    "y": 6747,
-    "z": "d1707f77.d9d96",
+    "x": 5737.883087158203,
+    "y": 6803.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "4b28f457.fca6dc"
+        "19dd27ef.ab039"
       ]
     ]
   },
   {
-    "id": "4b28f457.fca6dc",
+    "id": "19dd27ef.ab039",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5886.999755859375,
-    "y": 6745,
-    "z": "d1707f77.d9d96",
+    "x": 5946.883087158203,
+    "y": 6801.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "fd00316c.9df6b",
+    "id": "f8b3148.1a90a68",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4787.999755859375,
-    "y": 6733,
-    "z": "d1707f77.d9d96",
+    "x": 4847.883087158203,
+    "y": 6789.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "e580aaa3.2d8a9"
+        "2add06b4.24634a"
       ]
     ]
   },
   {
-    "id": "85ecad27.9bfc8",
+    "id": "df3932b1.5cfd1",
     "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": 4795.999755859375,
-    "y": 6626,
-    "z": "d1707f77.d9d96",
+    "x": 4855.883087158203,
+    "y": 6682.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "bf91a387.2b3ef",
-        "a3168ee5.a6eba",
-        "a823346f.949088"
+        "6d632da3.ca2994",
+        "65bd7037.bc9ea",
+        "29b67365.cad774"
       ]
     ]
   },
   {
-    "id": "bf91a387.2b3ef",
+    "id": "6d632da3.ca2994",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5031.999755859375,
-    "y": 6609,
-    "z": "d1707f77.d9d96",
+    "x": 5091.883087158203,
+    "y": 6665.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "a3168ee5.a6eba",
+    "id": "65bd7037.bc9ea",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5028.999755859375,
-    "y": 6650,
-    "z": "d1707f77.d9d96",
+    "x": 5088.883087158203,
+    "y": 6706.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "a823346f.949088",
+    "id": "29b67365.cad774",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5042.999755859375,
-    "y": 6690,
-    "z": "d1707f77.d9d96",
+    "x": 5102.883087158203,
+    "y": 6746.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "72e32840.b04238",
+    "id": "dd853f0d.c675b",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4731.999755859375,
-    "y": 6785,
-    "z": "d1707f77.d9d96",
+    "x": 4791.883087158203,
+    "y": 6841.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "704867e2.0c96c8",
+    "id": "6a2f520.9e626b",
     "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": 4739.999755859375,
-    "y": 6843,
-    "z": "d1707f77.d9d96",
+    "x": 4799.883087158203,
+    "y": 6899.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "dd8d3775.a881a",
+    "id": "b152a028.0e0e48",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4744.999755859375,
-    "y": 6583,
-    "z": "d1707f77.d9d96",
+    "x": 4804.883087158203,
+    "y": 6639.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "405773c0.604cf4",
+    "id": "3d7b7763.09cfd",
     "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": 4859.999755859375,
-    "y": 6535,
-    "z": "d1707f77.d9d96",
+    "x": 4919.883087158203,
+    "y": 6591.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "254dab5b.54ef9c",
+    "id": "a21574dc.7f1048",
     "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": 5032.999755859375,
-    "y": 7380,
-    "z": "d1707f77.d9d96",
+    "x": 5092.883087158203,
+    "y": 7436.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "c4177590.731478",
-        "fbd9a21c.61ca1"
+        "b03df3ba.8ce8d8",
+        "c15c4a9f.54e778"
       ]
     ]
   },
   {
-    "id": "c4177590.731478",
+    "id": "b03df3ba.8ce8d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5261.999755859375,
-    "y": 7357,
-    "z": "d1707f77.d9d96",
+    "x": 5321.883087158203,
+    "y": 7413.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "7eaf264d.a29568"
+        "b68c7fcf.24567"
       ]
     ]
   },
   {
-    "id": "fbd9a21c.61ca1",
+    "id": "c15c4a9f.54e778",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5261.999755859375,
-    "y": 7406,
-    "z": "d1707f77.d9d96",
+    "x": 5321.883087158203,
+    "y": 7462.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "7eaf264d.a29568",
+    "id": "b68c7fcf.24567",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5422.999755859375,
-    "y": 7362,
-    "z": "d1707f77.d9d96",
+    "x": 5482.883087158203,
+    "y": 7418.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "63b355d2.4342ec",
-        "9666a3e2.48dd48",
-        "ddab8936.6aed7"
+        "57615513.3c37ac",
+        "da2d189.a0c85e8",
+        "aa5be19c.b28bd"
       ]
     ]
   },
   {
-    "id": "74f5cdfa.eb70bc",
+    "id": "41927c2c.53b90c",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 5766.999755859375,
-    "y": 7342,
-    "z": "d1707f77.d9d96",
+    "x": 5826.883087158203,
+    "y": 7398.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "ddab8936.6aed7",
+    "id": "aa5be19c.b28bd",
     "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='`$prop.otn-tunnel-name`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />\n\n<parameter name='operational-status' value='Modified' />\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5736.999755859375,
-    "y": 7402,
-    "z": "d1707f77.d9d96",
+    "x": 5796.883087158203,
+    "y": 7458.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "63b355d2.4342ec",
+    "id": "57615513.3c37ac",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5643.999755859375,
-    "y": 7230,
-    "z": "d1707f77.d9d96",
+    "x": 5703.883087158203,
+    "y": 7286.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "a5898926.6491f",
+    "id": "7f678eb1.f9d898",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3994,
-    "y": 5868,
-    "z": "d1707f77.d9d96",
+    "x": 4053.883331298828,
+    "y": 5924.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "54495687.db6e08",
-        "24b292e6.4df33e",
-        "7a0aa2d.fce125c",
-        "50b3cc59.11db24",
-        "86caea3e.0715e8"
+        "78bf173f.567498",
+        "7299a42e.833c84",
+        "14b14bf.2fcb6b4",
+        "787fc902.6b8688",
+        "4505fb5a.3099fc"
       ]
     ]
   },
   {
-    "id": "2f70568d.ac5cfa",
+    "id": "950e3220.8c6648",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4736.999755859375,
-    "y": 6683,
-    "z": "d1707f77.d9d96",
+    "x": 4796.883087158203,
+    "y": 6739.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "dbdf2c9.87c1b5",
+    "id": "506cbb81.2befbc",
     "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",
     "comments": "",
     "outputs": 1,
-    "x": 4860,
-    "y": 6413,
-    "z": "d1707f77.d9d96",
+    "x": 4919.883331298828,
+    "y": 6469.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "9514e457.86bcb",
+    "id": "ce6bcae6.279bf",
     "type": "comment",
     "name": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "info": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "comments": "",
-    "x": 4997,
-    "y": 6363,
-    "z": "d1707f77.d9d96",
+    "x": 5056.883331298828,
+    "y": 6419.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "4295e286.bfc1e4",
+    "id": "3b830a4d.e803be",
     "type": "save",
     "name": "save ROOT UNI in AAI",
     "xml": "<save 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='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6805,
-    "y": 3539,
-    "z": "d1707f77.d9d96",
+    "x": 6864.883331298828,
+    "y": 3595.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "68ccdecd.da9c28",
+    "id": "debea5ca.c5efb8",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 4011,
-    "y": 1764,
-    "z": "d1707f77.d9d96",
+    "x": 4070.883331298828,
+    "y": 1820.8833312988281,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "604167bb.5b07c",
+    "id": "dcf5d1.89c23a3",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3989,
-    "y": 2634,
-    "z": "d1707f77.d9d96",
+    "x": 4048.883331298828,
+    "y": 2690.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "8e1315c9.c7504",
+    "id": "3dc14de7.91d75a",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 6796,
-    "y": 4006,
-    "z": "d1707f77.d9d96",
+    "x": 6855.883331298828,
+    "y": 4062.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "52d5e6df.7a6948",
+    "id": "2530e84c.0abb78",
     "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": 3501,
-    "y": 6008,
-    "z": "d1707f77.d9d96",
+    "x": 3560.883331298828,
+    "y": 6064.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "d6cce90e.618d6",
+    "id": "fb71ca0a.fe8928",
     "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": 3712,
-    "y": 4885,
-    "z": "d1707f77.d9d96",
+    "x": 3771.883331298828,
+    "y": 4941.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "1292663a.8513e2",
+    "id": "c01640bb.f526e8",
     "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": 3845,
-    "y": 4933,
-    "z": "d1707f77.d9d96",
+    "x": 3904.883331298828,
+    "y": 4989.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "e51131c0.7c711",
+    "id": "bb9baf34.d0edd",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4389.999755859375,
-    "y": 5013,
-    "z": "d1707f77.d9d96",
+    "x": 4449.883087158203,
+    "y": 5069.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "ed5f2a8f.0d1a9",
-        "e9808943.cadcd8"
+        "9b70cfc4.c55e3",
+        "fdbb8f8a.783248"
       ]
     ]
   },
   {
-    "id": "ed5f2a8f.0d1a9",
+    "id": "9b70cfc4.c55e3",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4582.999755859375,
-    "y": 5014,
-    "z": "d1707f77.d9d96",
+    "x": 4642.883087158203,
+    "y": 5070.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "1ae9053e.f80b53"
+        "c1e58440.70184"
       ]
     ]
   },
   {
-    "id": "e9808943.cadcd8",
+    "id": "fdbb8f8a.783248",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4586.999755859375,
-    "y": 5058,
-    "z": "d1707f77.d9d96",
+    "x": 4646.883087158203,
+    "y": 5114.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "63eaf34c.bfa79c"
+        "75c1affe.0ddba8"
       ]
     ]
   },
   {
-    "id": "63eaf34c.bfa79c",
+    "id": "75c1affe.0ddba8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4725.999755859375,
-    "y": 5053,
-    "z": "d1707f77.d9d96",
+    "x": 4785.883087158203,
+    "y": 5109.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "5c22d3df.9e2c54",
-        "cdccad8.628e65",
-        "86db9e26.58f248"
+        "4c2b44d5.f7301c",
+        "6ccb98db.74d4e8",
+        "d416487a.185998"
       ]
     ]
   },
   {
-    "id": "1ae9053e.f80b53",
+    "id": "c1e58440.70184",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4725.999755859375,
-    "y": 5010,
-    "z": "d1707f77.d9d96",
+    "x": 4785.883087158203,
+    "y": 5066.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "9a9628dc.017478",
-        "73763019.23312",
-        "8700555a.80709",
-        "f71cc5a0.3af018"
+        "5bab7896.e13d9",
+        "ec708b2b.d3c6e",
+        "dea6b450.126ae",
+        "10f1aa00.faee3e"
       ]
     ]
   },
   {
-    "id": "5c22d3df.9e2c54",
+    "id": "4c2b44d5.f7301c",
     "type": "set",
     "name": "set prop.connectivity-domainA-uuid",
     "xml": "<set>\n<parameter name='uuid.connectivity-domainA-uuid' value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5119.999755859375,
-    "y": 5304,
-    "z": "d1707f77.d9d96",
+    "x": 5179.883087158203,
+    "y": 5360.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "dc89033c.db42f",
+    "id": "eb20f196.54125",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5126.999755859375,
-    "y": 5258,
-    "z": "d1707f77.d9d96",
+    "x": 5186.883087158203,
+    "y": 5314.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "4bb3191b.a6309",
+    "id": "e29af13.61a371",
     "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": 4924.999755859375,
-    "y": 7008,
-    "z": "d1707f77.d9d96",
+    "x": 4984.883087158203,
+    "y": 7064.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "cdccad8.628e65",
+    "id": "6ccb98db.74d4e8",
     "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/' + $tmp.the-connectivity.connectivity-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=\"`$tmp.the-connectivity.connectivity-id`\" />\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": 5238.999755859375,
-    "y": 5357,
-    "z": "d1707f77.d9d96",
+    "x": 5298.883087158203,
+    "y": 5413.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "4dbfd84e.baba9",
+    "id": "e719db8e.3b76c8",
     "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/' + $tmp.aai.ROOT.connectivity.connectivity-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=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\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": 5120.999755859375,
-    "y": 5575,
-    "z": "d1707f77.d9d96",
+    "x": 5180.883087158203,
+    "y": 5631.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "aaf5216a.eeae28",
+    "id": "d1afb38c.0141a8",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3676,
-    "y": 4483,
-    "z": "d1707f77.d9d96",
+    "x": 3735.883331298828,
+    "y": 4539.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "87b59262.19be68",
+    "id": "42d36cb1.4fa424",
     "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": 4010,
-    "y": 4666,
-    "z": "d1707f77.d9d96",
+    "x": 4069.883331298828,
+    "y": 4722.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "99c42fc9.238f28",
+    "id": "298d7f45.2553b",
     "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": 3622,
-    "y": 4533,
-    "z": "d1707f77.d9d96",
+    "x": 3681.883331298828,
+    "y": 4589.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "31595937.eb192e",
-        "22ed3030.07f7",
-        "665827a1.858f8"
+        "9ef5d43.2b0bca8",
+        "3ef07e30.e6e7da",
+        "f6dffd82.1f8af"
       ]
     ]
   },
   {
-    "id": "22ed3030.07f7",
+    "id": "3ef07e30.e6e7da",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3849.490966796875,
-    "y": 4505.573974609375,
-    "z": "d1707f77.d9d96",
+    "x": 3909.374298095703,
+    "y": 4562.457305908203,
+    "z": "7062000.f761",
     "wires": [
       [
-        "dc72fe1c.e68cb8"
+        "afd7cfee.d60a88"
       ]
     ]
   },
   {
-    "id": "665827a1.858f8",
+    "id": "f6dffd82.1f8af",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3845,
-    "y": 4549.999938964844,
-    "z": "d1707f77.d9d96",
+    "x": 3904.883331298828,
+    "y": 4606.883270263672,
+    "z": "7062000.f761",
     "wires": [
       [
-        "a6baec30.078818"
+        "718ca986.9a7a48"
       ]
     ]
   },
   {
-    "id": "dc72fe1c.e68cb8",
+    "id": "afd7cfee.d60a88",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4012.0625,
-    "y": 4504.859680175781,
-    "z": "d1707f77.d9d96",
+    "x": 4071.945831298828,
+    "y": 4561.743011474609,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "a6baec30.078818",
+    "id": "718ca986.9a7a48",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4013,
-    "y": 4549.999938964844,
-    "z": "d1707f77.d9d96",
+    "x": 4072.883331298828,
+    "y": 4606.883270263672,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "cead87a8.8e6e18",
+    "id": "bbe16e71.3e09e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3798,
-    "y": 4623,
-    "z": "d1707f77.d9d96",
+    "x": 3857.883331298828,
+    "y": 4679.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "6dc71645.66cda8",
-        "87b59262.19be68"
+        "2abf34d.6a0b3cc",
+        "42d36cb1.4fa424"
       ]
     ]
   },
   {
-    "id": "31595937.eb192e",
+    "id": "9ef5d43.2b0bca8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3629,
-    "y": 4623,
-    "z": "d1707f77.d9d96",
+    "x": 3688.883331298828,
+    "y": 4679.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "cead87a8.8e6e18"
+        "bbe16e71.3e09e8"
       ]
     ]
   },
   {
-    "id": "6dc71645.66cda8",
+    "id": "2abf34d.6a0b3cc",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 3987,
-    "y": 4615,
-    "z": "d1707f77.d9d96",
+    "x": 4046.883331298828,
+    "y": 4671.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "978af086.86b638",
+    "id": "4ebb86dc.a0713",
     "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/' + $middle-man-conn.connectivity-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=\"`$middle-man-conn.connectivity-id`\" />\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": 3820,
-    "y": 4761,
-    "z": "d1707f77.d9d96",
+    "x": 3879.883331298828,
+    "y": 4817.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "b6303c7e.1a4d78",
+    "id": "e230ac3e.9cb188",
     "type": "comment",
     "name": "We are doing modify but middle man does not exist ==> it is definitely a new logical link",
     "info": "",
     "comments": "",
-    "x": 3603,
-    "y": 2844,
-    "z": "d1707f77.d9d96",
+    "x": 3662.883331298828,
+    "y": 2900.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "4a459c78.1597f4",
+    "id": "3d29417.d2eee3e",
     "type": "comment",
     "name": "We are doing modify and middle man exists, check if LEAF UNI already exists in AAI or not. If yes, consider the possible bw change. If it does not, then it is a new link needs to be added",
     "info": "",
     "comments": "",
-    "x": 3458,
-    "y": 4411,
-    "z": "d1707f77.d9d96",
+    "x": 3517.883331298828,
+    "y": 4467.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "53b126d5.31588",
+    "id": "c01a7bbf.331a48",
     "type": "exists",
     "name": "exists LEAF UNI",
     "xml": "<exists plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3231,
-    "y": 4679,
-    "z": "d1707f77.d9d96",
+    "x": 3290.883331298828,
+    "y": 4735.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "60778167.b14ae8",
-        "7c3e1eb0.4f5258"
+        "19c2896c.95fdb7",
+        "cde01ebb.100c6"
       ]
     ]
   },
   {
-    "id": "b3f9daed.71701",
+    "id": "adcb6448.ea7478",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3063,
-    "y": 4682,
-    "z": "d1707f77.d9d96",
+    "x": 3122.883331298828,
+    "y": 4738.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "53b126d5.31588"
+        "c01a7bbf.331a48"
       ]
     ]
   },
   {
-    "id": "7c3e1eb0.4f5258",
+    "id": "cde01ebb.100c6",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3394,
-    "y": 4698,
-    "z": "d1707f77.d9d96",
+    "x": 3453.883331298828,
+    "y": 4754.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "cc64efe3.d91b48"
+        "68da37f9.05cc18"
       ]
     ]
   },
   {
-    "id": "60778167.b14ae8",
+    "id": "19c2896c.95fdb7",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3430,
-    "y": 3305,
-    "z": "d1707f77.d9d96",
+    "x": 3489.883331298828,
+    "y": 3361.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "ba6991ee.d10c88"
+        "b19d09a1.5b2a5"
       ]
     ]
   },
   {
-    "id": "8a70b695.acfad8",
+    "id": "e9cce0c6.04cdf8",
     "type": "switchNode",
     "name": "switch leafuni.data-source == gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source == $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3746,
-    "y": 3357,
-    "z": "d1707f77.d9d96",
+    "x": 3805.883331298828,
+    "y": 3413.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "e00e54ae.19df5",
-        "8d19b4f.45dca48"
+        "24dd4d51.dc7852",
+        "a81116be.6c3738"
       ]
     ]
   },
   {
-    "id": "e00e54ae.19df5",
+    "id": "24dd4d51.dc7852",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3951,
-    "y": 3353,
-    "z": "d1707f77.d9d96",
+    "x": 4010.883331298828,
+    "y": 3409.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "8d19b4f.45dca48",
+    "id": "a81116be.6c3738",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3953,
-    "y": 3403,
-    "z": "d1707f77.d9d96",
+    "x": 4012.883331298828,
+    "y": 3459.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "bfb5d522.1c8f"
+        "29997430.010c94"
       ]
     ]
   },
   {
-    "id": "bfb5d522.1c8f",
+    "id": "29997430.010c94",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4109,
-    "y": 3409,
-    "z": "d1707f77.d9d96",
+    "x": 4168.883331298828,
+    "y": 3465.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "913a939f.a7796",
-        "99a26dee.a8c93",
-        "405f8638.47d8b",
-        "7041bf45.3f922"
+        "f4475341.93d378",
+        "4264dea0.b43bb8",
+        "5f09d2da.19bfa4",
+        "c71fd59.dfc0428"
       ]
     ]
   },
   {
-    "id": "913a939f.a7796",
+    "id": "f4475341.93d378",
     "type": "set",
     "name": "set bwModified",
     "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",
     "comments": "",
-    "x": 4335.000244140625,
-    "y": 3150,
-    "z": "d1707f77.d9d96",
+    "x": 4394.883575439453,
+    "y": 3206.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "1f1cb5e7.86a3a2",
+    "id": "5f1f0cb4.e46a84",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4913.999755859375,
-    "y": 4081,
-    "z": "d1707f77.d9d96",
+    "x": 4926.883056640625,
+    "y": 4293.88330078125,
+    "z": "7062000.f761",
     "wires": [
       [
-        "9334ab3f.b057e8",
-        "830719d7.f425c"
+        "293be2f2.0d66a6",
+        "898be63d.63497"
       ]
     ]
   },
   {
-    "id": "830719d7.f425c",
+    "id": "898be63d.63497",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5156.99951171875,
-    "y": 4030,
-    "z": "d1707f77.d9d96",
+    "x": 5128.8828125,
+    "y": 4260.88330078125,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "4b5e092e.90e4a",
+    "id": "853d7a8b.2e02f",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4761,
-    "y": 4305.999755859375,
-    "z": "d1707f77.d9d96",
+    "x": 4812.88330078125,
+    "y": 4470.883056640625,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "a99f59e2.0b7f4",
+    "id": "1915e47b.7ebf64",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4758.0621337890625,
-    "y": 4254.859771728516,
-    "z": "d1707f77.d9d96",
+    "x": 4809.9454345703125,
+    "y": 4419.743072509766,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "47107257.07ed4c",
+    "id": "caf66330.b1b298",
     "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": 4379.999755859375,
-    "y": 4081,
-    "z": "d1707f77.d9d96",
+    "x": 4392.883056640625,
+    "y": 4293.88330078125,
+    "z": "7062000.f761",
     "wires": [
       [
-        "74f02dc6.f3e414"
+        "ee97b865.b6783"
       ]
     ]
   },
   {
-    "id": "74f02dc6.f3e414",
+    "id": "ee97b865.b6783",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4584.999755859375,
-    "y": 4081,
-    "z": "d1707f77.d9d96",
+    "x": 4597.883056640625,
+    "y": 4293.88330078125,
+    "z": "7062000.f761",
     "wires": [
       [
-        "1b38e917.2d37ff"
+        "c8ca8353.4e5678"
       ]
     ]
   },
   {
-    "id": "1b38e917.2d37ff",
+    "id": "c8ca8353.4e5678",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4750.999755859375,
-    "y": 4081,
-    "z": "d1707f77.d9d96",
+    "x": 4763.883056640625,
+    "y": 4293.88330078125,
+    "z": "7062000.f761",
     "wires": [
       [
-        "1f1cb5e7.86a3a2"
+        "5f1f0cb4.e46a84"
       ]
     ]
   },
   {
-    "id": "9334ab3f.b057e8",
+    "id": "293be2f2.0d66a6",
     "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.the-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": 4383.999755859375,
-    "y": 4207,
-    "z": "d1707f77.d9d96",
+    "x": 4435.883056640625,
+    "y": 4371.88330078125,
+    "z": "7062000.f761",
     "wires": [
       [
-        "cee536c3.51917",
-        "9ce1aec4.35a0f8",
-        "3311b32f.fd5cec"
+        "82c1720.e28a61",
+        "745eb7b1.5e824",
+        "fa83b701.248a2"
       ]
     ]
   },
   {
-    "id": "cee536c3.51917",
+    "id": "82c1720.e28a61",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4594.999755859375,
-    "y": 4209,
-    "z": "d1707f77.d9d96",
+    "x": 4646.883056640625,
+    "y": 4373.88330078125,
+    "z": "7062000.f761",
     "wires": [
       [
-        "6ce9ff77.88c36"
+        "74de082.69b8bf8"
       ]
     ]
   },
   {
-    "id": "9ce1aec4.35a0f8",
+    "id": "745eb7b1.5e824",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4595.49072265625,
-    "y": 4254.574035644531,
-    "z": "d1707f77.d9d96",
+    "x": 4647.3740234375,
+    "y": 4419.457336425781,
+    "z": "7062000.f761",
     "wires": [
       [
-        "a99f59e2.0b7f4"
+        "1915e47b.7ebf64"
       ]
     ]
   },
   {
-    "id": "3311b32f.fd5cec",
+    "id": "fa83b701.248a2",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4592.999755859375,
-    "y": 4298,
-    "z": "d1707f77.d9d96",
+    "x": 4644.883056640625,
+    "y": 4462.88330078125,
+    "z": "7062000.f761",
     "wires": [
       [
-        "4b5e092e.90e4a"
+        "853d7a8b.2e02f"
       ]
     ]
   },
   {
-    "id": "ba6991ee.d10c88",
+    "id": "b19d09a1.5b2a5",
     "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": 3620,
-    "y": 3200,
-    "z": "d1707f77.d9d96",
+    "x": 3679.883331298828,
+    "y": 3256.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "3e6e8807.399b1",
-        "6cb7f3.c190b00c",
-        "4ea4467e.d45e28"
+        "9b46823e.72756",
+        "35aaafce.bf5cc8",
+        "d1f12cfb.14a2c8"
       ]
     ]
   },
   {
-    "id": "6cb7f3.c190b00c",
+    "id": "35aaafce.bf5cc8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3847.490966796875,
-    "y": 3172.573974609375,
-    "z": "d1707f77.d9d96",
+    "x": 3907.374298095703,
+    "y": 3229.457305908203,
+    "z": "7062000.f761",
     "wires": [
       [
-        "3aa5489d.56185"
+        "c379ee48.9a04a"
       ]
     ]
   },
   {
-    "id": "4ea4467e.d45e28",
+    "id": "d1f12cfb.14a2c8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3843,
-    "y": 3216.9999389648438,
-    "z": "d1707f77.d9d96",
+    "x": 3902.883331298828,
+    "y": 3273.883270263672,
+    "z": "7062000.f761",
     "wires": [
       [
-        "2d33201a.1cd89"
+        "7e073ce5.e1fbec"
       ]
     ]
   },
   {
-    "id": "3aa5489d.56185",
+    "id": "c379ee48.9a04a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4010.0625,
-    "y": 3171.8596801757812,
-    "z": "d1707f77.d9d96",
+    "x": 4069.945831298828,
+    "y": 3228.7430114746094,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "2d33201a.1cd89",
+    "id": "7e073ce5.e1fbec",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4011,
-    "y": 3216.9999389648438,
-    "z": "d1707f77.d9d96",
+    "x": 4070.883331298828,
+    "y": 3273.883270263672,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "3e6e8807.399b1",
+    "id": "9b46823e.72756",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3855,
-    "y": 3267,
-    "z": "d1707f77.d9d96",
+    "x": 3914.883331298828,
+    "y": 3323.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "8a70b695.acfad8"
+        "e9cce0c6.04cdf8"
       ]
     ]
   },
   {
-    "id": "9229fa15.bd2d6",
+    "id": "715dcd2e.3d9a6c",
     "type": "comment",
     "name": "Find LEAF and ROOT connectivity, then find vpn-bindings of each. adjust bw",
     "info": "",
     "comments": "",
-    "x": 3744.883331298828,
-    "y": 3457.883331298828,
-    "z": "d1707f77.d9d96",
+    "x": 3804.7666625976562,
+    "y": 3514.7666625976562,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "c7be917.1958a7",
+    "id": "b78f20d3.5b466",
     "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": 3759.60009765625,
-    "y": 3809.683349609375,
-    "z": "d1707f77.d9d96",
+    "x": 3819.483428955078,
+    "y": 3866.566680908203,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "1c05cf82.c8b1",
+    "id": "9e72dea1.067a48",
     "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": 3897.60009765625,
-    "y": 3867.683349609375,
-    "z": "d1707f77.d9d96",
+    "x": 3957.483428955078,
+    "y": 3924.566680908203,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "99a26dee.a8c93",
+    "id": "4264dea0.b43bb8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3475.60009765625,
-    "y": 3549.083251953125,
-    "z": "d1707f77.d9d96",
+    "x": 3535.483428955078,
+    "y": 3605.966583251953,
+    "z": "7062000.f761",
     "wires": [
       [
-        "c7be917.1958a7",
-        "1c05cf82.c8b1",
-        "469db255.7b4444",
-        "efc1c364.4b4c58",
-        "6f34f40.331fa0c",
-        "1b1a4e3.a475eb2"
+        "ea9a5f5d.8f9bf8",
+        "1c248a70.8f6db6",
+        "1f0e75d7.8b5a2a"
       ]
     ]
   },
   {
-    "id": "469db255.7b4444",
+    "id": "d32411c9.b56a18",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3716.60009765625,
-    "y": 3977.4833984375,
-    "z": "d1707f77.d9d96",
+    "x": 3776.483428955078,
+    "y": 4034.366729736328,
+    "z": "7062000.f761",
     "wires": [
       [
-        "464367ed.3d00b",
-        "e6e54b24.32fb6"
+        "e283eb67.9ec4b",
+        "f5e18bc8.e6b668"
       ]
     ]
   },
   {
-    "id": "464367ed.3d00b",
+    "id": "e283eb67.9ec4b",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3909.60009765625,
-    "y": 3978.4833984375,
-    "z": "d1707f77.d9d96",
+    "x": 3969.483428955078,
+    "y": 4035.366729736328,
+    "z": "7062000.f761",
     "wires": [
       [
-        "a3ebf193.e277d"
+        "ead422bf.e71108"
       ]
     ]
   },
   {
-    "id": "e6e54b24.32fb6",
+    "id": "f5e18bc8.e6b668",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3913.60009765625,
-    "y": 4022.4833984375,
-    "z": "d1707f77.d9d96",
+    "x": 3973.483428955078,
+    "y": 4079.366729736328,
+    "z": "7062000.f761",
     "wires": [
       [
-        "6798c9ca.f3748"
+        "c6dc9f70.44622"
       ]
     ]
   },
   {
-    "id": "6798c9ca.f3748",
+    "id": "c6dc9f70.44622",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4052.60009765625,
-    "y": 4017.4833984375,
-    "z": "d1707f77.d9d96",
+    "x": 4112.483428955078,
+    "y": 4074.366729736328,
+    "z": "7062000.f761",
     "wires": [
       [
-        "47107257.07ed4c"
+        "caf66330.b1b298"
       ]
     ]
   },
   {
-    "id": "a3ebf193.e277d",
+    "id": "ead422bf.e71108",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4053.60009765625,
-    "y": 3974.683349609375,
-    "z": "d1707f77.d9d96",
+    "x": 4113.483428955078,
+    "y": 4031.566680908203,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "405f8638.47d8b",
+    "id": "5f09d2da.19bfa4",
     "type": "switchNode",
     "name": "switch leafuni.data-source > gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source > $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4368.717041015625,
-    "y": 3406.283447265625,
-    "z": "d1707f77.d9d96",
+    "x": 4428.600372314453,
+    "y": 3463.166778564453,
+    "z": "7062000.f761",
     "wires": [
       [
-        "69419f95.d9df48",
-        "ee782f6.725585"
+        "d442302c.ca32e",
+        "7bb1b9a.4551dc8"
       ]
     ]
   },
   {
-    "id": "69419f95.d9df48",
+    "id": "d442302c.ca32e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4567.884033203125,
-    "y": 3472.88330078125,
-    "z": "d1707f77.d9d96",
+    "x": 4627.767364501953,
+    "y": 3529.766632080078,
+    "z": "7062000.f761",
     "wires": [
       [
-        "47d4988f.567e08"
+        "7e28b551.d4ae3c"
       ]
     ]
   },
   {
-    "id": "ee782f6.725585",
+    "id": "7bb1b9a.4551dc8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4589.884033203125,
-    "y": 3317.88330078125,
-    "z": "d1707f77.d9d96",
+    "x": 4649.767364501953,
+    "y": 3374.766632080078,
+    "z": "7062000.f761",
     "wires": [
       [
-        "a0601673.d665f8"
+        "ff62768e.03d4d"
       ]
     ]
   },
   {
-    "id": "7041bf45.3f922",
+    "id": "c71fd59.dfc0428",
     "type": "save",
     "name": "update LEAF UNI in AAI",
     "xml": "<update 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-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4367.717041015625,
-    "y": 3261.4833984375,
-    "z": "d1707f77.d9d96",
+    "x": 4427.600372314453,
+    "y": 3318.366729736328,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "e5025cb2.c9e55",
+    "id": "5004b561.86b324",
     "type": "comment",
     "name": "update LEAF UNI with the new bw",
     "info": "",
     "comments": "",
-    "x": 4383.884033203125,
-    "y": 3214.88330078125,
-    "z": "d1707f77.d9d96",
+    "x": 4443.767364501953,
+    "y": 3271.766632080078,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "33a2f8f.d3c0e88",
+    "id": "3679700e.bfb9b8",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5052.650634765625,
-    "y": 3191.88330078125,
-    "z": "d1707f77.d9d96",
+    "x": 5112.533966064453,
+    "y": 3248.766632080078,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "b9a113e7.d0095",
+    "id": "180c72db.e0ca25",
     "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": 5654.650634765625,
-    "y": 3296.88330078125,
-    "z": "d1707f77.d9d96",
+    "x": 5714.533966064453,
+    "y": 3353.766632080078,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "7bc84398.962aec",
+    "id": "eaf2956b.f5da68",
     "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": 5044.650390625,
-    "y": 3237.88330078125,
-    "z": "d1707f77.d9d96",
+    "x": 5104.533721923828,
+    "y": 3294.766632080078,
+    "z": "7062000.f761",
     "wires": [
       [
-        "e062888e.c155b",
-        "d6caf7a3.a3e818",
-        "20426568.d3347a"
+        "94b5c3f.97615c",
+        "5f9fd4c2.f09244",
+        "be126d8d.81e41"
       ]
     ]
   },
   {
-    "id": "d6caf7a3.a3e818",
+    "id": "5f9fd4c2.f09244",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5272.141357421875,
-    "y": 3210.457275390625,
-    "z": "d1707f77.d9d96",
+    "x": 5332.024688720703,
+    "y": 3267.340606689453,
+    "z": "7062000.f761",
     "wires": [
       [
-        "77c8310f.81edd8"
+        "7b864f73.0d50b8"
       ]
     ]
   },
   {
-    "id": "20426568.d3347a",
+    "id": "be126d8d.81e41",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5267.650390625,
-    "y": 3254.8832397460938,
-    "z": "d1707f77.d9d96",
+    "x": 5327.533721923828,
+    "y": 3311.766571044922,
+    "z": "7062000.f761",
     "wires": [
       [
-        "b2f89241.488ae8"
+        "20abe4f.26a359c"
       ]
     ]
   },
   {
-    "id": "77c8310f.81edd8",
+    "id": "7b864f73.0d50b8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5434.712890625,
-    "y": 3209.7429809570312,
-    "z": "d1707f77.d9d96",
+    "x": 5494.596221923828,
+    "y": 3266.6263122558594,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "b2f89241.488ae8",
+    "id": "20abe4f.26a359c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5435.650390625,
-    "y": 3254.8832397460938,
-    "z": "d1707f77.d9d96",
+    "x": 5495.533721923828,
+    "y": 3311.766571044922,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "b4c466e5.83e028",
+    "id": "cd6b80d0.dac0d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5432.650390625,
-    "y": 3304.88330078125,
-    "z": "d1707f77.d9d96",
+    "x": 5492.533721923828,
+    "y": 3361.766632080078,
+    "z": "7062000.f761",
     "wires": [
       [
-        "b8d224b3.0d89f8",
-        "b9a113e7.d0095"
+        "c08f6988.b1e668",
+        "180c72db.e0ca25"
       ]
     ]
   },
   {
-    "id": "e062888e.c155b",
+    "id": "94b5c3f.97615c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5263.650390625,
-    "y": 3304.88330078125,
-    "z": "d1707f77.d9d96",
+    "x": 5323.533721923828,
+    "y": 3361.766632080078,
+    "z": "7062000.f761",
     "wires": [
       [
-        "b4c466e5.83e028"
+        "cd6b80d0.dac0d8"
       ]
     ]
   },
   {
-    "id": "b8d224b3.0d89f8",
+    "id": "c08f6988.b1e668",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $tmp.delta`' />\n",
     "comments": "",
-    "x": 5614.651123046875,
-    "y": 3246.88330078125,
-    "z": "d1707f77.d9d96",
+    "x": 5674.534454345703,
+    "y": 3303.766632080078,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "200ee7db.1193b",
+    "id": "96b13181.04b1f8",
     "type": "comment",
     "name": "bw+ has increased ",
     "info": "",
     "comments": "",
-    "x": 4581.883331298828,
-    "y": 3279.883331298828,
-    "z": "d1707f77.d9d96",
+    "x": 4641.766662597656,
+    "y": 3336.7666625976562,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "cfd7c155.3c953",
+    "id": "a39bd08a.5e567",
     "type": "comment",
     "name": "bw- has decreased",
     "info": "",
     "comments": "",
-    "x": 4580.717041015625,
-    "y": 3436.683349609375,
-    "z": "d1707f77.d9d96",
+    "x": 4640.600372314453,
+    "y": 3493.566680908203,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "a3f905ae.3412d",
+    "id": "ca05c492.e4ea9",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5029.717041015625,
-    "y": 3394.683349609375,
-    "z": "d1707f77.d9d96",
+    "x": 5089.600372314453,
+    "y": 3451.566680908203,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "5d9da8bf.af3198",
+    "id": "6af65c6b.88b2a4",
     "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": 5631.717041015625,
-    "y": 3499.683349609375,
-    "z": "d1707f77.d9d96",
+    "x": 5691.600372314453,
+    "y": 3556.566680908203,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "a2a42ec7.6b9908",
+    "id": "e7dc732b.754658",
     "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": 5021.716796875,
-    "y": 3440.683349609375,
-    "z": "d1707f77.d9d96",
+    "x": 5081.600128173828,
+    "y": 3497.566680908203,
+    "z": "7062000.f761",
     "wires": [
       [
-        "219cb518.4963a2",
-        "a37936ca.d95308",
-        "6315a679.c1d5a8"
+        "5192fc04.bc79ac",
+        "9675a219.e39ec8",
+        "491e7a3e.fd6efc"
       ]
     ]
   },
   {
-    "id": "a37936ca.d95308",
+    "id": "9675a219.e39ec8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5249.207763671875,
-    "y": 3413.25732421875,
-    "z": "d1707f77.d9d96",
+    "x": 5309.091094970703,
+    "y": 3470.140655517578,
+    "z": "7062000.f761",
     "wires": [
       [
-        "21614efe.681032"
+        "9eb1719c.df987"
       ]
     ]
   },
   {
-    "id": "6315a679.c1d5a8",
+    "id": "491e7a3e.fd6efc",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5244.716796875,
-    "y": 3457.6832885742188,
-    "z": "d1707f77.d9d96",
+    "x": 5304.600128173828,
+    "y": 3514.566619873047,
+    "z": "7062000.f761",
     "wires": [
       [
-        "f930a997.1bf728"
+        "73d5ba80.efe18c"
       ]
     ]
   },
   {
-    "id": "21614efe.681032",
+    "id": "9eb1719c.df987",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5411.779296875,
-    "y": 3412.5430297851562,
-    "z": "d1707f77.d9d96",
+    "x": 5471.662628173828,
+    "y": 3469.4263610839844,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "f930a997.1bf728",
+    "id": "73d5ba80.efe18c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5412.716796875,
-    "y": 3457.6832885742188,
-    "z": "d1707f77.d9d96",
+    "x": 5472.600128173828,
+    "y": 3514.566619873047,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "58bbac12.21e334",
+    "id": "49e14e2.90e413",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5409.716796875,
-    "y": 3507.683349609375,
-    "z": "d1707f77.d9d96",
+    "x": 5469.600128173828,
+    "y": 3564.566680908203,
+    "z": "7062000.f761",
     "wires": [
       [
-        "c0a335ca.1c8908",
-        "5d9da8bf.af3198"
+        "fc162869.747088",
+        "6af65c6b.88b2a4"
       ]
     ]
   },
   {
-    "id": "219cb518.4963a2",
+    "id": "5192fc04.bc79ac",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5240.716796875,
-    "y": 3507.683349609375,
-    "z": "d1707f77.d9d96",
+    "x": 5300.600128173828,
+    "y": 3564.566680908203,
+    "z": "7062000.f761",
     "wires": [
       [
-        "58bbac12.21e334"
+        "49e14e2.90e413"
       ]
     ]
   },
   {
-    "id": "c0a335ca.1c8908",
+    "id": "fc162869.747088",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $tmp.delta`' />\n",
     "comments": "",
-    "x": 5591.717529296875,
-    "y": 3449.683349609375,
-    "z": "d1707f77.d9d96",
+    "x": 5651.600860595703,
+    "y": 3506.566680908203,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "137c150b.cd5fd3",
+    "id": "af7611a6.c24d8",
     "type": "set",
     "name": "set delta",
     "xml": "<set>\n<parameter name='tmp.delta' value='`$tmp.aai.leafuni.data-source - $gfp`' />\n<parameter name='tmp.realdelta' value='`$gfp - $tmp.aai.leafuni.data-source`' />\n<parameter name='tmp.isBwIncreased' value='false' />\n\n\n",
     "comments": "",
-    "x": 4946.716796875,
-    "y": 3353.683349609375,
-    "z": "d1707f77.d9d96",
+    "x": 5006.600128173828,
+    "y": 3410.566680908203,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "47d4988f.567e08",
+    "id": "7e28b551.d4ae3c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4739.883331298828,
-    "y": 3461.883331298828,
-    "z": "d1707f77.d9d96",
+    "x": 4799.766662597656,
+    "y": 3518.7666625976562,
+    "z": "7062000.f761",
     "wires": [
       [
-        "137c150b.cd5fd3",
-        "a2a42ec7.6b9908"
+        "af7611a6.c24d8",
+        "e7dc732b.754658"
       ]
     ]
   },
   {
-    "id": "a0601673.d665f8",
+    "id": "ff62768e.03d4d",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4760.61669921875,
-    "y": 3288.683349609375,
-    "z": "d1707f77.d9d96",
+    "x": 4820.500030517578,
+    "y": 3345.566680908203,
+    "z": "7062000.f761",
     "wires": [
       [
-        "10246d12.f8d883",
-        "7bc84398.962aec"
+        "d835bd5d.93ef8",
+        "eaf2956b.f5da68"
       ]
     ]
   },
   {
-    "id": "10246d12.f8d883",
+    "id": "d835bd5d.93ef8",
     "type": "set",
     "name": "set delta",
     "xml": "<set>\n<parameter name='tmp.delta' value='`$gfp - $tmp.aai.leafuni.data-source`' />\n<parameter name='tmp.realdelta' value='`$gfp - $tmp.aai.leafuni.data-source`' />\n<parameter name='tmp.isBwIncreased' value='true' />\n",
     "comments": "",
-    "x": 4959.4501953125,
-    "y": 3106.4833984375,
-    "z": "d1707f77.d9d96",
+    "x": 5019.333526611328,
+    "y": 3163.366729736328,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "34d8fb24.fcb29c",
+    "id": "2025b954.4fbac6",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 4354.7666015625,
-    "y": 3361.683349609375,
-    "z": "d1707f77.d9d96",
+    "x": 4414.649932861328,
+    "y": 3418.566680908203,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "efc1c364.4b4c58",
+    "id": "976feb0e.893a98",
     "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": 3803.10009765625,
-    "y": 4180.483642578125,
-    "z": "d1707f77.d9d96",
+    "x": 3916.9833984375,
+    "y": 4197.3671875,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "6f34f40.331fa0c",
+    "id": "a99b9bcd.cfe81",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3638.10009765625,
-    "y": 4252.68359375,
-    "z": "d1707f77.d9d96",
+    "x": 3751.9833984375,
+    "y": 4269.567138671875,
+    "z": "7062000.f761",
     "wires": [
       [
-        "421e3ec9.1cf95",
-        "db056196.ffcc18"
+        "98f48307.654f08",
+        "d531b9e1.8374e"
       ]
     ]
   },
   {
-    "id": "421e3ec9.1cf95",
+    "id": "98f48307.654f08",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3849.10009765625,
-    "y": 4252.68359375,
-    "z": "d1707f77.d9d96",
+    "x": 3962.9833984375,
+    "y": 4269.567138671875,
+    "z": "7062000.f761",
     "wires": [
       [
-        "ebf2f5dc.a6d998"
+        "c74f3bbd.636d88"
       ]
     ]
   },
   {
-    "id": "db056196.ffcc18",
+    "id": "d531b9e1.8374e",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3845.10009765625,
-    "y": 4300.68359375,
-    "z": "d1707f77.d9d96",
+    "x": 3958.9833984375,
+    "y": 4317.567138671875,
+    "z": "7062000.f761",
     "wires": [
       [
-        "dd6eee2e.c4fa6"
+        "7e7563eb.7c66dc"
       ]
     ]
   },
   {
-    "id": "ebf2f5dc.a6d998",
+    "id": "c74f3bbd.636d88",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4005.10009765625,
-    "y": 4248.68359375,
-    "z": "d1707f77.d9d96",
+    "x": 4118.9833984375,
+    "y": 4265.567138671875,
+    "z": "7062000.f761",
     "wires": [
       [
-        "33d1e42e.bb2424"
+        "6a777147.b443f8"
       ]
     ]
   },
   {
-    "id": "dd6eee2e.c4fa6",
+    "id": "7e7563eb.7c66dc",
     "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 but it should have been!' />\n",
     "comments": "",
-    "x": 3993.10009765625,
-    "y": 4295.68359375,
-    "z": "d1707f77.d9d96",
+    "x": 4106.9833984375,
+    "y": 4312.567138671875,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "fc79e006.6079c",
+    "id": "d69512d3.73027",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4900.066162109375,
-    "y": 4522.882568359375,
-    "z": "d1707f77.d9d96",
+    "x": 4959.949493408203,
+    "y": 4579.765899658203,
+    "z": "7062000.f761",
     "wires": [
       [
-        "c774ea44.ba62b",
-        "4da3b32.e6aba4c"
+        "cae5635c.9a1e2",
+        "6f0b5fb4.a1fb4"
       ]
     ]
   },
   {
-    "id": "4da3b32.e6aba4c",
+    "id": "6f0b5fb4.a1fb4",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5143.06640625,
-    "y": 4491.882568359375,
-    "z": "d1707f77.d9d96",
+    "x": 5202.949737548828,
+    "y": 4548.765899658203,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "8e9b346.f926ac8",
+    "id": "e903ccd1.487f98",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4760.066162109375,
-    "y": 4632.882568359375,
-    "z": "d1707f77.d9d96",
+    "x": 4819.949493408203,
+    "y": 4689.765899658203,
+    "z": "7062000.f761",
     "wires": [
       [
-        "d8bd194f.82e18"
+        "e80670f4.672e68"
       ]
     ]
   },
   {
-    "id": "5987f578.7ab7ec",
+    "id": "c7ea39a3.498988",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4748.06640625,
-    "y": 4725.8828125,
-    "z": "d1707f77.d9d96",
+    "x": 4807.949737548828,
+    "y": 4782.766143798828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "96788a5f.fb73d8",
+    "id": "3f0dd5a.ea39aaa",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4750.1285400390625,
-    "y": 4680.742340087891,
-    "z": "d1707f77.d9d96",
+    "x": 4810.011871337891,
+    "y": 4737.625671386719,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "33d1e42e.bb2424",
+    "id": "6a777147.b443f8",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.ROOT.connectivity.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4366.066162109375,
-    "y": 4522.882568359375,
-    "z": "d1707f77.d9d96",
+    "x": 4425.949493408203,
+    "y": 4579.765899658203,
+    "z": "7062000.f761",
     "wires": [
       [
-        "57073b47.b48554"
+        "b25b3b22.1646d"
       ]
     ]
   },
   {
-    "id": "57073b47.b48554",
+    "id": "b25b3b22.1646d",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4571.066162109375,
-    "y": 4522.882568359375,
-    "z": "d1707f77.d9d96",
+    "x": 4630.949493408203,
+    "y": 4579.765899658203,
+    "z": "7062000.f761",
     "wires": [
       [
-        "38862adc.eccce6"
+        "e858f590.02822"
       ]
     ]
   },
   {
-    "id": "38862adc.eccce6",
+    "id": "e858f590.02822",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4737.066162109375,
-    "y": 4522.882568359375,
-    "z": "d1707f77.d9d96",
+    "x": 4796.949493408203,
+    "y": 4579.765899658203,
+    "z": "7062000.f761",
     "wires": [
       [
-        "fc79e006.6079c"
+        "d69512d3.73027"
       ]
     ]
   },
   {
-    "id": "c774ea44.ba62b",
+    "id": "cae5635c.9a1e2",
     "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.ROOT.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": 4376.066162109375,
-    "y": 4632.882568359375,
-    "z": "d1707f77.d9d96",
+    "x": 4435.949493408203,
+    "y": 4689.765899658203,
+    "z": "7062000.f761",
     "wires": [
       [
-        "1cfab11c.2d8e77",
-        "f94fa616.fec76",
-        "4edf7dd3.8d7454"
+        "a8297a32.4725f",
+        "102b4f2b.1cfcf9",
+        "6f0b5913.92db28"
       ]
     ]
   },
   {
-    "id": "1cfab11c.2d8e77",
+    "id": "a8297a32.4725f",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4587.066162109375,
-    "y": 4634.882568359375,
-    "z": "d1707f77.d9d96",
+    "x": 4646.949493408203,
+    "y": 4691.765899658203,
+    "z": "7062000.f761",
     "wires": [
       [
-        "8e9b346.f926ac8"
+        "e903ccd1.487f98"
       ]
     ]
   },
   {
-    "id": "f94fa616.fec76",
+    "id": "102b4f2b.1cfcf9",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4587.55712890625,
-    "y": 4680.456604003906,
-    "z": "d1707f77.d9d96",
+    "x": 4647.440460205078,
+    "y": 4737.339935302734,
+    "z": "7062000.f761",
     "wires": [
       [
-        "96788a5f.fb73d8"
+        "3f0dd5a.ea39aaa"
       ]
     ]
   },
   {
-    "id": "4edf7dd3.8d7454",
+    "id": "6f0b5913.92db28",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4585.066162109375,
-    "y": 4723.882568359375,
-    "z": "d1707f77.d9d96",
+    "x": 4644.949493408203,
+    "y": 4780.765899658203,
+    "z": "7062000.f761",
     "wires": [
       [
-        "5987f578.7ab7ec"
+        "c7ea39a3.498988"
       ]
     ]
   },
   {
-    "id": "2a950f62.a5b77",
+    "id": "e8e91e40.c50e3",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 5995.883056640625,
-    "y": 7022.08349609375,
-    "z": "d1707f77.d9d96",
+    "x": 6055.766387939453,
+    "y": 7078.966827392578,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "80d2509.9388bb",
+    "id": "12a072b1.a1936d",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5272.35009765625,
-    "y": 4145.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 5324.2333984375,
+    "y": 4310.16650390625,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "6ce9ff77.88c36",
+    "id": "74de082.69b8bf8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5061.35009765625,
-    "y": 4207.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 4826.233642578125,
+    "y": 4376.16650390625,
+    "z": "7062000.f761",
     "wires": [
-      [
-        "6a93b09.0bf6b5"
-      ]
+      []
     ]
   },
   {
-    "id": "6a93b09.0bf6b5",
+    "id": "ac63c59c.83048",
     "type": "switchNode",
     "name": "switch ops-note is srcTtpOtnLayer",
-    "xml": "<switch test=\"`$tmp.aai.vpn-binding.ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
+    "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5305.35009765625,
-    "y": 4213.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 5357.2333984375,
+    "y": 4378.16650390625,
+    "z": "7062000.f761",
     "wires": [
       [
-        "df869d26.769e7",
-        "54afff98.91fe6"
+        "e6f065d2.aee8e",
+        "6b430222.42764c"
       ]
     ]
   },
   {
-    "id": "df869d26.769e7",
+    "id": "e6f065d2.aee8e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5536.35009765625,
-    "y": 4219.282958984375,
-    "z": "d1707f77.d9d96",
+    "x": 5482.2333984375,
+    "y": 4276.166259765625,
+    "z": "7062000.f761",
     "wires": [
       [
-        "956fa960.98f36"
+        "3f51a421.f29684"
       ]
     ]
   },
   {
-    "id": "54afff98.91fe6",
+    "id": "6b430222.42764c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5541.35009765625,
-    "y": 4293.282958984375,
-    "z": "d1707f77.d9d96",
+    "x": 5601.233428955078,
+    "y": 4350.166290283203,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "b25ba259.308448",
+    "id": "b946186b.4be33",
     "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": 4510.033203125,
-    "y": 3865,
-    "z": "d1707f77.d9d96",
+    "x": 4569.916534423828,
+    "y": 3921.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "2595900.42e62f",
+    "id": "402f3aa1.dbe4cc",
     "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": 4855.033203125,
-    "y": 3727,
-    "z": "d1707f77.d9d96",
+    "x": 4914.916534423828,
+    "y": 3783.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "f7c79bc.ed2f368"
+        "a579376d.bc3"
       ]
     ]
   },
   {
-    "id": "2aa73f1e.d8378",
+    "id": "d26cf0c5.68acc",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4562.033203125,
-    "y": 3721,
-    "z": "d1707f77.d9d96",
+    "x": 4621.916534423828,
+    "y": 3777.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "2595900.42e62f"
+        "402f3aa1.dbe4cc"
       ]
     ]
   },
   {
-    "id": "a86c57e2.a366f8",
+    "id": "e2cb41dc.f4c8f8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4817.033203125,
-    "y": 3678,
-    "z": "d1707f77.d9d96",
+    "x": 4876.916534423828,
+    "y": 3734.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "4c9cebf4.1f804c",
+    "id": "72812dae.8552e4",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4506.033203125,
-    "y": 3773,
-    "z": "d1707f77.d9d96",
+    "x": 4565.916534423828,
+    "y": 3829.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "92d67a36.4d6588",
+    "id": "82192f60.51b328",
     "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": 4514.033203125,
-    "y": 3818,
-    "z": "d1707f77.d9d96",
+    "x": 4573.916534423828,
+    "y": 3874.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "3d955905.d1d126",
+    "id": "37b8f0e0.bc121",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4511.033203125,
-    "y": 3671,
-    "z": "d1707f77.d9d96",
+    "x": 4570.916534423828,
+    "y": 3727.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "f7c79bc.ed2f368",
+    "id": "a579376d.bc3",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4764.033203125,
-    "y": 3795,
-    "z": "d1707f77.d9d96",
+    "x": 4823.916534423828,
+    "y": 3851.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "4caf1451.b1549c"
+        "bcbc46d8.da70d8"
       ]
     ]
   },
   {
-    "id": "4caf1451.b1549c",
+    "id": "bcbc46d8.da70d8",
     "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": 4949.033203125,
-    "y": 3794,
-    "z": "d1707f77.d9d96",
+    "x": 5008.916534423828,
+    "y": 3850.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "6c72501.b5308b"
+        "df0e838b.1a8"
       ]
     ]
   },
   {
-    "id": "6c72501.b5308b",
+    "id": "df0e838b.1a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5141.033203125,
-    "y": 3797,
-    "z": "d1707f77.d9d96",
+    "x": 5200.916534423828,
+    "y": 3853.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "a4a53b14.d840c8"
+        "b552c813.211c2"
       ]
     ]
   },
   {
-    "id": "a4a53b14.d840c8",
+    "id": "b552c813.211c2",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5313.033203125,
-    "y": 3793,
-    "z": "d1707f77.d9d96",
+    "x": 5372.916534423828,
+    "y": 3849.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "1ee93347.2464a5",
+    "id": "9806e019.ad2a",
     "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": 4689.033203125,
-    "y": 3908,
-    "z": "d1707f77.d9d96",
+    "x": 4748.916534423828,
+    "y": 3964.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "1b1a4e3.a475eb2",
+    "id": "ea9a5f5d.8f9bf8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4206.033203125,
-    "y": 3693,
-    "z": "d1707f77.d9d96",
+    "x": 4265.916534423828,
+    "y": 3749.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "6e002627.71f3d",
-        "cc80a6e9.8d5da",
-        "4c9cebf4.1f804c",
-        "92d67a36.4d6588",
-        "b25ba259.308448",
-        "2aa73f1e.d8378",
-        "1ee93347.2464a5"
+        "4c3bbf42.6f3d68",
+        "e37c29b1.ce632",
+        "72812dae.8552e4",
+        "82192f60.51b328",
+        "b946186b.4be33",
+        "d26cf0c5.68acc",
+        "9806e019.ad2a"
       ]
     ]
   },
   {
-    "id": "415f667b.eaf5b",
+    "id": "805d495b.3d6b18",
     "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": 4191.033203125,
-    "y": 3627,
-    "z": "d1707f77.d9d96",
+    "x": 4250.916534423828,
+    "y": 3683.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "cc80a6e9.8d5da",
+    "id": "e37c29b1.ce632",
     "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": 4570.033203125,
-    "y": 3614,
-    "z": "d1707f77.d9d96",
+    "x": 4629.916534423828,
+    "y": 3670.883331298828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "cd1fca4d.1735d8",
-        "96e89105.72a848",
-        "a86c57e2.a366f8"
+        "942a4caf.d868d8",
+        "8905a79d.0fb76",
+        "e2cb41dc.f4c8f8"
       ]
     ]
   },
   {
-    "id": "cd1fca4d.1735d8",
+    "id": "942a4caf.d868d8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4806.033203125,
-    "y": 3597,
-    "z": "d1707f77.d9d96",
+    "x": 4865.916534423828,
+    "y": 3653.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "96e89105.72a848",
+    "id": "8905a79d.0fb76",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4803.033203125,
-    "y": 3638,
-    "z": "d1707f77.d9d96",
+    "x": 4862.916534423828,
+    "y": 3694.883331298828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "6e002627.71f3d",
+    "id": "4c3bbf42.6f3d68",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4519.033203125,
-    "y": 3571,
-    "z": "d1707f77.d9d96",
+    "x": 4578.916534423828,
+    "y": 3627.883331298828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "e62c93af.986d08",
+    "id": "94da922f.c01d98",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5248.43310546875,
-    "y": 4620.39990234375,
-    "z": "d1707f77.d9d96",
+    "x": 5308.316436767578,
+    "y": 4677.283233642578,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "d8bd194f.82e18",
+    "id": "e80670f4.672e68",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5037.43310546875,
-    "y": 4682.39990234375,
-    "z": "d1707f77.d9d96",
+    "x": 5097.316436767578,
+    "y": 4739.283233642578,
+    "z": "7062000.f761",
     "wires": [
       [
-        "c9e19536.e28d3"
+        "ed69a679.8ddb2"
       ]
     ]
   },
   {
-    "id": "c9e19536.e28d3",
+    "id": "ed69a679.8ddb2",
     "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": 5281.43310546875,
-    "y": 4688.39990234375,
-    "z": "d1707f77.d9d96",
+    "x": 5341.316436767578,
+    "y": 4745.283233642578,
+    "z": "7062000.f761",
     "wires": [
       [
-        "2b2ae304.0b3ffc",
-        "c6c47f59.8c703"
+        "90bf5e35.d23788",
+        "6659c466.b510dc"
       ]
     ]
   },
   {
-    "id": "2b2ae304.0b3ffc",
+    "id": "90bf5e35.d23788",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5512.43310546875,
-    "y": 4666.39990234375,
-    "z": "d1707f77.d9d96",
+    "x": 5572.316436767578,
+    "y": 4723.283233642578,
+    "z": "7062000.f761",
     "wires": [
       [
-        "ae674a71.79993"
+        "5ef895fb.b1bf7c"
       ]
     ]
   },
   {
-    "id": "c6c47f59.8c703",
+    "id": "6659c466.b510dc",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5517.43310546875,
-    "y": 4733.39990234375,
-    "z": "d1707f77.d9d96",
+    "x": 5577.316436767578,
+    "y": 4790.283233642578,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "956fa960.98f36",
+    "id": "ef985380.75ae68",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5726.31689453125,
-    "y": 4231.08251953125,
-    "z": "d1707f77.d9d96",
+    "x": 5826.2001953125,
+    "y": 4287.965576171875,
+    "z": "7062000.f761",
     "wires": [
       [
-        "1ecd65d3.ab1d8a",
-        "db311e45.3ec9c8"
+        "76a7bc4a.dd01dc",
+        "c64cf61b.17568"
       ]
     ]
   },
   {
-    "id": "1ecd65d3.ab1d8a",
+    "id": "76a7bc4a.dd01dc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5921.31689453125,
-    "y": 4159.08251953125,
-    "z": "d1707f77.d9d96",
+    "x": 5981.200225830078,
+    "y": 4215.965850830078,
+    "z": "7062000.f761",
     "wires": [
       [
-        "d1b82de4.09693"
+        "79b64e60.35626"
       ]
     ]
   },
   {
-    "id": "db311e45.3ec9c8",
+    "id": "c64cf61b.17568",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5922.31689453125,
-    "y": 4292.08251953125,
-    "z": "d1707f77.d9d96",
+    "x": 5982.200225830078,
+    "y": 4348.965850830078,
+    "z": "7062000.f761",
     "wires": [
       [
-        "ef4d4c31.5752b8"
+        "d1f760ec.7590a"
       ]
     ]
   },
   {
-    "id": "d1b82de4.09693",
+    "id": "79b64e60.35626",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6066.31689453125,
-    "y": 4159.082763671875,
-    "z": "d1707f77.d9d96",
+    "x": 6126.200225830078,
+    "y": 4215.966094970703,
+    "z": "7062000.f761",
     "wires": [
       [
-        "55d1eb40.89e1f4",
-        "ab2949ce.172f58"
+        "a1fc801a.8dde7",
+        "f7199aa1.5a0618"
       ]
     ]
   },
   {
-    "id": "55d1eb40.89e1f4",
+    "id": "a1fc801a.8dde7",
     "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.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher + $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n",
+    "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 + $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6359.31689453125,
-    "y": 4137.08251953125,
-    "z": "d1707f77.d9d96",
+    "x": 6419.200225830078,
+    "y": 4193.965850830078,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "ab2949ce.172f58",
+    "id": "f7199aa1.5a0618",
     "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": 6310.966796875,
-    "y": 4184.3994140625,
-    "z": "d1707f77.d9d96",
+    "x": 6370.850128173828,
+    "y": 4241.282745361328,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "75b24fb6.238bf",
+    "id": "598a3c97.c62cd4",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6383.31689453125,
-    "y": 4098.08251953125,
-    "z": "d1707f77.d9d96",
+    "x": 6443.200225830078,
+    "y": 4154.965850830078,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "ef4d4c31.5752b8",
+    "id": "d1f760ec.7590a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6078.31689453125,
-    "y": 4291.082763671875,
-    "z": "d1707f77.d9d96",
+    "x": 6138.200225830078,
+    "y": 4347.966094970703,
+    "z": "7062000.f761",
     "wires": [
       [
-        "c3994ac7.46bf7",
-        "bad5aad4.351bf8"
+        "e43682b5.56552",
+        "8aed809d.a72bd8"
       ]
     ]
   },
   {
-    "id": "c3994ac7.46bf7",
+    "id": "e43682b5.56552",
     "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.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher - $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n",
+    "name": "update the-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 - $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6371.31689453125,
-    "y": 4269.08251953125,
-    "z": "d1707f77.d9d96",
+    "x": 6431.200225830078,
+    "y": 4325.965850830078,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "bad5aad4.351bf8",
+    "id": "8aed809d.a72bd8",
     "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": 6322.966796875,
-    "y": 4316.3994140625,
-    "z": "d1707f77.d9d96",
+    "x": 6382.850128173828,
+    "y": 4373.282745361328,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "999a7b18.8746a",
+    "id": "3a2ab7c7.d2dab8",
     "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": 6395.31689453125,
-    "y": 4230.08251953125,
-    "z": "d1707f77.d9d96",
+    "x": 6455.200225830078,
+    "y": 4286.965850830078,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "ae674a71.79993",
+    "id": "5ef895fb.b1bf7c",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5717.5498046875,
-    "y": 4673.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 5777.433135986328,
+    "y": 4730.166534423828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "ec19a864.ea4d58",
-        "d73a682a.7a7268"
+        "3e55897.59031f6",
+        "a1d97b4a.208e4"
       ]
     ]
   },
   {
-    "id": "ec19a864.ea4d58",
+    "id": "3e55897.59031f6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5912.5498046875,
-    "y": 4601.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 5972.433135986328,
+    "y": 4658.166534423828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "a6f4ca31.afd9c8"
+        "1661a8d0.f6d65f"
       ]
     ]
   },
   {
-    "id": "d73a682a.7a7268",
+    "id": "a1d97b4a.208e4",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5913.5498046875,
-    "y": 4734.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 5973.433135986328,
+    "y": 4791.166534423828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "3928fc2d.e43684"
+        "5810f31a.0a9ed4"
       ]
     ]
   },
   {
-    "id": "a6f4ca31.afd9c8",
+    "id": "1661a8d0.f6d65f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6057.5498046875,
-    "y": 4601.283447265625,
-    "z": "d1707f77.d9d96",
+    "x": 6117.433135986328,
+    "y": 4658.166778564453,
+    "z": "7062000.f761",
     "wires": [
       [
-        "c910035e.3934c",
-        "169e4263.459d16"
+        "da6580ac.af986",
+        "ee810baa.63495"
       ]
     ]
   },
   {
-    "id": "c910035e.3934c",
+    "id": "da6580ac.af986",
     "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.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher + $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6350.5498046875,
-    "y": 4579.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 6410.433135986328,
+    "y": 4636.166534423828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "169e4263.459d16",
+    "id": "ee810baa.63495",
     "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": 6302.19970703125,
-    "y": 4626.60009765625,
-    "z": "d1707f77.d9d96",
+    "x": 6362.083038330078,
+    "y": 4683.483428955078,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "7e4549dd.7efbf",
+    "id": "87cf660.a2b3f18",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6374.5498046875,
-    "y": 4540.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 6434.433135986328,
+    "y": 4597.166534423828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "3928fc2d.e43684",
+    "id": "5810f31a.0a9ed4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6069.5498046875,
-    "y": 4733.283447265625,
-    "z": "d1707f77.d9d96",
+    "x": 6129.433135986328,
+    "y": 4790.166778564453,
+    "z": "7062000.f761",
     "wires": [
       [
-        "e1457a0f.b9d6c8",
-        "d5693b3e.f3011"
+        "80c260b2.6af7a",
+        "9a874787.276bd"
       ]
     ]
   },
   {
-    "id": "e1457a0f.b9d6c8",
+    "id": "80c260b2.6af7a",
     "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.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher - $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6362.5498046875,
-    "y": 4711.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 6422.433135986328,
+    "y": 4768.166534423828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "d5693b3e.f3011",
+    "id": "9a874787.276bd",
     "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": 6314.19970703125,
-    "y": 4758.60009765625,
-    "z": "d1707f77.d9d96",
+    "x": 6374.083038330078,
+    "y": 4815.483428955078,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "3c74357c.38d252",
+    "id": "815fc293.94d2f8",
     "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": 6386.5498046875,
-    "y": 4672.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 6446.433135986328,
+    "y": 4729.166534423828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "69e6b36a.f41024",
+    "id": "a537e9a.90f0c98",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5125.39990234375,
-    "y": 5413.4833984375,
-    "z": "d1707f77.d9d96",
+    "x": 5185.283233642578,
+    "y": 5470.366729736328,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "86db9e26.58f248",
+    "id": "d416487a.185998",
     "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 = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5123.18310546875,
-    "y": 5453.68359375,
-    "z": "d1707f77.d9d96",
+    "x": 5183.066436767578,
+    "y": 5510.566925048828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "41cc1d.b64a83e4",
+    "id": "7898de27.66a698",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 4998.433349609375,
-    "y": 5638.16650390625,
-    "z": "d1707f77.d9d96",
+    "x": 5058.316680908203,
+    "y": 5695.049835205078,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "22a50e4b.58e402",
+    "id": "63d85a3d.4103fc",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4996.216552734375,
-    "y": 5678.36669921875,
-    "z": "d1707f77.d9d96",
+    "x": 5056.099884033203,
+    "y": 5735.250030517578,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "c6ebbffd.4a2ec",
+    "id": "105ea6a7.242f79",
     "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": 5100.5498046875,
-    "y": 6121.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 5160.433135986328,
+    "y": 6178.166534423828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "49a56683.38e268",
+    "id": "8f43e7c7.1c41b8",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4927.5498046875,
-    "y": 6178.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 4987.433135986328,
+    "y": 6235.166534423828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "9a2158f1.e886e",
-        "105a2de1.54e63a"
+        "4e0d7b1b.4cc2ec",
+        "609ed3b9.40f534"
       ]
     ]
   },
   {
-    "id": "9a2158f1.e886e",
+    "id": "4e0d7b1b.4cc2ec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5138.5498046875,
-    "y": 6178.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 5198.433135986328,
+    "y": 6235.166534423828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "ffb5bb91.04465"
+        "c2d7112c.1b117"
       ]
     ]
   },
   {
-    "id": "105a2de1.54e63a",
+    "id": "609ed3b9.40f534",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5134.5498046875,
-    "y": 6226.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 5194.433135986328,
+    "y": 6283.166534423828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "42935a.ea360ca8"
+        "fd4c4e47.075cf8"
       ]
     ]
   },
   {
-    "id": "ffb5bb91.04465",
+    "id": "c2d7112c.1b117",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5294.5498046875,
-    "y": 6174.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 5354.433135986328,
+    "y": 6231.166534423828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "7f5bea08.d1b89c",
-        "f5914753.58912",
-        "9c4a57c9.e2032"
+        "c4eacefe.2b5518",
+        "773bf221.e0586c",
+        "f38f117c.80c7b8"
       ]
     ]
   },
   {
-    "id": "42935a.ea360ca8",
+    "id": "fd4c4e47.075cf8",
     "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": 5282.5498046875,
-    "y": 6221.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 5342.433135986328,
+    "y": 6278.166534423828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "37f65b5f.7df50c",
+    "id": "a5cbc756.e321b8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5560.43359375,
-    "y": 6274.16650390625,
-    "z": "d1707f77.d9d96",
+    "x": 5620.316925048828,
+    "y": 6331.049835205078,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "9c4a57c9.e2032",
+    "id": "f38f117c.80c7b8",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5558.216796875,
-    "y": 6314.36669921875,
-    "z": "d1707f77.d9d96",
+    "x": 5618.100128173828,
+    "y": 6371.250030517578,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "f5914753.58912",
+    "id": "773bf221.e0586c",
     "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/' + $tmp.aai.ROOT.connectivity.connectivity-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=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\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": 5677.5498046875,
-    "y": 6226.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 5737.433135986328,
+    "y": 6283.166534423828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
   },
   {
-    "id": "7f5bea08.d1b89c",
+    "id": "c4eacefe.2b5518",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5548.5498046875,
-    "y": 6174.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 5608.433135986328,
+    "y": 6231.166534423828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "e32403dd.64bd88",
+    "id": "5ff4d90f.61eca8",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4989.5498046875,
-    "y": 6079.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 5049.433135986328,
+    "y": 6136.166534423828,
+    "z": "7062000.f761",
     "wires": []
   },
   {
-    "id": "6165612a.74a1f8",
+    "id": "1a8fecd4.39509b",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4696.8828125,
-    "y": 6161.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 4756.766143798828,
+    "y": 6218.166534423828,
+    "z": "7062000.f761",
     "wires": [
       [
-        "c6ebbffd.4a2ec",
-        "49a56683.38e268"
+        "105ea6a7.242f79",
+        "8f43e7c7.1c41b8"
       ]
     ]
   },
   {
-    "id": "901e2d41.157da8",
+    "id": "2374b67.d3b424a",
     "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/' + $tmp.the-connectivity.connectivity-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=\"`$tmp.the-connectivity.connectivity-id`\" />\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": 4975.63330078125,
-    "y": 6476.283203125,
-    "z": "d1707f77.d9d96",
+    "x": 5035.516632080078,
+    "y": 6533.166534423828,
+    "z": "7062000.f761",
     "wires": [
       []
     ]
+  },
+  {
+    "id": "5d1aa304.0ec964",
+    "type": "comment",
+    "name": "TODO: BUG -- DONE",
+    "info": "momkene connectivity haye vasati ke dummy hastand ham\nvpn-binding dashte bashand ke too in path involve hast pas\nbayad bw aan niz update shavad.",
+    "comments": "",
+    "x": 3740.8837890625,
+    "y": 3809.88330078125,
+    "z": "7062000.f761",
+    "wires": []
+  },
+  {
+    "id": "1c248a70.8f6db6",
+    "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": 4493.4169921875,
+    "y": 4084,
+    "z": "7062000.f761",
+    "wires": [
+      [
+        "e8d15ab4.54c49",
+        "20b8f97c.98322e",
+        "6302d7c5.b6ebe8"
+      ]
+    ]
+  },
+  {
+    "id": "3d05d16c.2a1566",
+    "type": "comment",
+    "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
+    "info": "",
+    "comments": "",
+    "x": 4595.4169921875,
+    "y": 4049,
+    "z": "7062000.f761",
+    "wires": []
+  },
+  {
+    "id": "e8d15ab4.54c49",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4698.4169921875,
+    "y": 4081,
+    "z": "7062000.f761",
+    "wires": [
+      [
+        "7ec23daa.6a0bc4"
+      ]
+    ]
+  },
+  {
+    "id": "20b8f97c.98322e",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4681.907958984375,
+    "y": 4142.574035644531,
+    "z": "7062000.f761",
+    "wires": [
+      [
+        "36ba2eea.c2f3b2"
+      ]
+    ]
+  },
+  {
+    "id": "6302d7c5.b6ebe8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4679.4169921875,
+    "y": 4186,
+    "z": "7062000.f761",
+    "wires": [
+      [
+        "949d59bf.9e67a"
+      ]
+    ]
+  },
+  {
+    "id": "7ec23daa.6a0bc4",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4866.417236328125,
+    "y": 4076,
+    "z": "7062000.f761",
+    "wires": [
+      [
+        "df77d6a9.222ef"
+      ]
+    ]
+  },
+  {
+    "id": "36ba2eea.c2f3b2",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return 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": 4844.4793701171875,
+    "y": 4142.859771728516,
+    "z": "7062000.f761",
+    "wires": []
+  },
+  {
+    "id": "949d59bf.9e67a",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 4846.4169921875,
+    "y": 4185,
+    "z": "7062000.f761",
+    "wires": []
+  },
+  {
+    "id": "df77d6a9.222ef",
+    "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": 5104.417236328125,
+    "y": 4081,
+    "z": "7062000.f761",
+    "wires": [
+      [
+        "abc8ebdb.52f0a8"
+      ]
+    ]
+  },
+  {
+    "id": "abc8ebdb.52f0a8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5338.4169921875,
+    "y": 4088,
+    "z": "7062000.f761",
+    "wires": [
+      [
+        "ac63c59c.83048"
+      ]
+    ]
+  },
+  {
+    "id": "1f0e75d7.8b5a2a",
+    "type": "set",
+    "name": "unset tmp.aai.all-vpn-bindings",
+    "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
+    "comments": "",
+    "x": 4472.11669921875,
+    "y": 4010,
+    "z": "7062000.f761",
+    "wires": []
+  },
+  {
+    "id": "bffd072f.5e512",
+    "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": 5755.2666015625,
+    "y": 4098.5830078125,
+    "z": "7062000.f761",
+    "wires": [
+      [
+        "f3f61fe0.c57dd"
+      ]
+    ]
+  },
+  {
+    "id": "f3f61fe0.c57dd",
+    "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": 5947.2666015625,
+    "y": 4087.583251953125,
+    "z": "7062000.f761",
+    "wires": [
+      [
+        "8cedd329.3f3c9"
+      ]
+    ]
+  },
+  {
+    "id": "8cedd329.3f3c9",
+    "type": "outcome",
+    "name": "connectivity",
+    "xml": "<outcome value='connectivity'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6129.2666015625,
+    "y": 4066.583251953125,
+    "z": "7062000.f761",
+    "wires": [
+      [
+        "86e0777f.9370f"
+      ]
+    ]
+  },
+  {
+    "id": "86e0777f.9370f",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 6291.2666015625,
+    "y": 4055.583251953125,
+    "z": "7062000.f761",
+    "wires": [
+      [
+        "869c4324.9670f",
+        "bbb484a7.96add8"
+      ]
+    ]
+  },
+  {
+    "id": "869c4324.9670f",
+    "type": "set",
+    "name": "unset tmp.the-connectivity",
+    "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",
+    "comments": "",
+    "x": 6488.2666015625,
+    "y": 3984.583251953125,
+    "z": "7062000.f761",
+    "wires": []
+  },
+  {
+    "id": "3f51a421.f29684",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5609.216796875,
+    "y": 4214.582763671875,
+    "z": "7062000.f761",
+    "wires": [
+      [
+        "ef985380.75ae68",
+        "bffd072f.5e512",
+        "bbf89c4c.2b2c98",
+        "55e59a7f.53654c"
+      ]
+    ]
+  },
+  {
+    "id": "bbf89c4c.2b2c98",
+    "type": "set",
+    "name": "unset tmp.aai.the-vpn-binding",
+    "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
+    "comments": "",
+    "x": 5793.783203125,
+    "y": 3988.800048828125,
+    "z": "7062000.f761",
+    "wires": []
+  },
+  {
+    "id": "55e59a7f.53654c",
+    "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": 5785.783203125,
+    "y": 4037.800048828125,
+    "z": "7062000.f761",
+    "wires": []
+  },
+  {
+    "id": "bbb484a7.96add8",
+    "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": 6485.7333984375,
+    "y": 4083.800048828125,
+    "z": "7062000.f761",
+    "wires": []
   }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/resources/graph.versions b/platform-logic/generic-resource-api/src/main/resources/graph.versions
index 6248a176..6af72c11 100755
--- a/platform-logic/generic-resource-api/src/main/resources/graph.versions
+++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions
@@ -298,3 +298,4 @@ GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-helper-find-ROOT-conn ${proj
 GENERIC-RESOURCE-API cll-vnf-topology-operation-find-maximum-used-tpn ${project.version} sync
 GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-delete ${project.version} sync
 GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-modify ${project.version} sync
+GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-delete-VPNBs ${project.version} sync
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
index f49b946f..9a35f126 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
@@ -478,13 +478,7 @@
                         </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='not-found'></outcome>
                 <outcome value='failure'>
                     <return status='failure'>
                         <parameter name='error-code' value='' />
@@ -1058,13 +1052,7 @@
                                             </outcome>
                                         </switch>
                                     </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='not-found'></outcome>
                                     <outcome value='failure'>
                                         <return status='failure'>
                                             <parameter name='error-code' value='' />
@@ -1076,13 +1064,7 @@
                         </switch>
                     </for>
                 </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                    </return>
-                </outcome>
+                <outcome value='not-found'></outcome>
                 <outcome value='failure'>
                     <return status='failure'>
                         <parameter name='error-code' value='' />
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
new file mode 100644
index 00000000..a155f743
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete-VPNBs.xml
@@ -0,0 +1,216 @@
+<service-logic
+        xmlns='http://www.onap.org/sdnc/svclogic'
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync'>
+        <block atomic='true'>
+            <set>
+                <parameter name='allNetworksList.' value='' />
+            </set>
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                          resource="network-resources"
+                          key="selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'"
+                          local-only="false"
+                          pfx="allNetworksList" >
+                <outcome value='success'></outcome>
+                <outcome value='Other'></outcome>
+                <outcome value='not-found'></outcome>
+            </get-resource>
+            <for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >
+                <switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>
+                    <outcome value='true'>
+                        <switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>
+                            <outcome value='true'>
+                                <set>
+                                    <parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
+                                </set>
+                            </outcome>
+                        </switch>
+                    </outcome>
+                </switch>
+            </for>
+            <set>
+                <parameter name='tmp.pce-src-node.' value='' />
+            </set>
+            <set>
+                <!--<parameter name='tmp.pce-src-node' value="`$param-prefix-domainA-pnfName[0] + '-' +-->
+                <!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->
+                <!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->
+                <!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->
+                <!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->
+                <!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->
+                <!--                                                   1 + '-' +-->
+                <!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->
+                <!--                                                   $param-prefix-domainA-pnfName[8]`" />-->
+                <parameter name='tmp.pce-src-node' value="`$param-prefix-domainA-pnfName[0] + '-' +
+                                                   $param-prefix-domainA-pnfName[1] + '-' +
+                                                   $param-prefix-domainA-pnfName[2] + '-' +
+                                                   $param-prefix-domainA-pnfName[3] + '-' +
+                                                   $param-prefix-domainA-pnfName[4] + '-' +
+                                                   $param-prefix-domainA-pnfName[5] + '-' +
+                                                   $otnTopoIdSrc + '-' +
+                                                   $param-prefix-domainA-pnfName[7] + '-' +
+                                                   $param-prefix-domainA-pnfName[8]`" />
+            </set>
+            <set>
+                <!--<parameter name='tmp.srcTtpOtnLayer' value="`$tmp.pce-src-node + '-' + -->
+                <!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->
+                <!--                                             $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-' +
+                                                   $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' >
+                                                                                <outcome value='success'>
+                                                                                    <block>
+                                                                                        <set>
+                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                            <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                            <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                            <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                            <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                            <!--<parameter name="format" value="json"/>-->
+                                                                                            <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                            <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                        </set>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                                <outcome value='not-found'>
+                                                                                    <return status='failure'>
+                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                        <parameter name="error-code" value="500" />
+                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                    </return>
+                                                                                </outcome>
+                                                                                <outcome value='Other'>
+                                                                                    <return status='failure'>
+                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                        <parameter name="error-code" value="500" />
+                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                    </return>
+                                                                                </outcome>
+                                                                            </get-resource>
+                                                                            <break/>
+                                                                        </block>
+                                                                    </outcome>
+                                                                </switch>
+                                                            </for>
+                                                        </block>
+                                                    </outcome>
+                                                    <outcome value='not-found'>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
+                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='Other'>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
+                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                        </return>
+                                                    </outcome>
+                                                </get-resource>
+                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                    <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />-->
+                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.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>
+                            </for>
+                        </block>
+                    </outcome>
+                    <outcome value='not-found'>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                        </return>
+                    </outcome>
+                    <outcome value='failure'>
+                        <return status='failure'>
+                            <parameter name='error-code' value='' />
+                            <parameter name='error-message' value='' />
+                        </return>
+                    </outcome>
+                </get-resource>
+            </block>
+        </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 4f92df4f..91889bb4 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
@@ -9,9 +9,9 @@
             </execute>
             <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
             <!--	resource="service-instance"-->
-            <!--	key='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->
-            <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->
-            <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->
+            <!--	key='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->
+            <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->
+            <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->
             <!--	local-only="false"-->
             <!--	force="true" pfx="tmp.aai.service-instance">-->
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
@@ -21,217 +21,1637 @@
          AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
                           local-only="false"
                           force="true" pfx="tmp.aai.service-instance">
-                <!--vnf-topology-operation-input.service-information.service-instance-id-->
+                <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                <!--	resource="service-instance"-->
+                <!--	key='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->
+                <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->
+                <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->
+                <!--	local-only="false"-->
+                <!--	force="true" pfx="tmp.aai.service-instance">-->
                 <outcome value='success'>
-                    <switch test="`$tmp.aai.service-instance.relationship-list.relationship_length != ''`">
+                    <switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>
+                        <outcome value='false'></outcome>
                         <outcome value='true'>
-                            <for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >
-                                <switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>
-                                    <outcome value='connectivity'>
-                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                      resource="connectivity"
-                                                      key="connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"
-                                                      local-only="false"
-                                                      pfx="tmp.aai.connectivity" >
-                                            <outcome value='success'>
-                                                <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">
-                                                                                <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' >
-                                                                                                                <outcome value='success'>
-                                                                                                                    <block>
-                                                                                                                        <set>
-                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                                                                            <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                                                                            <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                                                                            <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                                                                            <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                                                                            <!--<parameter name="format" value="json"/>-->
-                                                                                                                            <!--<parameter name="httpMethod" value="get"/>-->
-                                                                                                                            <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                                                                                        </set>
-                                                                                                                    </block>
-                                                                                                                </outcome>
-                                                                                                                <outcome value='not-found'>
-                                                                                                                    <return status='failure'>
-                                                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                                                        <parameter name="error-code" value="500" />
-                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                    </return>
-                                                                                                                </outcome>
-                                                                                                                <outcome value='Other'>
-                                                                                                                    <return status='failure'>
-                                                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                                                        <parameter name="error-code" value="500" />
-                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                    </return>
-                                                                                                                </outcome>
-                                                                                                            </get-resource>
-                                                                                                            <break/>
-                                                                                                        </block>
-                                                                                                    </outcome>
-                                                                                                </switch>
-                                                                                            </for>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                    <outcome value='not-found'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                            <parameter name="error-code" value="500" />
-                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                    <outcome value='Other'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                            <parameter name="error-code" value="500" />
-                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                </get-resource>
-                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                    <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />-->
-                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.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>
-                                                                                <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"/>
+                            <block>
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="pnfs"
+                                              key="selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'"
+                                              local-only="false"
+                                              pfx="ccsdkTopopnfs" ></get-resource>
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="logical-links"
+                                              key="selflink = 'https://aai.onap:8443/aai/v24/network/logical-links?depth=0'"
+                                              local-only="false"
+                                              pfx="ccsdkTopologicalLinks" ></get-resource>
+                                <set>
+                                    <parameter name='tmp.arr' value='' />
+                                    <parameter name='tmp.arridx' value='0' />
+                                    <parameter name='tmp.arr_length' value='0' />
+                                    <parameter name='otn-tunnel-slice' value='' />
+                                    <parameter name='otn-tunnel-slice_length' value='0' />
+                                    <!--<parameter name='tmp.slicevpns' value='' />-->
+                                    <!--<parameter name='tmp.slicevpns_length' value='0' />-->
+                                    <!--<parameter name='tmp.slicevpnuuids' value='' />-->
+                                    <!--<parameter name='tmp.slicevpnuuids.' value='' />-->
+                                </set>
+                                <for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                        <parameter name="ctx-destination" value="prop.ethernet-service-name"/>
+                                    </execute>
+                                    <set>
+                                        <!--<parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-name`" />-->
+                                        <parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-id`" />
+                                    </set>
+                                    <set>
+                                        <parameter name='allotted-resource-id' value="`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`" />
+                                    </set>
+                                    <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                    <!--	resource="allotted-resource"-->
+                                    <!--	key='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->
+                                    <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->
+                                    <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->
+                                    <!--         AND allotted-resource.id = $allotted-resource-id'-->
+                                    <!--	local-only="false"-->
+                                    <!--	force="true" pfx="tmp.aai.allotted-resource">-->
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                  resource="allotted-resource"
+                                                  key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type
+         AND allotted-resource.id = $allotted-resource-id'
+                                                  local-only="false"
+                                                  force="true" pfx="tmp.aai.allotted-resource">
+                                        <outcome value='not-found'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='error-code' value='' />
+                                                <parameter name='error-message' value='' />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='success'>
+                                            <block atomic="true">
+                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                              resource="allotted-resource:relationship-list"
+                                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type
+         AND allotted-resource.id = $allotted-resource-id'
+                                                              local-only="false"
+                                                              force="true" pfx="tmp.aai.allotted-resource.relationship-list">
+                                                    <outcome value='not-found'>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
+                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='failure'>
+                                                        <return status='failure'>
+                                                            <parameter name='error-code' value='' />
+                                                            <parameter name='error-message' value='' />
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='success'>
+                                                        <block atomic="true">
+                                                            <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>
+                                                                <outcome value='false'></outcome>
+                                                                <outcome value='true'>
+                                                                    <block atomic="true">
+                                                                        <for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >
+                                                                            <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>
+                                                                                <outcome value='network-policy'>
+                                                                                    <block atomic="true">
+                                                                                        <set>
+                                                                                            <parameter name='network-policy-id' value="`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`" />
+                                                                                        </set>
+                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                      resource="network-policy"
+                                                                                                      key='network-policy.network-policy-id = $network-policy-id'
+                                                                                                      local-only="false"
+                                                                                                      force="true" pfx="tmp.aai.network-policy">
+                                                                                            <outcome value='not-found'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                </return>
+                                                                                            </outcome>
                                                                                             <outcome value='failure'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='error-code' value='' />
+                                                                                                    <parameter name='error-message' value='' />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='success'>
+                                                                                                <block>
+                                                                                                    <set>
+                                                                                                        <parameter name='maximum-bandwidth' value="`$tmp.aai.network-policy.max-bandwidth`" />
+                                                                                                        <parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />
+                                                                                                    </set>
+                                                                                                </block>
+                                                                                            </outcome>
+                                                                                        </get-resource>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                            </switch>
+                                                                        </for>
+                                                                        <for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >
+                                                                            <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>
+                                                                                <outcome value='logical-link'>
+                                                                                    <block atomic="true">
+                                                                                        <set>
+                                                                                            <parameter name='logical-link-name' value="`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`" />
+                                                                                        </set>
+                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                      resource="logical-link"
+                                                                                                      key='logical-link.link-name = $logical-link-name'
+                                                                                                      local-only="false"
+                                                                                                      force="true" pfx="tmp.aai.logical-link">
+                                                                                            <outcome value='not-found'>
                                                                                                 <return status='failure'>
                                                                                                     <parameter name='ack-final' value='Y'/>
                                                                                                     <parameter name="error-code" value="500" />
-                                                                                                    <parameter name="error-message" value="Error executing delete ethernet service rest api" />
+                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='failure'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='error-code' value='' />
+                                                                                                    <parameter name='error-message' value='' />
                                                                                                 </return>
                                                                                             </outcome>
                                                                                             <outcome value='success'>
-                                                                                                <block atomic="true"></block>
+                                                                                                <block>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                        <parameter name="ctx-destination" value="prop.otn-tunnel-name"/>
+                                                                                                    </execute>
+                                                                                                    <set>
+                                                                                                        <!--<parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-name`" />-->
+                                                                                                        <parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-id`" />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='network-route-one' value="`$tmp.aai.logical-link.link-name`" />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='network-route-two' value="`$tmp.aai.logical-link.link-name2`" />
+                                                                                                    </set>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="network-route"
+                                                                                                                  key='network-route.route-id = $network-route-one'
+                                                                                                                  local-only="false"
+                                                                                                                  force="true" pfx="tmp.aai.network-route-one">
+                                                                                                        <outcome value='not-found'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                <parameter name='error-message' value='' />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <switch test='`$tmp.aai.network-route-one.type`'>
+                                                                                                                    <outcome value='ROOT'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-ROOT.' value="`$tmp.aai.network-route-one.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-B.' value="`$tmp.aai.network-route-one.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='LEAF'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-LEAF.' value="`$tmp.aai.network-route-one.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-A.' value="`$tmp.aai.network-route-one.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </switch>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="network-route"
+                                                                                                                  key='network-route.route-id = $network-route-two'
+                                                                                                                  local-only="false"
+                                                                                                                  force="true" pfx="tmp.aai.network-route-two">
+                                                                                                        <outcome value='not-found'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                <parameter name='error-message' value='' />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <switch test='`$tmp.aai.network-route-two.type`'>
+                                                                                                                    <outcome value='ROOT'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-ROOT.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-B.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='LEAF'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-LEAF.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-A.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </switch>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                        <parameter name="original_string" value='`$tmp.aai.network-route-A.next-hop`'/>
+                                                                                                        <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                        <parameter name="regex" value="[-]+"/>
+                                                                                                        <parameter name="ctx_memory_result_key" value="param-prefix-domainA-pnfName"/>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <set>
+                                                                                                                    <parameter name='tmp.src.domainA.pnf-name' value="`$param-prefix-domainA-pnfName[0] + '-' +
+                                                   $param-prefix-domainA-pnfName[1] + '-' +
+                                                   $param-prefix-domainA-pnfName[2] + '-' +
+                                                   $param-prefix-domainA-pnfName[3] + '-' +
+                                                   $param-prefix-domainA-pnfName[4] + '-' +
+                                                   $param-prefix-domainA-pnfName[5] + '-' +
+                                                   $param-prefix-domainA-pnfName[6] + '-' +
+                                                   $param-prefix-domainA-pnfName[7] + '-' +
+                                                   $param-prefix-domainA-pnfName[8]`" />
+                                                                                                                </set>
+                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                              resource="pnf"
+                                                                                                                              key="pnf.pnf-name = $tmp.src.domainA.pnf-name"
+                                                                                                                              pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                                                                    <!--AND depth = '0'"-->
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block>
+                                                                                                                            <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
+                                                                                                                                <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                                                                    <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.domainA.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                            </set>
+                                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                          resource="esr-thirdparty-sdnc"
+                                                                                                                                                          key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                                                                          pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                                <outcome value='success'>
+                                                                                                                                                    <block>
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                                            <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                                            <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                                            <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                                                            <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                                                            <!--<parameter name="format" value="json"/>-->
+                                                                                                                                                            <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                                                            <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                                        </set>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                                <outcome value='not-found'>
+                                                                                                                                                    <return status='failure'>
+                                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                    </return>
+                                                                                                                                                </outcome>
+                                                                                                                                                <outcome value='Other'>
+                                                                                                                                                    <return status='failure'>
+                                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                    </return>
+                                                                                                                                                </outcome>
+                                                                                                                                            </get-resource>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                    <outcome value='network-resource'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.domainA.eth-network-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                            </set>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                </switch>
+                                                                                                                            </for>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='not-found'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='Other'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </get-resource>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                    </execute>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="p-interface"
+                                                                                                                  key="pnf.pnf-name = $tmp.src.domainA.pnf-name
+	        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop"
+                                                                                                                  local-only="false"
+                                                                                                                  pfx="tmp.aai.network-route-A.p-interface-src" >
+                                                                                                        <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                                                                                        <!--	resource="p-interface"-->
+                                                                                                        <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
+                                                                                                        <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
+                                                                                                        <!--		local-only="false" -->
+                                                                                                        <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                    <parameter name="original_string" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>
+                                                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                    <parameter name="regex" value="[-]+"/>
+                                                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-domainA"/>
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic="true">
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='failure'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='error-code' value='' />
+                                                                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </execute>
+                                                                                                                <for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >
+                                                                                                                    <switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>
+                                                                                                                        <outcome value='tunnel-termination-point'>
+                                                                                                                            <block atomic="true">
+                                                                                                                                <set>
+                                                                                                                                    <parameter name='tmp.source.ttp-id' value="`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`" />
+                                                                                                                                </set>
+                                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                              resource="tunnel-termination-point"
+                                                                                                                                              key="tunnel-termination-point.ttp-id = $tmp.source.ttp-id
+		AND depth = '0'"
+                                                                                                                                              pfx='tmp.aai.source-ttp' local-only='false' >
+                                                                                                                                    <outcome value='success'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='source.tunnel-tp-id' value="`$tmp.aai.source-ttp.tunnel-tp-id`" />
+                                                                                                                                            </set>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                </get-resource>
+                                                                                                                                <break/>
+                                                                                                                            </block>
+                                                                                                                        </outcome>
+                                                                                                                    </switch>
+                                                                                                                </for>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='not-found'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                <parameter name='error-message' value='' />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <set>
+                                                                                                        <parameter name='tmp.LEAF.pnf-name-long' value="`$param-prefix-domainA-pnfName[0] + '-' +
+                                                   $param-prefix-domainA-pnfName[1] + '-' +
+                                                   $param-prefix-domainA-pnfName[2] + '-' +
+                                                   $param-prefix-domainA-pnfName[3] + '-' +
+                                                   $param-prefix-domainA-pnfName[4] + '-' +
+                                                   $param-prefix-domainA-pnfName[5] + '-' +
+                                                   $param-prefix-domainA-pnfName[6] + '-' +
+                                                   $param-prefix-domainA-pnfName[7] + '-' +
+                                                   $param-prefix-domainA-pnfName[8]`" />
+                                                                                                        <!--<parameter name='tmp.LEAF.pnf-name-short' value="`$param-prefix-domainA-pnfName[8]`" />-->
+                                                                                                        <parameter name='tmp.LEAF.pnf-name-short' value="`$tmp.src.pnf-name`" />
+                                                                                                        <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop`" />
+                                                                                                        <parameter name='tmp.LEAF.uni-tp-id' value="`$tmp.src.ltpId`" />
+                                                                                                    </set>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                        <parameter name="original_string" value='`$tmp.aai.network-route-B.next-hop`'/>
+                                                                                                        <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                        <parameter name="regex" value="[-]+"/>
+                                                                                                        <parameter name="ctx_memory_result_key" value="param-prefix-domainB-pnfName"/>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <set>
+                                                                                                                    <parameter name='tmp.dst.domainB.pnf-name' value="`$param-prefix-domainB-pnfName[0] + '-' +
+                                                   $param-prefix-domainB-pnfName[1] + '-' +
+                                                   $param-prefix-domainB-pnfName[2] + '-' +
+                                                   $param-prefix-domainB-pnfName[3] + '-' +
+                                                   $param-prefix-domainB-pnfName[4] + '-' +
+                                                   $param-prefix-domainB-pnfName[5] + '-' +
+                                                   $param-prefix-domainB-pnfName[6] + '-' +
+                                                   $param-prefix-domainB-pnfName[7] + '-' +
+                                                   $param-prefix-domainB-pnfName[8]`" />
+                                                                                                                </set>
+                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                              resource="pnf"
+                                                                                                                              key="pnf.pnf-name = $tmp.dst.domainB.pnf-name"
+                                                                                                                              pfx='tmp.aai.destination-pnf' local-only='false' >
+                                                                                                                    <!--AND depth = '0'"-->
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block>
+                                                                                                                            <for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >
+                                                                                                                                <switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>
+                                                                                                                                    <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.domainB.esr-thirdparty-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                            </set>
+                                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                          resource="esr-thirdparty-sdnc"
+                                                                                                                                                          key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                                                                          pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                                <outcome value='success'>
+                                                                                                                                                    <block>
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                                            <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                                            <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                                            <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                                                            <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                                                            <!--<parameter name="format" value="json"/>-->
+                                                                                                                                                            <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                                                            <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                                        </set>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                                <outcome value='not-found'>
+                                                                                                                                                    <return status='failure'>
+                                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                    </return>
+                                                                                                                                                </outcome>
+                                                                                                                                                <outcome value='Other'>
+                                                                                                                                                    <return status='failure'>
+                                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                    </return>
+                                                                                                                                                </outcome>
+                                                                                                                                            </get-resource>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                    <outcome value='network-resource'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.domainB.eth-network-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                            </set>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                </switch>
+                                                                                                                            </for>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='not-found'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='Other'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </get-resource>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                    </execute>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="p-interface"
+                                                                                                                  key="pnf.pnf-name = $tmp.dst.domainB.pnf-name
+	        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop"
+                                                                                                                  local-only="false"
+                                                                                                                  pfx="tmp.aai.network-route-B.p-interface-dst" >
+                                                                                                        <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                                                                                        <!--	resource="p-interface"-->
+                                                                                                        <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
+                                                                                                        <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
+                                                                                                        <!--		local-only="false" -->
+                                                                                                        <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                    <parameter name="original_string" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>
+                                                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                    <parameter name="regex" value="[-]+"/>
+                                                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-domainB"/>
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic="true">
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='failure'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='error-code' value='' />
+                                                                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </execute>
+                                                                                                                <for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >
+                                                                                                                    <switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>
+                                                                                                                        <outcome value='tunnel-termination-point'>
+                                                                                                                            <block atomic="true">
+                                                                                                                                <set>
+                                                                                                                                    <parameter name='tmp.destination.ttp-id' value="`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`" />
+                                                                                                                                </set>
+                                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                              resource="tunnel-termination-point"
+                                                                                                                                              key="tunnel-termination-point.ttp-id = $tmp.destination.ttp-id
+		AND depth = '0'"
+                                                                                                                                              pfx='tmp.aai.destination-ttp' local-only='false' >
+                                                                                                                                    <outcome value='success'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='destination.tunnel-tp-id' value="`$tmp.aai.destination-ttp.tunnel-tp-id`" />
+                                                                                                                                            </set>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                </get-resource>
+                                                                                                                                <break/>
+                                                                                                                            </block>
+                                                                                                                        </outcome>
+                                                                                                                    </switch>
+                                                                                                                </for>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='not-found'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                <parameter name='error-message' value='' />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <set>
+                                                                                                        <parameter name='tmp.ROOT.pnf-name-long' value="`$param-prefix-domainB-pnfName[0] + '-' +
+                                                   $param-prefix-domainB-pnfName[1] + '-' +
+                                                   $param-prefix-domainB-pnfName[2] + '-' +
+                                                   $param-prefix-domainB-pnfName[3] + '-' +
+                                                   $param-prefix-domainB-pnfName[4] + '-' +
+                                                   $param-prefix-domainB-pnfName[5] + '-' +
+                                                   $param-prefix-domainB-pnfName[6] + '-' +
+                                                   $param-prefix-domainB-pnfName[7] + '-' +
+                                                   $param-prefix-domainB-pnfName[8]`" />
+                                                                                                        <!--<parameter name='tmp.ROOT.pnf-name-short' value="`$param-prefix-domainB-pnfName[8]`" />-->
+                                                                                                        <parameter name='tmp.ROOT.pnf-name-short' value="`$tmp.dst.pnf-name`" />
+                                                                                                        <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop`" />
+                                                                                                        <parameter name='tmp.ROOT.uni-tp-id' value="`$tmp.dst.ltpId`" />
+                                                                                                    </set>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="uni"
+                                                                                                                  key="uni.id = $tmp.LEAF.uni-p-interface-long"
+                                                                                                                  local-only="false"
+                                                                                                                  pfx="tmp.aai.leafuni" >
+                                                                                                        <outcome value='not-found'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                <parameter name='error-message' value='' />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic='true'>
+                                                                                                                <set>
+                                                                                                                    <parameter name='bwToBeDecreased' value="`$tmp.aai.leafuni.data-source`" />
+                                                                                                                    <parameter name='tpid' value='`$tmp.aai.leafuni.tp-id`' />
+                                                                                                                    <parameter name='cvlan' value='`$tmp.aai.leafuni.cvlan`' />
+                                                                                                                </set>
+                                                                                                                <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                        key='uni.id = $tmp.LEAF.uni-p-interface-long'></delete>
+                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                              resource="uni"
+                                                                                                                              key="uni.id = $tmp.ROOT.uni-p-interface-long"
+                                                                                                                              local-only="false"
+                                                                                                                              pfx="tmp.aai.rootuni" >
+                                                                                                                    <outcome value='not-found'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='failure'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='error-code' value='' />
+                                                                                                                            <parameter name='error-message' value='' />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic="true">
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />
+                                                                                                                            </set>
+                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                                    key='uni.id = $tmp.ROOT.uni-p-interface-long'>
+                                                                                                                                <parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />
+                                                                                                                                <parameter name='data-source' value='`$tmp.newbw`' />
+                                                                                                                            </update>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </get-resource>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' ></call>
+                                                                                                    <switch test='`$found-middle-man`'>
+                                                                                                        <outcome value='false'>
+                                                                                                            <block atomic='true'>
+                                                                                                                <return status='failure'>
+                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                    <parameter name="error-message" value="LEAF CONN DOES NOT EXIST BUT IT SHOULD BE." />
+                                                                                                                </return>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='true'>
+                                                                                                            <block atomic='true'>
+                                                                                                                <set>
+                                                                                                                    <parameter name='tmp.MMonlyHasROOT' value='true' />
+                                                                                                                </set>
+                                                                                                                <set>
+                                                                                                                    <parameter name='tmp.MMstillHasUni' value='false' />
+                                                                                                                </set>
+                                                                                                                <for silentFailure='true' index='cridx' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >
+                                                                                                                    <switch test='`$middle-man-conn.relationship-list.relationship[$cridx].related-to`'>
+                                                                                                                        <outcome value='uni'>
+                                                                                                                            <block>
+                                                                                                                                <set>
+                                                                                                                                    <parameter name='tmp.mmUNI-id-long' value='`$middle-man-conn.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />
+                                                                                                                                </set>
+                                                                                                                                <switch test="`$tmp.mmUNI-id-long != $tmp.ROOT.uni-p-interface-long`">
+                                                                                                                                    <outcome value='false'>
+                                                                                                                                        <block></block>
+                                                                                                                                    </outcome>
+                                                                                                                                    <outcome value='true'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.MMonlyHasROOT' value='false' />
+                                                                                                                                            </set>
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.MMstillHasUni' value='true' />
+                                                                                                                                            </set>
+                                                                                                                                            <break/>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                </switch>
+                                                                                                                            </block>
+                                                                                                                        </outcome>
+                                                                                                                    </switch>
+                                                                                                                </for>
+                                                                                                                <set>
+                                                                                                                    <parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
+                                                                                                                    <parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />
+                                                                                                                    <!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->
+                                                                                                                    <!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->
+                                                                                                                    <!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->
+                                                                                                                    <!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->
+                                                                                                                    <!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->
+                                                                                                                    <!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->
+                                                                                                                </set>
+                                                                                                                <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' ></call>
+                                                                                                                <switch test="`$found-connectivity`">
+                                                                                                                    <outcome value='false'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                            <parameter name="error-message" value="LEAF CONN DOES NOT EXIST BUT IT SHOULD BE." />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='true'>
+                                                                                                                        <block atomic='true'>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.stillHasUni' value='false' />
+                                                                                                                                <parameter name='tmp.keepVPNBs' value='false' />
+                                                                                                                            </set>
+                                                                                                                            <for silentFailure='true' index='cridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >
+                                                                                                                                <switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>
+                                                                                                                                    <outcome value='uni'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.uni.id' value='`$tmp.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />
+                                                                                                                                            </set>
+                                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                          resource="uni"
+                                                                                                                                                          key="uni.id = $tmp.uni.id"
+                                                                                                                                                          local-only="false"
+                                                                                                                                                          pfx="tmp.aai.uni" >
+                                                                                                                                                <outcome value='success'>
+                                                                                                                                                    <block atomic='true'>
+                                                                                                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                                                            <parameter name="original_string" value='`$tmp.aai.uni.id`'/>
+                                                                                                                                                            <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                                                            <parameter name="regex" value="[-]+"/>
+                                                                                                                                                            <parameter name="ctx_memory_result_key" value="param-prefix-uni-pnfName"/>
+                                                                                                                                                            <outcome value='success'>
+                                                                                                                                                                <block atomic="true">
+                                                                                                                                                                    <set>
+                                                                                                                                                                        <parameter name='tmp.uni.pnf-name' value="`$param-prefix-uni-pnfName[0] + '-' +
+                                                   $param-prefix-uni-pnfName[1] + '-' +
+                                                   $param-prefix-uni-pnfName[2] + '-' +
+                                                   $param-prefix-uni-pnfName[3] + '-' +
+                                                   $param-prefix-uni-pnfName[4] + '-' +
+                                                   $param-prefix-uni-pnfName[5] + '-' +
+                                                   $param-prefix-uni-pnfName[6] + '-' +
+                                                   $param-prefix-uni-pnfName[7] + '-' +
+                                                   $param-prefix-uni-pnfName[8]`" />
+                                                                                                                                                                    </set>
+                                                                                                                                                                </block>
+                                                                                                                                                            </outcome>
+                                                                                                                                                            <outcome value='failure'>
+                                                                                                                                                                <return status='failure'>
+                                                                                                                                                                    <parameter name='error-code' value='' />
+                                                                                                                                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                                                                </return>
+                                                                                                                                                            </outcome>
+                                                                                                                                                        </execute>
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='tmp.stillHasUni' value='true' />
+                                                                                                                                                        </set>
+                                                                                                                                                        <switch test='`$tmp.uni.pnf-name == $tmp.LEAF.pnf-name-long`'>
+                                                                                                                                                            <outcome value='false'>
+                                                                                                                                                                <block></block>
+                                                                                                                                                            </outcome>
+                                                                                                                                                            <outcome value='true'>
+                                                                                                                                                                <block atomic='true'>
+                                                                                                                                                                    <set>
+                                                                                                                                                                        <parameter name='no-pce-call' value="true" />
+                                                                                                                                                                    </set>
+                                                                                                                                                                    <set>
+                                                                                                                                                                        <parameter name='tmp.stillHasUni' value='true' />
+                                                                                                                                                                        <parameter name='tmp.keepVPNBs' value='true' />
+                                                                                                                                                                    </set>
+                                                                                                                                                                </block>
+                                                                                                                                                            </outcome>
+                                                                                                                                                        </switch>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                                <outcome value='not-found'></outcome>
+                                                                                                                                                <outcome value='failure'></outcome>
+                                                                                                                                            </get-resource>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                </switch>
+                                                                                                                            </for>
+                                                                                                                            <switch test="`$tmp.keepVPNBs`">
+                                                                                                                                <outcome value='true'>
+                                                                                                                                    <block>
+                                                                                                                                        <block>
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='allNetworksList.' value='' />
+                                                                                                                                            </set>
+                                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                          resource="network-resources"
+                                                                                                                                                          key="selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'"
+                                                                                                                                                          local-only="false"
+                                                                                                                                                          pfx="allNetworksList" >
+                                                                                                                                                <outcome value='success'></outcome>
+                                                                                                                                                <outcome value='Other'></outcome>
+                                                                                                                                                <outcome value='not-found'></outcome>
+                                                                                                                                            </get-resource>
+                                                                                                                                            <for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >
+                                                                                                                                                <switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>
+                                                                                                                                                    <outcome value='true'>
+                                                                                                                                                        <switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>
+                                                                                                                                                            <outcome value='true'>
+                                                                                                                                                                <set>
+                                                                                                                                                                    <parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
+                                                                                                                                                                </set>
+                                                                                                                                                            </outcome>
+                                                                                                                                                        </switch>
+                                                                                                                                                    </outcome>
+                                                                                                                                                </switch>
+                                                                                                                                            </for>
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.pce-src-node.' value='' />
+                                                                                                                                            </set>
+                                                                                                                                            <set>
+                                                                                                                                                <!--<parameter name='tmp.pce-src-node' value="`$param-prefix-domainA-pnfName[0] + '-' +-->
+                                                                                                                                                <!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->
+                                                                                                                                                <!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->
+                                                                                                                                                <!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->
+                                                                                                                                                <!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->
+                                                                                                                                                <!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->
+                                                                                                                                                <!--                                                   1 + '-' +-->
+                                                                                                                                                <!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->
+                                                                                                                                                <!--                                                   $param-prefix-domainA-pnfName[8]`" />-->
+                                                                                                                                                <parameter name='tmp.pce-src-node' value="`$param-prefix-domainA-pnfName[0] + '-' +
+                                                   $param-prefix-domainA-pnfName[1] + '-' +
+                                                   $param-prefix-domainA-pnfName[2] + '-' +
+                                                   $param-prefix-domainA-pnfName[3] + '-' +
+                                                   $param-prefix-domainA-pnfName[4] + '-' +
+                                                   $param-prefix-domainA-pnfName[5] + '-' +
+                                                   $otnTopoIdSrc + '-' +
+                                                   $param-prefix-domainA-pnfName[7] + '-' +
+                                                   $param-prefix-domainA-pnfName[8]`" />
+                                                                                                                                            </set>
+                                                                                                                                            <set>
+                                                                                                                                                <!--<parameter name='tmp.srcTtpOtnLayer' value="`$tmp.pce-src-node + '-' + -->
+                                                                                                                                                <!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->
+                                                                                                                                                <!--                                             $tmp.source.ttp-id`" />-->
+                                                                                                                                                <parameter name='tmp.srcTtpOtnLayer' value="`$tmp.pce-src-node`" />
+                                                                                                                                            </set>
+                                                                                                                                            <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' ></call>
+                                                                                                                                        </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.the-vpn-binding.' value="" />
+                                                                                                                                                                        </set>
+                                                                                                                                                                        <set>
+                                                                                                                                                                            <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
+                                                                                                                                                                        </set>
+                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
+                                                                                                                                                                            <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
+                                                                                                                                                                            <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
+                                                                                                                                                                            <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                            <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $bwToBeDecreased`' />
+                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                        </update>
+                                                                                                                                                                    </block>
+                                                                                                                                                                </outcome>
+                                                                                                                                                                <outcome value='false'></outcome>
+                                                                                                                                                            </switch>
+                                                                                                                                                        </block>
+                                                                                                                                                    </for>
+                                                                                                                                                </block>
+                                                                                                                                            </outcome>
+                                                                                                                                            <outcome value='not-found'>
+                                                                                                                                                <return status='failure'>
+                                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                                    <parameter name="error-message" value="`'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>
+                                                                                                                                        <set>
+                                                                                                                                            <parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />
+                                                                                                                                        </set>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.leafconn.access-provider-id + '-clientId-' +
+                                                   $tmp.leafconn.access-client-id + '-topologyId-' +
+                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +
+                                                   $tmp.leafconn.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>
+                                                                                                                                        </block>
+                                                                                                                                        <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 + '/etht-svc-end-points=' + $tmp.LEAF.uni-p-interface-long`" />
+                                                                                                                                            <!--<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'>
+                                                                                                                                                <block atomic='true'>
+                                                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                            key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>
+                                                                                                                                                        <parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />
+                                                                                                                                                        <parameter name='operational-status' value='Modified' />
+                                                                                                                                                    </update>
+                                                                                                                                                </block>
+                                                                                                                                            </outcome>
+                                                                                                                                            <outcome value='false'>
+                                                                                                                                                <return status='failure'>
+                                                                                                                                                    <parameter name='error-code' value='' />
+                                                                                                                                                    <parameter name='error-message' value='Root Connectivity was not found' />
+                                                                                                                                                </return>
+                                                                                                                                            </outcome>
+                                                                                                                                        </switch>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='false'>
+                                                                                                                                    <switch test="`$tmp.stillHasUni`">
+                                                                                                                                        <outcome value='true'>
+                                                                                                                                            <block>
+                                                                                                                                                <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' ></call>
+                                                                                                                                                <block>
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />
+                                                                                                                                                    </set>
+                                                                                                                                                    <block atomic="true">
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.leafconn.access-provider-id + '-clientId-' +
+                                                   $tmp.leafconn.access-client-id + '-topologyId-' +
+                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +
+                                                   $tmp.leafconn.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>
+                                                                                                                                                    </block>
+                                                                                                                                                    <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 + '/etht-svc-end-points=' + $tmp.LEAF.uni-p-interface-long`" />
+                                                                                                                                                        <!--<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'>
+                                                                                                                                                            <block atomic='true'>
+                                                                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                        key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>
+                                                                                                                                                                    <parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />
+                                                                                                                                                                    <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                </update>
+                                                                                                                                                            </block>
+                                                                                                                                                        </outcome>
+                                                                                                                                                        <outcome value='false'>
+                                                                                                                                                            <return status='failure'>
+                                                                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                                                                <parameter name='error-message' value='Root Connectivity was not found' />
+                                                                                                                                                            </return>
+                                                                                                                                                        </outcome>
+                                                                                                                                                    </switch>
+                                                                                                                                                </block>
+                                                                                                                                            </block>
+                                                                                                                                        </outcome>
+                                                                                                                                        <outcome value='false'>
+                                                                                                                                            <block>
+                                                                                                                                                <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' ></call>
+                                                                                                                                                <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                        key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'></delete>
+                                                                                                                                                <block atomic="true">
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.the-connectivity.access-provider-id + '-clientId-' +
+                                                   $tmp.the-connectivity.access-client-id + '-topologyId-' +
+                                                   $tmp.the-connectivity.access-topology-id + '-nodeId-' +
+                                                   $tmp.the-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>
+                                                                                                                                                    <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.the-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>
+                                                                                                                                                </block>
+                                                                                                                                                <switch test="`$tmp.MMstillHasUni`">
+                                                                                                                                                    <outcome value='true'>
+                                                                                                                                                        <block>
+                                                                                                                                                            <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'>
+                                                                                                                                                                    <block atomic='true'>
+                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                                key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>
+                                                                                                                                                                            <parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />
+                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                        </update>
+                                                                                                                                                                    </block>
+                                                                                                                                                                </outcome>
+                                                                                                                                                                <outcome value='false'>
+                                                                                                                                                                    <return status='failure'>
+                                                                                                                                                                        <parameter name='error-code' value='' />
+                                                                                                                                                                        <parameter name='error-message' value='Root Connectivity was not found' />
+                                                                                                                                                                    </return>
+                                                                                                                                                                </outcome>
+                                                                                                                                                            </switch>
+                                                                                                                                                        </block>
+                                                                                                                                                    </outcome>
+                                                                                                                                                    <outcome value='false'>
+                                                                                                                                                        <block>
+                                                                                                                                                            <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">
+                                                                                                                                                                                                                <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' >
+                                                                                                                                                                                                                                                <outcome value='success'>
+                                                                                                                                                                                                                                                    <block>
+                                                                                                                                                                                                                                                        <set>
+                                                                                                                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                                                                                                                                            <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                                                                                                                                            <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                                                                                                                                            <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                                                                                                                                                            <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                                                                                                                                                            <!--<parameter name="format" value="json"/>-->
+                                                                                                                                                                                                                                                            <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                                                                                                                                                            <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                                                                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                                                                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                                                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                                                                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                                                                                                        </set>
+                                                                                                                                                                                                                                                    </block>
+                                                                                                                                                                                                                                                </outcome>
+                                                                                                                                                                                                                                                <outcome value='not-found'>
+                                                                                                                                                                                                                                                    <return status='failure'>
+                                                                                                                                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                                                                                                                    </return>
+                                                                                                                                                                                                                                                </outcome>
+                                                                                                                                                                                                                                                <outcome value='Other'>
+                                                                                                                                                                                                                                                    <return status='failure'>
+                                                                                                                                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                                                                                                                    </return>
+                                                                                                                                                                                                                                                </outcome>
+                                                                                                                                                                                                                                            </get-resource>
+                                                                                                                                                                                                                                            <break/>
+                                                                                                                                                                                                                                        </block>
+                                                                                                                                                                                                                                    </outcome>
+                                                                                                                                                                                                                                </switch>
+                                                                                                                                                                                                                            </for>
+                                                                                                                                                                                                                        </block>
+                                                                                                                                                                                                                    </outcome>
+                                                                                                                                                                                                                    <outcome value='not-found'>
+                                                                                                                                                                                                                        <return status='failure'>
+                                                                                                                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                                                                                        </return>
+                                                                                                                                                                                                                    </outcome>
+                                                                                                                                                                                                                    <outcome value='Other'>
+                                                                                                                                                                                                                        <return status='failure'>
+                                                                                                                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                                                                                        </return>
+                                                                                                                                                                                                                    </outcome>
+                                                                                                                                                                                                                </get-resource>
+                                                                                                                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                                                                                                                                    <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />-->
+                                                                                                                                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.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>
+                                                                                                                                                                                                                <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>
+                                                                                                                                                                                                                <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' ></delete>
+                                                                                                                                                                                                            </block>
+                                                                                                                                                                                                        </outcome>
+                                                                                                                                                                                                        <outcome value='not-found'>
+                                                                                                                                                                                                            <return status='failure'>
+                                                                                                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                                                                                                                            </return>
+                                                                                                                                                                                                        </outcome>
+                                                                                                                                                                                                        <outcome value='failure'>
+                                                                                                                                                                                                            <return status='failure'>
+                                                                                                                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                                                                                                                <parameter name='error-message' value='' />
+                                                                                                                                                                                                            </return>
+                                                                                                                                                                                                        </outcome>
+                                                                                                                                                                                                    </get-resource>
+                                                                                                                                                                                                </block>
+                                                                                                                                                                                            </outcome>
+                                                                                                                                                                                            <outcome value='uni'>
+                                                                                                                                                                                                <block atomic="true">
+                                                                                                                                                                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                                                                                                            key='uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value'></delete>
+                                                                                                                                                                                                </block>
+                                                                                                                                                                                            </outcome>
+                                                                                                                                                                                        </switch>
+                                                                                                                                                                                    </for>
+                                                                                                                                                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                                            key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'></delete>
+                                                                                                                                                                                </block>
+                                                                                                                                                                            </outcome>
+                                                                                                                                                                        </get-resource>
+                                                                                                                                                                    </outcome>
+                                                                                                                                                                </switch>
+                                                                                                                                                            </for>
+                                                                                                                                                            <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                    key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'></delete>
+                                                                                                                                                        </block>
+                                                                                                                                                    </outcome>
+                                                                                                                                                </switch>
+                                                                                                                                            </block>
+                                                                                                                                        </outcome>
+                                                                                                                                    </switch>
+                                                                                                                                </outcome>
+                                                                                                                            </switch>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </switch>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </switch>
+                                                                                                </block>
                                                                                             </outcome>
-                                                                                        </execute>
-                                                                                    </outcome>
-                                                                                    <outcome value=''></outcome>
-                                                                                </switch>
-                                                                                <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' ></delete>
-                                                                            </block>
-                                                                        </outcome>
-                                                                        <outcome value='not-found'>
-                                                                            <return status='failure'>
-                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                <parameter name="error-code" value="500" />
-                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                            </return>
-                                                                        </outcome>
-                                                                        <outcome value='failure'>
-                                                                            <return status='failure'>
-                                                                                <parameter name='error-code' value='' />
-                                                                                <parameter name='error-message' value='' />
-                                                                            </return>
-                                                                        </outcome>
-                                                                    </get-resource>
-                                                                </block>
-                                                            </outcome>
-                                                            <outcome value='uni'>
-                                                                <block atomic="true">
-                                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
-                                                                            key='uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value'></delete>
-                                                                </block>
-                                                            </outcome>
-                                                        </switch>
-                                                    </for>
-                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                            key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'></delete>
-                                                </block>
-                                            </outcome>
-                                            <outcome value='not-found'>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                </return>
-                                            </outcome>
-                                            <outcome value='failure'>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='' />
-                                                    <parameter name='error-message' value='' />
-                                                </return>
-                                            </outcome>
-                                        </get-resource>
-                                    </outcome>
-                                </switch>
-                            </for>
+                                                                                        </get-resource>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                            </switch>
+                                                                        </for>
+                                                                    </block>
+                                                                </outcome>
+                                                            </switch>
+                                                        </block>
+                                                    </outcome>
+                                                </get-resource>
+                                            </block>
+                                        </outcome>
+                                    </get-resource>
+                                </for>
+                                <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' ></call>
+                            </block>
                         </outcome>
                     </switch>
                 </outcome>
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml
index 6c46a403..76cea192 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml
@@ -1112,206 +1112,104 @@
                                                                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' ></call>
                                                                                                                                                 </block>
                                                                                                                                                 <set>
-                                                                                                                                                    <parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
-                                                                                                                                                    <parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />
-                                                                                                                                                    <!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->
-                                                                                                                                                    <!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->
-                                                                                                                                                    <!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->
-                                                                                                                                                    <!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->
-                                                                                                                                                    <!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->
-                                                                                                                                                    <!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->
+                                                                                                                                                    <parameter name='tmp.aai.all-vpn-bindings.' value='' />
                                                                                                                                                 </set>
-                                                                                                                                                <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' ></call>
-                                                                                                                                                <switch test="`$found-connectivity`">
-                                                                                                                                                    <outcome value='false'>
-                                                                                                                                                        <return status='failure'>
-                                                                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                                                                            <parameter name="error-message" value="LEAF CONN DOES NOT EXIST BUT IT SHOULD BE." />
-                                                                                                                                                        </return>
-                                                                                                                                                    </outcome>
-                                                                                                                                                    <outcome value='true'>
-                                                                                                                                                        <block atomic='true'>
-                                                                                                                                                            <for silentFailure='true' index='cridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >
-                                                                                                                                                                <switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>
-                                                                                                                                                                    <outcome value='vpn-binding'>
-                                                                                                                                                                        <block atomic="true">
-                                                                                                                                                                            <set>
-                                                                                                                                                                                <parameter name='tmp.aai.vpn-binding.' value='' />
-                                                                                                                                                                            </set>
-                                                                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                                                                          resource="vpn-binding"
-                                                                                                                                                                                          key="vpn-binding.vpn-id = $tmp.the-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'>
-                                                                                                                                                                                                <switch test="`$tmp.isBwIncreased`">
-                                                                                                                                                                                                    <outcome value='true'>
-                                                                                                                                                                                                        <block atomic='true'>
-                                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >
-                                                                                                                                                                                                                <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />
-                                                                                                                                                                                                                <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />
-                                                                                                                                                                                                                <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
-                                                                                                                                                                                                                <parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher + $tmp.delta`' />
-                                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                                            </update>
-                                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                                                                                                                    key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
-                                                                                                                                                                                                                <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
-                                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                                                <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
-                                                                                                                                                                                                                <!--<parameter name='cir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                                                <!--<parameter name='eir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                                            </update>
-                                                                                                                                                                                                        </block>
-                                                                                                                                                                                                    </outcome>
-                                                                                                                                                                                                    <outcome value='false'>
-                                                                                                                                                                                                        <block atomic='true'>
-                                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >
-                                                                                                                                                                                                                <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />
-                                                                                                                                                                                                                <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />
-                                                                                                                                                                                                                <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
-                                                                                                                                                                                                                <parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher - $tmp.delta`' />
-                                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                                            </update>
-                                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                                                                                                                    key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
-                                                                                                                                                                                                                <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
-                                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                                                <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
-                                                                                                                                                                                                                <!--<parameter name='cir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                                                <!--<parameter name='eir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                                            </update>
-                                                                                                                                                                                                        </block>
-                                                                                                                                                                                                    </outcome>
-                                                                                                                                                                                                </switch>
-                                                                                                                                                                                            </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>
-                                                                                                                                                    </outcome>
-                                                                                                                                                </switch>
-                                                                                                                                                <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'>
-                                                                                                                                                        <block atomic='true'>
-                                                                                                                                                            <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.ROOT.connectivity.relationship-list.relationship_length`' >
-                                                                                                                                                                <switch test='`$tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].related-to`'>
-                                                                                                                                                                    <outcome value='vpn-binding'>
-                                                                                                                                                                        <block atomic="true">
-                                                                                                                                                                            <set>
-                                                                                                                                                                                <parameter name='tmp.aai.vpn-binding.' value='' />
-                                                                                                                                                                            </set>
-                                                                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                                                                          resource="vpn-binding"
-                                                                                                                                                                                          key="vpn-binding.vpn-id = $tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
-                                                                                                                                                                                          local-only="false"
-                                                                                                                                                                                          pfx="tmp.aai.vpn-binding" >
-                                                                                                                                                                                <outcome value='success'>
-                                                                                                                                                                                    <block atomic="true">
+                                                                                                                                                <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.the-vpn-binding.' value="" />
+                                                                                                                                                                                </set>
+                                                                                                                                                                                <set>
+                                                                                                                                                                                    <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
+                                                                                                                                                                                </set>
+                                                                                                                                                                                <for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >
+                                                                                                                                                                                    <switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>
+                                                                                                                                                                                        <outcome value='connectivity'>
+                                                                                                                                                                                            <block atomic="true">
+                                                                                                                                                                                                <set>
+                                                                                                                                                                                                    <parameter name='tmp.the-connectivity.' value='' />
+                                                                                                                                                                                                </set>
+                                                                                                                                                                                                <set>
+                                                                                                                                                                                                    <parameter name='tmp.the-connectivity.' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />
+                                                                                                                                                                                                </set>
+                                                                                                                                                                                            </block>
+                                                                                                                                                                                        </outcome>
+                                                                                                                                                                                    </switch>
+                                                                                                                                                                                </for>
+                                                                                                                                                                                <switch test="`$tmp.isBwIncreased`">
+                                                                                                                                                                                    <outcome value='true'>
                                                                                                                                                                                         <block atomic='true'>
-                                                                                                                                                                                            <switch test="`$tmp.aai.vpn-binding.ops-note == $tmp.srcTtpOtnLayer `">
-                                                                                                                                                                                                <outcome value='true'>
-                                                                                                                                                                                                    <switch test="`$tmp.isBwIncreased`">
-                                                                                                                                                                                                        <outcome value='true'>
-                                                                                                                                                                                                            <block atomic='true'>
-                                                                                                                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                                                                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >
-                                                                                                                                                                                                                    <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />
-                                                                                                                                                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />
-                                                                                                                                                                                                                    <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
-                                                                                                                                                                                                                    <parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher + $tmp.delta`' />
-                                                                                                                                                                                                                    <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                                                </update>
-                                                                                                                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                                                                                                                        key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
-                                                                                                                                                                                                                    <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
-                                                                                                                                                                                                                    <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                                                    <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
-                                                                                                                                                                                                                    <!--<parameter name='cir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                                                    <!--<parameter name='eir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                                                </update>
-                                                                                                                                                                                                            </block>
-                                                                                                                                                                                                        </outcome>
-                                                                                                                                                                                                        <outcome value='false'>
-                                                                                                                                                                                                            <block atomic='true'>
-                                                                                                                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                                                                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >
-                                                                                                                                                                                                                    <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />
-                                                                                                                                                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />
-                                                                                                                                                                                                                    <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
-                                                                                                                                                                                                                    <parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher - $tmp.delta`' />
-                                                                                                                                                                                                                    <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                                                </update>
-                                                                                                                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                                                                                                                        key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
-                                                                                                                                                                                                                    <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
-                                                                                                                                                                                                                    <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                                                    <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
-                                                                                                                                                                                                                    <!--<parameter name='cir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                                                    <!--<parameter name='eir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                                                </update>
-                                                                                                                                                                                                            </block>
-                                                                                                                                                                                                        </outcome>
-                                                                                                                                                                                                    </switch>
-                                                                                                                                                                                                </outcome>
-                                                                                                                                                                                                <outcome value='false'></outcome>
-                                                                                                                                                                                            </switch>
+                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
+                                                                                                                                                                                                <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
+                                                                                                                                                                                                <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
+                                                                                                                                                                                                <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                                <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $tmp.delta`' />
+                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                            </update>
+                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                                                    key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
+                                                                                                                                                                                                <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
+                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
+                                                                                                                                                                                                <!--<parameter name='cir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                <!--<parameter name='eir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                            </update>
                                                                                                                                                                                         </block>
-                                                                                                                                                                                    </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>
+                                                                                                                                                                                    </outcome>
+                                                                                                                                                                                    <outcome value='false'>
+                                                                                                                                                                                        <block atomic='true'>
+                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
+                                                                                                                                                                                                <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
+                                                                                                                                                                                                <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
+                                                                                                                                                                                                <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                                <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $tmp.delta`' />
+                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                            </update>
+                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                                                    key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
+                                                                                                                                                                                                <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
+                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
+                                                                                                                                                                                                <!--<parameter name='cir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                <!--<parameter name='eir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                            </update>
+                                                                                                                                                                                        </block>
+                                                                                                                                                                                    </outcome>
+                                                                                                                                                                                </switch>
+                                                                                                                                                                            </block>
+                                                                                                                                                                        </outcome>
+                                                                                                                                                                        <outcome value='false'></outcome>
+                                                                                                                                                                    </switch>
+                                                                                                                                                                </block>
                                                                                                                                                             </for>
                                                                                                                                                         </block>
                                                                                                                                                     </outcome>
-                                                                                                                                                    <outcome value='false'>
+                                                                                                                                                    <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='Root Connectivity was not found but it should have been!' />
+                                                                                                                                                            <parameter name='error-message' value='' />
                                                                                                                                                         </return>
                                                                                                                                                     </outcome>
-                                                                                                                                                </switch>
+                                                                                                                                                </get-resource>
                                                                                                                                             </block>
                                                                                                                                         </block>
                                                                                                                                     </outcome>
-- 
cgit 1.2.3-korg