From 295501fd686a0c9281d92821f0aad194a6ce101c Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Fri, 6 May 2022 17:30:56 -0400
Subject: Temporarily removing the 'unsubscribe' operation from CLL deletion
 call flow.

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

Former-commit-id: 1c64137d9c5d0b21275c528d5b3fdf57e142c9fd
---
 ...-API_cll-vnf-topology-operation-cll-delete.json | 7539 ++++++++++----------
 ...E-API_cll-vnf-topology-operation-cll-delete.xml |   67 +-
 2 files changed, 3826 insertions(+), 3780 deletions(-)

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 5fb058b7..21b2270a 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": "b3c61f0e.0e195",
+        "id": "c958c928.fc7fe",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 183.56666564941406,
-        "y": 161.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 157.88330078125,
+        "y": 156.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a48494fd.8b7d"
+                "8b28c589.12d4a8"
             ]
         ]
     },
     {
-        "id": "a48494fd.8b7d",
+        "id": "8b28c589.12d4a8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,11102 +22,11147 @@
         "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": 481.8523864746094,
-        "y": 217.8047742843628,
-        "z": "1b4ba1fc.83240e",
+        "x": 456.1690216064453,
+        "y": 212.52387523651123,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6868eec5.8eff3"
+                "39af1a7f.521d1e"
             ]
         ]
     },
     {
-        "id": "6868eec5.8eff3",
+        "id": "39af1a7f.521d1e",
         "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": 487.99530029296875,
-        "y": 302.5666961669922,
-        "z": "1b4ba1fc.83240e",
+        "x": 462.3119354248047,
+        "y": 297.2857971191406,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "42b0c518.6297dc"
+                "7656a28c.ac0ab4"
             ]
         ]
     },
     {
-        "id": "42b0c518.6297dc",
+        "id": "7656a28c.ac0ab4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 837.5666961669922,
-        "y": 361.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 811.8833312988281,
+        "y": 356.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "fec7e153.ea24b",
-                "30575656.398222",
-                "189baf2e.d72529"
+                "fdfa5720.e8c418",
+                "3ac5985c.f18eb8",
+                "9905a45e.0c7298"
             ]
         ]
     },
     {
-        "id": "fec7e153.ea24b",
+        "id": "fdfa5720.e8c418",
         "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": 1138.9001922607422,
-        "y": 632.4969635009766,
-        "z": "1b4ba1fc.83240e",
+        "x": 1113.2168273925781,
+        "y": 627.216064453125,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "30575656.398222",
+        "id": "3ac5985c.f18eb8",
         "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": 1160.3286590576172,
-        "y": 334.8999786376953,
-        "z": "1b4ba1fc.83240e",
+        "x": 1134.6452941894531,
+        "y": 329.61907958984375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "27345488.79731c",
-                "7e08d842.a4058",
-                "14b3e2f5.681565"
+                "af28127c.d820d8",
+                "63469daf.849ae4",
+                "71a31314.344984"
             ]
         ]
     },
     {
-        "id": "27345488.79731c",
+        "id": "af28127c.d820d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1385.3286590576172,
-        "y": 192.8999786376953,
-        "z": "1b4ba1fc.83240e",
+        "x": 1359.6452941894531,
+        "y": 187.61907958984375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a8487fba.2cb09"
+                "a801d61e.c75b88"
             ]
         ]
     },
     {
-        "id": "7e08d842.a4058",
+        "id": "63469daf.849ae4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1380.8196258544922,
-        "y": 262.47401428222656,
-        "z": "1b4ba1fc.83240e",
+        "x": 1355.1362609863281,
+        "y": 257.193115234375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "26698778.b41f38"
+                "3d43dcc5.27db6c"
             ]
         ]
     },
     {
-        "id": "14b3e2f5.681565",
+        "id": "71a31314.344984",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1369.3286590576172,
-        "y": 308.8999786376953,
-        "z": "1b4ba1fc.83240e",
+        "x": 1343.6452941894531,
+        "y": 303.61907958984375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "e03cea3a.82881"
+                "858124ec.81d0f8"
             ]
         ]
     },
     {
-        "id": "b94ba14f.99f16",
+        "id": "d6a6cf8b.cb8788",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 1139.3286590576172,
-        "y": 222.8999786376953,
-        "z": "1b4ba1fc.83240e",
+        "x": 1113.6452941894531,
+        "y": 217.61907958984375,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "189baf2e.d72529",
+        "id": "9905a45e.0c7298",
         "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": 1127.3286590576172,
-        "y": 274.8999786376953,
-        "z": "1b4ba1fc.83240e",
+        "x": 1101.6452941894531,
+        "y": 269.61907958984375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "a8487fba.2cb09",
+        "id": "a801d61e.c75b88",
         "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": 1625.5666961669922,
-        "y": 189.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 1599.8833312988281,
+        "y": 184.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7bdf94e9.87c2bc",
-                "770405a0.0ddc6c"
+                "e0f3a386.0fe6",
+                "301731c1.c04b8e"
             ]
         ]
     },
     {
-        "id": "26698778.b41f38",
+        "id": "3d43dcc5.27db6c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1535.6290740966797,
-        "y": 265.4264373779297,
-        "z": "1b4ba1fc.83240e",
+        "x": 1509.9457092285156,
+        "y": 260.1455383300781,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "e03cea3a.82881",
+        "id": "858124ec.81d0f8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1539.5666961669922,
-        "y": 309.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 1513.8833312988281,
+        "y": 304.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "7bdf94e9.87c2bc",
+        "id": "e0f3a386.0fe6",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1830.5666961669922,
-        "y": 226.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 1804.8833312988281,
+        "y": 221.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "79eb131c.176e44"
+                "128d7cd4.e28ffb"
             ]
         ]
     },
     {
-        "id": "770405a0.0ddc6c",
+        "id": "301731c1.c04b8e",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1840.5666961669922,
-        "y": 153.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 1814.8833312988281,
+        "y": 148.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "79eb131c.176e44",
+        "id": "128d7cd4.e28ffb",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1823.5666961669922,
-        "y": 301.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 1797.8833312988281,
+        "y": 296.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "9d4673ee.891e5",
-                "1a86601d.154a48",
-                "d6a895b8.ea711",
-                "3f0be5e9.f7ecd2",
-                "eca8d05b.38fb78"
+                "1f66e7ef.b5efe",
+                "b392bf29.b70228",
+                "49e6917b.6d0138",
+                "391971a2.696836",
+                "7226ce6d.bf87d8"
             ]
         ]
     },
     {
-        "id": "fd1dcea.f15be3",
+        "id": "c1485ca8.2ec768",
         "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": 2309.566696166992,
-        "y": 352.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 2283.883331298828,
+        "y": 347.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "2555bbc5.26f19c",
-                "93423d46.b14978",
-                "4c790d06.05e3ec"
+                "42d08205.101f24",
+                "280ca852.5c8478",
+                "9260e446.97cb2"
             ]
         ]
     },
     {
-        "id": "2555bbc5.26f19c",
+        "id": "42d08205.101f24",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2525.566696166992,
-        "y": 419.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 2499.883331298828,
+        "y": 414.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "cc8af145.1212b8"
+                "1cda58ca.c0ca0f"
             ]
         ]
     },
     {
-        "id": "93423d46.b14978",
+        "id": "280ca852.5c8478",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2526.057662963867,
-        "y": 319.14064025878906,
-        "z": "1b4ba1fc.83240e",
+        "x": 2500.374298095703,
+        "y": 313.8597412109375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "fbfefea4.a2d338"
+                "37d08b63.267f54"
             ]
         ]
     },
     {
-        "id": "4c790d06.05e3ec",
+        "id": "9260e446.97cb2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2521.566696166992,
-        "y": 368.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 2495.883331298828,
+        "y": 363.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d962a49c.c504b8"
+                "3db04a4.fcc1db6"
             ]
         ]
     },
     {
-        "id": "9d4673ee.891e5",
+        "id": "1f66e7ef.b5efe",
         "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": 2026.5666961669922,
-        "y": 333.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 2000.8833312988281,
+        "y": 328.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d3206ca7.c31d1",
-                "fd1dcea.f15be3",
-                "426ddfc0.c628b",
-                "d0874bda.7e1ac"
+                "ae5848cb.e1b328",
+                "c1485ca8.2ec768",
+                "c9139602.db9618",
+                "aadbe6b3.d2bba"
             ]
         ]
     },
     {
-        "id": "d3206ca7.c31d1",
+        "id": "ae5848cb.e1b328",
         "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": 2306.566696166992,
-        "y": 271.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 2280.883331298828,
+        "y": 266.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "3f0be5e9.f7ecd2",
+        "id": "391971a2.696836",
         "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": 2000.5666961669922,
-        "y": 283.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 1974.8833312988281,
+        "y": 278.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "1a86601d.154a48",
+        "id": "b392bf29.b70228",
         "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": 2043.5666961669922,
-        "y": 142.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 2017.8833312988281,
+        "y": 137.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "d6a895b8.ea711",
+        "id": "49e6917b.6d0138",
         "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": 2055.566696166992,
-        "y": 183.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 2029.8833312988281,
+        "y": 178.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "c8d3ec04.e3f8a8",
+        "id": "33859df.81a8362",
         "type": "comment",
         "name": "The following two nodes are for PCE",
         "info": "",
         "comments": "",
-        "x": 2080.566696166992,
-        "y": 95.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 2054.883331298828,
+        "y": 90.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "d7434469.de441",
+        "id": "16362fdd.257198",
         "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": 2000.5666961669922,
-        "y": 229.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 1974.8833312988281,
+        "y": 224.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "fbfefea4.a2d338",
+        "id": "37d08b63.267f54",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2704.566696166992,
-        "y": 321.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 2678.883331298828,
+        "y": 316.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "d962a49c.c504b8",
+        "id": "3db04a4.fcc1db6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2704.504196166992,
-        "y": 370.70692443847656,
-        "z": "1b4ba1fc.83240e",
+        "x": 2678.820831298828,
+        "y": 365.426025390625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "cc8af145.1212b8",
+        "id": "1cda58ca.c0ca0f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2706.504196166992,
-        "y": 421.70692443847656,
-        "z": "1b4ba1fc.83240e",
+        "x": 2680.820831298828,
+        "y": 416.426025390625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "30ad22b3.c0b5e6"
+                "8ac18ed0.a417b8"
             ]
         ]
     },
     {
-        "id": "30ad22b3.c0b5e6",
+        "id": "8ac18ed0.a417b8",
         "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": 2999.504196166992,
-        "y": 368.70692443847656,
-        "z": "1b4ba1fc.83240e",
+        "x": 2973.820831298828,
+        "y": 363.426025390625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "5234d98d.9f94d",
-                "83314642.8bc358",
-                "55523c43.af8514"
+                "2f801aa3.62899e",
+                "8d0c42c.041064",
+                "39093638.1e8092"
             ]
         ]
     },
     {
-        "id": "83314642.8bc358",
+        "id": "8d0c42c.041064",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3302.995132446289,
-        "y": 25.280899047851562,
-        "z": "1b4ba1fc.83240e",
+        "x": 3277.311767578125,
+        "y": 20,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "f9033318.3a82e"
+                "25cca067.117fb8"
             ]
         ]
     },
     {
-        "id": "f9033318.3a82e",
+        "id": "25cca067.117fb8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3480.566665649414,
-        "y": 25.566665649414062,
-        "z": "1b4ba1fc.83240e",
+        "x": 3454.88330078125,
+        "y": 20.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "55523c43.af8514",
+        "id": "39093638.1e8092",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3298.504165649414,
-        "y": 74.70692443847656,
-        "z": "1b4ba1fc.83240e",
+        "x": 3272.82080078125,
+        "y": 69.426025390625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "ed442c0e.cae2b8"
+                "45859305.7fd9ac"
             ]
         ]
     },
     {
-        "id": "ed442c0e.cae2b8",
+        "id": "45859305.7fd9ac",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3480.504165649414,
-        "y": 74.70692443847656,
-        "z": "1b4ba1fc.83240e",
+        "x": 3454.82080078125,
+        "y": 69.426025390625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "5234d98d.9f94d",
+        "id": "2f801aa3.62899e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3302.504165649414,
-        "y": 125.70692443847656,
-        "z": "1b4ba1fc.83240e",
+        "x": 3276.82080078125,
+        "y": 120.426025390625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7ab56666.401778"
+                "6880d10c.55d838"
             ]
         ]
     },
     {
-        "id": "7ab56666.401778",
+        "id": "6880d10c.55d838",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3482.504165649414,
-        "y": 125.70692443847656,
-        "z": "1b4ba1fc.83240e",
+        "x": 3456.82080078125,
+        "y": 120.426025390625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6c101067.0de5e8"
+                "e9027b62.9e003"
             ]
         ]
     },
     {
-        "id": "6c101067.0de5e8",
+        "id": "e9027b62.9e003",
         "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": 3018.566696166992,
-        "y": 496.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 2992.883331298828,
+        "y": 491.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "646ab584.76e45c",
-                "ffe35827.b1255"
+                "72fd55d0.427e94",
+                "bb0cc7e.bea8238"
             ]
         ]
     },
     {
-        "id": "ffe35827.b1255",
+        "id": "bb0cc7e.bea8238",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3358.566665649414,
-        "y": 267.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 3332.88330078125,
+        "y": 262.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "646ab584.76e45c",
+        "id": "72fd55d0.427e94",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3357.566665649414,
-        "y": 321.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 3331.88330078125,
+        "y": 316.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7579f2ad.787884"
+                "32c96151.c1aa2e"
             ]
         ]
     },
     {
-        "id": "76ff4ece.4716a",
+        "id": "a8b50f84.db474",
         "type": "outcome",
         "name": "network-policy",
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4102.566665649414,
-        "y": 275.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 4076.88330078125,
+        "y": 270.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "522d04a5.cf337c"
+                "9b999d2e.09c6d8"
             ]
         ]
     },
     {
-        "id": "522d04a5.cf337c",
+        "id": "9b999d2e.09c6d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4279.566543579102,
-        "y": 268.56654357910156,
-        "z": "1b4ba1fc.83240e",
+        "x": 4253.8831787109375,
+        "y": 263.28564453125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "ff700b35.f88fd",
-                "a95b674a.f71a"
+                "13e93d82.810a42",
+                "3997cabd.9c2abe"
             ]
         ]
     },
     {
-        "id": "7579f2ad.787884",
+        "id": "32c96151.c1aa2e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3521.566665649414,
-        "y": 247.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 3495.88330078125,
+        "y": 242.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "687e4dd8.df6004",
-                "7a6c4648.75b9a"
+                "6a03759c.b65ec4",
+                "2a091548.5d967a"
             ]
         ]
     },
     {
-        "id": "687e4dd8.df6004",
+        "id": "6a03759c.b65ec4",
         "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": 3802.566665649414,
-        "y": 203.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 3776.88330078125,
+        "y": 198.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "498ba81e.b961f8"
+                "6d840347.ad0de4"
             ]
         ]
     },
     {
-        "id": "498ba81e.b961f8",
+        "id": "6d840347.ad0de4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4064.566665649414,
-        "y": 203.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 4038.88330078125,
+        "y": 198.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "76ff4ece.4716a"
+                "a8b50f84.db474"
             ]
         ]
     },
     {
-        "id": "ff700b35.f88fd",
+        "id": "13e93d82.810a42",
         "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": 4522.566543579102,
-        "y": 225.56654357910156,
-        "z": "1b4ba1fc.83240e",
+        "x": 4496.8831787109375,
+        "y": 220.28564453125,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "a95b674a.f71a",
+        "id": "3997cabd.9c2abe",
         "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": 4511.566543579102,
-        "y": 280.56654357910156,
-        "z": "1b4ba1fc.83240e",
+        "x": 4485.8831787109375,
+        "y": 275.28564453125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "4864ccac.4c9fb4",
-                "b78f5441.c1bfd",
-                "4088ff64.ba745"
+                "1629cf91.336928",
+                "7e24e3bc.4dd5bc",
+                "e3d66604.874708"
             ]
         ]
     },
     {
-        "id": "4088ff64.ba745",
+        "id": "e3d66604.874708",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4764.566665649414,
-        "y": 166.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 4738.88330078125,
+        "y": 161.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "745cd258.155a8c"
+                "9dd0299.013fdd8"
             ]
         ]
     },
     {
-        "id": "745cd258.155a8c",
+        "id": "9dd0299.013fdd8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4913.138198852539,
-        "y": 166.85243225097656,
-        "z": "1b4ba1fc.83240e",
+        "x": 4887.454833984375,
+        "y": 161.571533203125,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "d814f814.02812",
+        "id": "1b29ba86.57c2a5",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4912.075698852539,
-        "y": 210.99269104003906,
-        "z": "1b4ba1fc.83240e",
+        "x": 4886.392333984375,
+        "y": 205.7117919921875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "b78f5441.c1bfd",
+        "id": "7e24e3bc.4dd5bc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4753.075698852539,
-        "y": 210.99269104003906,
-        "z": "1b4ba1fc.83240e",
+        "x": 4727.392333984375,
+        "y": 205.7117919921875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d814f814.02812"
+                "1b29ba86.57c2a5"
             ]
         ]
     },
     {
-        "id": "4864ccac.4c9fb4",
+        "id": "1629cf91.336928",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4760.075698852539,
-        "y": 289.99269104003906,
-        "z": "1b4ba1fc.83240e",
+        "x": 4734.392333984375,
+        "y": 284.7117919921875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "efd9fdb1.0f83a"
+                "b86241e1.90f6f"
             ]
         ]
     },
     {
-        "id": "efd9fdb1.0f83a",
+        "id": "b86241e1.90f6f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4899.075698852539,
-        "y": 289.99269104003906,
-        "z": "1b4ba1fc.83240e",
+        "x": 4873.392333984375,
+        "y": 284.7117919921875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "f2ffc2c8.9c3d6",
-                "ca4f06f7.bf7198"
+                "6d437f62.f0b9e8",
+                "c60cac93.77d028"
             ]
         ]
     },
     {
-        "id": "f2ffc2c8.9c3d6",
+        "id": "6d437f62.f0b9e8",
         "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": 5104.566665649414,
-        "y": 287.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 5078.88330078125,
+        "y": 282.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "ca4f06f7.bf7198",
+        "id": "c60cac93.77d028",
         "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": 5103.566665649414,
-        "y": 333.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 5077.88330078125,
+        "y": 328.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "7a6c4648.75b9a",
+        "id": "2a091548.5d967a",
         "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": 3619.566665649414,
-        "y": 319.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 3593.88330078125,
+        "y": 314.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "2b038d01.8bcf5a"
+                "2f22efb0.7f6638"
             ]
         ]
     },
     {
-        "id": "2b038d01.8bcf5a",
+        "id": "2f22efb0.7f6638",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3899.566665649414,
-        "y": 319.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 3873.88330078125,
+        "y": 314.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "924692b1.dbe118"
+                "a8ed1762.dadd28"
             ]
         ]
     },
     {
-        "id": "924692b1.dbe118",
+        "id": "a8ed1762.dadd28",
         "type": "outcome",
         "name": "logical-link",
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2282.5668182373047,
-        "y": 808.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 2256.8834533691406,
+        "y": 803.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "e627a5b7.666348"
+                "d4da35fd.31c82"
             ]
         ]
     },
     {
-        "id": "e627a5b7.666348",
+        "id": "d4da35fd.31c82",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2459.566696166992,
-        "y": 801.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 2433.883331298828,
+        "y": 796.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "abe018e3.2ab958",
-                "b299dbd0.7106d8"
+                "de7b00e3.6a171",
+                "e6ab014c.406db"
             ]
         ]
     },
     {
-        "id": "abe018e3.2ab958",
+        "id": "de7b00e3.6a171",
         "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": 2702.566696166992,
-        "y": 758.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 2676.883331298828,
+        "y": 753.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "b299dbd0.7106d8",
+        "id": "e6ab014c.406db",
         "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": 2691.566696166992,
-        "y": 813.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 2665.883331298828,
+        "y": 808.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "73425fcf.6d608",
-                "9a2fb745.49c558",
-                "c8c584c4.60469"
+                "5a07beae.8794d8",
+                "1d7b95c6.606562",
+                "7f820a8.8f172f4"
             ]
         ]
     },
     {
-        "id": "73425fcf.6d608",
+        "id": "5a07beae.8794d8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2983.057662963867,
-        "y": 792.1406402587891,
-        "z": "1b4ba1fc.83240e",
+        "x": 2957.374298095703,
+        "y": 786.8597412109375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "11a6918b.0ed79e"
+                "ae195dbf.1750f"
             ]
         ]
     },
     {
-        "id": "9a2fb745.49c558",
+        "id": "1d7b95c6.606562",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2971.566696166992,
-        "y": 836.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 2945.883331298828,
+        "y": 831.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "147fb75c.cecad1"
+                "f12ba9c8.9a28f8"
             ]
         ]
     },
     {
-        "id": "11a6918b.0ed79e",
+        "id": "ae195dbf.1750f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3131.629196166992,
-        "y": 792.4264068603516,
-        "z": "1b4ba1fc.83240e",
+        "x": 3105.945831298828,
+        "y": 787.1455078125,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "147fb75c.cecad1",
+        "id": "f12ba9c8.9a28f8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3130.566696166992,
-        "y": 836.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 3104.883331298828,
+        "y": 831.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "c8c584c4.60469",
+        "id": "7f820a8.8f172f4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2978.566696166992,
-        "y": 915.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 2952.883331298828,
+        "y": 910.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "18430aa7.b0cd65"
+                "344a6e64.f3725a"
             ]
         ]
     },
     {
-        "id": "18430aa7.b0cd65",
+        "id": "344a6e64.f3725a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3117.566696166992,
-        "y": 915.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 3091.883331298828,
+        "y": 910.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a56438ce.7b3648",
-                "cd9c4fe8.e67498",
-                "b8cad49c.dd7ca",
-                "768c9bf8.5beb74",
-                "6f1a328d.ae400c",
-                "b16688a0.4defc",
-                "2c1d8b21.e96e8c",
-                "63cddf09.26d868",
-                "9d9de9db.5c38b8",
-                "e5f9b3dc.c2f9f",
-                "169ca3b9.4d31a4",
-                "1c28fc30.faaf74",
-                "19822907.e2052f",
-                "e8ad32eb.9df94",
-                "cf9533e5.c2371",
-                "22a945f9.085212",
-                "94938481.855978",
-                "7edb995a.421908",
-                "f054f8f8.d1b3a",
-                "dab7847.8f75af8",
-                "71a7eba7.ddb6fc",
-                "a71111e6.40602"
+                "fb96464b.51f05",
+                "51750f01.3f406",
+                "63f47c85.a7fa6c",
+                "96258457.425ae8",
+                "f469e44d.0f84d",
+                "f7610f35.e81b98",
+                "d89362f7.406e48",
+                "87d9c57.361fa38",
+                "ab43f120.02b19",
+                "7042856b.1828cc",
+                "f434b230.257eb8",
+                "2ac41e54.9dfb2a",
+                "ebbe2f0a.10f36",
+                "7162acbd.73776c",
+                "2683d5ea.5fda52",
+                "da74bb6.e442948",
+                "feffc86e.486bc",
+                "12bfceb8.d75889",
+                "3b541994.2db38e",
+                "b3267f6f.ff1998",
+                "729e2fc5.81fb",
+                "62f42d2.2eff654"
             ]
         ]
     },
     {
-        "id": "ece3c8dc.fca8e",
+        "id": "e06cec26.4f9a08",
         "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": 3461.566635131836,
-        "y": 389.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 3435.883270263672,
+        "y": 384.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "a56438ce.7b3648",
+        "id": "fb96464b.51f05",
         "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": 3442.566635131836,
-        "y": 489.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 3416.883270263672,
+        "y": 484.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "1c28fc30.faaf74",
+        "id": "2ac41e54.9dfb2a",
         "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": 3396.566635131836,
-        "y": 540.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 3370.883270263672,
+        "y": 535.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "cd9c4fe8.e67498",
+        "id": "51750f01.3f406",
         "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": 3370.566635131836,
-        "y": 589.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 3344.883270263672,
+        "y": 584.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "b8cad49c.dd7ca",
+        "id": "63f47c85.a7fa6c",
         "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": 3369.566635131836,
-        "y": 638.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 3343.883270263672,
+        "y": 633.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "768c9bf8.5beb74",
+        "id": "96258457.425ae8",
         "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": 3378.566635131836,
-        "y": 776.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 3352.883270263672,
+        "y": 771.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "fe7f9a9e.cf1db8",
-                "156916f6.f1ec61",
-                "66ef43c6.2e3d64"
+                "9bd02754.7964a8",
+                "8e7e5fd2.7d02c8",
+                "6675b2ad.72fd8c"
             ]
         ]
     },
     {
-        "id": "6f1a328d.ae400c",
+        "id": "f469e44d.0f84d",
         "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": 3371.566635131836,
-        "y": 837.5665435791016,
-        "z": "1b4ba1fc.83240e",
+        "x": 3345.883270263672,
+        "y": 832.28564453125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6dadc494.d9aa04",
-                "672f337a.746964",
-                "bcaed2fe.1f9ae"
+                "772ff0fe.2f34f",
+                "8d67ee85.1205f",
+                "96627f08.cbe71"
             ]
         ]
     },
     {
-        "id": "fe7f9a9e.cf1db8",
+        "id": "9bd02754.7964a8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3627.566390991211,
-        "y": 671.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 3601.883026123047,
+        "y": 666.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "cc05b9e7.0fc9a"
+                "4d13468a.d3ecb8"
             ]
         ]
     },
     {
-        "id": "156916f6.f1ec61",
+        "id": "8e7e5fd2.7d02c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3621.075424194336,
-        "y": 712.9926910400391,
-        "z": "1b4ba1fc.83240e",
+        "x": 3595.392059326172,
+        "y": 707.7117919921875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "4587637b.94db5c"
+                "ff1b9a29.a11d98"
             ]
         ]
     },
     {
-        "id": "66ef43c6.2e3d64",
+        "id": "6675b2ad.72fd8c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3616.075424194336,
-        "y": 762.9926910400391,
-        "z": "1b4ba1fc.83240e",
+        "x": 3590.392059326172,
+        "y": 757.7117919921875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "1eb5ad40.d06413"
+                "97bfc6e9.fba1d8"
             ]
         ]
     },
     {
-        "id": "cc05b9e7.0fc9a",
+        "id": "4d13468a.d3ecb8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3776.137924194336,
-        "y": 670.8524322509766,
-        "z": "1b4ba1fc.83240e",
+        "x": 3750.454559326172,
+        "y": 665.571533203125,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "4587637b.94db5c",
+        "id": "ff1b9a29.a11d98",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3766.075424194336,
-        "y": 720.9926910400391,
-        "z": "1b4ba1fc.83240e",
+        "x": 3740.392059326172,
+        "y": 715.7117919921875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "6dadc494.d9aa04",
+        "id": "772ff0fe.2f34f",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3592.566635131836,
-        "y": 823.5665435791016,
-        "z": "1b4ba1fc.83240e",
+        "x": 3566.883270263672,
+        "y": 818.28564453125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "1b1304b9.a5e66b"
+                "d6ce8ecd.6264d"
             ]
         ]
     },
     {
-        "id": "672f337a.746964",
+        "id": "8d67ee85.1205f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3588.075668334961,
-        "y": 872.9925689697266,
-        "z": "1b4ba1fc.83240e",
+        "x": 3562.392303466797,
+        "y": 867.711669921875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "e774fced.6104a8"
+                "cdc0e121.35daf"
             ]
         ]
     },
     {
-        "id": "bcaed2fe.1f9ae",
+        "id": "96627f08.cbe71",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3589.075668334961,
-        "y": 925.9925689697266,
-        "z": "1b4ba1fc.83240e",
+        "x": 3563.392303466797,
+        "y": 920.711669921875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "c076d47b.eaded"
+                "58d9f56e.c48314"
             ]
         ]
     },
     {
-        "id": "1b1304b9.a5e66b",
+        "id": "d6ce8ecd.6264d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3745.1380157470703,
-        "y": 828.8523101806641,
-        "z": "1b4ba1fc.83240e",
+        "x": 3719.4546508789062,
+        "y": 823.5714111328125,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "e774fced.6104a8",
+        "id": "cdc0e121.35daf",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3731.075668334961,
-        "y": 872.9925689697266,
-        "z": "1b4ba1fc.83240e",
+        "x": 3705.392303466797,
+        "y": 867.711669921875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "1eb5ad40.d06413",
+        "id": "97bfc6e9.fba1d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3788.566390991211,
-        "y": 773.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 3762.883026123047,
+        "y": 768.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7f2b8c9b.099c14"
+                "15d53662.387c32"
             ]
         ]
     },
     {
-        "id": "c076d47b.eaded",
+        "id": "58d9f56e.c48314",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3742.566635131836,
-        "y": 925.5665435791016,
-        "z": "1b4ba1fc.83240e",
+        "x": 3716.883270263672,
+        "y": 920.28564453125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "8445401a.e44628"
+                "46dc8745.e3cd18"
             ]
         ]
     },
     {
-        "id": "7f2b8c9b.099c14",
+        "id": "15d53662.387c32",
         "type": "switchNode",
         "name": "switch nr type",
         "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3949.566635131836,
-        "y": 660.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 3923.883270263672,
+        "y": 655.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "b0a8e75a.0829b8",
-                "40b074e3.b8cf9c",
-                "9b9082d.d33238"
+                "5f27def0.590658",
+                "b4572ec6.b95d6",
+                "50bdde17.ca9b2"
             ]
         ]
     },
     {
-        "id": "8445401a.e44628",
+        "id": "46dc8745.e3cd18",
         "type": "switchNode",
         "name": "switch nr type",
         "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3941.566635131836,
-        "y": 845.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 3915.883270263672,
+        "y": 840.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "65174d4b.beb5c4",
-                "b443365d.1a3bf",
-                "a01fe37.2547ea"
+                "be87179f.d632f8",
+                "ace0b3c8.e628e",
+                "f2575655.f8e378"
             ]
         ]
     },
     {
-        "id": "b0a8e75a.0829b8",
+        "id": "5f27def0.590658",
         "type": "outcome",
         "name": "ROOT",
         "xml": "<outcome value='ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4173.567123413086,
-        "y": 364.5666046142578,
-        "z": "1b4ba1fc.83240e",
+        "x": 4147.883758544922,
+        "y": 359.28570556640625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "9aca5d50.3d0028"
+                "61b5f01d.b80d4"
             ]
         ]
     },
     {
-        "id": "40b074e3.b8cf9c",
+        "id": "b4572ec6.b95d6",
         "type": "outcome",
         "name": "LEAF",
         "xml": "<outcome value='LEAF'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4175.567123413086,
-        "y": 418.5666046142578,
-        "z": "1b4ba1fc.83240e",
+        "x": 4149.883758544922,
+        "y": 413.28570556640625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d411ea2f.0fea6"
+                "c4a12276.3b1638"
             ]
         ]
     },
     {
-        "id": "65174d4b.beb5c4",
+        "id": "be87179f.d632f8",
         "type": "outcome",
         "name": "ROOT",
         "xml": "<outcome value='ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4139.567123413086,
-        "y": 624.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 4113.883758544922,
+        "y": 619.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "b1818ac5.01eff"
+                "d3817023.608058"
             ]
         ]
     },
     {
-        "id": "b443365d.1a3bf",
+        "id": "ace0b3c8.e628e",
         "type": "outcome",
         "name": "LEAF",
         "xml": "<outcome value='LEAF'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4141.567123413086,
-        "y": 678.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 4115.883758544922,
+        "y": 673.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7efc1cf.1fed664"
+                "515f06a6.62b11"
             ]
         ]
     },
     {
-        "id": "f6cae941.406738",
+        "id": "be2b27bb.08a9c8",
         "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": 4483.567123413086,
-        "y": 316.5666046142578,
-        "z": "1b4ba1fc.83240e",
+        "x": 4457.883758544922,
+        "y": 311.28570556640625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "71276df1.c00474",
+        "id": "b06c3c05.9b2298",
         "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": 4476.567123413086,
-        "y": 414.5666046142578,
-        "z": "1b4ba1fc.83240e",
+        "x": 4450.883758544922,
+        "y": 409.28570556640625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "18b30ce8.3b3b9b",
+        "id": "d2d6cd47.633ea8",
         "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": 4455.567123413086,
-        "y": 597.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 4429.883758544922,
+        "y": 592.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "bdb5a388.dc57d",
+        "id": "1e090814.77ece",
         "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": 4459.567123413086,
-        "y": 690.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 4433.883758544922,
+        "y": 685.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "365f833d.25b8d4",
+        "id": "6f64ab1a.72d4ac",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3635.566665649414,
-        "y": 1350.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3609.88330078125,
+        "y": 1345.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "9fbce841.2e2e5"
+                "fcfd7965.d24e6"
             ]
         ]
     },
     {
-        "id": "374e0e92.acb9ca",
+        "id": "670e6fe3.827898",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3645.057632446289,
-        "y": 1393.1407012939453,
-        "z": "1b4ba1fc.83240e",
+        "x": 3619.374267578125,
+        "y": 1387.8598022460938,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "544f9b1.6ea9ce4"
+                "329f67fd.7314c8"
             ]
         ]
     },
     {
-        "id": "a1cbd1ad.ad2c18",
+        "id": "69392cc6.84928c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3633.566665649414,
-        "y": 1439.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3607.88330078125,
+        "y": 1434.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "875bb611.eebb3"
+                "a3d0ff69.d983b"
             ]
         ]
     },
     {
-        "id": "def43ac8.216f6",
+        "id": "dee477e6.792e68",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3335.566665649414,
-        "y": 1312.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3309.88330078125,
+        "y": 1307.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "2c1d8b21.e96e8c",
+        "id": "d89362f7.406e48",
         "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": 3378.566665649414,
-        "y": 1377.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3352.88330078125,
+        "y": 1372.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "365f833d.25b8d4",
-                "374e0e92.acb9ca",
-                "a1cbd1ad.ad2c18"
+                "6f64ab1a.72d4ac",
+                "670e6fe3.827898",
+                "69392cc6.84928c"
             ]
         ]
     },
     {
-        "id": "b16688a0.4defc",
+        "id": "f7610f35.e81b98",
         "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": 3379.566635131836,
-        "y": 1129.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3353.883270263672,
+        "y": 1124.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "34aa1b4f.ba281c",
-                "141fecfc.2b9053"
+                "c7f5f619.d51258",
+                "a4e5ad2b.c867e"
             ]
         ]
     },
     {
-        "id": "141fecfc.2b9053",
+        "id": "a4e5ad2b.c867e",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3602.566635131836,
-        "y": 1115.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3576.883270263672,
+        "y": 1110.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6c70ba9f.edd1f4"
+                "8e8c42f1.638b2"
             ]
         ]
     },
     {
-        "id": "34aa1b4f.ba281c",
+        "id": "c7f5f619.d51258",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3604.566635131836,
-        "y": 1148.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3578.883270263672,
+        "y": 1143.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "809a76b0.69bfb"
+                "5f49f3a7.a8042c"
             ]
         ]
     },
     {
-        "id": "9fbce841.2e2e5",
+        "id": "fcfd7965.d24e6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3808.233169555664,
-        "y": 1349.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3782.5498046875,
+        "y": 1344.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d947a96b.ec0e98",
-                "78e35528.26de5c"
+                "6f4130f2.684b3",
+                "363079f1.761036"
             ]
         ]
     },
     {
-        "id": "544f9b1.6ea9ce4",
+        "id": "329f67fd.7314c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3798.6290435791016,
-        "y": 1396.4264373779297,
-        "z": "1b4ba1fc.83240e",
+        "x": 3772.9456787109375,
+        "y": 1391.1455383300781,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "875bb611.eebb3",
+        "id": "a3d0ff69.d983b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3802.566665649414,
-        "y": 1440.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3776.88330078125,
+        "y": 1435.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "d947a96b.ec0e98",
+        "id": "6f4130f2.684b3",
         "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": 4072.566665649414,
-        "y": 1333.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4046.88330078125,
+        "y": 1328.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "15bba4b9.d2a05b",
-                "3ad9867a.e42d4a"
+                "1e584023.51383",
+                "f8d90041.f96538"
             ]
         ]
     },
     {
-        "id": "3ad9867a.e42d4a",
+        "id": "f8d90041.f96538",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4295.566665649414,
-        "y": 1288.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4269.88330078125,
+        "y": 1283.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6b929f53.c8f4f8"
+                "9697fa74.602bc"
             ]
         ]
     },
     {
-        "id": "15bba4b9.d2a05b",
+        "id": "1e584023.51383",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4297.566665649414,
-        "y": 1352.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4271.88330078125,
+        "y": 1347.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "1ee9816c.cbffbf"
+                "c43abb24.f757f"
             ]
         ]
     },
     {
-        "id": "1ee9816c.cbffbf",
+        "id": "c43abb24.f757f",
         "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": 4459.566665649414,
-        "y": 1348.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4433.88330078125,
+        "y": 1343.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "6b929f53.c8f4f8",
+        "id": "9697fa74.602bc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4460.566665649414,
-        "y": 1285.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4434.88330078125,
+        "y": 1280.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "2ecc2d46.f12c7a",
-                "9183827d.0d9718"
+                "3aa59d52.2c8e1a",
+                "83c5954c.7a838"
             ]
         ]
     },
     {
-        "id": "809a76b0.69bfb",
+        "id": "5f49f3a7.a8042c",
         "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": 3747.566635131836,
-        "y": 1145.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3721.883270263672,
+        "y": 1140.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "6c70ba9f.edd1f4",
+        "id": "8e8c42f1.638b2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3750.566635131836,
-        "y": 1108.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3724.883270263672,
+        "y": 1103.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "920604a0.fd0cf",
-                "ad826b52.8e9fa"
+                "3b3764ed.353b8c",
+                "1fd3d7ac.934188"
             ]
         ]
     },
     {
-        "id": "920604a0.fd0cf",
+        "id": "3b3764ed.353b8c",
         "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": 3942.566635131836,
-        "y": 1110.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3916.883270263672,
+        "y": 1105.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "78e35528.26de5c",
+        "id": "363079f1.761036",
         "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": 4032.566665649414,
-        "y": 1465.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4006.88330078125,
+        "y": 1460.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "75c2427c.8c10cc"
+                "9254521f.b3181"
             ]
         ]
     },
     {
-        "id": "75c2427c.8c10cc",
+        "id": "9254521f.b3181",
         "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": 4238.566665649414,
-        "y": 1465.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4212.88330078125,
+        "y": 1460.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "5fbadc48.b9fad4"
+                "4418ce2f.a0c9d"
             ]
         ]
     },
     {
-        "id": "5fbadc48.b9fad4",
+        "id": "4418ce2f.a0c9d",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4453.852310180664,
-        "y": 1465.388442993164,
-        "z": "1b4ba1fc.83240e",
+        "x": 4428.1689453125,
+        "y": 1460.1075439453125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "4d8b1a53.4482f4"
+                "8ea77952.a62e58"
             ]
         ]
     },
     {
-        "id": "ad826b52.8e9fa",
+        "id": "1fd3d7ac.934188",
         "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": 3939.566635131836,
-        "y": 1175.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3913.883270263672,
+        "y": 1170.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "70c21f01.ccf8c",
-                "fd021df7.11e338",
-                "df54403.64867c"
+                "8290c612.7a239",
+                "966ac70d.6028c8",
+                "1ce11a36.13fbae"
             ]
         ]
     },
     {
-        "id": "70c21f01.ccf8c",
+        "id": "8290c612.7a239",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4135.066757202148,
-        "y": 1127.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4109.383392333984,
+        "y": 1122.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "37006658.3814c2"
+                "14e203c.361db7c"
             ]
         ]
     },
     {
-        "id": "fd021df7.11e338",
+        "id": "966ac70d.6028c8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4127.066757202148,
-        "y": 1182.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4101.383392333984,
+        "y": 1177.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "24c12ef7.012c52"
+                "ed056b5d.302798"
             ]
         ]
     },
     {
-        "id": "df54403.64867c",
+        "id": "1ce11a36.13fbae",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4132.066757202148,
-        "y": 1239.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4106.383392333984,
+        "y": 1234.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "2b777797.09f0b8"
+                "cd3e83f.158db8"
             ]
         ]
     },
     {
-        "id": "2b777797.09f0b8",
+        "id": "cd3e83f.158db8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4284.066757202148,
-        "y": 1240.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4258.383392333984,
+        "y": 1235.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "24c12ef7.012c52",
+        "id": "ed056b5d.302798",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4295.066757202148,
-        "y": 1185.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4269.383392333984,
+        "y": 1180.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "37006658.3814c2",
+        "id": "14e203c.361db7c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4279.449081420898,
-        "y": 1125.2223358154297,
-        "z": "1b4ba1fc.83240e",
+        "x": 4253.765716552734,
+        "y": 1119.9414367675781,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "9c96e054.d5da8"
+                "618a03ad.e0bdc4"
             ]
         ]
     },
     {
-        "id": "9c96e054.d5da8",
+        "id": "618a03ad.e0bdc4",
         "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": 4473.566635131836,
-        "y": 1169.5666046142578,
-        "z": "1b4ba1fc.83240e",
+        "x": 4447.883270263672,
+        "y": 1164.2857055664062,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "efaf74dd.57cd28"
+                "2cbaaf2e.c8d728"
             ]
         ]
     },
     {
-        "id": "9183827d.0d9718",
+        "id": "83c5954c.7a838",
         "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": 4630.566665649414,
-        "y": 1243.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4604.88330078125,
+        "y": 1238.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "2ecc2d46.f12c7a",
+        "id": "3aa59d52.2c8e1a",
         "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": 4631.566665649414,
-        "y": 1351.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4605.88330078125,
+        "y": 1346.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "e06b7ada.eb82e8",
+        "id": "7cc13839.b2e03",
         "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": 4632.566665649414,
-        "y": 1300.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4606.88330078125,
+        "y": 1295.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "4d8b1a53.4482f4",
+        "id": "8ea77952.a62e58",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4660.683853149414,
-        "y": 1465.906997680664,
-        "z": "1b4ba1fc.83240e",
+        "x": 4635.00048828125,
+        "y": 1460.6260986328125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "dced3e1c.40e48",
-                "5a4be8c3.e9f088",
-                "301c508b.710a5"
+                "f27b51c4.4be918",
+                "106457d2.e488d",
+                "3867b2c0.836c9e"
             ]
         ]
     },
     {
-        "id": "dced3e1c.40e48",
+        "id": "f27b51c4.4be918",
         "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": 4875.683853149414,
-        "y": 1427.906997680664,
-        "z": "1b4ba1fc.83240e",
+        "x": 4850.00048828125,
+        "y": 1422.6260986328125,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "5a4be8c3.e9f088",
+        "id": "106457d2.e488d",
         "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": 4872.683853149414,
-        "y": 1466.906997680664,
-        "z": "1b4ba1fc.83240e",
+        "x": 4847.00048828125,
+        "y": 1461.6260986328125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "34a88173.395bbe"
+                "d07dc21f.bf396"
             ]
         ]
     },
     {
-        "id": "301c508b.710a5",
+        "id": "3867b2c0.836c9e",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4828.183853149414,
-        "y": 1508.906997680664,
-        "z": "1b4ba1fc.83240e",
+        "x": 4802.50048828125,
+        "y": 1503.6260986328125,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "34a88173.395bbe",
+        "id": "d07dc21f.bf396",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5053.183853149414,
-        "y": 1465.906997680664,
-        "z": "1b4ba1fc.83240e",
+        "x": 5027.50048828125,
+        "y": 1460.6260986328125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "91aa780.576ce08"
+                "a0338f35.aa887"
             ]
         ]
     },
     {
-        "id": "46f94459.4a6e34",
+        "id": "7ad015c9.163974",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4861.566665649414,
-        "y": 1061.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4835.88330078125,
+        "y": 1056.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "eb72bb20.19559"
+                "79e701a7.e6bda"
             ]
         ]
     },
     {
-        "id": "eb72bb20.19559",
+        "id": "79e701a7.e6bda",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5038.566665649414,
-        "y": 1053.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 5012.88330078125,
+        "y": 1048.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "32b5afac.4ae738",
-                "92ed0f08.6c0c2"
+                "74575ab5.dab66c",
+                "bb3b928a.241048"
             ]
         ]
     },
     {
-        "id": "efaf74dd.57cd28",
+        "id": "2cbaaf2e.c8d728",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4664.566635131836,
-        "y": 1159.5666046142578,
-        "z": "1b4ba1fc.83240e",
+        "x": 4638.883270263672,
+        "y": 1154.2857055664062,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "46f94459.4a6e34",
-                "95ea5c2d.7d46e8"
+                "7ad015c9.163974",
+                "67f00ea1.c4a38"
             ]
         ]
     },
     {
-        "id": "95ea5c2d.7d46e8",
+        "id": "67f00ea1.c4a38",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4864.566665649414,
-        "y": 1135.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4838.88330078125,
+        "y": 1130.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "93430c1b.104ce"
+                "b8dbf273.d60738"
             ]
         ]
     },
     {
-        "id": "93430c1b.104ce",
+        "id": "b8dbf273.d60738",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5041.566665649414,
-        "y": 1127.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 5015.88330078125,
+        "y": 1122.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "78b310b8.dd74"
+                "36a761a6.6edbc6"
             ]
         ]
     },
     {
-        "id": "91aa780.576ce08",
+        "id": "a0338f35.aa887",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5211.183853149414,
-        "y": 1465.906997680664,
-        "z": "1b4ba1fc.83240e",
+        "x": 5185.50048828125,
+        "y": 1460.6260986328125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "5b4e25f5.7b14e4"
+                "ac7f5dcb.abfbe"
             ]
         ]
     },
     {
-        "id": "5b4e25f5.7b14e4",
+        "id": "ac7f5dcb.abfbe",
         "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": 5418.183853149414,
-        "y": 1465.906997680664,
-        "z": "1b4ba1fc.83240e",
+        "x": 5392.50048828125,
+        "y": 1460.6260986328125,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "92ed0f08.6c0c2",
+        "id": "bb3b928a.241048",
         "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": 5246.566665649414,
-        "y": 1060.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 5220.88330078125,
+        "y": 1055.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "322d8e2.13d36f2",
-                "a2041883.aae29",
-                "fe986e1.586ed1"
+                "14a2b948.3a7307",
+                "4db5fa80.8a7584",
+                "1d1f45c7.aa8332"
             ]
         ]
     },
     {
-        "id": "32b5afac.4ae738",
+        "id": "74575ab5.dab66c",
         "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": 5276.566665649414,
-        "y": 1008.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 5250.88330078125,
+        "y": 1003.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "322d8e2.13d36f2",
+        "id": "14a2b948.3a7307",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5456.566665649414,
-        "y": 1051.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 5430.88330078125,
+        "y": 1046.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "9ca79008.c70bf8"
+                "755aafd7.9f4fa8"
             ]
         ]
     },
     {
-        "id": "a2041883.aae29",
+        "id": "4db5fa80.8a7584",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5448.566665649414,
-        "y": 1106.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 5422.88330078125,
+        "y": 1101.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "ec84ed8c.59c368"
+                "70535561.166e44"
             ]
         ]
     },
     {
-        "id": "fe986e1.586ed1",
+        "id": "1d1f45c7.aa8332",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5453.566665649414,
-        "y": 1163.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 5427.88330078125,
+        "y": 1158.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "ae200af1.d5e5c8"
+                "91b4ba95.e0ecd8"
             ]
         ]
     },
     {
-        "id": "ae200af1.d5e5c8",
+        "id": "91b4ba95.e0ecd8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5605.566665649414,
-        "y": 1164.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 5579.88330078125,
+        "y": 1159.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "ec84ed8c.59c368",
+        "id": "70535561.166e44",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5616.566665649414,
-        "y": 1109.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 5590.88330078125,
+        "y": 1104.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "9ca79008.c70bf8",
+        "id": "755aafd7.9f4fa8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5600.948989868164,
-        "y": 1049.2223358154297,
-        "z": "1b4ba1fc.83240e",
+        "x": 5575.265625,
+        "y": 1043.9414367675781,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "e75f84ea.1b627"
+                "be3e1006.2c5ef"
             ]
         ]
     },
     {
-        "id": "78b310b8.dd74",
+        "id": "36a761a6.6edbc6",
         "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": 5276.566665649414,
-        "y": 1251.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 5250.88330078125,
+        "y": 1246.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "e75f84ea.1b627",
+        "id": "be3e1006.2c5ef",
         "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": 5815.566665649414,
-        "y": 1045.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 5789.88330078125,
+        "y": 1040.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "d425ccce.04f6a",
+        "id": "9e818253.3db4c8",
         "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": 4471.567123413086,
-        "y": 352.5666046142578,
-        "z": "1b4ba1fc.83240e",
+        "x": 4445.883758544922,
+        "y": 347.28570556640625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "72647ac9.fcc034",
+        "id": "e41aea83.6c1b9",
         "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": 4472.567092895508,
-        "y": 456.5666046142578,
-        "z": "1b4ba1fc.83240e",
+        "x": 4446.883728027344,
+        "y": 451.28570556640625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "9aca5d50.3d0028",
+        "id": "61b5f01d.b80d4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4296.567123413086,
-        "y": 358.5666046142578,
-        "z": "1b4ba1fc.83240e",
+        "x": 4270.883758544922,
+        "y": 353.28570556640625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "f6cae941.406738",
-                "d425ccce.04f6a"
+                "be2b27bb.08a9c8",
+                "9e818253.3db4c8"
             ]
         ]
     },
     {
-        "id": "d411ea2f.0fea6",
+        "id": "c4a12276.3b1638",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4302.567123413086,
-        "y": 422.5666046142578,
-        "z": "1b4ba1fc.83240e",
+        "x": 4276.883758544922,
+        "y": 417.28570556640625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "71276df1.c00474",
-                "72647ac9.fcc034"
+                "b06c3c05.9b2298",
+                "e41aea83.6c1b9"
             ]
         ]
     },
     {
-        "id": "b1818ac5.01eff",
+        "id": "d3817023.608058",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4267.567123413086,
-        "y": 624.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 4241.883758544922,
+        "y": 619.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "18b30ce8.3b3b9b",
-                "e0b34ba1.74f538"
+                "d2d6cd47.633ea8",
+                "8a84a541.05baa8"
             ]
         ]
     },
     {
-        "id": "7efc1cf.1fed664",
+        "id": "515f06a6.62b11",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4270.567123413086,
-        "y": 677.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 4244.883758544922,
+        "y": 672.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "bdb5a388.dc57d",
-                "f08a6dfd.10adf"
+                "1e090814.77ece",
+                "f18416f.b59a2e8"
             ]
         ]
     },
     {
-        "id": "e0b34ba1.74f538",
+        "id": "8a84a541.05baa8",
         "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": 4441.567123413086,
-        "y": 637.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 4415.883758544922,
+        "y": 632.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "f08a6dfd.10adf",
+        "id": "f18416f.b59a2e8",
         "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": 4444.567123413086,
-        "y": 728.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 4418.883758544922,
+        "y": 723.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "e27939d4.dc1f9",
+        "id": "e3b8353b.1a716",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3767.566665649414,
-        "y": 1807.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 3741.88330078125,
+        "y": 1802.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "e945ebed.eb7548",
-                "77e0d458.7dce6c"
+                "ff7eb3f1.2b5db",
+                "e41a1903.8d6c4"
             ]
         ]
     },
     {
-        "id": "f47a2634.b211d8",
+        "id": "cfbe25d.9897558",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3594.900161743164,
-        "y": 1808.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 3569.216796875,
+        "y": 1803.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "e27939d4.dc1f9"
+                "e3b8353b.1a716"
             ]
         ]
     },
     {
-        "id": "4a8297d6.2a928",
+        "id": "c7184b04.7c3a48",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3604.391128540039,
-        "y": 1851.1408233642578,
-        "z": "1b4ba1fc.83240e",
+        "x": 3578.707763671875,
+        "y": 1845.8599243164062,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "5c13cfc7.d7d798"
+                "1df80989.06ffa6"
             ]
         ]
     },
     {
-        "id": "aeb5511b.98c418",
+        "id": "6421e4be.cfd334",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3592.900161743164,
-        "y": 1897.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 3567.216796875,
+        "y": 1892.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6967c0f4.670908"
+                "61347385.0e669c"
             ]
         ]
     },
     {
-        "id": "5c13cfc7.d7d798",
+        "id": "1df80989.06ffa6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3757.9625396728516,
-        "y": 1854.4265594482422,
-        "z": "1b4ba1fc.83240e",
+        "x": 3732.2791748046875,
+        "y": 1849.1456604003906,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "6967c0f4.670908",
+        "id": "61347385.0e669c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3761.900161743164,
-        "y": 1898.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 3736.216796875,
+        "y": 1893.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "e945ebed.eb7548",
+        "id": "ff7eb3f1.2b5db",
         "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": 4053.900161743164,
-        "y": 1811.566909790039,
-        "z": "1b4ba1fc.83240e",
+        "x": 4028.216796875,
+        "y": 1806.2860107421875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "e55a817f.49527",
-                "d5120a58.c5add"
+                "2c9a5d35.edc2ea",
+                "e16f62ba.253eb"
             ]
         ]
     },
     {
-        "id": "d5120a58.c5add",
+        "id": "e16f62ba.253eb",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4276.900161743164,
-        "y": 1766.566909790039,
-        "z": "1b4ba1fc.83240e",
+        "x": 4251.216796875,
+        "y": 1761.2860107421875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "754abe34.cc3b8"
+                "9d889672.fd9088"
             ]
         ]
     },
     {
-        "id": "e55a817f.49527",
+        "id": "2c9a5d35.edc2ea",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4278.900161743164,
-        "y": 1830.566909790039,
-        "z": "1b4ba1fc.83240e",
+        "x": 4253.216796875,
+        "y": 1825.2860107421875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "1b1e2d9b.600bda"
+                "67c6ff18.c6a758"
             ]
         ]
     },
     {
-        "id": "1b1e2d9b.600bda",
+        "id": "67c6ff18.c6a758",
         "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": 4437.900161743164,
-        "y": 1849.566909790039,
-        "z": "1b4ba1fc.83240e",
+        "x": 4412.216796875,
+        "y": 1844.2860107421875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "754abe34.cc3b8",
+        "id": "9d889672.fd9088",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4441.900161743164,
-        "y": 1763.566909790039,
-        "z": "1b4ba1fc.83240e",
+        "x": 4416.216796875,
+        "y": 1758.2860107421875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "e1fca79d.bcc158",
-                "d062e564.f9cc3"
+                "acf9d743.7735b8",
+                "dd400cb5.f9a5e"
             ]
         ]
     },
     {
-        "id": "9d9de9db.5c38b8",
+        "id": "ab43f120.02b19",
         "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": 3366.900161743164,
-        "y": 1843.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 3341.216796875,
+        "y": 1838.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "f47a2634.b211d8",
-                "4a8297d6.2a928",
-                "aeb5511b.98c418"
+                "cfbe25d.9897558",
+                "c7184b04.7c3a48",
+                "6421e4be.cfd334"
             ]
         ]
     },
     {
-        "id": "dcd55e2.3f6482",
+        "id": "443ec13c.3b1388",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3327.900161743164,
-        "y": 1787.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 3302.216796875,
+        "y": 1782.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "63cddf09.26d868",
+        "id": "87d9c57.361fa38",
         "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": 3378.900161743164,
-        "y": 1582.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3353.216796875,
+        "y": 1577.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "43aff4f9.b6b3e4",
-                "25e76471.03af04"
+                "47939321.8d0314",
+                "28e1d4e9.ca62fc"
             ]
         ]
     },
     {
-        "id": "25e76471.03af04",
+        "id": "28e1d4e9.ca62fc",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3601.900161743164,
-        "y": 1568.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3576.216796875,
+        "y": 1563.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a96745eb.fd51a8"
+                "97457e61.73e3d8"
             ]
         ]
     },
     {
-        "id": "43aff4f9.b6b3e4",
+        "id": "47939321.8d0314",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3603.900161743164,
-        "y": 1601.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3578.216796875,
+        "y": 1596.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "65d2388d.31966"
+                "4d6d8144.ded038"
             ]
         ]
     },
     {
-        "id": "65d2388d.31966",
+        "id": "4d6d8144.ded038",
         "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": 3746.900161743164,
-        "y": 1598.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3721.216796875,
+        "y": 1593.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "a96745eb.fd51a8",
+        "id": "97457e61.73e3d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3749.900161743164,
-        "y": 1561.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3724.216796875,
+        "y": 1556.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "e299d57.a910ca8",
-                "f2c7502b.08699"
+                "a9d92823.960608",
+                "aea3c9c3.593308"
             ]
         ]
     },
     {
-        "id": "e299d57.a910ca8",
+        "id": "a9d92823.960608",
         "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": 3943.900161743164,
-        "y": 1564.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 3918.216796875,
+        "y": 1559.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "77e0d458.7dce6c",
+        "id": "e41a1903.8d6c4",
         "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": 3994.900131225586,
-        "y": 1944.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3969.216766357422,
+        "y": 1939.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "e086896d.a84a3"
+                "6ce2701b.388768"
             ]
         ]
     },
     {
-        "id": "e086896d.a84a3",
+        "id": "6ce2701b.388768",
         "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": 4200.900131225586,
-        "y": 1944.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4175.216766357422,
+        "y": 1939.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7b35902c.38cf98"
+                "879de70.58c1218"
             ]
         ]
     },
     {
-        "id": "7b35902c.38cf98",
+        "id": "879de70.58c1218",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4418.185775756836,
-        "y": 1943.388442993164,
-        "z": "1b4ba1fc.83240e",
+        "x": 4392.502410888672,
+        "y": 1938.1075439453125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "3adb3c4.e1dbc44"
+                "3d45c8a4.47e81"
             ]
         ]
     },
     {
-        "id": "f2c7502b.08699",
+        "id": "aea3c9c3.593308",
         "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": 3965.900161743164,
-        "y": 1632.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 3940.216796875,
+        "y": 1627.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "816c398a.a95008",
-                "793de235.310dbc",
-                "438956b5.03e5"
+                "ce24caf2.6cde98",
+                "b9bbe7dc.00f29",
+                "76cad8df.00ad38"
             ]
         ]
     },
     {
-        "id": "816c398a.a95008",
+        "id": "ce24caf2.6cde98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4161.400283813477,
-        "y": 1584.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 4135.7169189453125,
+        "y": 1579.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "c1f38920.d25ea"
+                "c03aa3dc.16bd"
             ]
         ]
     },
     {
-        "id": "793de235.310dbc",
+        "id": "b9bbe7dc.00f29",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4153.400283813477,
-        "y": 1639.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 4127.7169189453125,
+        "y": 1634.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "cab6de35.b52228"
+                "c287be98.ae3d3"
             ]
         ]
     },
     {
-        "id": "438956b5.03e5",
+        "id": "76cad8df.00ad38",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4158.400283813477,
-        "y": 1696.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 4132.7169189453125,
+        "y": 1691.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a8484dc0.47884"
+                "eb7ced2b.1fef2"
             ]
         ]
     },
     {
-        "id": "a8484dc0.47884",
+        "id": "eb7ced2b.1fef2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4310.400283813477,
-        "y": 1697.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 4284.7169189453125,
+        "y": 1692.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "cab6de35.b52228",
+        "id": "c287be98.ae3d3",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4321.400283813477,
-        "y": 1642.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 4295.7169189453125,
+        "y": 1637.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "c1f38920.d25ea",
+        "id": "c03aa3dc.16bd",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4305.782608032227,
-        "y": 1582.2224578857422,
-        "z": "1b4ba1fc.83240e",
+        "x": 4280.0992431640625,
+        "y": 1576.9415588378906,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "afe15cf0.f36818"
+                "5afd22fd.80941c"
             ]
         ]
     },
     {
-        "id": "e1fca79d.bcc158",
+        "id": "acf9d743.7735b8",
         "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": 4611.900161743164,
-        "y": 1724.566909790039,
-        "z": "1b4ba1fc.83240e",
+        "x": 4586.216796875,
+        "y": 1719.2860107421875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "d062e564.f9cc3",
+        "id": "dd400cb5.f9a5e",
         "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": 4612.900161743164,
-        "y": 1829.566909790039,
-        "z": "1b4ba1fc.83240e",
+        "x": 4587.216796875,
+        "y": 1824.2860107421875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "808f1d51.43ea1",
+        "id": "d2c0902b.6c4ea",
         "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": 4607.900161743164,
-        "y": 1778.566909790039,
-        "z": "1b4ba1fc.83240e",
+        "x": 4582.216796875,
+        "y": 1773.2860107421875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "3adb3c4.e1dbc44",
+        "id": "3d45c8a4.47e81",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4625.017318725586,
-        "y": 1932.9071197509766,
-        "z": "1b4ba1fc.83240e",
+        "x": 4599.333953857422,
+        "y": 1927.626220703125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d9f1d004.ab36e8",
-                "c34231fa.58e828",
-                "e0d690d7.a8c998"
+                "616411e3.181da",
+                "d5236702.85efc8",
+                "63f505ec.f0050c"
             ]
         ]
     },
     {
-        "id": "d9f1d004.ab36e8",
+        "id": "616411e3.181da",
         "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": 4840.017318725586,
-        "y": 1894.9071197509766,
-        "z": "1b4ba1fc.83240e",
+        "x": 4814.333953857422,
+        "y": 1889.626220703125,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "c34231fa.58e828",
+        "id": "d5236702.85efc8",
         "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": 4837.017318725586,
-        "y": 1933.9071197509766,
-        "z": "1b4ba1fc.83240e",
+        "x": 4811.333953857422,
+        "y": 1928.626220703125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "1c725cd0.b941cb"
+                "e9e8b1b.05378d"
             ]
         ]
     },
     {
-        "id": "e0d690d7.a8c998",
+        "id": "63f505ec.f0050c",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4792.517318725586,
-        "y": 1975.9071197509766,
-        "z": "1b4ba1fc.83240e",
+        "x": 4766.833953857422,
+        "y": 1970.626220703125,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "1c725cd0.b941cb",
+        "id": "e9e8b1b.05378d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5017.517318725586,
-        "y": 1932.9071197509766,
-        "z": "1b4ba1fc.83240e",
+        "x": 4991.833953857422,
+        "y": 1927.626220703125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d4ead200.f358d"
+                "9850361c.da76c8"
             ]
         ]
     },
     {
-        "id": "d4ead200.f358d",
+        "id": "9850361c.da76c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5175.517318725586,
-        "y": 1932.9071197509766,
-        "z": "1b4ba1fc.83240e",
+        "x": 5149.833953857422,
+        "y": 1927.626220703125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "21d1a6b2.01b042"
+                "db66a9b.93619d8"
             ]
         ]
     },
     {
-        "id": "21d1a6b2.01b042",
+        "id": "db66a9b.93619d8",
         "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": 5382.517318725586,
-        "y": 1932.9071197509766,
-        "z": "1b4ba1fc.83240e",
+        "x": 5356.833953857422,
+        "y": 1927.626220703125,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "4c098907.41a99",
+        "id": "84b58dac.88eef8",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4887.900161743164,
-        "y": 1600.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 4862.216796875,
+        "y": 1595.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "801eca00.935f68"
+                "26e5751a.9712e2"
             ]
         ]
     },
     {
-        "id": "801eca00.935f68",
+        "id": "26e5751a.9712e2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5064.900161743164,
-        "y": 1592.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5039.216796875,
+        "y": 1587.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "387f801c.205ae8",
-                "9175f1b.049129"
+                "6aba367d.688578",
+                "e91a3d87.4731c"
             ]
         ]
     },
     {
-        "id": "afe15cf0.f36818",
+        "id": "5afd22fd.80941c",
         "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": 4489.900161743164,
-        "y": 1596.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 4464.216796875,
+        "y": 1591.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "311e9242.e1d87e"
+                "c4ef25e3.8547c"
             ]
         ]
     },
     {
-        "id": "311e9242.e1d87e",
+        "id": "c4ef25e3.8547c",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4684.900161743164,
-        "y": 1596.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 4659.216796875,
+        "y": 1591.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "4c098907.41a99",
-                "349df30f.7cba04"
+                "84b58dac.88eef8",
+                "70651805.f7aa38"
             ]
         ]
     },
     {
-        "id": "9175f1b.049129",
+        "id": "e91a3d87.4731c",
         "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": 5272.900161743164,
-        "y": 1599.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5247.216796875,
+        "y": 1594.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "42985b25.52fcec",
-                "e5b701e3.8392b",
-                "3efd20ec.3f4778"
+                "52bb494b.9e9548",
+                "1f1e43c3.bd50ac",
+                "27bf06a9.82b122"
             ]
         ]
     },
     {
-        "id": "b70a777b.22a5f8",
+        "id": "13e72829.65bf18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5066.900161743164,
-        "y": 1665.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5041.216796875,
+        "y": 1660.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "8a34b29e.6de5e8"
+                "f997c96d.8efde"
             ]
         ]
     },
     {
-        "id": "349df30f.7cba04",
+        "id": "70651805.f7aa38",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4889.900161743164,
-        "y": 1673.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 4864.216796875,
+        "y": 1668.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "b70a777b.22a5f8"
+                "13e72829.65bf18"
             ]
         ]
     },
     {
-        "id": "387f801c.205ae8",
+        "id": "6aba367d.688578",
         "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": 5302.900161743164,
-        "y": 1547.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5277.216796875,
+        "y": 1542.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "8a34b29e.6de5e8",
+        "id": "f997c96d.8efde",
         "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": 5279.900161743164,
-        "y": 1731.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5254.216796875,
+        "y": 1726.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "42985b25.52fcec",
+        "id": "52bb494b.9e9548",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5482.900161743164,
-        "y": 1590.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5457.216796875,
+        "y": 1585.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "16d18a71.6daf16"
+                "32b0560b.723342"
             ]
         ]
     },
     {
-        "id": "e5b701e3.8392b",
+        "id": "1f1e43c3.bd50ac",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5474.900161743164,
-        "y": 1645.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5449.216796875,
+        "y": 1640.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6ba1c131.2a9348"
+                "6c345a14.f54524"
             ]
         ]
     },
     {
-        "id": "3efd20ec.3f4778",
+        "id": "27bf06a9.82b122",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5479.900161743164,
-        "y": 1702.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5454.216796875,
+        "y": 1697.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "e5aceb1d.a2ff7"
+                "6641f5b5.b5523c"
             ]
         ]
     },
     {
-        "id": "e5aceb1d.a2ff7",
+        "id": "6641f5b5.b5523c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5631.900161743164,
-        "y": 1703.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5606.216796875,
+        "y": 1698.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "6ba1c131.2a9348",
+        "id": "6c345a14.f54524",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5642.900161743164,
-        "y": 1648.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5617.216796875,
+        "y": 1643.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "16d18a71.6daf16",
+        "id": "32b0560b.723342",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5627.282485961914,
-        "y": 1588.2224578857422,
-        "z": "1b4ba1fc.83240e",
+        "x": 5601.59912109375,
+        "y": 1582.9415588378906,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "c4efa7e8.819f98"
+                "1b5e2086.1509ff"
             ]
         ]
     },
     {
-        "id": "c4efa7e8.819f98",
+        "id": "1b5e2086.1509ff",
         "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": 5841.900161743164,
-        "y": 1584.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5816.216796875,
+        "y": 1579.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "e5f9b3dc.c2f9f",
+        "id": "7042856b.1828cc",
         "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 + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
         "comments": "",
-        "x": 3340.566665649414,
-        "y": 1454.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3314.88330078125,
+        "y": 1449.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "169ca3b9.4d31a4",
+        "id": "f434b230.257eb8",
         "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 + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
         "comments": "",
-        "x": 3327.566665649414,
-        "y": 1974.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 3301.88330078125,
+        "y": 1969.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "426ddfc0.c628b",
+        "id": "c9139602.db9618",
         "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": 2452.566696166992,
-        "y": 167.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 2426.883331298828,
+        "y": 162.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "d0874bda.7e1ac",
+        "id": "aadbe6b3.d2bba",
         "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": 2386.566696166992,
-        "y": 203.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 2360.883331298828,
+        "y": 198.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "2daf88d4.4069b",
+        "id": "e7f44e9f.7383a",
         "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": 2571.566696166992,
-        "y": 130.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 2545.883331298828,
+        "y": 125.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "4d0caa12.a83adc",
+        "id": "106d7d06.a5399b",
         "type": "comment",
         "name": "NOT NEEDED ANYMORE?",
         "info": "",
         "comments": "",
-        "x": 4098.566665649414,
-        "y": 1432.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4072.88330078125,
+        "y": 1427.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "325da1a4.661aa6",
+        "id": "f63837b1.4cefc",
         "type": "comment",
         "name": "NOT NEEDED ANYMORE?",
         "info": "",
         "comments": "",
-        "x": 4054.566635131836,
-        "y": 1896.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4028.883270263672,
+        "y": 1891.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "eca8d05b.38fb78",
+        "id": "7226ce6d.bf87d8",
         "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": 2763.5670318603516,
-        "y": 7264.566543579102,
-        "z": "1b4ba1fc.83240e",
+        "x": 2737.8836669921875,
+        "y": 7259.28564453125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "9a99585.3b52728",
+        "id": "56edb3ef.738a04",
         "type": "comment",
         "name": "START OF DELETE OPERATION",
         "info": "",
         "comments": "",
-        "x": 3322.566665649414,
-        "y": 2456.566635131836,
-        "z": "1b4ba1fc.83240e",
+        "x": 3296.88330078125,
+        "y": 2451.2857360839844,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "e1bb190b.e249c8",
+        "id": "3c54c8c2.c90b98",
         "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": 3906.250015258789,
-        "y": 2557.966751098633,
-        "z": "1b4ba1fc.83240e",
+        "x": 3880.566650390625,
+        "y": 2552.6858520507812,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "19822907.e2052f",
+        "id": "ebbe2f0a.10f36",
         "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": 3277.250015258789,
-        "y": 2537.966751098633,
-        "z": "1b4ba1fc.83240e",
+        "x": 3251.566650390625,
+        "y": 2532.6858520507812,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "3e98cd57.b05732",
-                "c601135d.8ebcb8",
-                "224a5da0.cc93c2"
+                "2be68b52.20aa24",
+                "81d3f50b.6c4d9",
+                "2035d36a.c81f14"
             ]
         ]
     },
     {
-        "id": "c601135d.8ebcb8",
+        "id": "81d3f50b.6c4d9",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3504.740982055664,
-        "y": 2510.540725708008,
-        "z": "1b4ba1fc.83240e",
+        "x": 3479.0576171875,
+        "y": 2505.2598266601562,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "ad084de2.e988e8"
+                "13ee2347.80286d"
             ]
         ]
     },
     {
-        "id": "224a5da0.cc93c2",
+        "id": "2035d36a.c81f14",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3500.250015258789,
-        "y": 2554.9666900634766,
-        "z": "1b4ba1fc.83240e",
+        "x": 3474.566650390625,
+        "y": 2549.685791015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "dcac28ad.d4a36"
+                "991792d0.e4e98"
             ]
         ]
     },
     {
-        "id": "ad084de2.e988e8",
+        "id": "13ee2347.80286d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3667.312515258789,
-        "y": 2509.826431274414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3641.629150390625,
+        "y": 2504.5455322265625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "dcac28ad.d4a36",
+        "id": "991792d0.e4e98",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3668.250015258789,
-        "y": 2554.9666900634766,
-        "z": "1b4ba1fc.83240e",
+        "x": 3642.566650390625,
+        "y": 2549.685791015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "3e98cd57.b05732",
+        "id": "2be68b52.20aa24",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3512.250015258789,
-        "y": 2604.966751098633,
-        "z": "1b4ba1fc.83240e",
+        "x": 3486.566650390625,
+        "y": 2599.6858520507812,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "eb73cd4.3d8393"
+                "f8565a8c.b30f28"
             ]
         ]
     },
     {
-        "id": "eb73cd4.3d8393",
+        "id": "f8565a8c.b30f28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3664.566665649414,
-        "y": 2608.566604614258,
-        "z": "1b4ba1fc.83240e",
+        "x": 3638.88330078125,
+        "y": 2603.2857055664062,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "24f11631.71c6d2",
-                "e1bb190b.e249c8",
-                "5066cd38.1c6414",
-                "5dc3af5e.92a278"
+                "133776d8.0b0dc9",
+                "3c54c8c2.c90b98",
+                "95fcacf8.b9d6a8",
+                "70f331ff.6983c8"
             ]
         ]
     },
     {
-        "id": "24f11631.71c6d2",
+        "id": "133776d8.0b0dc9",
         "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": 3909.250015258789,
-        "y": 2500.966751098633,
-        "z": "1b4ba1fc.83240e",
+        "x": 3883.566650390625,
+        "y": 2495.6858520507812,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "80dbb6de.b49838",
+        "id": "5f7e58ce.54f7f8",
         "type": "comment",
         "name": "Update ROOT UNI's bw",
         "info": "",
         "comments": "",
-        "x": 3871.250015258789,
-        "y": 2611.766616821289,
-        "z": "1b4ba1fc.83240e",
+        "x": 3845.566650390625,
+        "y": 2606.4857177734375,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "45c0e5f4.f4ad34",
+        "id": "9cf7d79b.0475e8",
         "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": 4549.250015258789,
-        "y": 2654.766616821289,
-        "z": "1b4ba1fc.83240e",
+        "x": 4523.566650390625,
+        "y": 2649.4857177734375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "5066cd38.1c6414",
+        "id": "95fcacf8.b9d6a8",
         "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": 3863.249771118164,
-        "y": 2657.766616821289,
-        "z": "1b4ba1fc.83240e",
+        "x": 3837.56640625,
+        "y": 2652.4857177734375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a6e50ef0.8e2c5",
-                "13029608.69349a",
-                "208dd481.7b2554"
+                "8e888721.2a9c48",
+                "ad21a1a0.49ccd8",
+                "92e1736a.a036e"
             ]
         ]
     },
     {
-        "id": "13029608.69349a",
+        "id": "ad21a1a0.49ccd8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4166.740737915039,
-        "y": 2568.340591430664,
-        "z": "1b4ba1fc.83240e",
+        "x": 4141.057373046875,
+        "y": 2563.0596923828125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a4cd8e0.5d99ef"
+                "b3d3b1a9.2b5fb"
             ]
         ]
     },
     {
-        "id": "208dd481.7b2554",
+        "id": "92e1736a.a036e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4162.249771118164,
-        "y": 2612.766555786133,
-        "z": "1b4ba1fc.83240e",
+        "x": 4136.56640625,
+        "y": 2607.4856567382812,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a8fd408a.63278"
+                "d5ecd5d7.ea0b88"
             ]
         ]
     },
     {
-        "id": "a4cd8e0.5d99ef",
+        "id": "b3d3b1a9.2b5fb",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4329.312271118164,
-        "y": 2567.6262969970703,
-        "z": "1b4ba1fc.83240e",
+        "x": 4303.62890625,
+        "y": 2562.3453979492188,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "a8fd408a.63278",
+        "id": "d5ecd5d7.ea0b88",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4330.249771118164,
-        "y": 2612.766555786133,
-        "z": "1b4ba1fc.83240e",
+        "x": 4304.56640625,
+        "y": 2607.4856567382812,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "108d95bc.e243b2",
+        "id": "70cc9613.b0a74",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4327.249771118164,
-        "y": 2662.766616821289,
-        "z": "1b4ba1fc.83240e",
+        "x": 4301.56640625,
+        "y": 2657.4857177734375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6fb618e0.320358",
-                "45c0e5f4.f4ad34"
+                "b767bcd4.bb2b6",
+                "9cf7d79b.0475e8"
             ]
         ]
     },
     {
-        "id": "a6e50ef0.8e2c5",
+        "id": "8e888721.2a9c48",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4158.249771118164,
-        "y": 2662.766616821289,
-        "z": "1b4ba1fc.83240e",
+        "x": 4132.56640625,
+        "y": 2657.4857177734375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "108d95bc.e243b2"
+                "70cc9613.b0a74"
             ]
         ]
     },
     {
-        "id": "6fb618e0.320358",
+        "id": "b767bcd4.bb2b6",
         "type": "set",
         "name": "set new bw",
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",
         "comments": "",
-        "x": 4509.250503540039,
-        "y": 2604.766616821289,
-        "z": "1b4ba1fc.83240e",
+        "x": 4483.567138671875,
+        "y": 2599.4857177734375,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "501ef6fe.de27d8",
+        "id": "f9bbca0d.1c46f8",
         "type": "comment",
         "name": "Delete LEAF UNI",
         "info": "",
         "comments": "",
-        "x": 3857.566665649414,
-        "y": 2442.566604614258,
-        "z": "1b4ba1fc.83240e",
+        "x": 3831.88330078125,
+        "y": 2437.2857055664062,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "13751b77.2d6a35",
+        "id": "e994ec3a.2da648",
         "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": 3337.433334350586,
-        "y": 3775.166702270508,
-        "z": "1b4ba1fc.83240e",
+        "x": 3311.749969482422,
+        "y": 3769.8858032226562,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "42ae91e0.cfd958",
+        "id": "fbbab64f.85fdd8",
         "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": 3470.433334350586,
-        "y": 3823.166702270508,
-        "z": "1b4ba1fc.83240e",
+        "x": 3444.749969482422,
+        "y": 3817.8858032226562,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "f0c980e9.4c97f",
+        "id": "33b02c47.fcccbc",
         "type": "switchNode",
         "name": "switch found-connectivity?",
         "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3292.433334350586,
-        "y": 3874.966751098633,
-        "z": "1b4ba1fc.83240e",
+        "x": 3266.749969482422,
+        "y": 3869.6858520507812,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "ddd00137.0625f8",
-                "49bc5de5.143edc"
+                "6fdf1010.01d5e",
+                "10c0f7ca.be20e"
             ]
         ]
     },
     {
-        "id": "ddd00137.0625f8",
+        "id": "6fdf1010.01d5e",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3485.433334350586,
-        "y": 3875.966751098633,
-        "z": "1b4ba1fc.83240e",
+        "x": 3459.749969482422,
+        "y": 3870.6858520507812,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "baae6201.7fdf3"
+                "7864f46c.db26a4"
             ]
         ]
     },
     {
-        "id": "baae6201.7fdf3",
+        "id": "7864f46c.db26a4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3629.433334350586,
-        "y": 3872.166702270508,
-        "z": "1b4ba1fc.83240e",
+        "x": 3603.749969482422,
+        "y": 3866.8858032226562,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "49bc5de5.143edc",
+        "id": "10c0f7ca.be20e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3489.433334350586,
-        "y": 3919.966751098633,
-        "z": "1b4ba1fc.83240e",
+        "x": 3463.749969482422,
+        "y": 3914.6858520507812,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "8955d942.ba6bc"
+                "8add2f88.61a8b8"
             ]
         ]
     },
     {
-        "id": "8955d942.ba6bc",
+        "id": "8add2f88.61a8b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3628.433334350586,
-        "y": 3914.966751098633,
-        "z": "1b4ba1fc.83240e",
+        "x": 3602.749969482422,
+        "y": 3909.6858520507812,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "2c8b9b3a.156d1c",
-                "942c3741.17e638",
-                "ea29b2fb.fa9b"
+                "9b6852b0.a93d98",
+                "b900318c.bfd908",
+                "4cb0c066.1db128"
             ]
         ]
     },
     {
-        "id": "2c8b9b3a.156d1c",
+        "id": "9b6852b0.a93d98",
         "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": 3878.832992553711,
-        "y": 3923.483352661133,
-        "z": "1b4ba1fc.83240e",
+        "x": 3853.149627685547,
+        "y": 3918.2024536132812,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "829ce491.bb75d8"
+                "54f58bcc.441714"
             ]
         ]
     },
     {
-        "id": "829ce491.bb75d8",
+        "id": "54f58bcc.441714",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4100.832992553711,
-        "y": 3901.483352661133,
-        "z": "1b4ba1fc.83240e",
+        "x": 4075.149627685547,
+        "y": 3896.2024536132812,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "b35a1aab.3a595"
+                "7083e1.a84c342"
             ]
         ]
     },
     {
-        "id": "b35a1aab.3a595",
+        "id": "7083e1.a84c342",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4260.832504272461,
-        "y": 3881.483352661133,
-        "z": "1b4ba1fc.83240e",
+        "x": 4235.149139404297,
+        "y": 3876.2024536132812,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "335ed745.f60fb8"
+                "94bd3415.1f22d8"
             ]
         ]
     },
     {
-        "id": "f8921006.06e1a",
+        "id": "c56c894c.5bdb1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4413.833023071289,
-        "y": 3862.483383178711,
-        "z": "1b4ba1fc.83240e",
+        "x": 4388.149658203125,
+        "y": 3857.2024841308594,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "8d9ae5c3.a9c288",
-                "b59230eb.4dd598"
+                "b6fdc844.b0e6b",
+                "1a640b2c.739935"
             ]
         ]
     },
     {
-        "id": "8d9ae5c3.a9c288",
+        "id": "b6fdc844.b0e6b",
         "type": "set",
         "name": "set tmp.stillHasUni to TRUE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",
         "comments": "",
-        "x": 4610.333236694336,
-        "y": 3830.566604614258,
-        "z": "1b4ba1fc.83240e",
+        "x": 4584.649871826172,
+        "y": 3825.2857055664062,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "942c3741.17e638",
+        "id": "b900318c.bfd908",
         "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": 3985.333267211914,
-        "y": 3842.566635131836,
-        "z": "1b4ba1fc.83240e",
+        "x": 3959.64990234375,
+        "y": 3837.2857360839844,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "ea29b2fb.fa9b",
+        "id": "4cb0c066.1db128",
         "type": "switchNode",
         "name": "switch tmp.keepVPNBs?",
         "xml": "\n<switch test=\"`$tmp.keepVPNBs`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3793.333267211914,
-        "y": 4263.566879272461,
-        "z": "1b4ba1fc.83240e",
+        "x": 3767.64990234375,
+        "y": 4258.285980224609,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "1074f3a1.e40104",
-                "49cd5621.2fb45"
+                "ae543eb1.206b4",
+                "219c19f6.cbd26e"
             ]
         ]
     },
     {
-        "id": "b59230eb.4dd598",
+        "id": "1a640b2c.739935",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4578.566665649414,
-        "y": 3898.566635131836,
-        "z": "1b4ba1fc.83240e",
+        "x": 4552.88330078125,
+        "y": 3893.2857360839844,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "49cd5621.2fb45",
+        "id": "219c19f6.cbd26e",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 180.3340301513672,
-        "y": 5327.567123413086,
-        "z": "1b4ba1fc.83240e",
+        "x": 154.65066528320312,
+        "y": 5322.286224365234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "94db503d.b50288"
+                "2520c605.40a22a"
             ]
         ]
     },
     {
-        "id": "1074f3a1.e40104",
+        "id": "ae543eb1.206b4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4014.333999633789,
-        "y": 4365.566879272461,
-        "z": "1b4ba1fc.83240e",
+        "x": 3988.650634765625,
+        "y": 4360.285980224609,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "98bce2a7.eae0e8"
+                "8fd13dc7.dbef3"
             ]
         ]
     },
     {
-        "id": "98bce2a7.eae0e8",
+        "id": "8fd13dc7.dbef3",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4157.333999633789,
-        "y": 4361.566879272461,
-        "z": "1b4ba1fc.83240e",
+        "x": 4131.650634765625,
+        "y": 4356.285980224609,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "700868f.6d62d18",
-                "9e6ef63b.470c28",
-                "98c15798.fc2c28",
-                "a474eb09.bdcea",
-                "4e75594e.323fe8",
-                "8985192.1ed6868",
-                "bbed6bed.031a08",
-                "9b06d9ac.c2c2b",
-                "35800841.c29e7"
+                "6c48a46d.6b2974",
+                "de8af5e.f07e288",
+                "5285a28b.38c8dc",
+                "2212222d.1721a6",
+                "b943d622.b35cc",
+                "467c3bf.71cfdc4",
+                "cdd12e42.2ba1b8",
+                "7f0c132f.b1df44",
+                "dc36b830.307698"
             ]
         ]
     },
     {
-        "id": "7a0c4e0f.7452f",
+        "id": "86b26306.89d478",
         "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--- mark LEAF connectivity as Modified because the underlay OTN tunnel list of this connectivity is now different\n\nif FALSE --> means this domain (connectivity) has no other UNIs\n\nif MMstillHasUni == TRUE, means scenario (3), else, means scenario (4)\n\n(3) & (4) both:\n- delete VPNBs\n- delete LEAF connectivity\n- delete LEAF Ethernet Service from PNC\n\n(3) only:\n- change ROOT conn status to Modified\n- Keep the middle-man-conn and DON'T delete\n\n(4) only:\n- delete ROOT UNI\n- delete ROOT conn from AAI\n- delete ROOT Ethernet Service from PNC\n- delete middle-man-conn from AAI\n\n",
         "comments": "",
-        "x": 206.68336486816406,
-        "y": 5283.567123413086,
-        "z": "1b4ba1fc.83240e",
+        "x": 181,
+        "y": 5278.286224365234,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "7ce224df.f32d34",
+        "id": "10b960d7.987777",
         "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": 4033.567398071289,
-        "y": 4328.566879272461,
-        "z": "1b4ba1fc.83240e",
+        "x": 4007.884033203125,
+        "y": 4323.285980224609,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "eb1e9e05.cb15c8",
+        "id": "e29766c.069bc98",
         "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": 4846.351089477539,
-        "y": 4519.350326538086,
-        "z": "1b4ba1fc.83240e",
+        "x": 4820.667724609375,
+        "y": 4514.069427490234,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "1fff7e41.5e97da",
+        "id": "70e9715b.943958",
         "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": 5191.351089477539,
-        "y": 4381.350326538086,
-        "z": "1b4ba1fc.83240e",
+        "x": 5165.667724609375,
+        "y": 4376.069427490234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "384897a.b5a9568"
+                "6e757b83.cb351c"
             ]
         ]
     },
     {
-        "id": "3095386e.cc8938",
+        "id": "b42b3ac.1b570c8",
         "type": "for",
         "name": "for netwidx..allNetworksList_length",
         "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 4898.351089477539,
-        "y": 4375.350326538086,
-        "z": "1b4ba1fc.83240e",
+        "x": 4872.667724609375,
+        "y": 4370.069427490234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "1fff7e41.5e97da"
+                "70e9715b.943958"
             ]
         ]
     },
     {
-        "id": "31c473ae.f4e764",
+        "id": "b4fe4da5.f121d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5153.351089477539,
-        "y": 4332.350326538086,
-        "z": "1b4ba1fc.83240e",
+        "x": 5127.667724609375,
+        "y": 4327.069427490234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "ca81f202.b30418",
+        "id": "574f0028.fbd13",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
         "comments": "",
-        "x": 4842.351089477539,
-        "y": 4427.350326538086,
-        "z": "1b4ba1fc.83240e",
+        "x": 4816.667724609375,
+        "y": 4422.069427490234,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "b2478692.ea1d6",
+        "id": "d130fc75.80466",
         "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": 4850.351089477539,
-        "y": 4472.350326538086,
-        "z": "1b4ba1fc.83240e",
+        "x": 4824.667724609375,
+        "y": 4467.069427490234,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "eb2b76ee.d20fa8",
+        "id": "84c9d585.1543d",
         "type": "set",
         "name": "unset otnTopoIdSrc",
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
         "comments": "",
-        "x": 4847.351089477539,
-        "y": 4325.350326538086,
-        "z": "1b4ba1fc.83240e",
+        "x": 4821.667724609375,
+        "y": 4320.069427490234,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "384897a.b5a9568",
+        "id": "6e757b83.cb351c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5100.351089477539,
-        "y": 4449.350326538086,
-        "z": "1b4ba1fc.83240e",
+        "x": 5074.667724609375,
+        "y": 4444.069427490234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a1cf1e6d.96424"
+                "c54be700.be4fd"
             ]
         ]
     },
     {
-        "id": "a1cf1e6d.96424",
+        "id": "c54be700.be4fd",
         "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": 5285.351089477539,
-        "y": 4448.350326538086,
-        "z": "1b4ba1fc.83240e",
+        "x": 5259.667724609375,
+        "y": 4443.069427490234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "e54e7c9a.d7146"
+                "820246eb.c84c18"
             ]
         ]
     },
     {
-        "id": "e54e7c9a.d7146",
+        "id": "820246eb.c84c18",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5477.351089477539,
-        "y": 4451.350326538086,
-        "z": "1b4ba1fc.83240e",
+        "x": 5451.667724609375,
+        "y": 4446.069427490234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "88338270.bbe028"
+                "3a1b08b9.047658"
             ]
         ]
     },
     {
-        "id": "88338270.bbe028",
+        "id": "3a1b08b9.047658",
         "type": "set",
         "name": "set otnTopoIdSrc",
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 5649.351089477539,
-        "y": 4447.350326538086,
-        "z": "1b4ba1fc.83240e",
+        "x": 5623.667724609375,
+        "y": 4442.069427490234,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "5518c3fe.6c8f7c",
+        "id": "c9b94557.850d48",
         "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": 5025.351089477539,
-        "y": 4562.350326538086,
-        "z": "1b4ba1fc.83240e",
+        "x": 4999.667724609375,
+        "y": 4557.069427490234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "700868f.6d62d18",
+        "id": "6c48a46d.6b2974",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4542.351089477539,
-        "y": 4347.350326538086,
-        "z": "1b4ba1fc.83240e",
+        "x": 4516.667724609375,
+        "y": 4342.069427490234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7996b8d7.d892b8",
-                "fc1f2ae1.cce1f",
-                "ca81f202.b30418",
-                "b2478692.ea1d6",
-                "eb1e9e05.cb15c8",
-                "3095386e.cc8938",
-                "5518c3fe.6c8f7c"
+                "2a754e6c.bbb83a",
+                "94fc5eb6.895cc",
+                "574f0028.fbd13",
+                "d130fc75.80466",
+                "e29766c.069bc98",
+                "b42b3ac.1b570c8",
+                "c9b94557.850d48"
             ]
         ]
     },
     {
-        "id": "aec75daf.8805f",
+        "id": "cd78afa3.c104f8",
         "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": 4527.351089477539,
-        "y": 4281.350326538086,
-        "z": "1b4ba1fc.83240e",
+        "x": 4501.667724609375,
+        "y": 4276.069427490234,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "fc1f2ae1.cce1f",
+        "id": "94fc5eb6.895cc",
         "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": 4906.351089477539,
-        "y": 4268.350326538086,
-        "z": "1b4ba1fc.83240e",
+        "x": 4880.667724609375,
+        "y": 4263.069427490234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "74fcf491.6cb18c",
-                "27200085.4f11f",
-                "31c473ae.f4e764"
+                "17a57be5.3979b4",
+                "670b39d7.0b3ba",
+                "b4fe4da5.f121d"
             ]
         ]
     },
     {
-        "id": "74fcf491.6cb18c",
+        "id": "17a57be5.3979b4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5142.351089477539,
-        "y": 4251.350326538086,
-        "z": "1b4ba1fc.83240e",
+        "x": 5116.667724609375,
+        "y": 4246.069427490234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "27200085.4f11f",
+        "id": "670b39d7.0b3ba",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5139.351089477539,
-        "y": 4292.350326538086,
-        "z": "1b4ba1fc.83240e",
+        "x": 5113.667724609375,
+        "y": 4287.069427490234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "7996b8d7.d892b8",
+        "id": "2a754e6c.bbb83a",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
         "comments": "",
-        "x": 4855.351089477539,
-        "y": 4225.350326538086,
-        "z": "1b4ba1fc.83240e",
+        "x": 4829.667724609375,
+        "y": 4220.069427490234,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "9e6ef63b.470c28",
+        "id": "de8af5e.f07e288",
         "type": "set",
         "name": "unset tmp.aai.all-vpn-bindings",
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
         "comments": "",
-        "x": 4362.351089477539,
-        "y": 4679.750228881836,
-        "z": "1b4ba1fc.83240e",
+        "x": 4336.667724609375,
+        "y": 4674.469329833984,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "d0de5ca9.0d9ed8",
+        "id": "afb6c845.26534",
         "type": "comment",
         "name": "find all OTNs that have srcTtpOtnLayer and decrease their bandwidth",
         "info": "",
         "comments": "",
-        "x": 4485.651382446289,
-        "y": 4718.750228881836,
-        "z": "1b4ba1fc.83240e",
+        "x": 4459.968017578125,
+        "y": 4713.469329833984,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "98c15798.fc2c28",
+        "id": "5285a28b.38c8dc",
         "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": 4383.651382446289,
-        "y": 4753.750228881836,
-        "z": "1b4ba1fc.83240e",
+        "x": 4357.968017578125,
+        "y": 4748.469329833984,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "435ca159.b40ef",
-                "d725cba9.49bb",
-                "47bda61e.d52e08"
+                "c3de387c.6460a",
+                "b57ba7f8.c1c99",
+                "9da86502.5d643"
             ]
         ]
     },
     {
-        "id": "435ca159.b40ef",
+        "id": "c3de387c.6460a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4588.651382446289,
-        "y": 4750.750228881836,
-        "z": "1b4ba1fc.83240e",
+        "x": 4562.968017578125,
+        "y": 4745.469329833984,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "293c4671.01eaaa"
+                "4e1f19c.9621d68"
             ]
         ]
     },
     {
-        "id": "d725cba9.49bb",
+        "id": "b57ba7f8.c1c99",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4572.142349243164,
-        "y": 4812.324264526367,
-        "z": "1b4ba1fc.83240e",
+        "x": 4546.458984375,
+        "y": 4807.043365478516,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "107ae3d6.bea87c"
+                "ec0e24f9.a11f7"
             ]
         ]
     },
     {
-        "id": "47bda61e.d52e08",
+        "id": "9da86502.5d643",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4569.651382446289,
-        "y": 4855.750228881836,
-        "z": "1b4ba1fc.83240e",
+        "x": 4543.968017578125,
+        "y": 4850.469329833984,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "b006b7ef.442db8"
+                "182c3589.c7acda"
             ]
         ]
     },
     {
-        "id": "293c4671.01eaaa",
+        "id": "4e1f19c.9621d68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4756.651626586914,
-        "y": 4745.750228881836,
-        "z": "1b4ba1fc.83240e",
+        "x": 4730.96826171875,
+        "y": 4740.469329833984,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "94070507.2dec4"
+                "af4afceb.006698"
             ]
         ]
     },
     {
-        "id": "107ae3d6.bea87c",
+        "id": "ec0e24f9.a11f7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4734.713760375977,
-        "y": 4812.610000610352,
-        "z": "1b4ba1fc.83240e",
+        "x": 4709.0303955078125,
+        "y": 4807.3291015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "b006b7ef.442db8",
+        "id": "182c3589.c7acda",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4736.651382446289,
-        "y": 4854.750228881836,
-        "z": "1b4ba1fc.83240e",
+        "x": 4710.968017578125,
+        "y": 4849.469329833984,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "94070507.2dec4",
+        "id": "af4afceb.006698",
         "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": 4994.651626586914,
-        "y": 4750.750228881836,
-        "z": "1b4ba1fc.83240e",
+        "x": 4968.96826171875,
+        "y": 4745.469329833984,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "db3073d6.6320c8"
+                "31f75628.5330d2"
             ]
         ]
     },
     {
-        "id": "db3073d6.6320c8",
+        "id": "31f75628.5330d2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5228.651382446289,
-        "y": 4757.750228881836,
-        "z": "1b4ba1fc.83240e",
+        "x": 5202.968017578125,
+        "y": 4752.469329833984,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "37f340bd.0a3438"
+                "ceae5964.7d9d38"
             ]
         ]
     },
     {
-        "id": "fcec711e.ca4568",
+        "id": "b40ed0f.db80e3",
         "type": "comment",
         "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
         "info": "",
         "comments": "",
-        "x": 5145.467300415039,
-        "y": 4828.916549682617,
-        "z": "1b4ba1fc.83240e",
+        "x": 5119.783935546875,
+        "y": 4823.635650634766,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "37f340bd.0a3438",
+        "id": "ceae5964.7d9d38",
         "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": 5089.467300415039,
-        "y": 4877.916549682617,
-        "z": "1b4ba1fc.83240e",
+        "x": 5063.783935546875,
+        "y": 4872.635650634766,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "ab022fe7.308e68",
-                "3eb6abc9.a7b9b4"
+                "5a8ad6ff.27624",
+                "4b278311.73bb1c"
             ]
         ]
     },
     {
-        "id": "3eb6abc9.a7b9b4",
+        "id": "4b278311.73bb1c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5332.467788696289,
-        "y": 4918.916061401367,
-        "z": "1b4ba1fc.83240e",
+        "x": 5306.784423828125,
+        "y": 4913.635162353516,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "ab022fe7.308e68",
+        "id": "5a8ad6ff.27624",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5343.467544555664,
-        "y": 4875.916275024414,
-        "z": "1b4ba1fc.83240e",
+        "x": 5317.7841796875,
+        "y": 4870.6353759765625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "82036bd3.d2b678"
+                "e95ba342.193f38"
             ]
         ]
     },
     {
-        "id": "8f49a5ce.76f168",
+        "id": "9b07993f.50303",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5570.450942993164,
-        "y": 4883.332778930664,
-        "z": "1b4ba1fc.83240e",
+        "x": 5544.767578125,
+        "y": 4878.0518798828125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "c997366c.5a655",
-                "3dbdc2ab.0fbd3e",
-                "bd51e31d.644ad8"
+                "574e2cd3.b5ba0c",
+                "e0ae9339.0aa92",
+                "e02f1f89.ad2d2"
             ]
         ]
     },
     {
-        "id": "cd343233.3d4178",
+        "id": "c3321d25.6b65f",
         "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": 5735.500747680664,
-        "y": 4768.333236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 5709.8173828125,
+        "y": 4763.052337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "355f9f95.f927e8"
+                "88b3d964.1a518"
             ]
         ]
     },
     {
-        "id": "355f9f95.f927e8",
+        "id": "88b3d964.1a518",
         "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": 5927.500747680664,
-        "y": 4757.333480834961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5901.8173828125,
+        "y": 4752.052581787109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d2bb482a.6b0258"
+                "949f67cc.1ebd"
             ]
         ]
     },
     {
-        "id": "c997366c.5a655",
+        "id": "574e2cd3.b5ba0c",
         "type": "set",
         "name": "unset tmp.aai.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
         "comments": "",
-        "x": 5684.017593383789,
-        "y": 4658.550277709961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5658.334228515625,
+        "y": 4653.269378662109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "3dbdc2ab.0fbd3e",
+        "id": "e0ae9339.0aa92",
         "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": 5676.017593383789,
-        "y": 4707.550277709961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5650.334228515625,
+        "y": 4702.269378662109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "bd51e31d.644ad8",
+        "id": "e02f1f89.ad2d2",
         "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": 5907.434585571289,
-        "y": 4888.716293334961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5881.751220703125,
+        "y": 4883.435394287109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "284b8a46.878cde",
+        "id": "2481a087.0bf1c",
         "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": 5859.084487915039,
-        "y": 4936.033187866211,
-        "z": "1b4ba1fc.83240e",
+        "x": 5833.401123046875,
+        "y": 4930.752288818359,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "d8829575.9f3a28",
+        "id": "f95d52e7.62b688",
         "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": 5931.434585571289,
-        "y": 4849.716293334961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5905.751220703125,
+        "y": 4844.435394287109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "d2bb482a.6b0258",
+        "id": "949f67cc.1ebd",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6109.500747680664,
-        "y": 4736.333480834961,
-        "z": "1b4ba1fc.83240e",
+        "x": 6083.8173828125,
+        "y": 4731.052581787109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "c2a155f5.9faa88"
+                "121ace63.3c455a"
             ]
         ]
     },
     {
-        "id": "c2a155f5.9faa88",
+        "id": "121ace63.3c455a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6271.500747680664,
-        "y": 4725.333480834961,
-        "z": "1b4ba1fc.83240e",
+        "x": 6245.8173828125,
+        "y": 4720.052581787109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "560d06d2.09f708",
-                "97054905.242338"
+                "776f73a4.7e64dc",
+                "1667f272.dd2c96"
             ]
         ]
     },
     {
-        "id": "560d06d2.09f708",
+        "id": "776f73a4.7e64dc",
         "type": "set",
         "name": "unset tmp.the-connectivity",
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",
         "comments": "",
-        "x": 6468.500747680664,
-        "y": 4654.333480834961,
-        "z": "1b4ba1fc.83240e",
+        "x": 6442.8173828125,
+        "y": 4649.052581787109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "97054905.242338",
+        "id": "1667f272.dd2c96",
         "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": 6465.967544555664,
-        "y": 4753.550277709961,
-        "z": "1b4ba1fc.83240e",
+        "x": 6440.2841796875,
+        "y": 4748.269378662109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "e8ad32eb.9df94",
+        "id": "7162acbd.73776c",
         "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": 3123.483413696289,
-        "y": 3212.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 3097.800048828125,
+        "y": 3207.0857849121094,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "cf9533e5.c2371",
+        "id": "2683d5ea.5fda52",
         "type": "switchNode",
         "name": "switch found-middle-man?",
         "xml": "<switch test='`$found-middle-man`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3000.483413696289,
-        "y": 3322.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 2974.800048828125,
+        "y": 3317.0857849121094,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6d545915.394bc",
-                "8fea5bf9.a101b8"
+                "111b3018.d0a418",
+                "b6f13f54.b0b718"
             ]
         ]
     },
     {
-        "id": "6d545915.394bc",
+        "id": "111b3018.d0a418",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3184.483413696289,
-        "y": 3301.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 3158.800048828125,
+        "y": 3296.0857849121094,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a2317561.56953"
+                "d9364482.82062"
             ]
         ]
     },
     {
-        "id": "a2317561.56953",
+        "id": "d9364482.82062",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3327.483413696289,
-        "y": 3301.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 3301.800048828125,
+        "y": 3296.0857849121094,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a264af99.117e28"
+                "cf188c9f.ecc3c8"
             ]
         ]
     },
     {
-        "id": "a264af99.117e28",
+        "id": "cf188c9f.ecc3c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3503.483413696289,
-        "y": 3299.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 3477.800048828125,
+        "y": 3294.0857849121094,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "8fea5bf9.a101b8",
+        "id": "b6f13f54.b0b718",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3182.483413696289,
-        "y": 3356.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 3156.800048828125,
+        "y": 3351.0857849121094,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "3fcc1946.2227c6"
+                "fa2c2e9e.fbd89"
             ]
         ]
     },
     {
-        "id": "3fcc1946.2227c6",
+        "id": "fa2c2e9e.fbd89",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3029.483413696289,
-        "y": 3489.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 3003.800048828125,
+        "y": 3484.0857849121094,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "13751b77.2d6a35",
-                "42ae91e0.cfd958",
-                "f0c980e9.4c97f",
-                "15cfd0d2.c7223f",
-                "566cdb6f.69a6a4",
-                "130e3d11.8bda33"
+                "e994ec3a.2da648",
+                "fbbab64f.85fdd8",
+                "33b02c47.fcccbc",
+                "e05b8262.c1f5c8",
+                "b8b4eeda.6b348",
+                "3a07e59d.95a52a"
             ]
         ]
     },
     {
-        "id": "b391ba6b.5d625",
+        "id": "aa1b84fb.ddf7b",
         "type": "comment",
         "name": "Find LEAF connectivity",
         "info": "",
         "comments": "",
-        "x": 3251.566665649414,
-        "y": 3729.566635131836,
-        "z": "1b4ba1fc.83240e",
+        "x": 3225.88330078125,
+        "y": 3724.2857360839844,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "15cfd0d2.c7223f",
+        "id": "e05b8262.c1f5c8",
         "type": "set",
         "name": "set tmp.MMstillHasUni to FALSE",
         "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='false' />\n",
         "comments": "",
-        "x": 3334.016616821289,
-        "y": 3502.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 3308.333251953125,
+        "y": 3497.0857849121094,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "566cdb6f.69a6a4",
+        "id": "b8b4eeda.6b348",
         "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": 3332.516372680664,
-        "y": 3548.283432006836,
-        "z": "1b4ba1fc.83240e",
+        "x": 3306.8330078125,
+        "y": 3543.0025329589844,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "69987cbf.ba882c"
+                "28597309.d39dac"
             ]
         ]
     },
     {
-        "id": "69987cbf.ba882c",
+        "id": "28597309.d39dac",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3595.516372680664,
-        "y": 3543.283432006836,
-        "z": "1b4ba1fc.83240e",
+        "x": 3569.8330078125,
+        "y": 3538.0025329589844,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6b4b309c.a784f8"
+                "d8dec514.e87428"
             ]
         ]
     },
     {
-        "id": "6b4b309c.a784f8",
+        "id": "d8dec514.e87428",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3755.515884399414,
-        "y": 3523.283432006836,
-        "z": "1b4ba1fc.83240e",
+        "x": 3729.83251953125,
+        "y": 3518.0025329589844,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "537f8032.a139c8"
+                "5a2012d5.a1cef4"
             ]
         ]
     },
     {
-        "id": "608ff90c.2e5fc",
+        "id": "3416f94d.d55766",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5092.517593383789,
-        "y": 3554.283462524414,
-        "z": "1b4ba1fc.83240e",
+        "x": 5066.834228515625,
+        "y": 3549.0025634765625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "b2d28e5c.e8fb18",
-                "d55c5cbc.26dad8",
-                "99b14097.a9c1b8"
+                "d47c10e5.abb1a",
+                "37972450.3f34e4",
+                "9d62dddf.19f4b"
             ]
         ]
     },
     {
-        "id": "b2d28e5c.e8fb18",
+        "id": "d47c10e5.abb1a",
         "type": "set",
         "name": "set tmp.MMstillHasUni to TRUE",
         "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='true' />\n",
         "comments": "",
-        "x": 5332.018081665039,
-        "y": 3503.366714477539,
-        "z": "1b4ba1fc.83240e",
+        "x": 5306.334716796875,
+        "y": 3498.0858154296875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "d55c5cbc.26dad8",
+        "id": "37972450.3f34e4",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5265.251510620117,
-        "y": 3576.366744995117,
-        "z": "1b4ba1fc.83240e",
+        "x": 5239.568145751953,
+        "y": 3571.0858459472656,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "3b35e0ea.5843e8",
+        "id": "81bb4a2a.7bc33",
         "type": "comment",
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",
         "info": "",
         "comments": "",
-        "x": 4458.567642211914,
-        "y": 5110.566879272461,
-        "z": "1b4ba1fc.83240e",
+        "x": 4432.88427734375,
+        "y": 5105.285980224609,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "a474eb09.bdcea",
+        "id": "2212222d.1721a6",
         "type": "set",
         "name": "set tmp.leafconn.",
         "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",
         "comments": "",
-        "x": 4357.000503540039,
-        "y": 5162.483383178711,
-        "z": "1b4ba1fc.83240e",
+        "x": 4331.317138671875,
+        "y": 5157.202484130859,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "bbed6bed.031a08",
+        "id": "cdd12e42.2ba1b8",
         "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": 4508.000503540039,
-        "y": 5605.483383178711,
-        "z": "1b4ba1fc.83240e",
+        "x": 4482.317138671875,
+        "y": 5600.202484130859,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "9b06d9ac.c2c2b",
+        "id": "7f0c132f.b1df44",
         "type": "switchNode",
         "name": "switch found-root-connectivity",
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4323.000503540039,
-        "y": 5672.483383178711,
-        "z": "1b4ba1fc.83240e",
+        "x": 4297.317138671875,
+        "y": 5667.202484130859,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "da6e8509.7a87a8",
-                "16a08f38.4e9a49"
+                "926aab17.e275a",
+                "bc8bcaa1.d641e8"
             ]
         ]
     },
     {
-        "id": "da6e8509.7a87a8",
+        "id": "926aab17.e275a",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4588.000503540039,
-        "y": 5657.483383178711,
-        "z": "1b4ba1fc.83240e",
+        "x": 4562.317138671875,
+        "y": 5652.202484130859,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "c2e76143.b6b218"
+                "749c0d73.9fee4c"
             ]
         ]
     },
     {
-        "id": "16a08f38.4e9a49",
+        "id": "bc8bcaa1.d641e8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4584.000503540039,
-        "y": 5705.483383178711,
-        "z": "1b4ba1fc.83240e",
+        "x": 4558.317138671875,
+        "y": 5700.202484130859,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "8fe2e656.247af"
+                "49001f8f.249f28"
             ]
         ]
     },
     {
-        "id": "c2e76143.b6b218",
+        "id": "749c0d73.9fee4c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4744.000503540039,
-        "y": 5653.483383178711,
-        "z": "1b4ba1fc.83240e",
+        "x": 4718.317138671875,
+        "y": 5648.202484130859,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "9d183ed0.0c624"
+                "17e137f7.f9138"
             ]
         ]
     },
     {
-        "id": "8fe2e656.247af",
+        "id": "49001f8f.249f28",
         "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": 4732.000503540039,
-        "y": 5700.483383178711,
-        "z": "1b4ba1fc.83240e",
+        "x": 4706.317138671875,
+        "y": 5695.202484130859,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "2c1c4698.bb1b8a",
+        "id": "e9eb95a.e0ce568",
         "type": "set",
         "name": "set tmp.rootconn.",
         "xml": "<set>\n<parameter name='tmp.rootconn.' value=\"`$tmp.aai.ROOT.connectivity.`\" />\n\n\n",
         "comments": "",
-        "x": 5164.000747680664,
-        "y": 5595.483383178711,
-        "z": "1b4ba1fc.83240e",
+        "x": 5138.3173828125,
+        "y": 5590.202484130859,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "39f2eed6.a40982",
+        "id": "7c03a888.d651",
         "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": 4566.417495727539,
-        "y": 5191.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 4540.734130859375,
+        "y": 5186.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "4e75594e.323fe8",
+        "id": "b943d622.b35cc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4337.417495727539,
-        "y": 5280.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 4311.734130859375,
+        "y": 5275.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "39f2eed6.a40982",
-                "ec0a5547.230718"
+                "7c03a888.d651",
+                "741f789d.c1701"
             ]
         ]
     },
     {
-        "id": "ec0a5547.230718",
+        "id": "741f789d.c1701",
         "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": 4573.417495727539,
-        "y": 5273.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 4547.734130859375,
+        "y": 5268.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "f4f0abfb.959d98",
-                "6d247b2e.c14f4c",
-                "ac6604fb.6b0698"
+                "8e631709.9703e",
+                "67d67460.c609e4",
+                "d648c0fa.0b77a8"
             ]
         ]
     },
     {
-        "id": "f4f0abfb.959d98",
+        "id": "8e631709.9703e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4768.917617797852,
-        "y": 5225.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 4743.2342529296875,
+        "y": 5220.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7a4a15ea.cb5f7c"
+                "557dbe85.6b2148"
             ]
         ]
     },
     {
-        "id": "6d247b2e.c14f4c",
+        "id": "67d67460.c609e4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4760.917617797852,
-        "y": 5280.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 4735.2342529296875,
+        "y": 5275.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "9d792ff5.12f1d8"
+                "5bf448c8.1a6988"
             ]
         ]
     },
     {
-        "id": "7a4a15ea.cb5f7c",
+        "id": "557dbe85.6b2148",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4913.299942016602,
-        "y": 5225.422744750977,
-        "z": "1b4ba1fc.83240e",
+        "x": 4887.6165771484375,
+        "y": 5220.141845703125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "22a044c0.3de0ec"
+                "fe2fb306.35f718"
             ]
         ]
     },
     {
-        "id": "22a044c0.3de0ec",
+        "id": "fe2fb306.35f718",
         "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": 5097.417495727539,
-        "y": 5223.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5071.734130859375,
+        "y": 5218.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "afda241e.dc7d4"
+                "623662a6.321084"
             ]
         ]
     },
     {
-        "id": "afda241e.dc7d4",
+        "id": "623662a6.321084",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5292.417495727539,
-        "y": 5223.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5266.734130859375,
+        "y": 5218.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7162d2d.84a60ac"
+                "e938fab.b235908"
             ]
         ]
     },
     {
-        "id": "ac6604fb.6b0698",
+        "id": "d648c0fa.0b77a8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4765.917617797852,
-        "y": 5337.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 4740.2342529296875,
+        "y": 5332.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "cc0a2fe1.d0b358"
+                "b12af343.8616c"
             ]
         ]
     },
     {
-        "id": "cc0a2fe1.d0b358",
+        "id": "b12af343.8616c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4917.917617797852,
-        "y": 5338.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 4892.2342529296875,
+        "y": 5333.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "9d792ff5.12f1d8",
+        "id": "5bf448c8.1a6988",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4928.917617797852,
-        "y": 5281.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 4903.2342529296875,
+        "y": 5276.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "9e3505a2.ad7f68",
+        "id": "45e37676.b3ae38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5674.417495727539,
-        "y": 5227.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5648.734130859375,
+        "y": 5222.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "ea7ae99e.7714a",
-                "97767b77.532b48",
-                "bd9bb3b2.0d8698"
+                "ab290c95.7c31f8",
+                "9018bd5e.6b648",
+                "b0b7686a.f22a48"
             ]
         ]
     },
     {
-        "id": "7162d2d.84a60ac",
+        "id": "e938fab.b235908",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5495.417495727539,
-        "y": 5227.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5469.734130859375,
+        "y": 5222.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "9e3505a2.ad7f68"
+                "45e37676.b3ae38"
             ]
         ]
     },
     {
-        "id": "97767b77.532b48",
+        "id": "9018bd5e.6b648",
         "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": 5880.417495727539,
-        "y": 5240.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5854.734130859375,
+        "y": 5235.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "8ede340c.5a66c8",
-                "74477750.32976",
-                "ea5203af.a882c8"
+                "6880c853.571ac",
+                "27b0dc8.dc2bca4",
+                "88c18631.ac0cc8"
             ]
         ]
     },
     {
-        "id": "ea7ae99e.7714a",
+        "id": "ab290c95.7c31f8",
         "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": 5910.417495727539,
-        "y": 5188.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5884.734130859375,
+        "y": 5183.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "8ede340c.5a66c8",
+        "id": "6880c853.571ac",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6090.417495727539,
-        "y": 5231.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 6064.734130859375,
+        "y": 5226.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "5e0e6cb.070b594"
+                "23e6d39c.ca6f94"
             ]
         ]
     },
     {
-        "id": "74477750.32976",
+        "id": "27b0dc8.dc2bca4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6082.417495727539,
-        "y": 5286.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 6056.734130859375,
+        "y": 5281.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "8bfb7c50.692e68"
+                "c0508cff.258128"
             ]
         ]
     },
     {
-        "id": "ea5203af.a882c8",
+        "id": "88c18631.ac0cc8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6087.417495727539,
-        "y": 5343.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 6061.734130859375,
+        "y": 5338.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "1d7cc732.18ead1"
+                "9fe983fa.692458"
             ]
         ]
     },
     {
-        "id": "1d7cc732.18ead1",
+        "id": "9fe983fa.692458",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 6239.417495727539,
-        "y": 5344.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 6213.734130859375,
+        "y": 5339.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "8bfb7c50.692e68",
+        "id": "c0508cff.258128",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 6250.417495727539,
-        "y": 5289.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 6224.734130859375,
+        "y": 5284.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "5e0e6cb.070b594",
+        "id": "23e6d39c.ca6f94",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6234.799819946289,
-        "y": 5229.422744750977,
-        "z": "1b4ba1fc.83240e",
+        "x": 6209.116455078125,
+        "y": 5224.141845703125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "20b06727.e2f538"
+                "e1b89291.825068"
             ]
         ]
     },
     {
-        "id": "20b06727.e2f538",
+        "id": "e1b89291.825068",
         "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": 6449.417495727539,
-        "y": 5225.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 6423.734130859375,
+        "y": 5220.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "bd9bb3b2.0d8698",
+        "id": "b0b7686a.f22a48",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5830.417495727539,
-        "y": 5304.767074584961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5804.734130859375,
+        "y": 5299.486175537109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "8985192.1ed6868",
+        "id": "467c3bf.71cfdc4",
         "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": 4478.917739868164,
-        "y": 5385.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 4453.234375,
+        "y": 5380.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "62c705b1.502d1c",
-                "1b875464.e01f44"
+                "475456de.095b28",
+                "e46dba62.d133c8"
             ]
         ]
     },
     {
-        "id": "62c705b1.502d1c",
+        "id": "475456de.095b28",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4839.417495727539,
-        "y": 5393.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 4813.734130859375,
+        "y": 5388.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d191549e.030218"
+                "e4100738.bedad8"
             ]
         ]
     },
     {
-        "id": "d191549e.030218",
+        "id": "e4100738.bedad8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4997.417495727539,
-        "y": 5393.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 4971.734130859375,
+        "y": 5388.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "18bca107.e50237",
+        "id": "2c862c6c.12858c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5000.917495727539,
-        "y": 5433.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 4975.234130859375,
+        "y": 5428.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "1b875464.e01f44",
+        "id": "e46dba62.d133c8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4843.417495727539,
-        "y": 5433.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 4817.734130859375,
+        "y": 5428.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "18bca107.e50237"
+                "2c862c6c.12858c"
             ]
         ]
     },
     {
-        "id": "8380c690.faafc",
+        "id": "4be3ffba.2e7d2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5152.134536743164,
-        "y": 5647.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5126.451171875,
+        "y": 5642.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "1f713bf9.1daaec",
-                "39b06195.a8d3be"
+                "6bb3bb26.aa81b4",
+                "1977e509.6db2ab"
             ]
         ]
     },
     {
-        "id": "39b06195.a8d3be",
+        "id": "1977e509.6db2ab",
         "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": 5394.134292602539,
-        "y": 5597.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5368.450927734375,
+        "y": 5592.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "fbd8ede5.0e2c68",
-                "fe4285c6.cb2308",
-                "3fecf8f4.4ce3f"
+                "b10ef966.1e9bd8",
+                "14377f23.b76f19",
+                "338fe6b.9e69f9a"
             ]
         ]
     },
     {
-        "id": "fbd8ede5.0e2c68",
+        "id": "b10ef966.1e9bd8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5589.634536743164,
-        "y": 5531.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5563.951171875,
+        "y": 5526.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "10a1ac3d.04aa44"
+                "ca399707.489dc"
             ]
         ]
     },
     {
-        "id": "fe4285c6.cb2308",
+        "id": "14377f23.b76f19",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5585.634536743164,
-        "y": 5587.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5559.951171875,
+        "y": 5582.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "f166d116.9a8368"
+                "9a688c1c.979b18"
             ]
         ]
     },
     {
-        "id": "10a1ac3d.04aa44",
+        "id": "ca399707.489dc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5734.016738891602,
-        "y": 5549.022354125977,
-        "z": "1b4ba1fc.83240e",
+        "x": 5708.3333740234375,
+        "y": 5543.741455078125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "2f38d9ab.5bfbbe"
+                "518bb115.3e1828"
             ]
         ]
     },
     {
-        "id": "2f38d9ab.5bfbbe",
+        "id": "518bb115.3e1828",
         "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": 5918.134292602539,
-        "y": 5547.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5892.450927734375,
+        "y": 5542.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "e1d73c4d.409db8"
+                "a95efbd.96c1f88"
             ]
         ]
     },
     {
-        "id": "3fecf8f4.4ce3f",
+        "id": "338fe6b.9e69f9a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5595.634536743164,
-        "y": 5632.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5569.951171875,
+        "y": 5627.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "ba50366d.81301"
+                "2bd9cd74.b57772"
             ]
         ]
     },
     {
-        "id": "ba50366d.81301",
+        "id": "2bd9cd74.b57772",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5774.634536743164,
-        "y": 5648.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5748.951171875,
+        "y": 5643.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "f166d116.9a8368",
+        "id": "9a688c1c.979b18",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5756.634536743164,
-        "y": 5600.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5730.951171875,
+        "y": 5595.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "1d5ce61.ba31c9a",
+        "id": "a5be160b.7233f8",
         "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": 5305.634536743164,
-        "y": 5702.966293334961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5279.951171875,
+        "y": 5697.685394287109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "8374d45d.c41588",
-                "6d72c625.482d5"
+                "21841842.1d8ad8",
+                "25d11f87.0e38d"
             ]
         ]
     },
     {
-        "id": "8374d45d.c41588",
+        "id": "21841842.1d8ad8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5654.134536743164,
-        "y": 5684.966293334961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5628.451171875,
+        "y": 5679.685394287109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "53e0b67e.6fc768"
+                "77a65248.1f8454"
             ]
         ]
     },
     {
-        "id": "53e0b67e.6fc768",
+        "id": "77a65248.1f8454",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5910.134536743164,
-        "y": 5687.966293334961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5884.451171875,
+        "y": 5682.685394287109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "1ee806c.abb34f9",
+        "id": "36c31917.4e963e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5862.634536743164,
-        "y": 5728.966293334961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5836.951171875,
+        "y": 5723.685394287109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "6d72c625.482d5",
+        "id": "25d11f87.0e38d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5664.134536743164,
-        "y": 5733.966293334961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5638.451171875,
+        "y": 5728.685394287109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "1ee806c.abb34f9"
+                "36c31917.4e963e"
             ]
         ]
     },
     {
-        "id": "1f713bf9.1daaec",
+        "id": "6bb3bb26.aa81b4",
         "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": 5387.134292602539,
-        "y": 5515.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 5361.450927734375,
+        "y": 5510.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "e1d73c4d.409db8",
+        "id": "a95efbd.96c1f88",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6113.134292602539,
-        "y": 5547.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 6087.450927734375,
+        "y": 5542.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "b323e9c9.c4083"
+                "5b53283.237bd58"
             ]
         ]
     },
     {
-        "id": "be7ed337.773238",
+        "id": "32954f05.a0f998",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6495.134292602539,
-        "y": 5551.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 6469.450927734375,
+        "y": 5546.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "1a0db354.43c10d",
-                "711b7fd1.39246",
-                "1b22d01c.0f5988"
+                "77ce96c2.5602e8",
+                "3fe633a6.1c94b4",
+                "2e5333ff.9beaf4"
             ]
         ]
     },
     {
-        "id": "b323e9c9.c4083",
+        "id": "5b53283.237bd58",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6316.134292602539,
-        "y": 5551.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 6290.450927734375,
+        "y": 5546.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "be7ed337.773238"
+                "32954f05.a0f998"
             ]
         ]
     },
     {
-        "id": "711b7fd1.39246",
+        "id": "3fe633a6.1c94b4",
         "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": 6701.134292602539,
-        "y": 5564.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 6675.450927734375,
+        "y": 5559.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d1222469.959ab8",
-                "2ce3fcd5.8dd1cc",
-                "95dec9e7.124ae"
+                "6653ee89.119c48",
+                "90d289d3.d64128",
+                "65b6f2f3.cb40dc"
             ]
         ]
     },
     {
-        "id": "1a0db354.43c10d",
+        "id": "77ce96c2.5602e8",
         "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": 6731.134292602539,
-        "y": 5512.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 6705.450927734375,
+        "y": 5507.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "d1222469.959ab8",
+        "id": "6653ee89.119c48",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6911.134292602539,
-        "y": 5555.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 6885.450927734375,
+        "y": 5550.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "15af61ce.93dc56"
+                "e4a1281d.94a088"
             ]
         ]
     },
     {
-        "id": "2ce3fcd5.8dd1cc",
+        "id": "90d289d3.d64128",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6903.134292602539,
-        "y": 5610.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 6877.450927734375,
+        "y": 5605.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "85d2a0c5.7b74c"
+                "c0981577.68ad28"
             ]
         ]
     },
     {
-        "id": "95dec9e7.124ae",
+        "id": "65b6f2f3.cb40dc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6908.134292602539,
-        "y": 5667.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 6882.450927734375,
+        "y": 5662.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6c15ae6.0ebeb5"
+                "9cc01382.31d9c8"
             ]
         ]
     },
     {
-        "id": "6c15ae6.0ebeb5",
+        "id": "9cc01382.31d9c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 7060.134292602539,
-        "y": 5668.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 7034.450927734375,
+        "y": 5663.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "85d2a0c5.7b74c",
+        "id": "c0981577.68ad28",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 7071.134292602539,
-        "y": 5613.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 7045.450927734375,
+        "y": 5608.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "15af61ce.93dc56",
+        "id": "e4a1281d.94a088",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 7055.516616821289,
-        "y": 5553.022354125977,
-        "z": "1b4ba1fc.83240e",
+        "x": 7029.833251953125,
+        "y": 5547.741455078125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "370a475d.301248"
+                "e0ec5a36.3fa468"
             ]
         ]
     },
     {
-        "id": "370a475d.301248",
+        "id": "e0ec5a36.3fa468",
         "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": 7270.134292602539,
-        "y": 5549.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 7244.450927734375,
+        "y": 5544.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "1b22d01c.0f5988",
+        "id": "2e5333ff.9beaf4",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 6651.134292602539,
-        "y": 5628.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 6625.450927734375,
+        "y": 5623.085784912109,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "537f8032.a139c8",
+        "id": "5a2012d5.a1cef4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3880.566665649414,
-        "y": 3517.566635131836,
-        "z": "1b4ba1fc.83240e",
+        "x": 3854.88330078125,
+        "y": 3512.2857360839844,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "4c0087b1.a54ff",
-                "543f9693.a47c"
+                "2e4356c1.85e5c2",
+                "817ee67a.98bbb8"
             ]
         ]
     },
     {
-        "id": "4c0087b1.a54ff",
+        "id": "2e4356c1.85e5c2",
         "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": 4071.149917602539,
-        "y": 3460.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 4045.466552734375,
+        "y": 3455.0857849121094,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "543f9693.a47c",
+        "id": "817ee67a.98bbb8",
         "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": 4118.149917602539,
-        "y": 3531.366683959961,
-        "z": "1b4ba1fc.83240e",
+        "x": 4092.466552734375,
+        "y": 3526.0857849121094,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "e4164ac6.db6c38",
-                "5e838a6b.5e0f0c"
+                "eff8b608.f4ac8",
+                "aeb603b8.1d9588"
             ]
         ]
     },
     {
-        "id": "e4164ac6.db6c38",
+        "id": "eff8b608.f4ac8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4356.567398071289,
-        "y": 3490.566635131836,
-        "z": "1b4ba1fc.83240e",
+        "x": 4330.884033203125,
+        "y": 3485.2857360839844,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "4d697267.53d1ec"
+                "bb88d9bc.29cfc"
             ]
         ]
     },
     {
-        "id": "5e838a6b.5e0f0c",
+        "id": "aeb603b8.1d9588",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4363.567611694336,
-        "y": 3547.566604614258,
-        "z": "1b4ba1fc.83240e",
+        "x": 4337.884246826172,
+        "y": 3542.2857055664062,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "fa76b584.bdbd9"
+                "c59416d6.8ba4c8"
             ]
         ]
     },
     {
-        "id": "4d697267.53d1ec",
+        "id": "bb88d9bc.29cfc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4484.567886352539,
-        "y": 3486.566635131836,
-        "z": "1b4ba1fc.83240e",
+        "x": 4458.884521484375,
+        "y": 3481.2857360839844,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "130e3d11.8bda33",
+        "id": "3a07e59d.95a52a",
         "type": "set",
         "name": "set tmp.MMonlyHasROOT to TRUE",
         "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='true' />\n",
         "comments": "",
-        "x": 3339.766616821289,
-        "y": 3444.966781616211,
-        "z": "1b4ba1fc.83240e",
+        "x": 3314.083251953125,
+        "y": 3439.6858825683594,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "99b14097.a9c1b8",
+        "id": "9d62dddf.19f4b",
         "type": "set",
         "name": "set tmp.MMonlyHasROOT to FALSE",
         "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='false' />\n",
         "comments": "",
-        "x": 5321.600845336914,
-        "y": 3446.966812133789,
-        "z": "1b4ba1fc.83240e",
+        "x": 5295.91748046875,
+        "y": 3441.6859130859375,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "335ed745.f60fb8",
+        "id": "94bd3415.1f22d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4433.350357055664,
-        "y": 3967.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 4407.6669921875,
+        "y": 3961.9024353027344,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "64f170e7.ccc2d",
-                "d03c542e.06f138"
+                "6935663a.9d5408",
+                "be9be1c2.b73f18"
             ]
         ]
     },
     {
-        "id": "64f170e7.ccc2d",
+        "id": "6935663a.9d5408",
         "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": 4606.233169555664,
-        "y": 3962.843002319336,
-        "z": "1b4ba1fc.83240e",
+        "x": 4580.5498046875,
+        "y": 3957.5621032714844,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "d03c542e.06f138",
+        "id": "be9be1c2.b73f18",
         "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": 4609.233169555664,
-        "y": 4009.843002319336,
-        "z": "1b4ba1fc.83240e",
+        "x": 4583.5498046875,
+        "y": 4004.5621032714844,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d5d4471e.75f138",
-                "fea86c4e.6eb66",
-                "9876b951.6d5f9"
+                "c0042631.4f4f28",
+                "22708d43.de1092",
+                "4a7fa995.9eae4"
             ]
         ]
     },
     {
-        "id": "d5d4471e.75f138",
+        "id": "c0042631.4f4f28",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4781.233169555664,
-        "y": 3993.843002319336,
-        "z": "1b4ba1fc.83240e",
+        "x": 4755.5498046875,
+        "y": 3988.5621032714844,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "c08f73d3.bbadb"
+                "ca5dd9fd.1cc728"
             ]
         ]
     },
     {
-        "id": "fea86c4e.6eb66",
+        "id": "22708d43.de1092",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4781.724136352539,
-        "y": 4039.417037963867,
-        "z": "1b4ba1fc.83240e",
+        "x": 4756.040771484375,
+        "y": 4034.1361389160156,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "9876b951.6d5f9",
+        "id": "4a7fa995.9eae4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4782.233169555664,
-        "y": 4079.843002319336,
-        "z": "1b4ba1fc.83240e",
+        "x": 4756.5498046875,
+        "y": 4074.5621032714844,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "c08f73d3.bbadb",
+        "id": "ca5dd9fd.1cc728",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4942.233169555664,
-        "y": 3989.843002319336,
-        "z": "1b4ba1fc.83240e",
+        "x": 4916.5498046875,
+        "y": 3984.5621032714844,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "71418de6.0d2394",
-                "d8794541.6fe0d",
-                "69521be3.cd51ac"
+                "47c9bf0a.a975f",
+                "7fbd75a1.7d6984",
+                "d27053b4.e2d198"
             ]
         ]
     },
     {
-        "id": "7f40068a.c630c8",
+        "id": "4c40c5cd.79b95c",
         "type": "comment",
         "name": "find the node part of the uni.id (uni-tp-id-node-part)",
         "info": "",
         "comments": "",
-        "x": 5275.233169555664,
-        "y": 3920.843002319336,
-        "z": "1b4ba1fc.83240e",
+        "x": 5249.5498046875,
+        "y": 3915.5621032714844,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "d8794541.6fe0d",
+        "id": "7fbd75a1.7d6984",
         "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": 5210.233169555664,
-        "y": 3977.843002319336,
-        "z": "1b4ba1fc.83240e",
+        "x": 5184.5498046875,
+        "y": 3972.5621032714844,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "eb66d929.7d0b9",
-                "25fd01e0.613c0e"
+                "daa849f8.0ba3e",
+                "4a912d90.87d7dc"
             ]
         ]
     },
     {
-        "id": "25fd01e0.613c0e",
+        "id": "4a912d90.87d7dc",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5433.233169555664,
-        "y": 3963.843002319336,
-        "z": "1b4ba1fc.83240e",
+        "x": 5407.5498046875,
+        "y": 3958.5621032714844,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "b7f38bd8.a0bf3"
+                "88c966fa.22614"
             ]
         ]
     },
     {
-        "id": "eb66d929.7d0b9",
+        "id": "daa849f8.0ba3e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5435.233169555664,
-        "y": 3996.843002319336,
-        "z": "1b4ba1fc.83240e",
+        "x": 5409.5498046875,
+        "y": 3991.5621032714844,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "23361310.a1a764"
+                "9f641079.ba835"
             ]
         ]
     },
     {
-        "id": "b7f38bd8.a0bf3",
+        "id": "88c966fa.22614",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5581.233169555664,
-        "y": 3956.843002319336,
-        "z": "1b4ba1fc.83240e",
+        "x": 5555.5498046875,
+        "y": 3951.5621032714844,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "16198ed9.69ab49"
+                "9a9d27fb.7b5ae"
             ]
         ]
     },
     {
-        "id": "23361310.a1a764",
+        "id": "9f641079.ba835",
         "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": 5578.233169555664,
-        "y": 3993.843002319336,
-        "z": "1b4ba1fc.83240e",
+        "x": 5552.5498046875,
+        "y": 3988.5621032714844,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "16198ed9.69ab49",
+        "id": "9a9d27fb.7b5ae",
         "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": 5758.233169555664,
-        "y": 3956.843002319336,
-        "z": "1b4ba1fc.83240e",
+        "x": 5732.5498046875,
+        "y": 3951.5621032714844,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "71418de6.0d2394",
+        "id": "47c9bf0a.a975f",
         "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": 5254.233169555664,
-        "y": 4111.843002319336,
-        "z": "1b4ba1fc.83240e",
+        "x": 5228.5498046875,
+        "y": 4106.562103271484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "adaeb862.473368",
-                "2ff17e89.b4833a"
+                "9f7c3aad.53ed38",
+                "d508e81a.16c548"
             ]
         ]
     },
     {
-        "id": "adaeb862.473368",
+        "id": "9f7c3aad.53ed38",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5535.233169555664,
-        "y": 4088.843002319336,
-        "z": "1b4ba1fc.83240e",
+        "x": 5509.5498046875,
+        "y": 4083.5621032714844,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "b52ce206.918da8"
+                "6b5444ec.0e74cc"
             ]
         ]
     },
     {
-        "id": "2ff17e89.b4833a",
+        "id": "d508e81a.16c548",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5528.233169555664,
-        "y": 4147.843002319336,
-        "z": "1b4ba1fc.83240e",
+        "x": 5502.5498046875,
+        "y": 4142.562103271484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "b7c68567.02237"
+                "a57a183a.4f512"
             ]
         ]
     },
     {
-        "id": "b52ce206.918da8",
+        "id": "6b5444ec.0e74cc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5665.233169555664,
-        "y": 4092.843002319336,
-        "z": "1b4ba1fc.83240e",
+        "x": 5639.5498046875,
+        "y": 4087.5621032714844,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "b7c68567.02237",
+        "id": "a57a183a.4f512",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5670.233169555664,
-        "y": 4146.843002319336,
-        "z": "1b4ba1fc.83240e",
+        "x": 5644.5498046875,
+        "y": 4141.562103271484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "e0f7b55.335ff48",
-                "cb97a1e2.dfe9f8"
+                "b18806a7.b3bfd",
+                "ccf1cec1.bc032"
             ]
         ]
     },
     {
-        "id": "e0f7b55.335ff48",
+        "id": "b18806a7.b3bfd",
         "type": "set",
         "name": "set no-pce-call",
         "xml": "<set>\n<parameter name='no-pce-call' value=\"true\" />\n",
         "comments": "",
-        "x": 5862.233169555664,
-        "y": 4113.843002319336,
-        "z": "1b4ba1fc.83240e",
+        "x": 5836.5498046875,
+        "y": 4108.562103271484,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "8511bfc9.24e818",
+        "id": "2b23daed.de49a6",
         "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": 5878.233169555664,
-        "y": 4165.843002319336,
-        "z": "1b4ba1fc.83240e",
+        "x": 5852.5498046875,
+        "y": 4160.562103271484,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "cb97a1e2.dfe9f8",
+        "id": "ccf1cec1.bc032",
         "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": 5896.516860961914,
-        "y": 4235.433334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 5870.83349609375,
+        "y": 4230.152435302734,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "69521be3.cd51ac",
+        "id": "d27053b4.e2d198",
         "type": "set",
         "name": "set tmp.stillHasUni to TRUE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",
         "comments": "",
-        "x": 5173.216567993164,
-        "y": 4061.333236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 5147.533203125,
+        "y": 4056.0523376464844,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "94db503d.b50288",
+        "id": "2520c605.40a22a",
         "type": "switchNode",
         "name": "switch tmp.stillHasUni?",
         "xml": "\n<switch test=\"`$tmp.stillHasUni`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 409.4172821044922,
-        "y": 5331.532943725586,
-        "z": "1b4ba1fc.83240e",
+        "x": 383.7339172363281,
+        "y": 5326.252044677734,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "98c37402.345048",
-                "44b19987.103118"
+                "c1b9af54.b56a3",
+                "ab60aff5.ef6de8"
             ]
         ]
     },
     {
-        "id": "5e023344.61a9f4",
+        "id": "37365b38.b727a4",
         "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": 4314.199722290039,
-        "y": 5495.416732788086,
-        "z": "1b4ba1fc.83240e",
+        "x": 4288.516357421875,
+        "y": 5490.135833740234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "76f7324c.5ab6f4",
-                "92aa08d0.816178",
-                "84add947.e60b78"
+                "81da98d4.afeb3",
+                "3ec2a5e9.1b8c7a",
+                "90c2c87a.2ba4f8"
             ]
         ]
     },
     {
-        "id": "26cdc27d.9e4c6e",
+        "id": "1b110349.17b25d",
         "type": "comment",
         "name": "Update ROOT UNI's bw -- ALREADY DONE",
         "info": "",
         "comments": "",
-        "x": 4312.200210571289,
-        "y": 5447.416976928711,
-        "z": "1b4ba1fc.83240e",
+        "x": 4286.516845703125,
+        "y": 5442.136077880859,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "eb8b95c0.79475",
+        "id": "feaf6c5c.b919f",
         "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": 4929.199966430664,
-        "y": 5565.416976928711,
-        "z": "1b4ba1fc.83240e",
+        "x": 4903.5166015625,
+        "y": 5560.136077880859,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "92aa08d0.816178",
+        "id": "3ec2a5e9.1b8c7a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4531.690933227539,
-        "y": 5465.990951538086,
-        "z": "1b4ba1fc.83240e",
+        "x": 4506.007568359375,
+        "y": 5460.710052490234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "8b26daec.dead98"
+                "3e15c1e0.3f5b3e"
             ]
         ]
     },
     {
-        "id": "84add947.e60b78",
+        "id": "90c2c87a.2ba4f8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4527.199966430664,
-        "y": 5510.416915893555,
-        "z": "1b4ba1fc.83240e",
+        "x": 4501.5166015625,
+        "y": 5505.136016845703,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6ddd64cd.a4b574"
+                "f6e77d5b.d9f6c8"
             ]
         ]
     },
     {
-        "id": "8b26daec.dead98",
+        "id": "3e15c1e0.3f5b3e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4694.262466430664,
-        "y": 5465.276657104492,
-        "z": "1b4ba1fc.83240e",
+        "x": 4668.5791015625,
+        "y": 5459.995758056641,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "6ddd64cd.a4b574",
+        "id": "f6e77d5b.d9f6c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4695.199966430664,
-        "y": 5510.416915893555,
-        "z": "1b4ba1fc.83240e",
+        "x": 4669.5166015625,
+        "y": 5505.136016845703,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "5ac227ed.4c0b7",
+        "id": "ac60929d.a61b6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4692.199966430664,
-        "y": 5560.416976928711,
-        "z": "1b4ba1fc.83240e",
+        "x": 4666.5166015625,
+        "y": 5555.136077880859,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "176f7b0f.04a15d",
-                "eb8b95c0.79475"
+                "86bfdde2.f9d01",
+                "feaf6c5c.b919f"
             ]
         ]
     },
     {
-        "id": "76f7324c.5ab6f4",
+        "id": "81da98d4.afeb3",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4523.199966430664,
-        "y": 5560.416976928711,
-        "z": "1b4ba1fc.83240e",
+        "x": 4497.5166015625,
+        "y": 5555.136077880859,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "5ac227ed.4c0b7"
+                "ac60929d.a61b6"
             ]
         ]
     },
     {
-        "id": "176f7b0f.04a15d",
+        "id": "86bfdde2.f9d01",
         "type": "set",
         "name": "set new bw",
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",
         "comments": "",
-        "x": 4885.200942993164,
-        "y": 5485.416976928711,
-        "z": "1b4ba1fc.83240e",
+        "x": 4859.517578125,
+        "y": 5480.136077880859,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "2932b285.c1e58e",
+        "id": "ace6c92e.10b74",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
-        "x": 5313.900161743164,
-        "y": 5423.183578491211,
-        "z": "1b4ba1fc.83240e",
+        "x": 5288.216796875,
+        "y": 5417.902679443359,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "9d183ed0.0c624",
+        "id": "17e137f7.f9138",
         "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": 5339.683364868164,
-        "y": 5465.383773803711,
-        "z": "1b4ba1fc.83240e",
+        "x": 5314,
+        "y": 5460.102874755859,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "98c37402.345048",
+        "id": "c1b9af54.b56a3",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 593.5669708251953,
-        "y": 5382.566635131836,
-        "z": "1b4ba1fc.83240e",
+        "x": 567.8836059570312,
+        "y": 5377.285736083984,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "e53158e8.a8e898"
+                "ee95a91b.c63f6"
             ]
         ]
     },
     {
-        "id": "44b19987.103118",
+        "id": "ab60aff5.ef6de8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 576.5669097900391,
-        "y": 5304.566635131836,
-        "z": "1b4ba1fc.83240e",
+        "x": 550.883544921875,
+        "y": 5299.285736083984,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d82acda1.7d932"
+                "50a1f630.9e921"
             ]
         ]
     },
     {
-        "id": "add9e89e.85dcc8",
+        "id": "e3a00d61.16ee98",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 705.5667572021484,
-        "y": 4391.566360473633,
-        "z": "1b4ba1fc.83240e",
+        "x": 679.8833923339844,
+        "y": 4386.285461425781,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "1b682749.fdf219",
-                "555aecf4.9d0abc",
-                "fa8f69fe.c57418",
-                "924743a9.bdd1d",
-                "eeb2edff.f77838",
-                "b3758874.8f232",
-                "9c7760f0.090d48"
+                "31d81fe6.59b2e8",
+                "32e6c64e.1f59ea",
+                "ec3295c7.2b4e68",
+                "28934462.eda2dc",
+                "f47b26f.a890d58",
+                "787fd0ee.fe0408",
+                "e0d5d04e.46068"
             ]
         ]
     },
     {
-        "id": "1b682749.fdf219",
+        "id": "31d81fe6.59b2e8",
         "type": "set",
         "name": "set tmp.leafconn.",
         "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",
         "comments": "",
-        "x": 957.2501068115234,
-        "y": 4369.616165161133,
-        "z": "1b4ba1fc.83240e",
+        "x": 931.5667419433594,
+        "y": 4364.335266113281,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "20195ed4.4f043a",
+        "id": "7f4eb95e.24b05",
         "type": "comment",
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",
         "info": "",
         "comments": "",
-        "x": 1058.8172454833984,
-        "y": 4317.699661254883,
-        "z": "1b4ba1fc.83240e",
+        "x": 1033.1338806152344,
+        "y": 4312.418762207031,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "9fa4061c.f2e2c8",
+        "id": "6288e052.96f2",
         "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": 1166.6670989990234,
-        "y": 4398.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 1140.9837341308594,
+        "y": 4393.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "555aecf4.9d0abc",
+        "id": "32e6c64e.1f59ea",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 937.6670989990234,
-        "y": 4487.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 911.9837341308594,
+        "y": 4482.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "9fa4061c.f2e2c8",
-                "a9e7fb46.8bda4"
+                "6288e052.96f2",
+                "fe4b92e6.ffdd"
             ]
         ]
     },
     {
-        "id": "a9e7fb46.8bda4",
+        "id": "fe4b92e6.ffdd",
         "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": 1173.6670989990234,
-        "y": 4480.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 1147.9837341308594,
+        "y": 4475.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "caf23ffe.0efab",
-                "c3c6018c.a6e8b8",
-                "a18cc13f.db156"
+                "a543f0e2.a728d8",
+                "2a0dd5d7.a28cf2",
+                "7ecf5c91.3a5cec"
             ]
         ]
     },
     {
-        "id": "caf23ffe.0efab",
+        "id": "a543f0e2.a728d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1369.167221069336,
-        "y": 4432.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 1343.4838562011719,
+        "y": 4427.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "f910fabf.7d6ff8"
+                "ff8dc86e.9ae7d8"
             ]
         ]
     },
     {
-        "id": "c3c6018c.a6e8b8",
+        "id": "2a0dd5d7.a28cf2",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1361.167221069336,
-        "y": 4487.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 1335.4838562011719,
+        "y": 4482.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7989bd98.acfa84"
+                "2e71c1c5.bae5ee"
             ]
         ]
     },
     {
-        "id": "f910fabf.7d6ff8",
+        "id": "ff8dc86e.9ae7d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1513.549545288086,
-        "y": 4432.555526733398,
-        "z": "1b4ba1fc.83240e",
+        "x": 1487.8661804199219,
+        "y": 4427.274627685547,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "ffb71773.7c6d48"
+                "ea932b87.e300a"
             ]
         ]
     },
     {
-        "id": "ffb71773.7c6d48",
+        "id": "ea932b87.e300a",
         "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": 1697.6670989990234,
-        "y": 4430.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 1671.9837341308594,
+        "y": 4425.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a91274f1.8c8af"
+                "a57e88f9.3dbb78"
             ]
         ]
     },
     {
-        "id": "a91274f1.8c8af",
+        "id": "a57e88f9.3dbb78",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1892.6670989990234,
-        "y": 4430.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 1866.9837341308594,
+        "y": 4425.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "4cf12171.7f9938"
+                "bc5f5f85.45dd38"
             ]
         ]
     },
     {
-        "id": "a18cc13f.db156",
+        "id": "7ecf5c91.3a5cec",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1366.167221069336,
-        "y": 4544.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 1340.4838562011719,
+        "y": 4539.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "3d61f539.cfb7aa"
+                "555bfa65.d963d4"
             ]
         ]
     },
     {
-        "id": "3d61f539.cfb7aa",
+        "id": "555bfa65.d963d4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1518.167221069336,
-        "y": 4545.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 1492.4838562011719,
+        "y": 4540.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "7989bd98.acfa84",
+        "id": "2e71c1c5.bae5ee",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1529.167221069336,
-        "y": 4488.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 1503.4838562011719,
+        "y": 4483.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "a5cb8297.ace3c",
+        "id": "b2af47a.be99538",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2274.6670989990234,
-        "y": 4434.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 2248.9837341308594,
+        "y": 4429.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "2680c237.68eca6",
-                "fc040fd7.89c84",
-                "2a46caf5.5b4116"
+                "7d049acd.fef104",
+                "735b2479.3a3c34",
+                "9afda8fe.94c61"
             ]
         ]
     },
     {
-        "id": "4cf12171.7f9938",
+        "id": "bc5f5f85.45dd38",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2095.6670989990234,
-        "y": 4434.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 2069.9837341308594,
+        "y": 4429.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a5cb8297.ace3c"
+                "b2af47a.be99538"
             ]
         ]
     },
     {
-        "id": "fa8f69fe.c57418",
+        "id": "ec3295c7.2b4e68",
         "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": 1079.1673431396484,
-        "y": 4592.499465942383,
-        "z": "1b4ba1fc.83240e",
+        "x": 1053.4839782714844,
+        "y": 4587.218566894531,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "f60ef44c.acdc6",
-                "f2d3c91e.712808"
+                "d93fc4e8.d2141",
+                "e3d87702.3e04a"
             ]
         ]
     },
     {
-        "id": "f2d3c91e.712808",
+        "id": "e3d87702.3e04a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1443.6670989990234,
-        "y": 4640.499465942383,
-        "z": "1b4ba1fc.83240e",
+        "x": 1417.9837341308594,
+        "y": 4635.218566894531,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "95261a80.102e28"
+                "467380a4.6c5ea"
             ]
         ]
     },
     {
-        "id": "f60ef44c.acdc6",
+        "id": "d93fc4e8.d2141",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1439.6670989990234,
-        "y": 4600.499465942383,
-        "z": "1b4ba1fc.83240e",
+        "x": 1413.9837341308594,
+        "y": 4595.218566894531,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "93ef3053.4d666"
+                "74c8e4d8.aba72c"
             ]
         ]
     },
     {
-        "id": "93ef3053.4d666",
+        "id": "74c8e4d8.aba72c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1597.6670989990234,
-        "y": 4600.499465942383,
-        "z": "1b4ba1fc.83240e",
+        "x": 1571.9837341308594,
+        "y": 4595.218566894531,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "95261a80.102e28",
+        "id": "467380a4.6c5ea",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1601.1670989990234,
-        "y": 4640.499465942383,
-        "z": "1b4ba1fc.83240e",
+        "x": 1575.4837341308594,
+        "y": 4635.218566894531,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "fc040fd7.89c84",
+        "id": "735b2479.3a3c34",
         "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": 2480.6670989990234,
-        "y": 4447.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 2454.9837341308594,
+        "y": 4442.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "3d8ec7b4.a91e7",
-                "f9528a5a.50e1f8",
-                "f194c3a5.898d88"
+                "c4e177eb.43ef28",
+                "2d977136.9bd1f6",
+                "57e5d5ac.7eac64"
             ]
         ]
     },
     {
-        "id": "2680c237.68eca6",
+        "id": "7d049acd.fef104",
         "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": 2510.6670989990234,
-        "y": 4395.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 2484.9837341308594,
+        "y": 4390.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "3d8ec7b4.a91e7",
+        "id": "c4e177eb.43ef28",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2690.6670989990234,
-        "y": 4438.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 2664.9837341308594,
+        "y": 4433.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "e578c39c.344a5"
+                "e1f43f97.38cd18"
             ]
         ]
     },
     {
-        "id": "f9528a5a.50e1f8",
+        "id": "2d977136.9bd1f6",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2682.6670989990234,
-        "y": 4493.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 2656.9837341308594,
+        "y": 4488.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "b1a83287.5e83a"
+                "96a7d4c6.d3f4b"
             ]
         ]
     },
     {
-        "id": "f194c3a5.898d88",
+        "id": "57e5d5ac.7eac64",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2687.6670989990234,
-        "y": 4550.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 2661.9837341308594,
+        "y": 4545.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d1a6ffed.890f4"
+                "c392199a.c19ae8"
             ]
         ]
     },
     {
-        "id": "d1a6ffed.890f4",
+        "id": "c392199a.c19ae8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2839.6670989990234,
-        "y": 4551.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 2813.9837341308594,
+        "y": 4546.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "b1a83287.5e83a",
+        "id": "96a7d4c6.d3f4b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2850.6670989990234,
-        "y": 4496.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 2824.9837341308594,
+        "y": 4491.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "e578c39c.344a5",
+        "id": "e1f43f97.38cd18",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2835.0494232177734,
-        "y": 4436.555526733398,
-        "z": "1b4ba1fc.83240e",
+        "x": 2809.3660583496094,
+        "y": 4431.274627685547,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "dfc70a8a.f85818"
+                "a7aa546c.5009d8"
             ]
         ]
     },
     {
-        "id": "dfc70a8a.f85818",
+        "id": "a7aa546c.5009d8",
         "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": 3049.6670989990234,
-        "y": 4432.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 3023.9837341308594,
+        "y": 4427.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "2a46caf5.5b4116",
+        "id": "9afda8fe.94c61",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2430.6670989990234,
-        "y": 4511.899856567383,
-        "z": "1b4ba1fc.83240e",
+        "x": 2404.9837341308594,
+        "y": 4506.618957519531,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "924743a9.bdd1d",
+        "id": "28934462.eda2dc",
         "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": 1108.2501068115234,
-        "y": 4812.616165161133,
-        "z": "1b4ba1fc.83240e",
+        "x": 1082.5667419433594,
+        "y": 4807.335266113281,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "eeb2edff.f77838",
+        "id": "f47b26f.a890d58",
         "type": "switchNode",
         "name": "switch found-root-connectivity",
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 923.2501068115234,
-        "y": 4879.616165161133,
-        "z": "1b4ba1fc.83240e",
+        "x": 897.5667419433594,
+        "y": 4874.335266113281,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "33b186f1.cd717a",
-                "46c96756.fc5c58"
+                "d8af5065.8b84b8",
+                "1e55c33.7a66f3d"
             ]
         ]
     },
     {
-        "id": "33b186f1.cd717a",
+        "id": "d8af5065.8b84b8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1188.2501068115234,
-        "y": 4864.616165161133,
-        "z": "1b4ba1fc.83240e",
+        "x": 1162.5667419433594,
+        "y": 4859.335266113281,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "cdcc95c0.40a4e8"
+                "f3c54a4a.4e3ba8"
             ]
         ]
     },
     {
-        "id": "46c96756.fc5c58",
+        "id": "1e55c33.7a66f3d",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1184.2501068115234,
-        "y": 4912.616165161133,
-        "z": "1b4ba1fc.83240e",
+        "x": 1158.5667419433594,
+        "y": 4907.335266113281,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "5f6a4b73.d387f4"
+                "ce49485f.e53e78"
             ]
         ]
     },
     {
-        "id": "cdcc95c0.40a4e8",
+        "id": "f3c54a4a.4e3ba8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1344.2501068115234,
-        "y": 4860.616165161133,
-        "z": "1b4ba1fc.83240e",
+        "x": 1318.5667419433594,
+        "y": 4855.335266113281,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "5134ba22.f81734"
+                "f655fe6a.478a2"
             ]
         ]
     },
     {
-        "id": "5f6a4b73.d387f4",
+        "id": "ce49485f.e53e78",
         "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": 1332.2501068115234,
-        "y": 4907.616165161133,
-        "z": "1b4ba1fc.83240e",
+        "x": 1306.5667419433594,
+        "y": 4902.335266113281,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "73beafc9.2c20a8",
+        "id": "f3ecfcf6.c34748",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
-        "x": 1613.1497650146484,
-        "y": 4811.316360473633,
-        "z": "1b4ba1fc.83240e",
+        "x": 1587.4664001464844,
+        "y": 4806.035461425781,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "5134ba22.f81734",
+        "id": "f655fe6a.478a2",
         "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": 1638.9329681396484,
-        "y": 4853.516555786133,
-        "z": "1b4ba1fc.83240e",
+        "x": 1613.2496032714844,
+        "y": 4848.235656738281,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "39215cce.b57e94",
+        "id": "78dea2d4.65caf4",
         "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": 1052.5667572021484,
-        "y": 4126.883255004883,
-        "z": "1b4ba1fc.83240e",
+        "x": 1026.8833923339844,
+        "y": 4121.602355957031,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "d82acda1.7d932",
+        "id": "50a1f630.9e921",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 658.5667877197266,
-        "y": 4131.566390991211,
-        "z": "1b4ba1fc.83240e",
+        "x": 632.8834228515625,
+        "y": 4126.285491943359,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "39215cce.b57e94",
-                "add9e89e.85dcc8"
+                "78dea2d4.65caf4",
+                "e3a00d61.16ee98"
             ]
         ]
     },
     {
-        "id": "e53158e8.a8e898",
+        "id": "ee95a91b.c63f6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 742.0167388916016,
-        "y": 5384.083236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 716.3333740234375,
+        "y": 5378.802337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "5f6a4675.ad6e08",
-                "454309b7.55d6d8",
-                "1e655667.3c83ca",
-                "36ecf6b9.5afb0a"
+                "a4300755.b44ad8",
+                "4319a166.6767b",
+                "c1e6d7e.1a91aa8",
+                "7dc09fd4.2514c"
             ]
         ]
     },
     {
-        "id": "5f6a4675.ad6e08",
+        "id": "a4300755.b44ad8",
         "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": 1103.4000396728516,
-        "y": 5147.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 1077.7166748046875,
+        "y": 5141.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "454309b7.55d6d8",
+        "id": "4319a166.6767b",
         "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": 1014.4000396728516,
-        "y": 5216.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 988.7166748046875,
+        "y": 5210.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "1e655667.3c83ca",
+        "id": "c1e6d7e.1a91aa8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 905.5666656494141,
-        "y": 5451.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 879.88330078125,
+        "y": 5445.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "96f2f082.9a3518",
-                "4b895364.485e14",
-                "2fffa63d.405042"
+                "6bef4230.e722e4",
+                "41351f51.03e8b",
+                "71820932.ce34a"
             ]
         ]
     },
     {
-        "id": "bd546556.218588",
+        "id": "2a329201.baab2e",
         "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": 2614.565933227539,
-        "y": 5376.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 2588.882568359375,
+        "y": 5370.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d9b04f13.72ba2",
-                "6f67d0fd.f943c",
-                "d85e2a4.827e658"
+                "65fc47.6ca7abb8",
+                "955b1af3.e7d3b8",
+                "72151671.442258"
             ]
         ]
     },
     {
-        "id": "eb3b9787.8ee65",
+        "id": "daaffadf.b0d788",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2564.565933227539,
-        "y": 5440.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 2538.882568359375,
+        "y": 5434.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "89310244.45d948",
+        "id": "ae76296d.4aa7d8",
         "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": 2644.565933227539,
-        "y": 5324.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 2618.882568359375,
+        "y": 5318.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "d9b04f13.72ba2",
+        "id": "65fc47.6ca7abb8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2932.5660552978516,
-        "y": 5307.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 2906.8826904296875,
+        "y": 5301.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "ca13eb43.a9266"
+                "6f1e5821.6bfab8"
             ]
         ]
     },
     {
-        "id": "6f67d0fd.f943c",
+        "id": "955b1af3.e7d3b8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2924.5660552978516,
-        "y": 5362.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 2898.8826904296875,
+        "y": 5356.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7e30219a.74a1a8"
+                "5731f70c.9d6e58"
             ]
         ]
     },
     {
-        "id": "d85e2a4.827e658",
+        "id": "72151671.442258",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2929.5660552978516,
-        "y": 5419.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 2903.8826904296875,
+        "y": 5413.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "1fa2a159.15189f"
+                "531fbc69.7d6ca4"
             ]
         ]
     },
     {
-        "id": "1fa2a159.15189f",
+        "id": "531fbc69.7d6ca4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3081.5660552978516,
-        "y": 5420.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 3055.8826904296875,
+        "y": 5414.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "7e30219a.74a1a8",
+        "id": "5731f70c.9d6e58",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3092.5660552978516,
-        "y": 5365.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 3066.8826904296875,
+        "y": 5359.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "ca13eb43.a9266",
+        "id": "6f1e5821.6bfab8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3076.9483795166016,
-        "y": 5304.73893737793,
-        "z": "1b4ba1fc.83240e",
+        "x": 3051.2650146484375,
+        "y": 5299.458038330078,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "3ed958.dd670ea8"
+                "af5a0545.43691"
             ]
         ]
     },
     {
-        "id": "3ed958.dd670ea8",
+        "id": "af5a0545.43691",
         "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": 3291.5660552978516,
-        "y": 5301.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 3265.8826904296875,
+        "y": 5295.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "96f2f082.9a3518",
+        "id": "6bef4230.e722e4",
         "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": 1187.566665649414,
-        "y": 5320.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 1161.88330078125,
+        "y": 5314.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "bd5e9405.7c27a8",
+        "id": "80b0094c.3afc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1398.0667877197266,
-        "y": 5459.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 1372.3834228515625,
+        "y": 5453.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "de47c705.79a8b8"
+                "8b920100.3048e"
             ]
         ]
     },
     {
-        "id": "6b3e7adb.d2bb84",
+        "id": "fd028bda.dc87c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1401.0667877197266,
-        "y": 5347.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 1375.3834228515625,
+        "y": 5341.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a396ce34.a18e2"
+                "b6a8539e.9a283"
             ]
         ]
     },
     {
-        "id": "a85067c1.2cd6d",
+        "id": "dfe8b9b5.0780c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1393.0667877197266,
-        "y": 5402.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 1367.3834228515625,
+        "y": 5396.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d6007294.f11f4"
+                "a57ef7af.c3223"
             ]
         ]
     },
     {
-        "id": "a396ce34.a18e2",
+        "id": "b6a8539e.9a283",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1535.448989868164,
-        "y": 5341.739028930664,
-        "z": "1b4ba1fc.83240e",
+        "x": 1509.765625,
+        "y": 5336.4581298828125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7dd1d4e7.a0f1bc"
+                "99e24c60.f2ee9"
             ]
         ]
     },
     {
-        "id": "de47c705.79a8b8",
+        "id": "8b920100.3048e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1550.0667877197266,
-        "y": 5460.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 1524.3834228515625,
+        "y": 5454.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "d6007294.f11f4",
+        "id": "a57ef7af.c3223",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1561.0667877197266,
-        "y": 5403.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 1535.3834228515625,
+        "y": 5397.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "7dd1d4e7.a0f1bc",
+        "id": "99e24c60.f2ee9",
         "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": 1722.566177368164,
-        "y": 5343.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 1696.8828125,
+        "y": 5337.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "559db4ec.64792c"
+                "b066cef.3d778b"
             ]
         ]
     },
     {
-        "id": "559db4ec.64792c",
+        "id": "b066cef.3d778b",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1950.566177368164,
-        "y": 5336.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 1924.8828125,
+        "y": 5330.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "799fadac.e2e6ec"
+                "bf0363b8.4e697"
             ]
         ]
     },
     {
-        "id": "4b895364.485e14",
+        "id": "41351f51.03e8b",
         "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": 1205.566665649414,
-        "y": 5395.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 1179.88330078125,
+        "y": 5389.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "bd5e9405.7c27a8",
-                "6b3e7adb.d2bb84",
-                "a85067c1.2cd6d"
+                "80b0094c.3afc",
+                "fd028bda.dc87c",
+                "dfe8b9b5.0780c"
             ]
         ]
     },
     {
-        "id": "799fadac.e2e6ec",
+        "id": "bf0363b8.4e697",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2156.566177368164,
-        "y": 5333.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 2130.8828125,
+        "y": 5327.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7cbbce76.57d9f"
+                "d631d833.b0d378"
             ]
         ]
     },
     {
-        "id": "7cbbce76.57d9f",
+        "id": "d631d833.b0d378",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2371.5655670166016,
-        "y": 5336.083267211914,
-        "z": "1b4ba1fc.83240e",
+        "x": 2345.8822021484375,
+        "y": 5330.8023681640625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "89310244.45d948",
-                "bd546556.218588",
-                "eb3b9787.8ee65"
+                "ae76296d.4aa7d8",
+                "2a329201.baab2e",
+                "daaffadf.b0d788"
             ]
         ]
     },
     {
-        "id": "2fffa63d.405042",
+        "id": "71820932.ce34a",
         "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": 1329.3333892822266,
-        "y": 5544.483169555664,
-        "z": "1b4ba1fc.83240e",
+        "x": 1303.6500244140625,
+        "y": 5539.2022705078125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "fb4bb7df.e56c5",
-                "af1e6659.9dd9c8"
+                "813e179b.713d1",
+                "76f746e6.c0f1d"
             ]
         ]
     },
     {
-        "id": "fb4bb7df.e56c5",
+        "id": "813e179b.713d1",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1675.8333892822266,
-        "y": 5537.483169555664,
-        "z": "1b4ba1fc.83240e",
+        "x": 1650.1500244140625,
+        "y": 5532.2022705078125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "84518bf4.248028"
+                "455cd4bd.60fbe4"
             ]
         ]
     },
     {
-        "id": "af1e6659.9dd9c8",
+        "id": "76f746e6.c0f1d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1679.8333892822266,
-        "y": 5577.483169555664,
-        "z": "1b4ba1fc.83240e",
+        "x": 1654.1500244140625,
+        "y": 5572.2022705078125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "b347040e.1f286"
+                "627d6bed.c81224"
             ]
         ]
     },
     {
-        "id": "84518bf4.248028",
+        "id": "455cd4bd.60fbe4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1833.8333892822266,
-        "y": 5537.483169555664,
-        "z": "1b4ba1fc.83240e",
+        "x": 1808.1500244140625,
+        "y": 5532.2022705078125,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "b347040e.1f286",
+        "id": "627d6bed.c81224",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1837.3333892822266,
-        "y": 5577.483169555664,
-        "z": "1b4ba1fc.83240e",
+        "x": 1811.6500244140625,
+        "y": 5572.2022705078125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "3d1d7271.d95cbe"
+                "eb743ad2.daea58"
             ]
         ]
     },
     {
-        "id": "36ecf6b9.5afb0a",
+        "id": "7dc09fd4.2514c",
         "type": "switchNode",
         "name": "switch tmp.MMstillHasUni?",
         "xml": "\n<switch test=\"`$tmp.MMstillHasUni`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 938.8667144775391,
-        "y": 5874.283432006836,
-        "z": "1b4ba1fc.83240e",
+        "x": 913.183349609375,
+        "y": 5869.002532958984,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "4a5bd207.ca776c",
-                "b171c0.d456c64"
+                "22d45a38.9f5796",
+                "bd1f8261.b1a1b"
             ]
         ]
     },
     {
-        "id": "4a5bd207.ca776c",
+        "id": "22d45a38.9f5796",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1132.866714477539,
-        "y": 5701.283462524414,
-        "z": "1b4ba1fc.83240e",
+        "x": 1107.183349609375,
+        "y": 5696.0025634765625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "b00c5aa2.01bbe8"
+                "b4f2b377.ab70a8"
             ]
         ]
     },
     {
-        "id": "b171c0.d456c64",
+        "id": "bd1f8261.b1a1b",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1119.0334014892578,
-        "y": 6023.883529663086,
-        "z": "1b4ba1fc.83240e",
+        "x": 1093.3500366210938,
+        "y": 6018.602630615234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "782b8611.563688"
+                "f125dad1.1ae098"
             ]
         ]
     },
     {
-        "id": "b00c5aa2.01bbe8",
+        "id": "b4f2b377.ab70a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1281.033462524414,
-        "y": 5700.883560180664,
-        "z": "1b4ba1fc.83240e",
+        "x": 1255.35009765625,
+        "y": 5695.6026611328125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "8daf379c.cd379",
-                "ae051555.1a065",
-                "5d9c1c4d.83462c"
+                "2ce9ebc5.9980ac",
+                "33e7432a.ad365c",
+                "1ed03004.8d6e4"
             ]
         ]
     },
     {
-        "id": "8daf379c.cd379",
+        "id": "2ce9ebc5.9980ac",
         "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": 1702.883316040039,
-        "y": 5672.283462524414,
-        "z": "1b4ba1fc.83240e",
+        "x": 1677.199951171875,
+        "y": 5667.0025634765625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "ae051555.1a065",
+        "id": "33e7432a.ad365c",
         "type": "switchNode",
         "name": "switch found-root-connectivity",
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1517.883316040039,
-        "y": 5739.283462524414,
-        "z": "1b4ba1fc.83240e",
+        "x": 1492.199951171875,
+        "y": 5734.0025634765625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "f1328e61.aaecf8",
-                "75cc2f9e.02c51"
+                "e7aa98fb.d5331",
+                "d055e12e.7731d8"
             ]
         ]
     },
     {
-        "id": "f1328e61.aaecf8",
+        "id": "e7aa98fb.d5331",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1782.883316040039,
-        "y": 5724.283462524414,
-        "z": "1b4ba1fc.83240e",
+        "x": 1757.199951171875,
+        "y": 5719.0025634765625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "320d795a.de0396"
+                "68adf16f.2488d8"
             ]
         ]
     },
     {
-        "id": "75cc2f9e.02c51",
+        "id": "d055e12e.7731d8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1781.883316040039,
-        "y": 5772.283462524414,
-        "z": "1b4ba1fc.83240e",
+        "x": 1756.199951171875,
+        "y": 5767.0025634765625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "9b6d9f14.bbdc1"
+                "f1e6e2bf.7ae47"
             ]
         ]
     },
     {
-        "id": "320d795a.de0396",
+        "id": "68adf16f.2488d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1938.883316040039,
-        "y": 5720.283462524414,
-        "z": "1b4ba1fc.83240e",
+        "x": 1913.199951171875,
+        "y": 5715.0025634765625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d445fc4a.df5c"
+                "b0a90683.d1b168"
             ]
         ]
     },
     {
-        "id": "9b6d9f14.bbdc1",
+        "id": "f1e6e2bf.7ae47",
         "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": 1929.883316040039,
-        "y": 5767.283462524414,
-        "z": "1b4ba1fc.83240e",
+        "x": 1904.199951171875,
+        "y": 5762.0025634765625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "d445fc4a.df5c",
+        "id": "b0a90683.d1b168",
         "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": 2247.5660552978516,
-        "y": 5714.183853149414,
-        "z": "1b4ba1fc.83240e",
+        "x": 2221.8826904296875,
+        "y": 5708.9029541015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "d355d862.978bc",
+        "id": "609277ca.345368",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
-        "x": 2221.7828521728516,
-        "y": 5671.983657836914,
-        "z": "1b4ba1fc.83240e",
+        "x": 2196.0994873046875,
+        "y": 5666.7027587890625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "782b8611.563688",
+        "id": "f125dad1.1ae098",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1256.600112915039,
-        "y": 6023.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 1230.916748046875,
+        "y": 6017.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "dfb91948.e397a8",
-                "a8afb078.60b068",
-                "9067b91d.deea4"
+                "6a84ca09.c3f86c",
+                "32b2c890.ef7958"
             ]
         ]
     },
     {
-        "id": "dfb91948.e397a8",
+        "id": "6a84ca09.c3f86c",
         "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": 1561.9162139892578,
-        "y": 5956.383438110352,
-        "z": "1b4ba1fc.83240e",
+        "x": 1536.2328491210938,
+        "y": 5951.1025390625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "9cf25842.080a8"
+                "f1408389.66d578"
             ]
         ]
     },
     {
-        "id": "9cf25842.080a8",
+        "id": "f1408389.66d578",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1870.250015258789,
-        "y": 6012.38346862793,
-        "z": "1b4ba1fc.83240e",
+        "x": 1844.566650390625,
+        "y": 6007.102569580078,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6539b459.18686c"
+                "89925b7f.d67008"
             ]
         ]
     },
     {
-        "id": "6539b459.18686c",
+        "id": "89925b7f.d67008",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2049.9166412353516,
-        "y": 6012.383560180664,
-        "z": "1b4ba1fc.83240e",
+        "x": 2024.2332763671875,
+        "y": 6007.1026611328125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "eb5ca2dd.0acd08"
+                "ea5801a3.bdc318"
             ]
         ]
     },
     {
-        "id": "eb5ca2dd.0acd08",
+        "id": "ea5801a3.bdc318",
         "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": 2249.916519165039,
-        "y": 6012.383529663086,
-        "z": "1b4ba1fc.83240e",
+        "x": 2224.233154296875,
+        "y": 6007.102630615234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d2d794d6.23b038",
-                "fd78cb11.7b7858",
-                "dc3bf10c.53584"
+                "a1e89c64.ee08",
+                "8d6c0f91.a49cb8",
+                "4e2495e6.04e044"
             ]
         ]
     },
     {
-        "id": "d2d794d6.23b038",
+        "id": "a1e89c64.ee08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2456.916275024414,
-        "y": 6062.383529663086,
-        "z": "1b4ba1fc.83240e",
+        "x": 2431.23291015625,
+        "y": 6057.102630615234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "2ee18ab4.452c46"
+                "b790569e.977af8"
             ]
         ]
     },
     {
-        "id": "6518db29.e12ccc",
+        "id": "a110091a.c88bd8",
         "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": 2434.149917602539,
-        "y": 6246.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 2408.466552734375,
+        "y": 6241.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "1586acc8.b40733",
-                "3f4ac64b.7a4a4a",
-                "c51a0fc1.cf0b78"
+                "2d065eb8.336f2a",
+                "87ee966c.316df8",
+                "aec85de6.45d0c"
             ]
         ]
     },
     {
-        "id": "2ead9053.75b73",
+        "id": "4adb06fe.906c3",
         "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": 1603.1498565673828,
-        "y": 6289.583145141602,
-        "z": "1b4ba1fc.83240e",
+        "x": 1577.4664916992188,
+        "y": 6284.30224609375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "606f2389.64cdcc"
+                "275bed8a.2109fa"
             ]
         ]
     },
     {
-        "id": "606f2389.64cdcc",
+        "id": "275bed8a.2109fa",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1800.1498565673828,
-        "y": 6303.583145141602,
-        "z": "1b4ba1fc.83240e",
+        "x": 1774.4664916992188,
+        "y": 6298.30224609375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "c7f0bc3b.019c9",
-                "c9900403.e4a84"
+                "4f9c6be0.2a3c14",
+                "a2e8db17.e0dad8"
             ]
         ]
     },
     {
-        "id": "c7f0bc3b.019c9",
+        "id": "4f9c6be0.2a3c14",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2004.149917602539,
-        "y": 6206.583145141602,
-        "z": "1b4ba1fc.83240e",
+        "x": 1978.466552734375,
+        "y": 6201.30224609375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "b4e58d4e.4eaf1"
+                "e20e285e.547a2"
             ]
         ]
     },
     {
-        "id": "b4e58d4e.4eaf1",
+        "id": "e20e285e.547a2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2185.149917602539,
-        "y": 6222.583145141602,
-        "z": "1b4ba1fc.83240e",
+        "x": 2159.466552734375,
+        "y": 6217.30224609375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6518db29.e12ccc"
+                "a110091a.c88bd8"
             ]
         ]
     },
     {
-        "id": "c9900403.e4a84",
+        "id": "a2e8db17.e0dad8",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2014.149917602539,
-        "y": 6464.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 1988.466552734375,
+        "y": 6459.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "5c8dbf44.909798"
+                "f74bc39.65f35c"
             ]
         ]
     },
     {
-        "id": "5c8dbf44.909798",
+        "id": "f74bc39.65f35c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2177.149917602539,
-        "y": 6464.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 2151.466552734375,
+        "y": 6459.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "972de022.0ff4c8"
+                "c00c0bc0.55fe4"
             ]
         ]
     },
     {
-        "id": "972de022.0ff4c8",
+        "id": "c00c0bc0.55fe4",
         "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": 2420.149917602539,
-        "y": 6464.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 2394.466552734375,
+        "y": 6459.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "d7d50183.fdbf5",
+        "id": "97487c98.0e417",
         "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": 1388.149917602539,
-        "y": 7230.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 1362.466552734375,
+        "y": 7225.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "2ee18ab4.452c46",
+        "id": "b790569e.977af8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1429.1498565673828,
-        "y": 6287.583145141602,
-        "z": "1b4ba1fc.83240e",
+        "x": 1403.4664916992188,
+        "y": 6282.30224609375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "2ead9053.75b73",
-                "d7d50183.fdbf5",
-                "e2860ec7.2879b"
+                "4adb06fe.906c3",
+                "97487c98.0e417",
+                "d04fa9dd.0ea93"
             ]
         ]
     },
     {
-        "id": "1586acc8.b40733",
+        "id": "2d065eb8.336f2a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2645.149917602539,
-        "y": 6248.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 2619.466552734375,
+        "y": 6243.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "31acc7de.eb35a"
+                "b92767c5.7007a"
             ]
         ]
     },
     {
-        "id": "3f4ac64b.7a4a4a",
+        "id": "87ee966c.316df8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2645.640884399414,
-        "y": 6294.157272338867,
-        "z": "1b4ba1fc.83240e",
+        "x": 2619.95751953125,
+        "y": 6288.876373291016,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a537397f.244a6"
+                "39698a7e.793e46"
             ]
         ]
     },
     {
-        "id": "c51a0fc1.cf0b78",
+        "id": "aec85de6.45d0c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2643.149917602539,
-        "y": 6337.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 2617.466552734375,
+        "y": 6332.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "c765f98e.c8b24"
+                "11419a70.f242ee"
             ]
         ]
     },
     {
-        "id": "dc3bf10c.53584",
+        "id": "4e2495e6.04e044",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2480.966323852539,
-        "y": 5963.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 2455.282958984375,
+        "y": 5957.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "fd78cb11.7b7858",
+        "id": "8d6c0f91.a49cb8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2478.475357055664,
-        "y": 6006.609298706055,
-        "z": "1b4ba1fc.83240e",
+        "x": 2452.7919921875,
+        "y": 6001.328399658203,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "a8afb078.60b068",
+        "id": "32b2c890.ef7958",
         "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": 1559.0834503173828,
-        "y": 6017.983047485352,
-        "z": "1b4ba1fc.83240e",
+        "x": 1533.4000854492188,
+        "y": 6012.7021484375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "31acc7de.eb35a",
+        "id": "b92767c5.7007a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2811.149917602539,
-        "y": 6238.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 2785.466552734375,
+        "y": 6233.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d6296a84.0c07b",
-                "f2b7ba42.95aca8",
-                "d7abab02.efd25",
-                "933064b1.3f6b68",
-                "31b8d600.38568a"
+                "8147cbd5.b42498",
+                "7f8cdbe.2608ca4",
+                "991bc3e4.d8b4a8",
+                "b286c779.61d138",
+                "b9b93ea.866444"
             ]
         ]
     },
     {
-        "id": "c765f98e.c8b24",
+        "id": "11419a70.f242ee",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2810.149917602539,
-        "y": 6336.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 2784.466552734375,
+        "y": 6331.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "a537397f.244a6",
+        "id": "39698a7e.793e46",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2808.2122955322266,
-        "y": 6294.443008422852,
-        "z": "1b4ba1fc.83240e",
+        "x": 2782.5289306640625,
+        "y": 6289.162109375,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "d6296a84.0c07b",
+        "id": "8147cbd5.b42498",
         "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": 3033.149917602539,
-        "y": 5956.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3007.466552734375,
+        "y": 5951.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "f2b7ba42.95aca8",
+        "id": "7f8cdbe.2608ca4",
         "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": 3059.149917602539,
-        "y": 6073.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3033.466552734375,
+        "y": 6068.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "c16bbe6e.2f18e8",
-                "8e5054c2.6d8be8",
-                "8a22e0f4.ac84d"
+                "d327bb6b.4f842",
+                "fcec59b5.0b9b4",
+                "c483fb97.0216f8"
             ]
         ]
     },
     {
-        "id": "d7abab02.efd25",
+        "id": "991bc3e4.d8b4a8",
         "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": 3162.149917602539,
-        "y": 6340.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3136.466552734375,
+        "y": 6335.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "fc236214.f51f38",
-                "6b8cfbc.a2c4d84"
+                "de0f39f6.8546f",
+                "d42c9248.43e218"
             ]
         ]
     },
     {
-        "id": "933064b1.3f6b68",
+        "id": "b286c779.61d138",
         "type": "switchNode",
         "name": "switch connectivity has ethernet service",
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3100.149917602539,
-        "y": 6475.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3074.466552734375,
+        "y": 6470.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "2126f3a4.668d54",
-                "a948f36a.4c2d08"
+                "f81c3e8c.ae8e4",
+                "1d01e37a.e82265"
             ]
         ]
     },
     {
-        "id": "31b8d600.38568a",
+        "id": "b9b93ea.866444",
         "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": 3081.149917602539,
-        "y": 6591.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3055.466552734375,
+        "y": 6586.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "c16bbe6e.2f18e8",
+        "id": "d327bb6b.4f842",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3254.6500396728516,
-        "y": 6025.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3228.9666748046875,
+        "y": 6020.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "78bd184e.3e97c8"
+                "df7e30e7.7c136"
             ]
         ]
     },
     {
-        "id": "8e5054c2.6d8be8",
+        "id": "fcec59b5.0b9b4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3246.6500396728516,
-        "y": 6080.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3220.9666748046875,
+        "y": 6075.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "12475557.66bd73"
+                "49204a47.5b32c4"
             ]
         ]
     },
     {
-        "id": "78bd184e.3e97c8",
+        "id": "df7e30e7.7c136",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3389.032241821289,
-        "y": 6020.238998413086,
-        "z": "1b4ba1fc.83240e",
+        "x": 3363.348876953125,
+        "y": 6014.958099365234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6ef9af4.3be5bd"
+                "2df8196b.742ffe"
             ]
         ]
     },
     {
-        "id": "8a22e0f4.ac84d",
+        "id": "c483fb97.0216f8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3251.6500396728516,
-        "y": 6137.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3225.9666748046875,
+        "y": 6132.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "28978481.66e84c"
+                "6350206c.c1b658"
             ]
         ]
     },
     {
-        "id": "28978481.66e84c",
+        "id": "6350206c.c1b658",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3403.6500396728516,
-        "y": 6138.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3377.9666748046875,
+        "y": 6133.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "12475557.66bd73",
+        "id": "49204a47.5b32c4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3414.6500396728516,
-        "y": 6081.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3388.9666748046875,
+        "y": 6076.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "a948f36a.4c2d08",
+        "id": "1d01e37a.e82265",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3353.149917602539,
-        "y": 6453.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3327.466552734375,
+        "y": 6448.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a8dc909e.5f43f8"
+                "6635b3c9.2401f4"
             ]
         ]
     },
     {
-        "id": "2126f3a4.668d54",
+        "id": "f81c3e8c.ae8e4",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3353.149917602539,
-        "y": 6509.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3327.466552734375,
+        "y": 6504.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "6ef9af4.3be5bd",
+        "id": "2df8196b.742ffe",
         "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": 3576.149429321289,
-        "y": 6021.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3550.466064453125,
+        "y": 6016.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "3b761727.cf2a9"
+                "6df12a4f.4f5be4"
             ]
         ]
     },
     {
-        "id": "3b761727.cf2a9",
+        "id": "6df12a4f.4f5be4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3817.149429321289,
-        "y": 6012.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3791.466064453125,
+        "y": 6007.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "68d5173c.b0347"
+                "345bdac9.d7580e"
             ]
         ]
     },
     {
-        "id": "a8dc909e.5f43f8",
+        "id": "6635b3c9.2401f4",
         "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": 3703.149429321289,
-        "y": 6443.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3677.466064453125,
+        "y": 6438.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "dcfeac9e.5fc9a8",
-                "8f5d17cf.8dabd"
+                "62245fed.88f7b8",
+                "93d26392.9844b"
             ]
         ]
     },
     {
-        "id": "fc236214.f51f38",
+        "id": "de0f39f6.8546f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3469.649429321289,
-        "y": 6365.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3443.966064453125,
+        "y": 6360.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "f765e05b.501478"
+                "efef7a04.122ab"
             ]
         ]
     },
     {
-        "id": "6b8cfbc.a2c4d84",
+        "id": "d42c9248.43e218",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3470.649429321289,
-        "y": 6310.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3444.966064453125,
+        "y": 6305.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "4d6a8560.f17a1c"
+                "5547b05c.5a7128"
             ]
         ]
     },
     {
-        "id": "f765e05b.501478",
+        "id": "efef7a04.122ab",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3641.649429321289,
-        "y": 6363.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3615.966064453125,
+        "y": 6358.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "4d6a8560.f17a1c",
+        "id": "5547b05c.5a7128",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3638.149429321289,
-        "y": 6312.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3612.466064453125,
+        "y": 6307.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "432d0671.cb443",
+        "id": "67e0872f.595688",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4174.149185180664,
-        "y": 5961.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 4148.4658203125,
+        "y": 5956.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "78d865b4.b939ac",
-                "5830c911.f22ee",
-                "aa227269.131cb"
+                "5fd99c9d.a6e514",
+                "c5566cea.30bd7",
+                "ac42532d.c50238"
             ]
         ]
     },
     {
-        "id": "68d5173c.b0347",
+        "id": "345bdac9.d7580e",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4023.149429321289,
-        "y": 6009.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 3997.466064453125,
+        "y": 6004.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "432d0671.cb443"
+                "67e0872f.595688"
             ]
         ]
     },
     {
-        "id": "dcfeac9e.5fc9a8",
+        "id": "62245fed.88f7b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4035.649429321289,
-        "y": 6417.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 4009.966064453125,
+        "y": 6412.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7c5aa740.2ac998"
+                "5832ca1b.e5ff14"
             ]
         ]
     },
     {
-        "id": "8f5d17cf.8dabd",
+        "id": "93d26392.9844b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4039.649429321289,
-        "y": 6457.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 4013.966064453125,
+        "y": 6452.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "61ae232.1605c5c"
+                "263d2537.eb493a"
             ]
         ]
     },
     {
-        "id": "61ae232.1605c5c",
+        "id": "263d2537.eb493a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4227.149429321289,
-        "y": 6461.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 4201.466064453125,
+        "y": 6456.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
-            []
+            [
+                "4ed6624e.3d3df4"
+            ]
         ]
     },
     {
-        "id": "7c5aa740.2ac998",
+        "id": "5832ca1b.e5ff14",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4223.649429321289,
-        "y": 6421.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 4197.966064453125,
+        "y": 6416.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "5830c911.f22ee",
+        "id": "c5566cea.30bd7",
         "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": 4380.149185180664,
-        "y": 5974.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 4354.4658203125,
+        "y": 5969.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "9672ea53.f6fc4",
-                "10a5745e.fad27c",
-                "4c3d97fc.40ae6"
+                "1f8f123b.3b43b6",
+                "ad361732.c4c148",
+                "b36b591c.d0d57"
             ]
         ]
     },
     {
-        "id": "78d865b4.b939ac",
+        "id": "5fd99c9d.a6e514",
         "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": 4410.149185180664,
-        "y": 5922.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 4384.4658203125,
+        "y": 5917.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "9672ea53.f6fc4",
+        "id": "1f8f123b.3b43b6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4590.149185180664,
-        "y": 5965.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 4564.4658203125,
+        "y": 5960.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a62535f9.bce6d8"
+                "55972070.a10d1"
             ]
         ]
     },
     {
-        "id": "10a5745e.fad27c",
+        "id": "ad361732.c4c148",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4582.149185180664,
-        "y": 6020.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 4556.4658203125,
+        "y": 6015.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "f6286309.b286"
+                "b3ebf2d9.9fcd08"
             ]
         ]
     },
     {
-        "id": "4c3d97fc.40ae6",
+        "id": "b36b591c.d0d57",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4587.149185180664,
-        "y": 6077.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 4561.4658203125,
+        "y": 6072.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "5b2489d7.40c81"
+                "a70cb792.ca4f6"
             ]
         ]
     },
     {
-        "id": "aa227269.131cb",
+        "id": "ac42532d.c50238",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4330.149185180664,
-        "y": 6038.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 4304.4658203125,
+        "y": 6033.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "5b2489d7.40c81",
+        "id": "a70cb792.ca4f6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4739.149185180664,
-        "y": 6078.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 4713.4658203125,
+        "y": 6073.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "f6286309.b286",
+        "id": "b3ebf2d9.9fcd08",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4750.149185180664,
-        "y": 6023.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 4724.4658203125,
+        "y": 6018.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "a62535f9.bce6d8",
+        "id": "55972070.a10d1",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4734.531509399414,
-        "y": 5963.238906860352,
-        "z": "1b4ba1fc.83240e",
+        "x": 4708.84814453125,
+        "y": 5957.9580078125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "34794224.ac9ad6"
+                "4ce9545d.714c5c"
             ]
         ]
     },
     {
-        "id": "34794224.ac9ad6",
+        "id": "4ce9545d.714c5c",
         "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": 4949.149185180664,
-        "y": 5959.583236694336,
-        "z": "1b4ba1fc.83240e",
+        "x": 4923.4658203125,
+        "y": 5954.302337646484,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "8d1e7ba3.e7c148",
+        "id": "40aef7f6.0b7228",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",
         "comments": "",
-        "x": 1684.9166412353516,
-        "y": 6757.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 1659.2332763671875,
+        "y": 6751.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "6711b1e6.015f5",
+        "id": "4576702d.22188",
         "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": 1710.9166412353516,
-        "y": 6874.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 1685.2332763671875,
+        "y": 6868.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "89c94611.e7551",
-                "372b07e6.2f493",
-                "93b4846e.f3d23"
+                "b905b.3d0c77a6",
+                "a913e20f.2cee1",
+                "5b499033.3c7be8"
             ]
         ]
     },
     {
-        "id": "89c94611.e7551",
+        "id": "b905b.3d0c77a6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1906.416763305664,
-        "y": 6826.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 1880.7333984375,
+        "y": 6820.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "bdc72764.d7a65"
+                "fda08d88.ca8218"
             ]
         ]
     },
     {
-        "id": "372b07e6.2f493",
+        "id": "a913e20f.2cee1",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1898.416763305664,
-        "y": 6881.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 1872.7333984375,
+        "y": 6875.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "4210f39b.7722f4"
+                "6f461b70.2ad3ec"
             ]
         ]
     },
     {
-        "id": "bdc72764.d7a65",
+        "id": "fda08d88.ca8218",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2040.7989654541016,
-        "y": 6820.839096069336,
-        "z": "1b4ba1fc.83240e",
+        "x": 2015.1156005859375,
+        "y": 6815.558197021484,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "8221a60d.0a6"
+                "c0fafd9c.883f28"
             ]
         ]
     },
     {
-        "id": "93b4846e.f3d23",
+        "id": "5b499033.3c7be8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1903.416763305664,
-        "y": 6938.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 1877.7333984375,
+        "y": 6932.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "534b689.ea55a98"
+                "23b6f155.461de6"
             ]
         ]
     },
     {
-        "id": "534b689.ea55a98",
+        "id": "23b6f155.461de6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2055.416763305664,
-        "y": 6939.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 2029.7333984375,
+        "y": 6933.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "4210f39b.7722f4",
+        "id": "6f461b70.2ad3ec",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2066.416763305664,
-        "y": 6882.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 2040.7333984375,
+        "y": 6876.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "8221a60d.0a6",
+        "id": "c0fafd9c.883f28",
         "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": 2227.9161529541016,
-        "y": 6822.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 2202.2327880859375,
+        "y": 6816.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "70fb3446.1294d4"
+                "810f1bc.7b19d68"
             ]
         ]
     },
     {
-        "id": "70fb3446.1294d4",
+        "id": "810f1bc.7b19d68",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2468.9161529541016,
-        "y": 6813.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 2443.2327880859375,
+        "y": 6807.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7728eab2.206384"
+                "ad7d1fb5.cc1a18"
             ]
         ]
     },
     {
-        "id": "5e0f68b.e6e5b18",
+        "id": "56d2a753.e194",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2825.9159088134766,
-        "y": 6762.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 2800.2325439453125,
+        "y": 6756.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "1f9f6b0b.3a7bad",
-                "3a372a08.82b95e",
-                "20000492.69e4a4"
+                "1805810f.473127",
+                "c086be3e.9f0a58",
+                "b6b8383e.7e7b78"
             ]
         ]
     },
     {
-        "id": "7728eab2.206384",
+        "id": "ad7d1fb5.cc1a18",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2674.9161529541016,
-        "y": 6810.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 2649.2327880859375,
+        "y": 6804.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "5e0f68b.e6e5b18"
+                "56d2a753.e194"
             ]
         ]
     },
     {
-        "id": "3a372a08.82b95e",
+        "id": "c086be3e.9f0a58",
         "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": 3031.9159088134766,
-        "y": 6775.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 3006.2325439453125,
+        "y": 6769.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "78de1b03.bad77c",
-                "d65c6861.1c4098",
-                "dc64de9d.8956c8"
+                "41ba51ef.c8b828",
+                "a2407b12.88a828",
+                "6a27d837.9d059"
             ]
         ]
     },
     {
-        "id": "20000492.69e4a4",
+        "id": "b6b8383e.7e7b78",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2981.9159088134766,
-        "y": 6839.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 2956.2325439453125,
+        "y": 6833.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "1f9f6b0b.3a7bad",
+        "id": "1805810f.473127",
         "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": 3061.9159088134766,
-        "y": 6723.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 3036.2325439453125,
+        "y": 6717.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "78de1b03.bad77c",
+        "id": "41ba51ef.c8b828",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3241.9159088134766,
-        "y": 6766.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 3216.2325439453125,
+        "y": 6760.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "13eb6200.778f26"
+                "67360da7.aafffc"
             ]
         ]
     },
     {
-        "id": "d65c6861.1c4098",
+        "id": "a2407b12.88a828",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3233.9159088134766,
-        "y": 6821.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 3208.2325439453125,
+        "y": 6815.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "bff87948.e35e"
+                "aba785db.cff2e"
             ]
         ]
     },
     {
-        "id": "dc64de9d.8956c8",
+        "id": "6a27d837.9d059",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3238.9159088134766,
-        "y": 6878.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 3213.2325439453125,
+        "y": 6872.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "573969ab.842a48"
+                "2e83f42c.ac084c"
             ]
         ]
     },
     {
-        "id": "573969ab.842a48",
+        "id": "2e83f42c.ac084c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3390.9159088134766,
-        "y": 6879.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 3365.2325439453125,
+        "y": 6873.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "bff87948.e35e",
+        "id": "aba785db.cff2e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3401.9159088134766,
-        "y": 6824.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 3376.2325439453125,
+        "y": 6818.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "13eb6200.778f26",
+        "id": "67360da7.aafffc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3386.2982330322266,
-        "y": 6763.839004516602,
-        "z": "1b4ba1fc.83240e",
+        "x": 3360.6148681640625,
+        "y": 6758.55810546875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "f7bc1d31.5e03a"
+                "5bfcca0.e84cb38"
             ]
         ]
     },
     {
-        "id": "f7bc1d31.5e03a",
+        "id": "5bfcca0.e84cb38",
         "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": 3600.9159088134766,
-        "y": 6760.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 3575.2325439453125,
+        "y": 6754.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "e2860ec7.2879b",
+        "id": "d04fa9dd.0ea93",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1476.9166412353516,
-        "y": 6885.183334350586,
-        "z": "1b4ba1fc.83240e",
+        "x": 1451.2332763671875,
+        "y": 6879.902435302734,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "8d1e7ba3.e7c148",
-                "6711b1e6.015f5",
-                "91e5ef44.c1379"
+                "40aef7f6.0b7228",
+                "4576702d.22188",
+                "1c9c9766.902671"
             ]
         ]
     },
     {
-        "id": "91e5ef44.c1379",
+        "id": "1c9c9766.902671",
         "type": "switchNode",
         "name": "switch connectivity has ethernet service",
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1759.116714477539,
-        "y": 7026.383529663086,
-        "z": "1b4ba1fc.83240e",
+        "x": 1733.433349609375,
+        "y": 7021.102630615234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "9d430c54.8affb",
-                "4e9e0184.b64f38"
+                "14008b93.c61004",
+                "9e2bb4b2.c6532"
             ]
         ]
     },
     {
-        "id": "4e9e0184.b64f38",
+        "id": "9e2bb4b2.c6532",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2012.116714477539,
-        "y": 7004.383529663086,
-        "z": "1b4ba1fc.83240e",
+        "x": 1986.433349609375,
+        "y": 6999.102630615234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "8c955553.2a5b4"
+                "4241c741.35655"
             ]
         ]
     },
     {
-        "id": "9d430c54.8affb",
+        "id": "14008b93.c61004",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2012.116714477539,
-        "y": 7060.383529663086,
-        "z": "1b4ba1fc.83240e",
+        "x": 1986.433349609375,
+        "y": 7055.102630615234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "8c955553.2a5b4",
+        "id": "4241c741.35655",
         "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": 2362.116226196289,
-        "y": 6994.383529663086,
-        "z": "1b4ba1fc.83240e",
+        "x": 2336.432861328125,
+        "y": 6989.102630615234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7b6e5c2.eee3ea4",
-                "23885c26.87d57c"
+                "ea96feaf.f1788",
+                "4822a513.5b5dec"
             ]
         ]
     },
     {
-        "id": "7b6e5c2.eee3ea4",
+        "id": "ea96feaf.f1788",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2694.616226196289,
-        "y": 6968.383529663086,
-        "z": "1b4ba1fc.83240e",
+        "x": 2668.932861328125,
+        "y": 6963.102630615234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6e7264f6.b603bc"
+                "99064a7c.800f78"
             ]
         ]
     },
     {
-        "id": "23885c26.87d57c",
+        "id": "4822a513.5b5dec",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2698.616226196289,
-        "y": 7008.383529663086,
-        "z": "1b4ba1fc.83240e",
+        "x": 2672.932861328125,
+        "y": 7003.102630615234,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7c20df87.4ce228"
+                "75af94b2.bd71a4"
             ]
         ]
     },
     {
-        "id": "7c20df87.4ce228",
+        "id": "75af94b2.bd71a4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2886.116226196289,
-        "y": 7012.383529663086,
-        "z": "1b4ba1fc.83240e",
+        "x": 2860.432861328125,
+        "y": 7007.102630615234,
+        "z": "df66c4ba.dc49d",
         "wires": [
-            []
+            [
+                "383276dd.aedfd2"
+            ]
         ]
     },
     {
-        "id": "6e7264f6.b603bc",
+        "id": "99064a7c.800f78",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2882.616226196289,
-        "y": 6972.383529663086,
-        "z": "1b4ba1fc.83240e",
+        "x": 2856.932861328125,
+        "y": 6967.102630615234,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "b3758874.8f232",
+        "id": "787fd0ee.fe0408",
         "type": "execute",
         "name": "execute RestApiCallNode Delete Underlay OTN tunnel from the LEAF ethernet Service",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/underlay/otn-tunnels=' + $tmp.underlayOTN`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1114.933364868164,
-        "y": 4711.966567993164,
-        "z": "1b4ba1fc.83240e",
+        "x": 1089.25,
+        "y": 4706.6856689453125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d41942d3.562958",
-                "ebe016f8.97161"
+                "9f0cae6f.29b72",
+                "ae365d21.2b4fd8"
             ]
         ]
     },
     {
-        "id": "d41942d3.562958",
+        "id": "9f0cae6f.29b72",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1543.433120727539,
-        "y": 4699.966567993164,
-        "z": "1b4ba1fc.83240e",
+        "x": 1517.749755859375,
+        "y": 4694.6856689453125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "5ea52c46.125904"
+                "b4e1628f.b3806"
             ]
         ]
     },
     {
-        "id": "ebe016f8.97161",
+        "id": "ae365d21.2b4fd8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1547.433120727539,
-        "y": 4739.966567993164,
-        "z": "1b4ba1fc.83240e",
+        "x": 1521.749755859375,
+        "y": 4734.6856689453125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "f81bc98a.2445d"
+                "f7f8736e.92596"
             ]
         ]
     },
     {
-        "id": "5ea52c46.125904",
+        "id": "b4e1628f.b3806",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1701.433120727539,
-        "y": 4699.966567993164,
-        "z": "1b4ba1fc.83240e",
+        "x": 1675.749755859375,
+        "y": 4694.6856689453125,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "f81bc98a.2445d",
+        "id": "f7f8736e.92596",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1704.933120727539,
-        "y": 4739.966567993164,
-        "z": "1b4ba1fc.83240e",
+        "x": 1679.249755859375,
+        "y": 4734.6856689453125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "82036bd3.d2b678",
+        "id": "e95ba342.193f38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5138.683364868164,
-        "y": 5032.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 5113,
+        "y": 5027.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "54859efe.15c158",
-                "fd20f3ef.b5a108",
-                "bf190cd2.45b99"
+                "6274dc16.d97334",
+                "78a742b8.f3e49c",
+                "a7f7a97f.231788"
             ]
         ]
     },
     {
-        "id": "bf190cd2.45b99",
+        "id": "a7f7a97f.231788",
         "type": "set",
         "name": "set vpnNameToSearch",
         "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",
         "comments": "",
-        "x": 5365.683364868164,
-        "y": 4977.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 5340,
+        "y": 4972.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "54859efe.15c158",
+        "id": "6274dc16.d97334",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5519.683364868164,
-        "y": 5029.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 5494,
+        "y": 5024.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "fd20f3ef.b5a108",
+        "id": "78a742b8.f3e49c",
         "type": "switchNode",
         "name": "switch $foundVpnName",
         "xml": "<switch test=\"`$foundVpnName`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5364.683364868164,
-        "y": 5084.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 5339,
+        "y": 5079.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "290514d0.09f59c"
+                "198065a6.b0f88a"
             ]
         ]
     },
     {
-        "id": "290514d0.09f59c",
+        "id": "198065a6.b0f88a",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5543.683364868164,
-        "y": 5083.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 5518,
+        "y": 5078.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "8f49a5ce.76f168"
+                "9b07993f.50303"
             ]
         ]
     },
     {
-        "id": "22a945f9.085212",
+        "id": "da74bb6.e442948",
         "type": "set",
         "name": "unset secondary related variables",
         "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",
         "comments": "",
-        "x": 3405.933334350586,
-        "y": 438.56666564941406,
-        "z": "1b4ba1fc.83240e",
+        "x": 3380.249969482422,
+        "y": 433.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "94938481.855978",
+        "id": "feffc86e.486bc",
         "type": "set",
         "name": "set network-route-three",
         "xml": "<set>\n<parameter name='network-route-three' value=\"`$tmp.aai.logical-link.segment-id`\" />\n\n\n",
         "comments": "",
-        "x": 3369.933334350586,
-        "y": 688.5666656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 3344.249969482422,
+        "y": 683.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "7edb995a.421908",
+        "id": "12bfceb8.d75889",
         "type": "switchNode",
         "name": "switch secondary empty?",
         "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3373.349838256836,
-        "y": 730.8166351318359,
-        "z": "1b4ba1fc.83240e",
+        "x": 3347.666473388672,
+        "y": 725.5357360839844,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "2aad068d.f37552",
-                "160f6f1.9c78f91"
+                "692e1a2b.3a9c5c",
+                "b2412330.9864f8"
             ]
         ]
     },
     {
-        "id": "2aad068d.f37552",
+        "id": "692e1a2b.3a9c5c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3612.3497161865234,
-        "y": 566.8166656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 3586.6663513183594,
+        "y": 561.5357666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "1be1e31f.1947f5"
+                "cf959ce5.f99248"
             ]
         ]
     },
     {
-        "id": "160f6f1.9c78f91",
+        "id": "b2412330.9864f8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3621.3497161865234,
-        "y": 613.8166656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 3595.6663513183594,
+        "y": 608.5357666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "939cd6fd.61434"
+                "5a3f29c4.e69d68"
             ]
         ]
     },
     {
-        "id": "939cd6fd.61434",
+        "id": "5a3f29c4.e69d68",
         "type": "set",
         "name": "set hasSecondary true",
         "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",
         "comments": "",
-        "x": 3835.3497161865234,
-        "y": 607.8166656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 3809.6663513183594,
+        "y": 602.5357666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "1be1e31f.1947f5",
+        "id": "cf959ce5.f99248",
         "type": "set",
         "name": "set hasSecondary false",
         "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",
         "comments": "",
-        "x": 3839.3497161865234,
-        "y": 563.8166656494141,
-        "z": "1b4ba1fc.83240e",
+        "x": 3813.6663513183594,
+        "y": 558.5357666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "9b9082d.d33238",
+        "id": "50bdde17.ca9b2",
         "type": "outcome",
         "name": "SECONDARY-ROOT",
         "xml": "<outcome value='SECONDARY-ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4201.383773803711,
-        "y": 517.2666168212891,
-        "z": "1b4ba1fc.83240e",
+        "x": 4175.700408935547,
+        "y": 511.9857177734375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "5bb9e60d.7c50c8"
+                "eb2d50e2.230b88"
             ]
         ]
     },
     {
-        "id": "5bb9e60d.7c50c8",
+        "id": "eb2d50e2.230b88",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4375.383773803711,
-        "y": 512.2666168212891,
-        "z": "1b4ba1fc.83240e",
+        "x": 4349.700408935547,
+        "y": 506.9857177734375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7a7e54e9.bf28b4",
-                "1946febe.bd9461"
+                "7743c0e4.ff58d",
+                "fbbd6ec6.676af8"
             ]
         ]
     },
     {
-        "id": "7a7e54e9.bf28b4",
+        "id": "7743c0e4.ff58d",
         "type": "set",
         "name": "set network-route-SECONDARY-ROOT",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
-        "x": 4619.384017944336,
-        "y": 504.26661682128906,
-        "z": "1b4ba1fc.83240e",
+        "x": 4593.700653076172,
+        "y": 498.9857177734375,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "1946febe.bd9461",
+        "id": "fbbd6ec6.676af8",
         "type": "set",
         "name": "set network-route-C",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
-        "x": 4565.384017944336,
-        "y": 544.2666168212891,
-        "z": "1b4ba1fc.83240e",
+        "x": 4539.700653076172,
+        "y": 538.9857177734375,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "a01fe37.2547ea",
+        "id": "f2575655.f8e378",
         "type": "outcome",
         "name": "SECONDARY-ROOT",
         "xml": "<outcome value='SECONDARY-ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4170.383773803711,
-        "y": 746.6666412353516,
-        "z": "1b4ba1fc.83240e",
+        "x": 4144.700408935547,
+        "y": 741.3857421875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "918e4345.efda7"
+                "9c041385.58f0a8"
             ]
         ]
     },
     {
-        "id": "918e4345.efda7",
+        "id": "9c041385.58f0a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4328.383529663086,
-        "y": 789.6664581298828,
-        "z": "1b4ba1fc.83240e",
+        "x": 4302.700164794922,
+        "y": 784.3855590820312,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6e675e43.dde0d8",
-                "80002079.3161b8"
+                "d46c9c27.1618a",
+                "fae38fd4.0207e8"
             ]
         ]
     },
     {
-        "id": "6e675e43.dde0d8",
+        "id": "d46c9c27.1618a",
         "type": "set",
         "name": "set network-route-SECONDARY-ROOT",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
-        "x": 4550.383529663086,
-        "y": 775.6665802001953,
-        "z": "1b4ba1fc.83240e",
+        "x": 4524.700164794922,
+        "y": 770.3856811523438,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "80002079.3161b8",
+        "id": "fae38fd4.0207e8",
         "type": "set",
         "name": "set network-route-C",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
-        "x": 4496.383529663086,
-        "y": 815.6665802001953,
-        "z": "1b4ba1fc.83240e",
+        "x": 4470.700164794922,
+        "y": 810.3856811523438,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "f054f8f8.d1b3a",
+        "id": "3b541994.2db38e",
         "type": "save",
         "name": "get network-route-three 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-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",
         "comments": "",
         "outputs": 1,
-        "x": 3381.816635131836,
-        "y": 982.8999176025391,
-        "z": "1b4ba1fc.83240e",
+        "x": 3356.133270263672,
+        "y": 977.6190185546875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "36902805.8d90e",
-                "becbd8eb.e312f8",
-                "8659a4ac.581568"
+                "a7d11d5e.62ca",
+                "b2aac144.2741f8",
+                "fb257074.006628"
             ]
         ]
     },
     {
-        "id": "36902805.8d90e",
+        "id": "a7d11d5e.62ca",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3621.816635131836,
-        "y": 965.8999176025391,
-        "z": "1b4ba1fc.83240e",
+        "x": 3596.133270263672,
+        "y": 960.6190185546875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "becbd8eb.e312f8",
+        "id": "b2aac144.2741f8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3617.325698852539,
-        "y": 1008.3259735107422,
-        "z": "1b4ba1fc.83240e",
+        "x": 3591.642333984375,
+        "y": 1003.0450744628906,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "8659a4ac.581568",
+        "id": "fb257074.006628",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3621.325668334961,
-        "y": 1056.325942993164,
-        "z": "1b4ba1fc.83240e",
+        "x": 3595.642303466797,
+        "y": 1051.0450439453125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "3e8b9bd4.673dec"
+                "9e133df7.481"
             ]
         ]
     },
     {
-        "id": "3e8b9bd4.673dec",
+        "id": "9e133df7.481",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3776.816635131836,
-        "y": 1025.8998565673828,
-        "z": "1b4ba1fc.83240e",
+        "x": 3751.133270263672,
+        "y": 1020.6189575195312,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "dcd7f0d5.69944"
+                "5d283673.03481"
             ]
         ]
     },
     {
-        "id": "dcd7f0d5.69944",
+        "id": "5d283673.03481",
         "type": "switchNode",
         "name": "switch nr type",
         "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3898.816635131836,
-        "y": 972.8998565673828,
-        "z": "1b4ba1fc.83240e",
+        "x": 3873.133270263672,
+        "y": 967.6189575195312,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "b21b1a8d.ec399",
-                "40a89314.47b21c",
-                "f3bd5a06.f854e"
+                "bd8b3788.0306c8",
+                "a98e1a14.629d2",
+                "64a49d41.8a256c"
             ]
         ]
     },
     {
-        "id": "b21b1a8d.ec399",
+        "id": "bd8b3788.0306c8",
         "type": "outcome",
         "name": "ROOT",
         "xml": "<outcome value='ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4134.816635131836,
-        "y": 822.8998565673828,
-        "z": "1b4ba1fc.83240e",
+        "x": 4109.133270263672,
+        "y": 817.6189575195312,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "c5a6386c.ce6e1"
+                "a81c580d.51216"
             ]
         ]
     },
     {
-        "id": "40a89314.47b21c",
+        "id": "a98e1a14.629d2",
         "type": "outcome",
         "name": "LEAF",
         "xml": "<outcome value='LEAF'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4130.816635131836,
-        "y": 878.8998565673828,
-        "z": "1b4ba1fc.83240e",
+        "x": 4105.133270263672,
+        "y": 873.6189575195312,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "12081a23.d55f7e"
+                "589a315.c47ec5"
             ]
         ]
     },
     {
-        "id": "c5a6386c.ce6e1",
+        "id": "a81c580d.51216",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4260.816635131836,
-        "y": 830.8998565673828,
-        "z": "1b4ba1fc.83240e",
+        "x": 4235.133270263672,
+        "y": 825.6189575195312,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "bedffac2.d82048",
-                "6105d759.fbeec8"
+                "22e46140.c55d46",
+                "52abbdbb.d37324"
             ]
         ]
     },
     {
-        "id": "12081a23.d55f7e",
+        "id": "589a315.c47ec5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4263.816635131836,
-        "y": 883.8998565673828,
-        "z": "1b4ba1fc.83240e",
+        "x": 4238.133270263672,
+        "y": 878.6189575195312,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7ef90f2d.cab8",
-                "728a110f.c5d4a8"
+                "cf0c55ac.b4f5",
+                "5defc5f6.f6a484"
             ]
         ]
     },
     {
-        "id": "f3bd5a06.f854e",
+        "id": "64a49d41.8a256c",
         "type": "outcome",
         "name": "SECONDARY-ROOT",
         "xml": "<outcome value='SECONDARY-ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4123.816635131836,
-        "y": 956.8998565673828,
-        "z": "1b4ba1fc.83240e",
+        "x": 4098.133270263672,
+        "y": 951.6189575195312,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a50b1577.32615"
+                "e6763c4c.a7231"
             ]
         ]
     },
     {
-        "id": "a50b1577.32615",
+        "id": "e6763c4c.a7231",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4279.816635131836,
-        "y": 977.8998565673828,
-        "z": "1b4ba1fc.83240e",
+        "x": 4254.133270263672,
+        "y": 972.6189575195312,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "8c375d88.8bcbe",
-                "79733ca8.98d714"
+                "1756c413.4839cc",
+                "782ca4c6.82ca7c"
             ]
         ]
     },
     {
-        "id": "bedffac2.d82048",
+        "id": "22e46140.c55d46",
         "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": 4507.816635131836,
-        "y": 860.8998565673828,
-        "z": "1b4ba1fc.83240e",
+        "x": 4482.133270263672,
+        "y": 855.6189575195312,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "6105d759.fbeec8",
+        "id": "52abbdbb.d37324",
         "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": 4499.816635131836,
-        "y": 902.8998565673828,
-        "z": "1b4ba1fc.83240e",
+        "x": 4474.133270263672,
+        "y": 897.6189575195312,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "7ef90f2d.cab8",
+        "id": "cf0c55ac.b4f5",
         "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": 4500.816635131836,
-        "y": 954.8998565673828,
-        "z": "1b4ba1fc.83240e",
+        "x": 4475.133270263672,
+        "y": 949.6189575195312,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "728a110f.c5d4a8",
+        "id": "5defc5f6.f6a484",
         "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": 4487.816635131836,
-        "y": 994.8998565673828,
-        "z": "1b4ba1fc.83240e",
+        "x": 4462.133270263672,
+        "y": 989.6189575195312,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "79733ca8.98d714",
+        "id": "782ca4c6.82ca7c",
         "type": "set",
         "name": "set network-route-C",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
         "comments": "",
-        "x": 4461.816635131836,
-        "y": 1088.8998565673828,
-        "z": "1b4ba1fc.83240e",
+        "x": 4436.133270263672,
+        "y": 1083.6189575195312,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "8c375d88.8bcbe",
+        "id": "1756c413.4839cc",
         "type": "set",
         "name": "set network-route-SECONDARY-ROOT",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
         "comments": "",
-        "x": 4523.816635131836,
-        "y": 1044.8998565673828,
-        "z": "1b4ba1fc.83240e",
+        "x": 4498.133270263672,
+        "y": 1039.6189575195312,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "663710d5.9b6118",
+        "id": "484721d3.79272",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3725.816665649414,
-        "y": 2228.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3700.13330078125,
+        "y": 2223.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "4284e0ad.37004",
-                "54bef6f2.4fc7a"
+                "b5f1ffe9.23b0f8",
+                "1ac2c659.fd2752"
             ]
         ]
     },
     {
-        "id": "16d496be.188cb9",
+        "id": "3809e292.fa07fe",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3553.150161743164,
-        "y": 2229.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3527.466796875,
+        "y": 2224.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "663710d5.9b6118"
+                "484721d3.79272"
             ]
         ]
     },
     {
-        "id": "545ddc0c.5d5ecc",
+        "id": "9915b355.be7de",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3562.641128540039,
-        "y": 2272.1407012939453,
-        "z": "1b4ba1fc.83240e",
+        "x": 3536.957763671875,
+        "y": 2266.8598022460938,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "5e1fc0e8.d800d8",
+        "id": "a933d5e7.aab9f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3551.150161743164,
-        "y": 2318.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3525.466796875,
+        "y": 2313.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "4284e0ad.37004",
+        "id": "b5f1ffe9.23b0f8",
         "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-C.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-domainC\"/>\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4016.150161743164,
-        "y": 2244.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3990.466796875,
+        "y": 2239.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7adfe0fe.0b09c",
-                "70e2db35.da559c"
+                "5643d89b.9da4c",
+                "ff517248.3a648"
             ]
         ]
     },
     {
-        "id": "70e2db35.da559c",
+        "id": "ff517248.3a648",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4239.150161743164,
-        "y": 2199.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4213.466796875,
+        "y": 2194.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "624b6d74.0c220c"
+                "55ae5854.3eda38"
             ]
         ]
     },
     {
-        "id": "7adfe0fe.0b09c",
+        "id": "5643d89b.9da4c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4241.150161743164,
-        "y": 2263.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4215.466796875,
+        "y": 2258.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "44c8e026.3089e"
+                "b94af8ff.6b0728"
             ]
         ]
     },
     {
-        "id": "71a7eba7.ddb6fc",
+        "id": "729e2fc5.81fb",
         "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.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.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": 3347.150161743164,
-        "y": 2250.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3321.466796875,
+        "y": 2245.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "16d496be.188cb9",
-                "545ddc0c.5d5ecc",
-                "5e1fc0e8.d800d8"
+                "3809e292.fa07fe",
+                "9915b355.be7de",
+                "a933d5e7.aab9f"
             ]
         ]
     },
     {
-        "id": "720f0fd3.e06eb",
+        "id": "c78860d4.be69b",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3286.150161743164,
-        "y": 2208.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3260.466796875,
+        "y": 2203.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "dab7847.8f75af8",
+        "id": "b3267f6f.ff1998",
         "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-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3367.150161743164,
-        "y": 2098.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3341.466796875,
+        "y": 2093.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "bb6830ab.78043",
-                "943e3a24.27d0d"
+                "95bacf59.0ff4f",
+                "1f5368f.a927697"
             ]
         ]
     },
     {
-        "id": "943e3a24.27d0d",
+        "id": "1f5368f.a927697",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3590.150161743164,
-        "y": 2084.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3564.466796875,
+        "y": 2079.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "14789ba.27922e4"
+                "d9fb5654.5b333"
             ]
         ]
     },
     {
-        "id": "bb6830ab.78043",
+        "id": "95bacf59.0ff4f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3592.150161743164,
-        "y": 2117.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3566.466796875,
+        "y": 2112.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "14789ba.27922e4",
+        "id": "d9fb5654.5b333",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3738.150161743164,
-        "y": 2077.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3712.466796875,
+        "y": 2072.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "f084bd9b.374fe",
-                "635334a7.ad5104"
+                "5dfbdc91.e62934",
+                "c6faa1d4.308aa"
             ]
         ]
     },
     {
-        "id": "f084bd9b.374fe",
+        "id": "5dfbdc91.e62934",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 3930.1500396728516,
-        "y": 2014.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3904.4666748046875,
+        "y": 2009.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "54bef6f2.4fc7a",
+        "id": "1ac2c659.fd2752",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3997.150161743164,
-        "y": 2375.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3971.466796875,
+        "y": 2370.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "2fc07773.c6e698"
+                "65bc2e8.d7ad75"
             ]
         ]
     },
     {
-        "id": "2fc07773.c6e698",
+        "id": "65bc2e8.d7ad75",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4203.150161743164,
-        "y": 2375.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4177.466796875,
+        "y": 2370.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "eda47f6d.73a9a"
+                "1afa33da.5ab90c"
             ]
         ]
     },
     {
-        "id": "635334a7.ad5104",
+        "id": "c6faa1d4.308aa",
         "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.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3952.1500396728516,
-        "y": 2082.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3926.4666748046875,
+        "y": 2077.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "fd3d2e45.ba5c18",
-                "6f65faaa.29e51c",
-                "979b3e61.62e1e8"
+                "5532b203.91ac2c",
+                "8b9d700b.47a8d",
+                "394e6c3a.4b06ac"
             ]
         ]
     },
     {
-        "id": "fd3d2e45.ba5c18",
+        "id": "5532b203.91ac2c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4147.650161743164,
-        "y": 2034.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4121.966796875,
+        "y": 2029.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "76cbe983.f31c3"
+                "6665fa87.172574"
             ]
         ]
     },
     {
-        "id": "6f65faaa.29e51c",
+        "id": "8b9d700b.47a8d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4139.650161743164,
-        "y": 2089.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4113.966796875,
+        "y": 2084.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "ad429934.3c84f"
+                "de859847.0ba4f"
             ]
         ]
     },
     {
-        "id": "979b3e61.62e1e8",
+        "id": "394e6c3a.4b06ac",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4144.650161743164,
-        "y": 2146.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4118.966796875,
+        "y": 2141.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "bbff5204.a70cf8"
+                "bb9f9dd0.735df"
             ]
         ]
     },
     {
-        "id": "bbff5204.a70cf8",
+        "id": "bb9f9dd0.735df",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4296.650161743164,
-        "y": 2147.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4270.966796875,
+        "y": 2142.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "76cbe983.f31c3",
+        "id": "6665fa87.172574",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4292.032485961914,
-        "y": 2032.2223358154297,
-        "z": "1b4ba1fc.83240e",
+        "x": 4266.34912109375,
+        "y": 2026.9414367675781,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "181d9117.3dc1c7"
+                "5de1cc8d.104a64"
             ]
         ]
     },
     {
-        "id": "a71111e6.40602",
+        "id": "62f42d2.2eff654",
         "type": "set",
         "name": "set SECONDARY-ROOT stuff",
         "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",
         "comments": "",
-        "x": 3347.816665649414,
-        "y": 2343.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3322.13330078125,
+        "y": 2338.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "f86bd22d.6a796",
+        "id": "657d67ff.88d37",
         "type": "comment",
         "name": "NOT NEEDED ANYMORE?",
         "info": "",
         "comments": "",
-        "x": 4026.816635131836,
-        "y": 2319.5665130615234,
-        "z": "1b4ba1fc.83240e",
+        "x": 4001.133270263672,
+        "y": 2314.285614013672,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "44c8e026.3089e",
+        "id": "b94af8ff.6b0728",
         "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": 4400.150161743164,
-        "y": 2282.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4374.466796875,
+        "y": 2277.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "624b6d74.0c220c",
+        "id": "55ae5854.3eda38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4404.150161743164,
-        "y": 2196.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4378.466796875,
+        "y": 2191.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6725a861.5cac68",
-                "116c17e7.39a43"
+                "98470c66.40aa6",
+                "d46d48e0.99162"
             ]
         ]
     },
     {
-        "id": "eda47f6d.73a9a",
+        "id": "1afa33da.5ab90c",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4420.435806274414,
-        "y": 2374.388442993164,
-        "z": "1b4ba1fc.83240e",
+        "x": 4394.75244140625,
+        "y": 2369.1075439453125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "c2e9db6e.5e8918"
+                "ab3c9c27.f71ab"
             ]
         ]
     },
     {
-        "id": "ad429934.3c84f",
+        "id": "de859847.0ba4f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4307.650161743164,
-        "y": 2092.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4281.966796875,
+        "y": 2087.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "6725a861.5cac68",
+        "id": "98470c66.40aa6",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",
         "comments": "",
-        "x": 4574.150161743164,
-        "y": 2157.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4548.466796875,
+        "y": 2152.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "116c17e7.39a43",
+        "id": "d46d48e0.99162",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",
         "comments": "",
-        "x": 4575.150161743164,
-        "y": 2262.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4549.466796875,
+        "y": 2257.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "d91f7d75.bbcbd8",
+        "id": "e385276.9cfc7d8",
         "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": 4570.150161743164,
-        "y": 2211.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4544.466796875,
+        "y": 2206.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "c2e9db6e.5e8918",
+        "id": "ab3c9c27.f71ab",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4627.267349243164,
-        "y": 2363.9071197509766,
-        "z": "1b4ba1fc.83240e",
+        "x": 4601.583984375,
+        "y": 2358.626220703125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a655b2d0.b12cf8",
-                "1b13a85a.c9fe7",
-                "4c91f5f3.8ae07c"
+                "55038a5c.3543e4",
+                "ba6f27b7.23068",
+                "b4e2b396.74f668"
             ]
         ]
     },
     {
-        "id": "a655b2d0.b12cf8",
+        "id": "55038a5c.3543e4",
         "type": "set",
         "name": "set destination ttp-id",
         "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4842.267349243164,
-        "y": 2325.9071197509766,
-        "z": "1b4ba1fc.83240e",
+        "x": 4816.583984375,
+        "y": 2320.626220703125,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "1b13a85a.c9fe7",
+        "id": "ba6f27b7.23068",
         "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-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4839.267349243164,
-        "y": 2364.9071197509766,
-        "z": "1b4ba1fc.83240e",
+        "x": 4813.583984375,
+        "y": 2359.626220703125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "14ad9c89.4bb913"
+                "1dac26ff.18cf11"
             ]
         ]
     },
     {
-        "id": "4c91f5f3.8ae07c",
+        "id": "b4e2b396.74f668",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4794.767349243164,
-        "y": 2406.9071197509766,
-        "z": "1b4ba1fc.83240e",
+        "x": 4769.083984375,
+        "y": 2401.626220703125,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "5e825807.3f1cc",
+        "id": "1ebc335e.7ecae5",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4876.150161743164,
-        "y": 2116.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 4850.466796875,
+        "y": 2111.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "fd8902be.b515c8"
+                "fdce260a.3abd28"
             ]
         ]
     },
     {
-        "id": "181d9117.3dc1c7",
+        "id": "5de1cc8d.104a64",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4476.150039672852,
-        "y": 2046.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4450.4666748046875,
+        "y": 2041.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "b70e554c.645b38"
+                "ed710853.f63fd"
             ]
         ]
     },
     {
-        "id": "b70e554c.645b38",
+        "id": "ed710853.f63fd",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4673.150161743164,
-        "y": 2112.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 4647.466796875,
+        "y": 2107.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "5e825807.3f1cc",
-                "25292003.2c4df"
+                "1ebc335e.7ecae5",
+                "55d60384.c1aed4"
             ]
         ]
     },
     {
-        "id": "25292003.2c4df",
+        "id": "55d60384.c1aed4",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4878.150161743164,
-        "y": 2189.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 4852.466796875,
+        "y": 2184.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "c08bfda1.3541a8"
+                "dc3c174a.64011"
             ]
         ]
     },
     {
-        "id": "14ad9c89.4bb913",
+        "id": "1dac26ff.18cf11",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5019.767349243164,
-        "y": 2363.9071197509766,
-        "z": "1b4ba1fc.83240e",
+        "x": 4994.083984375,
+        "y": 2358.626220703125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "f56384d9.606e1"
+                "84d63541.1d27b"
             ]
         ]
     },
     {
-        "id": "f56384d9.606e1",
+        "id": "84d63541.1d27b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5177.767349243164,
-        "y": 2363.9071197509766,
-        "z": "1b4ba1fc.83240e",
+        "x": 5152.083984375,
+        "y": 2358.626220703125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a47e1ae7.393b38"
+                "e5032679.d8329"
             ]
         ]
     },
     {
-        "id": "a47e1ae7.393b38",
+        "id": "e5032679.d8329",
         "type": "set",
         "name": "set destination tunnel tp ip",
         "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 5384.767349243164,
-        "y": 2363.9071197509766,
-        "z": "1b4ba1fc.83240e",
+        "x": 5359.083984375,
+        "y": 2358.626220703125,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "fd8902be.b515c8",
+        "id": "fdce260a.3abd28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5053.150161743164,
-        "y": 2108.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5027.466796875,
+        "y": 2103.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "3983145.c01d1ec",
-                "ded6bcc1.37b508"
+                "5e499a66.459cd4",
+                "dca5a8c2.a2e2d"
             ]
         ]
     },
     {
-        "id": "ded6bcc1.37b508",
+        "id": "dca5a8c2.a2e2d",
         "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.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5261.150161743164,
-        "y": 2115.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5235.466796875,
+        "y": 2110.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "15291f10.bfa1d1",
-                "4ad88ea0.313028",
-                "9de78895.27ba68"
+                "5837fed4.78811",
+                "3b1607b7.8add2",
+                "d23ccac.f36ffb8"
             ]
         ]
     },
     {
-        "id": "c08bfda1.3541a8",
+        "id": "dc3c174a.64011",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5055.150161743164,
-        "y": 2181.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5029.466796875,
+        "y": 2176.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "757e0ab3.492124"
+                "a2aaab02.f42f78"
             ]
         ]
     },
     {
-        "id": "3983145.c01d1ec",
+        "id": "5e499a66.459cd4",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainC id",
         "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5291.150161743164,
-        "y": 2063.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5265.466796875,
+        "y": 2058.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "757e0ab3.492124",
+        "id": "a2aaab02.f42f78",
         "type": "set",
         "name": "set domainC ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5290.150161743164,
-        "y": 2305.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5264.466796875,
+        "y": 2300.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "15291f10.bfa1d1",
+        "id": "5837fed4.78811",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5471.150161743164,
-        "y": 2106.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5445.466796875,
+        "y": 2101.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "f933124d.0d0d48"
+                "82649274.8d841"
             ]
         ]
     },
     {
-        "id": "4ad88ea0.313028",
+        "id": "3b1607b7.8add2",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5463.150161743164,
-        "y": 2161.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5437.466796875,
+        "y": 2156.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "708c5d46.721ab4"
+                "b977b3e4.7f0818"
             ]
         ]
     },
     {
-        "id": "9de78895.27ba68",
+        "id": "d23ccac.f36ffb8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5468.150161743164,
-        "y": 2218.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5442.466796875,
+        "y": 2213.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "c3cc12ab.3cd488"
+                "cc6cd97.f9dc7a8"
             ]
         ]
     },
     {
-        "id": "c3cc12ab.3cd488",
+        "id": "cc6cd97.f9dc7a8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5620.150161743164,
-        "y": 2219.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5594.466796875,
+        "y": 2214.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "708c5d46.721ab4",
+        "id": "b977b3e4.7f0818",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5631.150161743164,
-        "y": 2164.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5605.466796875,
+        "y": 2159.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "f933124d.0d0d48",
+        "id": "82649274.8d841",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5615.532485961914,
-        "y": 2104.222457885742,
-        "z": "1b4ba1fc.83240e",
+        "x": 5589.84912109375,
+        "y": 2098.9415588378906,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "2ba1c8df.2a738"
+                "d86ccfd2.8a362"
             ]
         ]
     },
     {
-        "id": "2ba1c8df.2a738",
+        "id": "d86ccfd2.8a362",
         "type": "set",
         "name": "set controller domainC data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.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": 5830.150161743164,
-        "y": 2100.5667877197266,
-        "z": "1b4ba1fc.83240e",
+        "x": 5804.466796875,
+        "y": 2095.285888671875,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "5dc3af5e.92a278",
+        "id": "70f331ff.6983c8",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3861.816665649414,
-        "y": 2712.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 3836.13330078125,
+        "y": 2707.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "a2e190cc.8d4f1"
+                "b09a105f.8c6438"
             ]
         ]
     },
     {
-        "id": "a2e190cc.8d4f1",
+        "id": "b09a105f.8c6438",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4052.816665649414,
-        "y": 2716.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4027.13330078125,
+        "y": 2711.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d5cbc45b.cf7e18"
+                "3fb841a7.fe1d76"
             ]
         ]
     },
     {
-        "id": "d5cbc45b.cf7e18",
+        "id": "3fb841a7.fe1d76",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4179.816665649414,
-        "y": 2715.566665649414,
-        "z": "1b4ba1fc.83240e",
+        "x": 4154.13330078125,
+        "y": 2710.2857666015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "9dcfaa3c.2df838"
+                "5fa41047.5ae908"
             ]
         ]
     },
     {
-        "id": "9dcfaa3c.2df838",
+        "id": "5fa41047.5ae908",
         "type": "save",
         "name": "get secondary root uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4406.150405883789,
-        "y": 2708.9002838134766,
-        "z": "1b4ba1fc.83240e",
+        "x": 4380.467041015625,
+        "y": 2703.619384765625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "9b50524c.8f5e2",
-                "d7d45f06.b90c18",
-                "a735aab1.9f93a8"
+                "494cb062.3b09d",
+                "8f274cf6.78b4a",
+                "75ad380b.fe1e68"
             ]
         ]
     },
     {
-        "id": "9b50524c.8f5e2",
+        "id": "494cb062.3b09d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4773.150161743164,
-        "y": 2602.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 4747.466796875,
+        "y": 2597.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "c267b95.509ac48"
+                "e1748800.9b50a8"
             ]
         ]
     },
     {
-        "id": "d7d45f06.b90c18",
+        "id": "8f274cf6.78b4a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4768.659194946289,
-        "y": 2647.326126098633,
-        "z": "1b4ba1fc.83240e",
+        "x": 4742.975830078125,
+        "y": 2642.0452270507812,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "bfc554f5.bfe79"
+                "94646798.3ff8c"
             ]
         ]
     },
     {
-        "id": "a735aab1.9f93a8",
+        "id": "75ad380b.fe1e68",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4764.659194946289,
-        "y": 2697.326187133789,
-        "z": "1b4ba1fc.83240e",
+        "x": 4738.975830078125,
+        "y": 2692.0452880859375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6ab7706d.b84f78"
+                "b33dba75.a7d33"
             ]
         ]
     },
     {
-        "id": "5ae763e6.35d8f4",
+        "id": "5fbe7a1c.d00084",
         "type": "save",
         "name": "update SECONDARY-ROOT UNI in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5212.659683227539,
-        "y": 2692.3263092041016,
-        "z": "1b4ba1fc.83240e",
+        "x": 5186.976318359375,
+        "y": 2687.04541015625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "c267b95.509ac48",
+        "id": "e1748800.9b50a8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4935.721694946289,
-        "y": 2602.1858673095703,
-        "z": "1b4ba1fc.83240e",
+        "x": 4910.038330078125,
+        "y": 2596.9049682617188,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "bfc554f5.bfe79",
+        "id": "94646798.3ff8c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4936.659194946289,
-        "y": 2647.326126098633,
-        "z": "1b4ba1fc.83240e",
+        "x": 4910.975830078125,
+        "y": 2642.0452270507812,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "6ab7706d.b84f78",
+        "id": "b33dba75.a7d33",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4933.659194946289,
-        "y": 2697.326187133789,
-        "z": "1b4ba1fc.83240e",
+        "x": 4907.975830078125,
+        "y": 2692.0452880859375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "3400e5b4.3cd32a",
-                "5ae763e6.35d8f4"
+                "d2b432cc.1ba93",
+                "5fbe7a1c.d00084"
             ]
         ]
     },
     {
-        "id": "3400e5b4.3cd32a",
+        "id": "d2b432cc.1ba93",
         "type": "set",
         "name": "set new bw",
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source - $bwToBeDecreased`' />\n",
         "comments": "",
-        "x": 5115.659927368164,
-        "y": 2639.326187133789,
-        "z": "1b4ba1fc.83240e",
+        "x": 5089.9765625,
+        "y": 2634.0452880859375,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "fa76b584.bdbd9",
+        "id": "c59416d6.8ba4c8",
         "type": "switchNode",
         "name": "switch tmp.mmUNI-id-long != SECONDARY-ROOT UNI",
         "xml": "\n<switch test=\"`$tmp.mmUNI-id-long != $tmp.SECONDARY-ROOT.uni-p-interface-long`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4650.150405883789,
-        "y": 3552.899917602539,
-        "z": "1b4ba1fc.83240e",
+        "x": 4624.467041015625,
+        "y": 3547.6190185546875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "ef9b97c4.4f1c68"
+                "5928f063.6a717"
             ]
         ]
     },
     {
-        "id": "ef9b97c4.4f1c68",
+        "id": "5928f063.6a717",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4940.150405883789,
-        "y": 3554.899917602539,
-        "z": "1b4ba1fc.83240e",
+        "x": 4914.467041015625,
+        "y": 3549.6190185546875,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "608ff90c.2e5fc"
+                "3416f94d.d55766"
             ]
         ]
     },
     {
-        "id": "35800841.c29e7",
+        "id": "dc36b830.307698",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4302.683364868164,
-        "y": 5782.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 4277,
+        "y": 5777.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "23246adb.7861de"
+                "124e668b.8a0c71"
             ]
         ]
     },
     {
-        "id": "23246adb.7861de",
+        "id": "124e668b.8a0c71",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4493.683364868164,
-        "y": 5786.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 4468,
+        "y": 5781.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "f3b9dd7.5ea102"
+                "3f950141.3b094e"
             ]
         ]
     },
     {
-        "id": "f3b9dd7.5ea102",
+        "id": "3f950141.3b094e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4620.683364868164,
-        "y": 5785.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 4595,
+        "y": 5780.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "60b7ba2f.bc3c0c"
+                "6756d23f.fb95d4"
             ]
         ]
     },
     {
-        "id": "60b7ba2f.bc3c0c",
+        "id": "6756d23f.fb95d4",
         "type": "switchNode",
         "name": "switch 2-ROOTS in same domain?",
         "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4846.016372680664,
-        "y": 5787.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 4820.3330078125,
+        "y": 5782.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "2443ceec.623df2",
-                "ad2ba37e.796088"
+                "c6ced4f8.328df",
+                "bfbd9ba5.66b2f8"
             ]
         ]
     },
     {
-        "id": "2443ceec.623df2",
+        "id": "c6ced4f8.328df",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5056.016372680664,
-        "y": 5764.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 5030.3330078125,
+        "y": 5759.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "bd893034.6b25e8"
+                "7a2bf212.dfea8c"
             ]
         ]
     },
     {
-        "id": "ad2ba37e.796088",
+        "id": "bfbd9ba5.66b2f8",
         "type": "outcomeTrue",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5061.016372680664,
-        "y": 5813.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 5035.3330078125,
+        "y": 5808.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d0993207.1b217"
+                "cebc5e3b.0e3a98"
             ]
         ]
     },
     {
-        "id": "bd893034.6b25e8",
+        "id": "7a2bf212.dfea8c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5182.016372680664,
-        "y": 5764.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 5156.3330078125,
+        "y": 5759.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "d0993207.1b217",
+        "id": "cebc5e3b.0e3a98",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5179.016372680664,
-        "y": 5820.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 5153.3330078125,
+        "y": 5815.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "7824302d.31915",
-                "638f8d60.f2970c"
+                "65ef26ee.10a09",
+                "893a526e.ec5e18"
             ]
         ]
     },
     {
-        "id": "7824302d.31915",
+        "id": "65ef26ee.10a09",
         "type": "save",
         "name": "update SECONDARY-ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5493.016372680664,
-        "y": 5879.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 5467.3330078125,
+        "y": 5874.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "b539af9b.8e6488",
+        "id": "7678c022.e9095",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
-        "x": 5425.233413696289,
-        "y": 5831.699966430664,
-        "z": "1b4ba1fc.83240e",
+        "x": 5399.550048828125,
+        "y": 5826.4190673828125,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "638f8d60.f2970c",
+        "id": "893a526e.ec5e18",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5623.683364868164,
-        "y": 5789.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 5598,
+        "y": 5784.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "9c7760f0.090d48",
+        "id": "e0d5d04e.46068",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 893.6833648681641,
-        "y": 4979.899673461914,
-        "z": "1b4ba1fc.83240e",
+        "x": 868,
+        "y": 4974.6187744140625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "89d9c849.63865"
+                "a56cc6d9.68657"
             ]
         ]
     },
     {
-        "id": "89d9c849.63865",
+        "id": "a56cc6d9.68657",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1084.683364868164,
-        "y": 4983.899673461914,
-        "z": "1b4ba1fc.83240e",
+        "x": 1059,
+        "y": 4978.6187744140625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "71eabcdb.edbe1c"
+                "e90b308b.e1e54"
             ]
         ]
     },
     {
-        "id": "71eabcdb.edbe1c",
+        "id": "e90b308b.e1e54",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1211.683364868164,
-        "y": 4982.899673461914,
-        "z": "1b4ba1fc.83240e",
+        "x": 1186,
+        "y": 4977.6187744140625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "b655e9e.17d4118"
+                "a8eda34d.bea12"
             ]
         ]
     },
     {
-        "id": "b655e9e.17d4118",
+        "id": "a8eda34d.bea12",
         "type": "switchNode",
         "name": "switch 2-ROOTS in same domain?",
         "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1437.016372680664,
-        "y": 4984.899673461914,
-        "z": "1b4ba1fc.83240e",
+        "x": 1411.3330078125,
+        "y": 4979.6187744140625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "451cba7b.55b034",
-                "89345bed.8540d8"
+                "8a22e9e3.103c4",
+                "489f9bfc.0598fc"
             ]
         ]
     },
     {
-        "id": "451cba7b.55b034",
+        "id": "8a22e9e3.103c4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1647.016372680664,
-        "y": 4961.899673461914,
-        "z": "1b4ba1fc.83240e",
+        "x": 1621.3330078125,
+        "y": 4956.6187744140625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "6b3712d.199ce6c"
+                "d0fe931e.edcfb"
             ]
         ]
     },
     {
-        "id": "89345bed.8540d8",
+        "id": "489f9bfc.0598fc",
         "type": "outcomeTrue",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1652.016372680664,
-        "y": 5010.899673461914,
-        "z": "1b4ba1fc.83240e",
+        "x": 1626.3330078125,
+        "y": 5005.6187744140625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "84894ba9.2f6d9"
+                "8c7de2ba.22e088"
             ]
         ]
     },
     {
-        "id": "6b3712d.199ce6c",
+        "id": "d0fe931e.edcfb",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1773.016372680664,
-        "y": 4961.899673461914,
-        "z": "1b4ba1fc.83240e",
+        "x": 1747.3330078125,
+        "y": 4956.6187744140625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "84894ba9.2f6d9",
+        "id": "8c7de2ba.22e088",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1770.016372680664,
-        "y": 5017.899673461914,
-        "z": "1b4ba1fc.83240e",
+        "x": 1744.3330078125,
+        "y": 5012.6187744140625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "d5552e7d.44cc8",
-                "e67d570d.d5f9f"
+                "65c8b788.d0e558",
+                "4c911e6c.738418"
             ]
         ]
     },
     {
-        "id": "e67d570d.d5f9f",
+        "id": "4c911e6c.738418",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2214.683364868164,
-        "y": 4986.899673461914,
-        "z": "1b4ba1fc.83240e",
+        "x": 2189,
+        "y": 4981.6187744140625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "41723099.7f44e8",
+        "id": "dd48d8e6.216f08",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
-        "x": 2016.233413696289,
-        "y": 5028.699478149414,
-        "z": "1b4ba1fc.83240e",
+        "x": 1990.550048828125,
+        "y": 5023.4185791015625,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "d5552e7d.44cc8",
+        "id": "65c8b788.d0e558",
         "type": "save",
         "name": "update SECONDARY-ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2084.016372680664,
-        "y": 5076.899673461914,
-        "z": "1b4ba1fc.83240e",
+        "x": 2058.3330078125,
+        "y": 5071.6187744140625,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "5d9c1c4d.83462c",
+        "id": "1ed03004.8d6e4",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1496.0167388916016,
-        "y": 5820.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 1470.3333740234375,
+        "y": 5815.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "4a1beb8f.c1dbac"
+                "fb5466ce.3f1ab"
             ]
         ]
     },
     {
-        "id": "4a1beb8f.c1dbac",
+        "id": "fb5466ce.3f1ab",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1687.0167388916016,
-        "y": 5824.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 1661.3333740234375,
+        "y": 5819.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "c43fef47.9c947"
+                "dfa5085f.0e0158"
             ]
         ]
     },
     {
-        "id": "c43fef47.9c947",
+        "id": "dfa5085f.0e0158",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1814.0167388916016,
-        "y": 5823.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 1788.3333740234375,
+        "y": 5818.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "40808ad0.742134"
+                "7e51bd6c.d2742c"
             ]
         ]
     },
     {
-        "id": "40808ad0.742134",
+        "id": "7e51bd6c.d2742c",
         "type": "switchNode",
         "name": "switch 2-ROOTS in same domain?",
         "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2039.3497467041016,
-        "y": 5825.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 2013.6663818359375,
+        "y": 5820.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "5a051931.8c6a5",
-                "818560aa.91932"
+                "6b07f1cb.4afc3",
+                "110d7be3.9bb1f4"
             ]
         ]
     },
     {
-        "id": "5a051931.8c6a5",
+        "id": "6b07f1cb.4afc3",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2249.3497467041016,
-        "y": 5802.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 2223.6663818359375,
+        "y": 5797.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "8edca568.ede98"
+                "8b99f6ab.569ed"
             ]
         ]
     },
     {
-        "id": "818560aa.91932",
+        "id": "110d7be3.9bb1f4",
         "type": "outcomeTrue",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2254.3497467041016,
-        "y": 5851.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 2228.6663818359375,
+        "y": 5846.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "9a80cebb.ff473"
+                "675a78e3.b9924"
             ]
         ]
     },
     {
-        "id": "8edca568.ede98",
+        "id": "8b99f6ab.569ed",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2375.3497467041016,
-        "y": 5802.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 2349.6663818359375,
+        "y": 5797.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "9a80cebb.ff473",
+        "id": "675a78e3.b9924",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2372.3497467041016,
-        "y": 5858.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 2346.6663818359375,
+        "y": 5853.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             [
-                "cc186b3e.b594b",
-                "5f3c966d.1d57c"
+                "4f39f0f0.b363c8",
+                "87158cb0.5a00c8"
             ]
         ]
     },
     {
-        "id": "5f3c966d.1d57c",
+        "id": "87158cb0.5a00c8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2817.0167388916016,
-        "y": 5827.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 2791.3333740234375,
+        "y": 5822.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "224407cc.d62a7",
+        "id": "b15d8a43.4b5da8",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
-        "x": 2618.5667877197266,
-        "y": 5869.699966430664,
-        "z": "1b4ba1fc.83240e",
+        "x": 2592.8834228515625,
+        "y": 5864.4190673828125,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "cc186b3e.b594b",
+        "id": "4f39f0f0.b363c8",
         "type": "save",
         "name": "update SECONDARY-ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2686.3497467041016,
-        "y": 5917.900161743164,
-        "z": "1b4ba1fc.83240e",
+        "x": 2660.6663818359375,
+        "y": 5912.6192626953125,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "9067b91d.deea4",
+        "id": "bc0be831.bf6158",
         "type": "execute",
         "name": "execute Terminate SSE Connection",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='deleteSubscriptionAndSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\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=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1546.4500274658203,
-        "y": 6126.280899047852,
-        "z": "1b4ba1fc.83240e",
+        "x": 1520.7666625976562,
+        "y": 6121,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
     },
     {
-        "id": "61909f2b.d81a28",
+        "id": "75a2fd5c.c75aac",
         "type": "set",
         "name": "set parameters",
         "xml": "<set>\n<parameter name='subscriptionId' value='`$rcvd-bandwidth-value`' />\n",
         "comments": "",
-        "x": 1478.483413696289,
-        "y": 6067.680801391602,
-        "z": "1b4ba1fc.83240e",
+        "x": 1452.800048828125,
+        "y": 6062.39990234375,
+        "z": "df66c4ba.dc49d",
         "wires": []
     },
     {
-        "id": "3d1d7271.d95cbe",
+        "id": "b1b75307.3fe99",
         "type": "execute",
         "name": "execute Terminate SSE Connection",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='deleteSubscriptionAndSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\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=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2095.116714477539,
-        "y": 5574.514297485352,
-        "z": "1b4ba1fc.83240e",
+        "x": 2081.433349609375,
+        "y": 5541.2333984375,
+        "z": "df66c4ba.dc49d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "eb743ad2.daea58",
+        "type": "execute",
+        "name": "execute delete service-pm",
+        "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-service-pm:performance-monitoring/service-pm=' + $tmp.the-connectivity.etht-svc-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"delete\" />\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=\"responsePrefix\" value=\"ethdelete-result\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2045.333251953125,
+        "y": 5586.33349609375,
+        "z": "df66c4ba.dc49d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4ed6624e.3d3df4",
+        "type": "execute",
+        "name": "execute delete service-pm",
+        "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-service-pm:performance-monitoring/service-pm=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"delete\" />\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=\"responsePrefix\" value=\"ethdelete-result\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4443.6669921875,
+        "y": 6460.33349609375,
+        "z": "df66c4ba.dc49d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "383276dd.aedfd2",
+        "type": "execute",
+        "name": "execute delete service-pm",
+        "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-service-pm:performance-monitoring/service-pm=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"delete\" />\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=\"responsePrefix\" value=\"ethdelete-result\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3103.666748046875,
+        "y": 7008.33349609375,
+        "z": "df66c4ba.dc49d",
         "wires": [
             []
         ]
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 259691f9..3c429253 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
@@ -1783,25 +1783,18 @@
                                                                                                                                                         </outcome>
                                                                                                                                                         <outcome value='success'>
                                                                                                                                                             <block atomic="true">
-                                                                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='deleteSubscriptionAndSseConnection' >
-                                                                                                                                                                    <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url`" />
-                                                                                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`" />
-                                                                                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`" />
+                                                                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-service-pm:performance-monitoring/service-pm=' + $tmp.the-connectivity.etht-svc-name`" />
                                                                                                                                                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
                                                                                                                                                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
                                                                                                                                                                     <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
                                                                                                                                                                     <parameter name="format" value="json" />
-                                                                                                                                                                    <parameter name="httpMethod" value="post" />
+                                                                                                                                                                    <parameter name="httpMethod" value="delete" />
                                                                                                                                                                     <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=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />
-                                                                                                                                                                    <parameter name="module" value="GENERIC-RESOURCE-API" />
-                                                                                                                                                                    <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />
-                                                                                                                                                                    <parameter name="version" value="`$project.version`" />
-                                                                                                                                                                    <parameter name="mode" value="sync" />
-                                                                                                                                                                    <parameter name="responsePrefix" value="restapi-result"/>
+                                                                                                                                                                    <parameter name="responsePrefix" value="ethdelete-result"/>
                                                                                                                                                                 </execute>
                                                                                                                                                             </block>
                                                                                                                                                         </outcome>
@@ -2008,7 +2001,21 @@
                                                                                                                                                                                                                                 </return>
                                                                                                                                                                                                                             </outcome>
                                                                                                                                                                                                                             <outcome value='success'>
-                                                                                                                                                                                                                                <block atomic="true"></block>
+                                                                                                                                                                                                                                <block atomic="true">
+                                                                                                                                                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                                                                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-service-pm:performance-monitoring/service-pm=' + $tmp.aai.connectivity.etht-svc-name`" />
+                                                                                                                                                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                                                                                                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                                                                                                                                                                                        <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                                                                                                                                                                                                        <parameter name="format" value="json" />
+                                                                                                                                                                                                                                        <parameter name="httpMethod" value="delete" />
+                                                                                                                                                                                                                                        <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="responsePrefix" value="ethdelete-result"/>
+                                                                                                                                                                                                                                    </execute>
+                                                                                                                                                                                                                                </block>
                                                                                                                                                                                                                             </outcome>
                                                                                                                                                                                                                         </execute>
                                                                                                                                                                                                                     </outcome>
@@ -2150,7 +2157,21 @@
                                                                                                                                                                                                         </return>
                                                                                                                                                                                                     </outcome>
                                                                                                                                                                                                     <outcome value='success'>
-                                                                                                                                                                                                        <block atomic="true"></block>
+                                                                                                                                                                                                        <block atomic="true">
+                                                                                                                                                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                                                                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-service-pm:performance-monitoring/service-pm=' + $tmp.aai.connectivity.etht-svc-name`" />
+                                                                                                                                                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                                                                                                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                                                                                                                                                                <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                                                                                                                                                                                <parameter name="format" value="json" />
+                                                                                                                                                                                                                <parameter name="httpMethod" value="delete" />
+                                                                                                                                                                                                                <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="responsePrefix" value="ethdelete-result"/>
+                                                                                                                                                                                                            </execute>
+                                                                                                                                                                                                        </block>
                                                                                                                                                                                                     </outcome>
                                                                                                                                                                                                 </execute>
                                                                                                                                                                                             </outcome>
@@ -2167,26 +2188,6 @@
                                                                                                                                                             </for>
                                                                                                                                                             <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
                                                                                                                                                                     key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'></delete>
-                                                                                                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='deleteSubscriptionAndSseConnection' >
-                                                                                                                                                                <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url`" />
-                                                                                                                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`" />
-                                                                                                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`" />
-                                                                                                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
-                                                                                                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
-                                                                                                                                                                <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
-                                                                                                                                                                <parameter name="format" value="json" />
-                                                                                                                                                                <parameter name="httpMethod" value="post" />
-                                                                                                                                                                <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=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />
-                                                                                                                                                                <parameter name="module" value="GENERIC-RESOURCE-API" />
-                                                                                                                                                                <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />
-                                                                                                                                                                <parameter name="version" value="`$project.version`" />
-                                                                                                                                                                <parameter name="mode" value="sync" />
-                                                                                                                                                                <parameter name="responsePrefix" value="restapi-result"/>
-                                                                                                                                                            </execute>
                                                                                                                                                         </block>
                                                                                                                                                     </outcome>
                                                                                                                                                 </switch>
-- 
cgit 1.2.3-korg