X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Fcloud_leased_line%2FGENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json;h=1a4c840000695cae22caf901dc702e9aba29955f;hb=c14f920415db0de169e0826e0d746cf80757b1f4;hp=50f87f432d1a8765acfeb585eb2b7ef826f39b94;hpb=22d596935f2edeefbe3f0d5acc72cf39e27e17aa;p=sdnc%2Foam.git

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 50f87f43..1a4c8400 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": "4eba0592.d8f9ec",
+        "id": "d6c73c0b.0d5f48",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 171.88333129882812,
-        "y": 174,
-        "z": "d1eceead.adafe",
+        "x": 157.88330078125,
+        "y": 156.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2ad94242.d34e8e"
+                "d49f5b5f.8b9338"
             ]
         ]
     },
     {
-        "id": "2ad94242.d34e8e",
+        "id": "d49f5b5f.8b9338",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -23,221 +23,221 @@
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
         "x": 456.1690216064453,
-        "y": 235.23810863494873,
-        "z": "d1eceead.adafe",
+        "y": 212.52387523651123,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "86bffa6e.8633f8"
+                "3720330.25593ce"
             ]
         ]
     },
     {
-        "id": "86bffa6e.8633f8",
+        "id": "3720330.25593ce",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-delete",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
         "x": 462.3119354248047,
-        "y": 320.0000305175781,
-        "z": "d1eceead.adafe",
+        "y": 297.2857971191406,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "47cd43dd.6a0c84"
+                "7f694928.267bb8"
             ]
         ]
     },
     {
-        "id": "47cd43dd.6a0c84",
+        "id": "7f694928.267bb8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 811.8833312988281,
-        "y": 379,
-        "z": "d1eceead.adafe",
+        "y": 356.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "17095ff1.ceb8e",
-                "f2cac95d.2dd4f",
-                "41a5db6f.16b124"
+                "14360151.1c2e2f",
+                "2b05d42f.ff48b4",
+                "b833ca08.643e2"
             ]
         ]
     },
     {
-        "id": "17095ff1.ceb8e",
+        "id": "14360151.1c2e2f",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
         "x": 1113.2168273925781,
-        "y": 649.9302978515625,
-        "z": "d1eceead.adafe",
+        "y": 627.216064453125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f2cac95d.2dd4f",
+        "id": "2b05d42f.ff48b4",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",
         "comments": "",
         "outputs": 1,
         "x": 1134.6452941894531,
-        "y": 352.33331298828125,
-        "z": "d1eceead.adafe",
+        "y": 329.61907958984375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d39ef031.51bcf8",
-                "d0a14c94.f617f8",
-                "66ff38b5.215e28"
+                "41fb5683.e713a",
+                "80e71c24.60d2d",
+                "fe4111b5.f2228"
             ]
         ]
     },
     {
-        "id": "d39ef031.51bcf8",
+        "id": "41fb5683.e713a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1359.6452941894531,
-        "y": 210.33331298828125,
-        "z": "d1eceead.adafe",
+        "y": 187.61907958984375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6bec9327.9503c4"
+                "41abc238.ea1884"
             ]
         ]
     },
     {
-        "id": "d0a14c94.f617f8",
+        "id": "80e71c24.60d2d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1355.1362609863281,
-        "y": 279.9073486328125,
-        "z": "d1eceead.adafe",
+        "y": 257.193115234375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "73227915.55ca3"
+                "844c0ad5.c095b"
             ]
         ]
     },
     {
-        "id": "66ff38b5.215e28",
+        "id": "fe4111b5.f2228",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1343.6452941894531,
-        "y": 326.33331298828125,
-        "z": "d1eceead.adafe",
+        "y": 303.61907958984375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5c121a7a.2c527c"
+                "1e9cd9f4.55835e"
             ]
         ]
     },
     {
-        "id": "dcc088f.fb3b378",
+        "id": "692bc437.51a034",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
         "x": 1113.6452941894531,
-        "y": 240.33331298828125,
-        "z": "d1eceead.adafe",
+        "y": 217.61907958984375,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "41a5db6f.16b124",
+        "id": "b833ca08.643e2",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
         "x": 1101.6452941894531,
-        "y": 292.33331298828125,
-        "z": "d1eceead.adafe",
+        "y": 269.61907958984375,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "6bec9327.9503c4",
+        "id": "41abc238.ea1884",
         "type": "switchNode",
         "name": "switch allotted-resources_length != 0",
         "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1599.8833312988281,
-        "y": 207,
-        "z": "d1eceead.adafe",
+        "y": 184.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "52c7d728.b872f8",
-                "31624b25.4a6dec"
+                "edbcfce1.4d552",
+                "d741e3bd.0b6788"
             ]
         ]
     },
     {
-        "id": "73227915.55ca3",
+        "id": "844c0ad5.c095b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 1509.9457092285156,
-        "y": 282.8597717285156,
-        "z": "d1eceead.adafe",
+        "y": 260.1455383300781,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "5c121a7a.2c527c",
+        "id": "1e9cd9f4.55835e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 1513.8833312988281,
-        "y": 327,
-        "z": "d1eceead.adafe",
+        "y": 304.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "52c7d728.b872f8",
+        "id": "edbcfce1.4d552",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1804.8833312988281,
-        "y": 244,
-        "z": "d1eceead.adafe",
+        "y": 221.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b08352cf.6ac34"
+                "589ae77f.807888"
             ]
         ]
     },
     {
-        "id": "31624b25.4a6dec",
+        "id": "d741e3bd.0b6788",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1814.8833312988281,
-        "y": 171,
-        "z": "d1eceead.adafe",
+        "y": 148.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "b08352cf.6ac34",
+        "id": "589ae77f.807888",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -245,751 +245,751 @@
         "comments": "",
         "outputs": 1,
         "x": 1797.8833312988281,
-        "y": 319,
-        "z": "d1eceead.adafe",
+        "y": 296.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "bdd428b9.6fddd",
-                "8710bcb7.6e657",
-                "6f728611.a8a3e",
-                "6d42412e.61e8d",
-                "e22daf3c.82e7c8"
+                "10bd96f7.8fa059",
+                "cb92da4c.da1bb",
+                "cbe49015.ae0dd",
+                "6c495f2.f763aa",
+                "4304e2aa.cc073c"
             ]
         ]
     },
     {
-        "id": "50e447ae.0fde38",
+        "id": "5f06cb70.adae8c",
         "type": "save",
         "name": "get allotted-resource from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 2283.883331298828,
-        "y": 370,
-        "z": "d1eceead.adafe",
+        "y": 347.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "27d61e5e.f12fe2",
-                "2c908c8d.59c394",
-                "32fadd2c.e0a1c2"
+                "c68fbf4e.5d82c",
+                "2146d17e.d0a56e",
+                "f04a7ec7.eb68d"
             ]
         ]
     },
     {
-        "id": "27d61e5e.f12fe2",
+        "id": "c68fbf4e.5d82c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2499.883331298828,
-        "y": 437,
-        "z": "d1eceead.adafe",
+        "y": 414.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4e35bc34.a92d94"
+                "cbd25b41.5a644"
             ]
         ]
     },
     {
-        "id": "2c908c8d.59c394",
+        "id": "2146d17e.d0a56e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2500.374298095703,
-        "y": 336.573974609375,
-        "z": "d1eceead.adafe",
+        "y": 313.8597412109375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6fdcac69.b07bec"
+                "d020f647.b48948"
             ]
         ]
     },
     {
-        "id": "32fadd2c.e0a1c2",
+        "id": "f04a7ec7.eb68d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2495.883331298828,
-        "y": 386,
-        "z": "d1eceead.adafe",
+        "y": 363.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "71176ed6.70694"
+                "bf60182e.46d6e"
             ]
         ]
     },
     {
-        "id": "bdd428b9.6fddd",
+        "id": "10bd96f7.8fa059",
         "type": "for",
         "name": "for each allotted-resource",
         "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 2000.8833312988281,
-        "y": 351,
-        "z": "d1eceead.adafe",
+        "y": 328.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7043f926.26b93",
-                "50e447ae.0fde38",
-                "8af2638e.140428",
-                "b2d6bb83.745318"
+                "9d7e7b42.ef2a18",
+                "5f06cb70.adae8c",
+                "b4f5dada.48378",
+                "5db562b1.71111c"
             ]
         ]
     },
     {
-        "id": "7043f926.26b93",
+        "id": "9d7e7b42.ef2a18",
         "type": "set",
         "name": "set the current allotted-resource-id",
         "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",
         "comments": "",
         "x": 2280.883331298828,
-        "y": 289,
-        "z": "d1eceead.adafe",
+        "y": 266.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "6d42412e.61e8d",
+        "id": "6c495f2.f763aa",
         "type": "set",
         "name": "set tmp.arr",
         "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",
         "comments": "",
         "x": 1974.8833312988281,
-        "y": 301,
-        "z": "d1eceead.adafe",
+        "y": 278.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "8710bcb7.6e657",
+        "id": "cb92da4c.da1bb",
         "type": "get-resource",
         "name": "get-resource pnfs-list",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
         "comments": "",
         "outputs": 1,
         "x": 2017.8833312988281,
-        "y": 160,
-        "z": "d1eceead.adafe",
+        "y": 137.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "6f728611.a8a3e",
+        "id": "cbe49015.ae0dd",
         "type": "get-resource",
         "name": "get-resource logical-links",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
         "comments": "",
         "outputs": 1,
         "x": 2029.8833312988281,
-        "y": 201,
-        "z": "d1eceead.adafe",
+        "y": 178.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "8a5a98d5.6ebb1",
+        "id": "f6d3e50c.b329e8",
         "type": "comment",
         "name": "The following two nodes are for PCE",
         "info": "",
         "comments": "",
         "x": 2054.883331298828,
-        "y": 113,
-        "z": "d1eceead.adafe",
+        "y": 90.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "2303563c.e9131a",
+        "id": "300ce0be.29882",
         "type": "set",
         "name": "set tmp.arr",
         "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",
         "comments": "",
         "x": 1974.8833312988281,
-        "y": 247,
-        "z": "d1eceead.adafe",
+        "y": 224.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "6fdcac69.b07bec",
+        "id": "d020f647.b48948",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 2678.883331298828,
-        "y": 339,
-        "z": "d1eceead.adafe",
+        "y": 316.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "71176ed6.70694",
+        "id": "bf60182e.46d6e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 2678.820831298828,
-        "y": 388.1402587890625,
-        "z": "d1eceead.adafe",
+        "y": 365.426025390625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "4e35bc34.a92d94",
+        "id": "cbd25b41.5a644",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2680.820831298828,
-        "y": 439.1402587890625,
-        "z": "d1eceead.adafe",
+        "y": 416.426025390625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6a0085f3.85f3dc"
+                "365e9f97.d4a028"
             ]
         ]
     },
     {
-        "id": "6a0085f3.85f3dc",
+        "id": "365e9f97.d4a028",
         "type": "save",
         "name": "get allotted-resource relationship from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 2973.820831298828,
-        "y": 386.1402587890625,
-        "z": "d1eceead.adafe",
+        "y": 363.426025390625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "47170bd3.47cd24",
-                "41231d4a.3c5914",
-                "413cb45a.a52f94"
+                "6e92372c.3a07f8",
+                "c96fb012.9bb888",
+                "95b7cbb5.ac06c8"
             ]
         ]
     },
     {
-        "id": "41231d4a.3c5914",
+        "id": "c96fb012.9bb888",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3247.311798095703,
-        "y": 278.7142333984375,
-        "z": "d1eceead.adafe",
+        "x": 3277.311767578125,
+        "y": 20,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ddcd6972.1cc26"
+                "58ab1443.358994"
             ]
         ]
     },
     {
-        "id": "ddcd6972.1cc26",
+        "id": "58ab1443.358994",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3424.883331298828,
-        "y": 279,
-        "z": "d1eceead.adafe",
+        "x": 3454.88330078125,
+        "y": 20.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "413cb45a.a52f94",
+        "id": "95b7cbb5.ac06c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3242.820831298828,
-        "y": 328.1402587890625,
-        "z": "d1eceead.adafe",
+        "x": 3272.82080078125,
+        "y": 69.426025390625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "29789682.9a5ca2"
+                "1f97dde6.30f20a"
             ]
         ]
     },
     {
-        "id": "29789682.9a5ca2",
+        "id": "1f97dde6.30f20a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3424.820831298828,
-        "y": 328.1402587890625,
-        "z": "d1eceead.adafe",
+        "x": 3454.82080078125,
+        "y": 69.426025390625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "47170bd3.47cd24",
+        "id": "6e92372c.3a07f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3246.820831298828,
-        "y": 379.1402587890625,
-        "z": "d1eceead.adafe",
+        "x": 3276.82080078125,
+        "y": 120.426025390625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5d602163.27f0b"
+                "7a25dc67.63046c"
             ]
         ]
     },
     {
-        "id": "5d602163.27f0b",
+        "id": "7a25dc67.63046c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3426.820831298828,
-        "y": 379.1402587890625,
-        "z": "d1eceead.adafe",
+        "x": 3456.82080078125,
+        "y": 120.426025390625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "dd9e7161.bb7c"
+                "742cdaa9.4808c4"
             ]
         ]
     },
     {
-        "id": "dd9e7161.bb7c",
+        "id": "742cdaa9.4808c4",
         "type": "switchNode",
         "name": "switch allotted-resource.relationship-list not empty",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2992.883331298828,
-        "y": 514,
-        "z": "d1eceead.adafe",
+        "y": 491.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e567be5f.46cf",
-                "117d3c85.14baf3"
+                "9afa3e4f.f2f2c8",
+                "ce58b166.b2448"
             ]
         ]
     },
     {
-        "id": "117d3c85.14baf3",
+        "id": "ce58b166.b2448",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3302.883331298828,
-        "y": 521,
-        "z": "d1eceead.adafe",
+        "x": 3332.88330078125,
+        "y": 262.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "e567be5f.46cf",
+        "id": "9afa3e4f.f2f2c8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3301.883331298828,
-        "y": 575,
-        "z": "d1eceead.adafe",
+        "x": 3331.88330078125,
+        "y": 316.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1aa53c9a.ee4c73"
+                "aba0f7b5.b64ec8"
             ]
         ]
     },
     {
-        "id": "16e58d5c.45543b",
+        "id": "50f7604e.0c4dc8",
         "type": "outcome",
         "name": "network-policy",
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4046.883331298828,
-        "y": 529,
-        "z": "d1eceead.adafe",
+        "x": 4076.88330078125,
+        "y": 270.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e0a75ebb.a4e0a"
+                "e079a6c2.9c941"
             ]
         ]
     },
     {
-        "id": "e0a75ebb.a4e0a",
+        "id": "e079a6c2.9c941",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4223.883209228516,
-        "y": 521.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 4253.8831787109375,
+        "y": 263.28564453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "64783b1d.9ea984",
-                "aa6dd372.e093d"
+                "83280d27.4bae7",
+                "92c6fb1f.05a328"
             ]
         ]
     },
     {
-        "id": "1aa53c9a.ee4c73",
+        "id": "aba0f7b5.b64ec8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3465.883331298828,
-        "y": 501,
-        "z": "d1eceead.adafe",
+        "x": 3495.88330078125,
+        "y": 242.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "9d9386aa.4ba0f",
-                "a5c7d0d0.70a6f8"
+                "a8c08369.0aef78",
+                "98755b5f.40e4a"
             ]
         ]
     },
     {
-        "id": "9d9386aa.4ba0f",
+        "id": "a8c08369.0aef78",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3746.883331298828,
-        "y": 457,
-        "z": "d1eceead.adafe",
+        "x": 3776.88330078125,
+        "y": 198.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ac9ffe20.350ab8"
+                "64ebbb1e.14821c"
             ]
         ]
     },
     {
-        "id": "ac9ffe20.350ab8",
+        "id": "64ebbb1e.14821c",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4008.883331298828,
-        "y": 457,
-        "z": "d1eceead.adafe",
+        "x": 4038.88330078125,
+        "y": 198.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "16e58d5c.45543b"
+                "50f7604e.0c4dc8"
             ]
         ]
     },
     {
-        "id": "64783b1d.9ea984",
+        "id": "83280d27.4bae7",
         "type": "set",
         "name": "set the 1st network-policy-id",
         "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
-        "x": 4466.883209228516,
-        "y": 478.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 4496.8831787109375,
+        "y": 220.28564453125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "aa6dd372.e093d",
+        "id": "92c6fb1f.05a328",
         "type": "save",
         "name": "get network-policy from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",
         "comments": "",
         "outputs": 1,
-        "x": 4455.883209228516,
-        "y": 533.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 4485.8831787109375,
+        "y": 275.28564453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a2aec981.c05928",
-                "c6a2ea9c.683df",
-                "b8928013.256998"
+                "26a63936.d2dcb6",
+                "935c2a76.01522",
+                "61809f6c.f102a"
             ]
         ]
     },
     {
-        "id": "b8928013.256998",
+        "id": "61809f6c.f102a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4708.883331298828,
-        "y": 420,
-        "z": "d1eceead.adafe",
+        "x": 4738.88330078125,
+        "y": 161.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "83be4f6.3f006b"
+                "8483d549.4ff1d8"
             ]
         ]
     },
     {
-        "id": "83be4f6.3f006b",
+        "id": "8483d549.4ff1d8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 4857.454864501953,
-        "y": 420.2857666015625,
-        "z": "d1eceead.adafe",
+        "x": 4887.454833984375,
+        "y": 161.571533203125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "586d6db7.c2d804",
+        "id": "79f73429.37a0f4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4856.392364501953,
-        "y": 464.426025390625,
-        "z": "d1eceead.adafe",
+        "x": 4886.392333984375,
+        "y": 205.7117919921875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c6a2ea9c.683df",
+        "id": "935c2a76.01522",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4697.392364501953,
-        "y": 464.426025390625,
-        "z": "d1eceead.adafe",
+        "x": 4727.392333984375,
+        "y": 205.7117919921875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "586d6db7.c2d804"
+                "79f73429.37a0f4"
             ]
         ]
     },
     {
-        "id": "a2aec981.c05928",
+        "id": "26a63936.d2dcb6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4704.392364501953,
-        "y": 543.426025390625,
-        "z": "d1eceead.adafe",
+        "x": 4734.392333984375,
+        "y": 284.7117919921875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4d4b39ee.fece78"
+                "4efa868e.4aaf8"
             ]
         ]
     },
     {
-        "id": "4d4b39ee.fece78",
+        "id": "4efa868e.4aaf8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4843.392364501953,
-        "y": 543.426025390625,
-        "z": "d1eceead.adafe",
+        "x": 4873.392333984375,
+        "y": 284.7117919921875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "68714312.362fe4",
-                "860808d4.582b4"
+                "ac693539.f50e98",
+                "9a31854c.efaef8"
             ]
         ]
     },
     {
-        "id": "68714312.362fe4",
+        "id": "ac693539.f50e98",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
-        "x": 5048.883331298828,
-        "y": 541,
-        "z": "d1eceead.adafe",
+        "x": 5078.88330078125,
+        "y": 282.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "860808d4.582b4",
+        "id": "9a31854c.efaef8",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
-        "x": 5047.883331298828,
-        "y": 587,
-        "z": "d1eceead.adafe",
+        "x": 5077.88330078125,
+        "y": 328.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a5c7d0d0.70a6f8",
+        "id": "98755b5f.40e4a",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3563.883331298828,
-        "y": 573,
-        "z": "d1eceead.adafe",
+        "x": 3593.88330078125,
+        "y": 314.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "91204981.e8b1c8"
+                "a599949c.47c2"
             ]
         ]
     },
     {
-        "id": "91204981.e8b1c8",
+        "id": "a599949c.47c2",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3843.883331298828,
-        "y": 573,
-        "z": "d1eceead.adafe",
+        "x": 3873.88330078125,
+        "y": 314.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "815c7496.5664a8"
+                "9f30fb79.9864f8"
             ]
         ]
     },
     {
-        "id": "815c7496.5664a8",
+        "id": "9f30fb79.9864f8",
         "type": "outcome",
         "name": "logical-link",
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2256.8834533691406,
-        "y": 826.0001220703125,
-        "z": "d1eceead.adafe",
+        "y": 803.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2e1a5e6a.390622"
+                "4497a7be.db159"
             ]
         ]
     },
     {
-        "id": "2e1a5e6a.390622",
+        "id": "4497a7be.db159",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2433.883331298828,
-        "y": 819,
-        "z": "d1eceead.adafe",
+        "y": 796.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "fda12a63.354948",
-                "9acb494f.3c831"
+                "748da704.3dc228",
+                "132fdd9a.6a584a"
             ]
         ]
     },
     {
-        "id": "fda12a63.354948",
+        "id": "748da704.3dc228",
         "type": "set",
         "name": "set the current logical-link-name",
         "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
         "x": 2676.883331298828,
-        "y": 776,
-        "z": "d1eceead.adafe",
+        "y": 753.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "9acb494f.3c831",
+        "id": "132fdd9a.6a584a",
         "type": "save",
         "name": "get logical-link from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
         "comments": "",
         "outputs": 1,
         "x": 2665.883331298828,
-        "y": 831,
-        "z": "d1eceead.adafe",
+        "y": 808.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2cf3e7af.84ed7",
-                "7720ff91.14ecb8",
-                "6208751c.cb4214"
+                "1d5c52ad.8a4fcd",
+                "c6fd8eb5.369a58",
+                "b0ba9e98.5ef29"
             ]
         ]
     },
     {
-        "id": "2cf3e7af.84ed7",
+        "id": "1d5c52ad.8a4fcd",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2957.374298095703,
-        "y": 809.573974609375,
-        "z": "d1eceead.adafe",
+        "y": 786.8597412109375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "644aada5.da5074"
+                "81786826.f1adc"
             ]
         ]
     },
     {
-        "id": "7720ff91.14ecb8",
+        "id": "c6fd8eb5.369a58",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2945.883331298828,
-        "y": 854,
-        "z": "d1eceead.adafe",
+        "y": 831.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b4b18b88.8b8778"
+                "568abbfd.c78f14"
             ]
         ]
     },
     {
-        "id": "644aada5.da5074",
+        "id": "81786826.f1adc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 3105.945831298828,
-        "y": 809.8597412109375,
-        "z": "d1eceead.adafe",
+        "y": 787.1455078125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "b4b18b88.8b8778",
+        "id": "568abbfd.c78f14",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 3104.883331298828,
-        "y": 854,
-        "z": "d1eceead.adafe",
+        "y": 831.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "6208751c.cb4214",
+        "id": "b0ba9e98.5ef29",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2952.883331298828,
-        "y": 933,
-        "z": "d1eceead.adafe",
+        "y": 910.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f4a1f138.8436a"
+                "56d4032d.446f0c"
             ]
         ]
     },
     {
-        "id": "f4a1f138.8436a",
+        "id": "56d4032d.446f0c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -997,2769 +997,2645 @@
         "comments": "",
         "outputs": 1,
         "x": 3091.883331298828,
-        "y": 933,
-        "z": "d1eceead.adafe",
-        "wires": [
-            [
-                "64b776d1.df13b8",
-                "cf58d1a3.b75bc8",
-                "a4d7ff96.ceb5f8",
-                "4f57fa4.5908a84",
-                "93281de6.9193c8",
-                "279a0c66.95b87c",
-                "2fd6be0.ec30642",
-                "3458f9fd.a9fdce",
-                "b114579a.337d4",
-                "83634982.62f32",
-                "a78c5989.f5207",
-                "dc895d5a.f09ef",
-                "8c6f82a5.234d18",
-                "a984d0c7.8574d",
-                "49347bae.3e2974"
-            ]
-        ]
-    },
-    {
-        "id": "fe79d8e9.168438",
+        "y": 910.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "a588efb1.b17fd",
+                "9c7e31dc.43bc2",
+                "64cc49aa.338118",
+                "a266d487.c02dd",
+                "f1099f4d.7efe5",
+                "6aa3951e.157a4c",
+                "4618e1c0.461d88",
+                "d38e0865.514348",
+                "eef6ad07.9c7d5",
+                "78d4922e.8ebe04",
+                "c220ecdf.76a978",
+                "940f9aa.5464fe8",
+                "14f1d608.fff342",
+                "5e5dd175.2ee1b",
+                "95f11825.f517d8",
+                "79dba259.2612cc",
+                "11c024cf.1cb7db",
+                "8bfce836.dcd148",
+                "ec6aad53.7d628",
+                "c02bc34.16c814",
+                "ad2e0fde.b44de8",
+                "d87e7a94.9bda08"
+            ]
+        ]
+    },
+    {
+        "id": "6986f9e3.b25bc8",
         "type": "execute",
         "name": "execute UUID generator for ethernet-service-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3405.883331298828,
-        "y": 739,
-        "z": "d1eceead.adafe",
+        "x": 3435.883270263672,
+        "y": 384.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "64b776d1.df13b8",
+        "id": "a588efb1.b17fd",
         "type": "execute",
         "name": "execute UUID generator for otn-tunnel-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3386.883331298828,
-        "y": 789,
-        "z": "d1eceead.adafe",
+        "x": 3416.883270263672,
+        "y": 484.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "dc895d5a.f09ef",
+        "id": "940f9aa.5464fe8",
         "type": "set",
         "name": "set new ethernet-service-name",
         "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
         "comments": "",
-        "x": 3343.883331298828,
-        "y": 834,
-        "z": "d1eceead.adafe",
+        "x": 3370.883270263672,
+        "y": 535.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "cf58d1a3.b75bc8",
+        "id": "9c7e31dc.43bc2",
         "type": "set",
         "name": "set network-route-one",
         "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",
         "comments": "",
-        "x": 3318.883331298828,
-        "y": 897,
-        "z": "d1eceead.adafe",
+        "x": 3344.883270263672,
+        "y": 584.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a4d7ff96.ceb5f8",
+        "id": "64cc49aa.338118",
         "type": "set",
         "name": "set network-route-two",
         "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
         "comments": "",
-        "x": 3319.883331298828,
-        "y": 952,
-        "z": "d1eceead.adafe",
+        "x": 3343.883270263672,
+        "y": 633.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "4f57fa4.5908a84",
+        "id": "a266d487.c02dd",
         "type": "save",
         "name": "get network-route-one from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-one'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-one\">",
         "comments": "",
         "outputs": 1,
-        "x": 3335.883331298828,
-        "y": 1000,
-        "z": "d1eceead.adafe",
+        "x": 3352.883270263672,
+        "y": 771.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "722a434e.2a3adc",
-                "e8fe3cd4.c3586",
-                "fdbfe007.1ea3b"
+                "1276721a.95abce",
+                "59c480c0.a5bb2",
+                "56433b78.3dde04"
             ]
         ]
     },
     {
-        "id": "93281de6.9193c8",
+        "id": "f1099f4d.7efe5",
         "type": "save",
         "name": "get network-route-two from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-two'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-two\">",
         "comments": "",
         "outputs": 1,
-        "x": 3324.883331298828,
-        "y": 1086.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3345.883270263672,
+        "y": 832.28564453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b372ac3d.0a4b1",
-                "d24aa16b.e47da",
-                "419032bc.a4963c"
+                "194bfca3.59d3d3",
+                "f16b27ad.e4a0d",
+                "a3a5e961.07f0a"
             ]
         ]
     },
     {
-        "id": "722a434e.2a3adc",
+        "id": "1276721a.95abce",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3536.883331298828,
-        "y": 884,
-        "z": "d1eceead.adafe",
+        "x": 3601.883026123047,
+        "y": 666.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "aae0d761.ec3158"
+                "5d3d475c.e8e038"
             ]
         ]
     },
     {
-        "id": "e8fe3cd4.c3586",
+        "id": "59c480c0.a5bb2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3532.392364501953,
-        "y": 933.426025390625,
-        "z": "d1eceead.adafe",
+        "x": 3595.392059326172,
+        "y": 707.7117919921875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "af62b91c.6bf638"
+                "c3e2bb46.01e6a"
             ]
         ]
     },
     {
-        "id": "fdbfe007.1ea3b",
+        "id": "56433b78.3dde04",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3536.392364501953,
-        "y": 986.426025390625,
-        "z": "d1eceead.adafe",
+        "x": 3590.392059326172,
+        "y": 757.7117919921875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "72360610.10f7e"
+                "1b66d741.6f4631"
             ]
         ]
     },
     {
-        "id": "aae0d761.ec3158",
+        "id": "5d3d475c.e8e038",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3685.454864501953,
-        "y": 883.2857666015625,
-        "z": "d1eceead.adafe",
+        "x": 3750.454559326172,
+        "y": 665.571533203125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "af62b91c.6bf638",
+        "id": "c3e2bb46.01e6a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3675.392364501953,
-        "y": 933.426025390625,
-        "z": "d1eceead.adafe",
+        "x": 3740.392059326172,
+        "y": 715.7117919921875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "b372ac3d.0a4b1",
+        "id": "194bfca3.59d3d3",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3547.883331298828,
-        "y": 1056.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3566.883270263672,
+        "y": 818.28564453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3bdfccb0.f2d08c"
+                "8a4c46dd.2c996"
             ]
         ]
     },
     {
-        "id": "d24aa16b.e47da",
+        "id": "f16b27ad.e4a0d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3543.392364501953,
-        "y": 1106.4259033203125,
-        "z": "d1eceead.adafe",
+        "x": 3562.392303466797,
+        "y": 867.711669921875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "57f2def1.81f4e"
+                "171f1743.fcb899"
             ]
         ]
     },
     {
-        "id": "419032bc.a4963c",
+        "id": "a3a5e961.07f0a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3544.392364501953,
-        "y": 1159.4259033203125,
-        "z": "d1eceead.adafe",
+        "x": 3563.392303466797,
+        "y": 920.711669921875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "91fe26d2.5b80d"
+                "c731b8e7.238d38"
             ]
         ]
     },
     {
-        "id": "3bdfccb0.f2d08c",
+        "id": "8a4c46dd.2c996",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3696.454864501953,
-        "y": 1056.28564453125,
-        "z": "d1eceead.adafe",
+        "x": 3719.4546508789062,
+        "y": 823.5714111328125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "57f2def1.81f4e",
+        "id": "171f1743.fcb899",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3686.392364501953,
-        "y": 1106.4259033203125,
-        "z": "d1eceead.adafe",
+        "x": 3705.392303466797,
+        "y": 867.711669921875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "72360610.10f7e",
+        "id": "1b66d741.6f4631",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3697.883331298828,
-        "y": 986,
-        "z": "d1eceead.adafe",
+        "x": 3762.883026123047,
+        "y": 768.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "21ff581a.7d3f68"
+                "cecd018.605a88"
             ]
         ]
     },
     {
-        "id": "91fe26d2.5b80d",
+        "id": "c731b8e7.238d38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3697.883331298828,
-        "y": 1158.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3716.883270263672,
+        "y": 920.28564453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f4949055.0aa838"
+                "f9f52da3.b95878"
             ]
         ]
     },
     {
-        "id": "21ff581a.7d3f68",
+        "id": "cecd018.605a88",
         "type": "switchNode",
         "name": "switch nr type",
         "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3869.883331298828,
-        "y": 986,
-        "z": "d1eceead.adafe",
+        "x": 3923.883270263672,
+        "y": 655.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d771576e.5459b",
-                "743ce77.86c2e98"
+                "f0539c95.2ea1d",
+                "44b1b904.08834",
+                "41d8ce05.5caae"
             ]
         ]
     },
     {
-        "id": "f4949055.0aa838",
+        "id": "f9f52da3.b95878",
         "type": "switchNode",
         "name": "switch nr type",
         "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3870.883331298828,
-        "y": 1159,
-        "z": "d1eceead.adafe",
+        "x": 3915.883270263672,
+        "y": 840.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "854204ac.64311",
-                "5401ccd6.c2c2e4"
+                "abd0f375.c30ff",
+                "eba9832a.ffee4",
+                "4bc67983.47c6f"
             ]
         ]
     },
     {
-        "id": "d771576e.5459b",
+        "id": "f0539c95.2ea1d",
         "type": "outcome",
         "name": "ROOT",
         "xml": "<outcome value='ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4045.883331298828,
-        "y": 965,
-        "z": "d1eceead.adafe",
+        "x": 4147.883758544922,
+        "y": 359.28570556640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2e04d27d.5faff6"
+                "653aef18.035f68"
             ]
         ]
     },
     {
-        "id": "743ce77.86c2e98",
+        "id": "44b1b904.08834",
         "type": "outcome",
         "name": "LEAF",
         "xml": "<outcome value='LEAF'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4047.883331298828,
-        "y": 1019,
-        "z": "d1eceead.adafe",
+        "x": 4149.883758544922,
+        "y": 413.28570556640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "12c64a9b.27d615"
+                "4456e14a.c61538"
             ]
         ]
     },
     {
-        "id": "854204ac.64311",
+        "id": "abd0f375.c30ff",
         "type": "outcome",
         "name": "ROOT",
         "xml": "<outcome value='ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4046.883331298828,
-        "y": 1129,
-        "z": "d1eceead.adafe",
+        "x": 4113.883758544922,
+        "y": 619.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a8347389.2ab3b"
+                "dc25cb2f.e0da48"
             ]
         ]
     },
     {
-        "id": "5401ccd6.c2c2e4",
+        "id": "eba9832a.ffee4",
         "type": "outcome",
         "name": "LEAF",
         "xml": "<outcome value='LEAF'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4048.883331298828,
-        "y": 1183,
-        "z": "d1eceead.adafe",
+        "x": 4115.883758544922,
+        "y": 673.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "49b6f3ad.a55ac4"
+                "7b200b08.d1724c"
             ]
         ]
     },
     {
-        "id": "20ddeea0.a0e9ea",
+        "id": "a11ab8.c3c2f548",
         "type": "set",
         "name": "set network-route-ROOT",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
-        "x": 4355.883331298828,
-        "y": 917,
-        "z": "d1eceead.adafe",
+        "x": 4457.883758544922,
+        "y": 311.28570556640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a4916484.b95cf",
+        "id": "7e53eaf1.53c434",
         "type": "set",
         "name": "set network-route-LEAF",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
-        "x": 4348.883331298828,
-        "y": 1015,
-        "z": "d1eceead.adafe",
+        "x": 4450.883758544922,
+        "y": 409.28570556640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "2f347429.e690cc",
+        "id": "231b0ffb.372688",
         "type": "set",
         "name": "set network-route-ROOT",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
-        "x": 4348.883331298828,
-        "y": 1102,
-        "z": "d1eceead.adafe",
+        "x": 4429.883758544922,
+        "y": 592.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "cad2e783.60fc68",
+        "id": "1b4ef1ae.221bae",
         "type": "set",
         "name": "set network-route-LEAF",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
-        "x": 4352.883331298828,
-        "y": 1195,
-        "z": "d1eceead.adafe",
+        "x": 4433.883758544922,
+        "y": 685.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "b1d86e33.3aa378",
+        "id": "f61c43e6.4dbe28",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3579.883331298828,
-        "y": 1604,
-        "z": "d1eceead.adafe",
+        "x": 3609.88330078125,
+        "y": 1345.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a5f9a85c.99ac48"
+                "58e01c76.2a233c"
             ]
         ]
     },
     {
-        "id": "a4982a5c.ee1f08",
+        "id": "f239d755.e3888",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3589.374298095703,
-        "y": 1646.5740356445312,
-        "z": "d1eceead.adafe",
+        "x": 3619.374267578125,
+        "y": 1387.8598022460938,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "bbb83480.f4afb8"
+                "ffe24b12.95af4"
             ]
         ]
     },
     {
-        "id": "9afba595.5831a",
+        "id": "7fecb9.d188bb48",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3577.883331298828,
-        "y": 1693,
-        "z": "d1eceead.adafe",
+        "x": 3607.88330078125,
+        "y": 1434.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "eeac5d42.037ff"
+                "6af9609c.4c1ea"
             ]
         ]
     },
     {
-        "id": "a9f44662.0eb94",
+        "id": "6132f0e6.1cd1a8",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3279.883331298828,
-        "y": 1566,
-        "z": "d1eceead.adafe",
+        "x": 3309.88330078125,
+        "y": 1307.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "2fd6be0.ec30642",
+        "id": "4618e1c0.461d88",
         "type": "save",
         "name": "get p-interface-src from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3322.883331298828,
-        "y": 1631,
-        "z": "d1eceead.adafe",
+        "x": 3352.88330078125,
+        "y": 1372.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b1d86e33.3aa378",
-                "a4982a5c.ee1f08",
-                "9afba595.5831a"
+                "f61c43e6.4dbe28",
+                "f239d755.e3888",
+                "7fecb9.d188bb48"
             ]
         ]
     },
     {
-        "id": "279a0c66.95b87c",
+        "id": "6aa3951e.157a4c",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3323.883331298828,
-        "y": 1301,
-        "z": "d1eceead.adafe",
+        "x": 3353.883270263672,
+        "y": 1124.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ab7f6387.a06298",
-                "178d0fab.57c17"
+                "273ca4a1.1ba064",
+                "4a30eba.076bb14"
             ]
         ]
     },
     {
-        "id": "178d0fab.57c17",
+        "id": "4a30eba.076bb14",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3546.883331298828,
-        "y": 1287,
-        "z": "d1eceead.adafe",
+        "x": 3576.883270263672,
+        "y": 1110.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "174b650f.6f4cdb"
+                "3b0c1a6c.5d807e"
             ]
         ]
     },
     {
-        "id": "ab7f6387.a06298",
+        "id": "273ca4a1.1ba064",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3548.883331298828,
-        "y": 1320,
-        "z": "d1eceead.adafe",
+        "x": 3578.883270263672,
+        "y": 1143.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "109222da.cab295"
+                "1277d9f.69171a6"
             ]
         ]
     },
     {
-        "id": "a5f9a85c.99ac48",
+        "id": "58e01c76.2a233c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3752.549835205078,
-        "y": 1603,
-        "z": "d1eceead.adafe",
+        "x": 3782.5498046875,
+        "y": 1344.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f0dfffc5.29d178",
-                "acd2704e.4ae308"
+                "f718a065.a6f86",
+                "66055190.fb6538"
             ]
         ]
     },
     {
-        "id": "bbb83480.f4afb8",
+        "id": "ffe24b12.95af4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3742.9457092285156,
-        "y": 1649.8597717285156,
-        "z": "d1eceead.adafe",
+        "x": 3772.9456787109375,
+        "y": 1391.1455383300781,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "eeac5d42.037ff",
+        "id": "6af9609c.4c1ea",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3746.883331298828,
-        "y": 1694,
-        "z": "d1eceead.adafe",
+        "x": 3776.88330078125,
+        "y": 1435.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f0dfffc5.29d178",
+        "id": "f718a065.a6f86",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4016.883331298828,
-        "y": 1587,
-        "z": "d1eceead.adafe",
+        "x": 4046.88330078125,
+        "y": 1328.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "11bdf0f4.508487",
-                "23d1e1ad.23f75e"
+                "97c35025.9a9a9",
+                "3a478d5e.f8179a"
             ]
         ]
     },
     {
-        "id": "23d1e1ad.23f75e",
+        "id": "3a478d5e.f8179a",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4239.883331298828,
-        "y": 1542,
-        "z": "d1eceead.adafe",
+        "x": 4269.88330078125,
+        "y": 1283.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3fc7a366.f1683c"
+                "e66b8dbe.739f2"
             ]
         ]
     },
     {
-        "id": "11bdf0f4.508487",
+        "id": "97c35025.9a9a9",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4241.883331298828,
-        "y": 1606,
-        "z": "d1eceead.adafe",
+        "x": 4271.88330078125,
+        "y": 1347.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d6cac3a3.d1f4"
+                "8b5a4d36.3a2bb8"
             ]
         ]
     },
     {
-        "id": "d6cac3a3.d1f4",
+        "id": "8b5a4d36.3a2bb8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 4403.883331298828,
-        "y": 1602,
-        "z": "d1eceead.adafe",
+        "x": 4433.88330078125,
+        "y": 1343.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "3fc7a366.f1683c",
+        "id": "e66b8dbe.739f2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4404.883331298828,
-        "y": 1539,
-        "z": "d1eceead.adafe",
+        "x": 4434.88330078125,
+        "y": 1280.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d54289dc.18d288",
-                "cc99bc89.a9c058"
+                "9ab6076f.b64fb",
+                "39801818.ba2ad"
             ]
         ]
     },
     {
-        "id": "17e0fd07.b5de8b",
-        "type": "save",
-        "name": "save connectivity resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4018.883331298828,
-        "y": 1746,
-        "z": "d1eceead.adafe",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f1afd056.64d73",
-        "type": "execute",
-        "name": "execute UUID generator for connectivity domainA",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4063.883331298828,
-        "y": 1656,
-        "z": "d1eceead.adafe",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "50d51c8c.dc95ac",
-        "type": "save",
-        "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
-        "comments": "",
-        "outputs": 1,
-        "x": 4146.883331298828,
-        "y": 1794,
-        "z": "d1eceead.adafe",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "109222da.cab295",
+        "id": "1277d9f.69171a6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 3691.883331298828,
-        "y": 1317,
-        "z": "d1eceead.adafe",
+        "x": 3721.883270263672,
+        "y": 1140.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "174b650f.6f4cdb",
+        "id": "3b0c1a6c.5d807e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3694.883331298828,
-        "y": 1280,
-        "z": "d1eceead.adafe",
+        "x": 3724.883270263672,
+        "y": 1103.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6b9c6245.ea050c",
-                "ab33cb14.ff6cc8"
+                "67f68b93.dc06f4",
+                "41f439c7.6c07f8"
             ]
         ]
     },
     {
-        "id": "6b9c6245.ea050c",
+        "id": "67f68b93.dc06f4",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 3868.883331298828,
-        "y": 1236,
-        "z": "d1eceead.adafe",
+        "x": 3916.883270263672,
+        "y": 1105.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "acd2704e.4ae308",
+        "id": "66055190.fb6538",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3970.883331298828,
-        "y": 1871,
-        "z": "d1eceead.adafe",
+        "x": 4006.88330078125,
+        "y": 1460.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "73a0105b.ac0e58"
+                "c328fdc0.a05af"
             ]
         ]
     },
     {
-        "id": "73a0105b.ac0e58",
+        "id": "c328fdc0.a05af",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4176.883331298828,
-        "y": 1871,
-        "z": "d1eceead.adafe",
+        "x": 4212.88330078125,
+        "y": 1460.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6dbfb157.d8359"
+                "23ec2727.c8e7f"
             ]
         ]
     },
     {
-        "id": "6dbfb157.d8359",
+        "id": "23ec2727.c8e7f",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4392.168975830078,
-        "y": 1870.82177734375,
-        "z": "d1eceead.adafe",
+        "x": 4428.1689453125,
+        "y": 1460.1075439453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "616def67.e5a25"
+                "e1b77e00.282c4"
             ]
         ]
     },
     {
-        "id": "ab33cb14.ff6cc8",
+        "id": "41f439c7.6c07f8",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3883.883331298828,
-        "y": 1347,
-        "z": "d1eceead.adafe",
+        "x": 3913.883270263672,
+        "y": 1170.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e7bde0a4.3a223",
-                "856b3a3e.33dd18",
-                "ec1837c2.7e65e8"
+                "89a8d2d0.88f3",
+                "6334a351.696854",
+                "c542e0e0.bf42b"
             ]
         ]
     },
     {
-        "id": "e7bde0a4.3a223",
+        "id": "89a8d2d0.88f3",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4079.3834533691406,
-        "y": 1299,
-        "z": "d1eceead.adafe",
+        "x": 4109.383392333984,
+        "y": 1122.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a049038b.508d4"
+                "c62cbf2d.6fa458"
             ]
         ]
     },
     {
-        "id": "856b3a3e.33dd18",
+        "id": "6334a351.696854",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4071.3834533691406,
-        "y": 1354,
-        "z": "d1eceead.adafe",
+        "x": 4101.383392333984,
+        "y": 1177.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f843f7f2.8c64b8"
+                "143c4bf3.014b4c"
             ]
         ]
     },
     {
-        "id": "ec1837c2.7e65e8",
+        "id": "c542e0e0.bf42b",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4076.3834533691406,
-        "y": 1411,
-        "z": "d1eceead.adafe",
+        "x": 4106.383392333984,
+        "y": 1234.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "47e459e1.2a9ce"
+                "ca788cf9.3c8038"
             ]
         ]
     },
     {
-        "id": "47e459e1.2a9ce",
+        "id": "ca788cf9.3c8038",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4228.383453369141,
-        "y": 1412,
-        "z": "d1eceead.adafe",
+        "x": 4258.383392333984,
+        "y": 1235.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f843f7f2.8c64b8",
+        "id": "143c4bf3.014b4c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4239.383453369141,
-        "y": 1357,
-        "z": "d1eceead.adafe",
+        "x": 4269.383392333984,
+        "y": 1180.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a049038b.508d4",
+        "id": "c62cbf2d.6fa458",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4223.765777587891,
-        "y": 1296.6556701660156,
-        "z": "d1eceead.adafe",
+        "x": 4253.765716552734,
+        "y": 1119.9414367675781,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b2d1999f.753708"
+                "aab3feab.bcb5b"
             ]
         ]
     },
     {
-        "id": "b2d1999f.753708",
+        "id": "aab3feab.bcb5b",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4407.883331298828,
-        "y": 1311,
-        "z": "d1eceead.adafe",
+        "x": 4447.883270263672,
+        "y": 1164.2857055664062,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "9b22416d.9cdac8"
+                "ac9dba33.9ee3a8"
             ]
         ]
     },
     {
-        "id": "cc99bc89.a9c058",
+        "id": "39801818.ba2ad",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
         "comments": "",
-        "x": 4574.883331298828,
-        "y": 1497,
-        "z": "d1eceead.adafe",
+        "x": 4604.88330078125,
+        "y": 1238.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "d54289dc.18d288",
+        "id": "9ab6076f.b64fb",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",
         "comments": "",
-        "x": 4575.883331298828,
-        "y": 1605,
-        "z": "d1eceead.adafe",
+        "x": 4605.88330078125,
+        "y": 1346.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "46e18359.07aad4",
+        "id": "6381354a.11146c",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 4576.883331298828,
-        "y": 1554,
-        "z": "d1eceead.adafe",
+        "x": 4606.88330078125,
+        "y": 1295.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "616def67.e5a25",
+        "id": "e1b77e00.282c4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4599.000518798828,
-        "y": 1871.34033203125,
-        "z": "d1eceead.adafe",
+        "x": 4635.00048828125,
+        "y": 1460.6260986328125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6d0c5fcb.438328",
-                "40a1c35d.17991c",
-                "6c800e67.6aa9c8"
+                "a1ad6a91.cdad1",
+                "bef51671.772a1",
+                "55e08f7a.b87978"
             ]
         ]
     },
     {
-        "id": "6d0c5fcb.438328",
+        "id": "a1ad6a91.cdad1",
         "type": "set",
         "name": "set source ttp-id",
         "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4814.000518798828,
-        "y": 1833.34033203125,
-        "z": "d1eceead.adafe",
+        "x": 4850.00048828125,
+        "y": 1422.6260986328125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "40a1c35d.17991c",
+        "id": "bef51671.772a1",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4811.000518798828,
-        "y": 1872.34033203125,
-        "z": "d1eceead.adafe",
+        "x": 4847.00048828125,
+        "y": 1461.6260986328125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "9de28790.cf8c7"
+                "db81e8e0.68e13"
             ]
         ]
     },
     {
-        "id": "6c800e67.6aa9c8",
+        "id": "55e08f7a.b87978",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4766.500518798828,
-        "y": 1914.34033203125,
-        "z": "d1eceead.adafe",
+        "x": 4802.50048828125,
+        "y": 1503.6260986328125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "9de28790.cf8c7",
+        "id": "db81e8e0.68e13",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4991.500518798828,
-        "y": 1871.34033203125,
-        "z": "d1eceead.adafe",
+        "x": 5027.50048828125,
+        "y": 1460.6260986328125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e5173d49.fc3368"
+                "52661a57.fe0a3c"
             ]
         ]
     },
     {
-        "id": "376d58a4.adb2a",
+        "id": "409a042d.2fadac",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4805.883331298828,
-        "y": 1315,
-        "z": "d1eceead.adafe",
+        "x": 4835.88330078125,
+        "y": 1056.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "60247fbe.4b6c2"
+                "f76f51b8.a98b3"
             ]
         ]
     },
     {
-        "id": "60247fbe.4b6c2",
+        "id": "f76f51b8.a98b3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4982.883331298828,
-        "y": 1307,
-        "z": "d1eceead.adafe",
+        "x": 5012.88330078125,
+        "y": 1048.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4270b940.4f6ac",
-                "65b48891.d54c3"
+                "f1cd5bd3.ddbdb8",
+                "b8b89faf.7ac19"
             ]
         ]
     },
     {
-        "id": "9b22416d.9cdac8",
+        "id": "ac9dba33.9ee3a8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4602.883331298828,
-        "y": 1311,
-        "z": "d1eceead.adafe",
+        "x": 4638.883270263672,
+        "y": 1154.2857055664062,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "376d58a4.adb2a",
-                "59d37917.573538"
+                "409a042d.2fadac",
+                "80f5aaec.b0ffc8"
             ]
         ]
     },
     {
-        "id": "59d37917.573538",
+        "id": "80f5aaec.b0ffc8",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4808.883331298828,
-        "y": 1389,
-        "z": "d1eceead.adafe",
+        "x": 4838.88330078125,
+        "y": 1130.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b8751b8b.fb4f58"
+                "bf72647d.49f538"
             ]
         ]
     },
     {
-        "id": "b8751b8b.fb4f58",
+        "id": "bf72647d.49f538",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4985.883331298828,
-        "y": 1381,
-        "z": "d1eceead.adafe",
+        "x": 5015.88330078125,
+        "y": 1122.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "673e159e.9038cc"
+                "97239b14.6f12c8"
             ]
         ]
     },
     {
-        "id": "e5173d49.fc3368",
+        "id": "52661a57.fe0a3c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5149.500518798828,
-        "y": 1871.34033203125,
-        "z": "d1eceead.adafe",
+        "x": 5185.50048828125,
+        "y": 1460.6260986328125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e816a090.0c423"
+                "5700a19e.1dbeb8"
             ]
         ]
     },
     {
-        "id": "e816a090.0c423",
+        "id": "5700a19e.1dbeb8",
         "type": "set",
         "name": "set source tunnel tp ip",
         "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 5356.500518798828,
-        "y": 1871.34033203125,
-        "z": "d1eceead.adafe",
+        "x": 5392.50048828125,
+        "y": 1460.6260986328125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "65b48891.d54c3",
+        "id": "b8b89faf.7ac19",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5190.883331298828,
-        "y": 1314,
-        "z": "d1eceead.adafe",
+        "x": 5220.88330078125,
+        "y": 1055.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "12ca2f18.a3fcb1",
-                "2eff6a6f.1256be",
-                "ae932fb7.b2f368"
+                "5d74c4c9.fd207c",
+                "bdb7d238.f96a08",
+                "7cf71a83.19030c"
             ]
         ]
     },
     {
-        "id": "4270b940.4f6ac",
+        "id": "f1cd5bd3.ddbdb8",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainA id",
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5220.883331298828,
-        "y": 1262,
-        "z": "d1eceead.adafe",
+        "x": 5250.88330078125,
+        "y": 1003.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "12ca2f18.a3fcb1",
+        "id": "5d74c4c9.fd207c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5400.883331298828,
-        "y": 1305,
-        "z": "d1eceead.adafe",
+        "x": 5430.88330078125,
+        "y": 1046.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "19df6125.66c90f"
+                "e430f4b5.90b5d"
             ]
         ]
     },
     {
-        "id": "2eff6a6f.1256be",
+        "id": "bdb7d238.f96a08",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5392.883331298828,
-        "y": 1360,
-        "z": "d1eceead.adafe",
+        "x": 5422.88330078125,
+        "y": 1101.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5900b30a.9db0cc"
+                "46b0e213.0f69d4"
             ]
         ]
     },
     {
-        "id": "ae932fb7.b2f368",
+        "id": "7cf71a83.19030c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5397.883331298828,
-        "y": 1417,
-        "z": "d1eceead.adafe",
+        "x": 5427.88330078125,
+        "y": 1158.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "abcfe080.ae7e7"
+                "99bfc958.cc2928"
             ]
         ]
     },
     {
-        "id": "abcfe080.ae7e7",
+        "id": "99bfc958.cc2928",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5549.883331298828,
-        "y": 1418,
-        "z": "d1eceead.adafe",
+        "x": 5579.88330078125,
+        "y": 1159.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "5900b30a.9db0cc",
+        "id": "46b0e213.0f69d4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5560.883331298828,
-        "y": 1363,
-        "z": "d1eceead.adafe",
+        "x": 5590.88330078125,
+        "y": 1104.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "19df6125.66c90f",
+        "id": "e430f4b5.90b5d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5545.265655517578,
-        "y": 1302.6556701660156,
-        "z": "d1eceead.adafe",
+        "x": 5575.265625,
+        "y": 1043.9414367675781,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "db94bf6b.c81da8"
+                "3d0751e6.cf382e"
             ]
         ]
     },
     {
-        "id": "673e159e.9038cc",
+        "id": "97239b14.6f12c8",
         "type": "set",
         "name": "set domainA ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5220.883331298828,
-        "y": 1505,
-        "z": "d1eceead.adafe",
+        "x": 5250.88330078125,
+        "y": 1246.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "db94bf6b.c81da8",
+        "id": "3d0751e6.cf382e",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5759.883331298828,
-        "y": 1299,
-        "z": "d1eceead.adafe",
+        "x": 5789.88330078125,
+        "y": 1040.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "653ea460.331594",
+        "id": "33b11d1b.98a69a",
         "type": "set",
         "name": "set network-route-B",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
-        "x": 4343.883331298828,
-        "y": 953,
-        "z": "d1eceead.adafe",
+        "x": 4445.883758544922,
+        "y": 347.28570556640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "3ff377ce.541508",
+        "id": "2dc9cffb.3878b8",
         "type": "set",
         "name": "set network-route-A",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
-        "x": 4334.883331298828,
-        "y": 1051,
-        "z": "d1eceead.adafe",
+        "x": 4446.883728027344,
+        "y": 451.28570556640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "2e04d27d.5faff6",
+        "id": "653aef18.035f68",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4168.883331298828,
-        "y": 959,
-        "z": "d1eceead.adafe",
+        "x": 4270.883758544922,
+        "y": 353.28570556640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "20ddeea0.a0e9ea",
-                "653ea460.331594"
+                "a11ab8.c3c2f548",
+                "33b11d1b.98a69a"
             ]
         ]
     },
     {
-        "id": "12c64a9b.27d615",
+        "id": "4456e14a.c61538",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4174.883331298828,
-        "y": 1023,
-        "z": "d1eceead.adafe",
+        "x": 4276.883758544922,
+        "y": 417.28570556640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a4916484.b95cf",
-                "3ff377ce.541508"
+                "7e53eaf1.53c434",
+                "2dc9cffb.3878b8"
             ]
         ]
     },
     {
-        "id": "a8347389.2ab3b",
+        "id": "dc25cb2f.e0da48",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4174.883331298828,
-        "y": 1129,
-        "z": "d1eceead.adafe",
+        "x": 4241.883758544922,
+        "y": 619.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2f347429.e690cc",
-                "64f47a9a.5541ec"
+                "231b0ffb.372688",
+                "3979d153.538ee6"
             ]
         ]
     },
     {
-        "id": "49b6f3ad.a55ac4",
+        "id": "7b200b08.d1724c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4177.883331298828,
-        "y": 1182,
-        "z": "d1eceead.adafe",
+        "x": 4244.883758544922,
+        "y": 672.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "cad2e783.60fc68",
-                "93b1477b.b7ce28"
+                "1b4ef1ae.221bae",
+                "49dc9fac.676fe"
             ]
         ]
     },
     {
-        "id": "64f47a9a.5541ec",
+        "id": "3979d153.538ee6",
         "type": "set",
         "name": "set network-route-B",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
-        "x": 4334.883331298828,
-        "y": 1142,
-        "z": "d1eceead.adafe",
+        "x": 4415.883758544922,
+        "y": 632.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "93b1477b.b7ce28",
+        "id": "49dc9fac.676fe",
         "type": "set",
         "name": "set network-route-A",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
-        "x": 4337.883331298828,
-        "y": 1233,
-        "z": "d1eceead.adafe",
+        "x": 4418.883758544922,
+        "y": 723.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "bcceae66.215ea8",
+        "id": "f7cb7391.6f67a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3709.883331298828,
-        "y": 2443,
-        "z": "d1eceead.adafe",
+        "x": 3741.88330078125,
+        "y": 1802.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "fa55cad.2f0ddb8",
-                "341eac77.d5f56c"
+                "9a5ca37c.910178",
+                "2a8d98c8.2c78a"
             ]
         ]
     },
     {
-        "id": "e6e2e92d.d49f8",
+        "id": "fd44019f.688f6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3537.216827392578,
-        "y": 2444,
-        "z": "d1eceead.adafe",
+        "x": 3569.216796875,
+        "y": 1803.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "bcceae66.215ea8"
+                "f7cb7391.6f67a"
             ]
         ]
     },
     {
-        "id": "15d49e8e.f5c6d1",
+        "id": "3eb019bb.1ee706",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3546.707794189453,
-        "y": 2486.5740356445312,
-        "z": "d1eceead.adafe",
+        "x": 3578.707763671875,
+        "y": 1845.8599243164062,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b6575c89.a4dbd8"
+                "f4d10bee.1b32c"
             ]
         ]
     },
     {
-        "id": "456db0bd.6c4e5",
+        "id": "ef74e13b.116b3",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3535.216827392578,
-        "y": 2533,
-        "z": "d1eceead.adafe",
+        "x": 3567.216796875,
+        "y": 1892.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f1a4c78.c749938"
+                "7a977b6c.124a74"
             ]
         ]
     },
     {
-        "id": "b6575c89.a4dbd8",
+        "id": "f4d10bee.1b32c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3700.2792053222656,
-        "y": 2489.8597717285156,
-        "z": "d1eceead.adafe",
+        "x": 3732.2791748046875,
+        "y": 1849.1456604003906,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f1a4c78.c749938",
+        "id": "7a977b6c.124a74",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3704.216827392578,
-        "y": 2534,
-        "z": "d1eceead.adafe",
+        "x": 3736.216796875,
+        "y": 1893.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "fa55cad.2f0ddb8",
+        "id": "9a5ca37c.910178",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3996.216827392578,
-        "y": 2447.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 4028.216796875,
+        "y": 1806.2860107421875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2a55ff3d.a63f58",
-                "a4fedadd.ffdcf"
+                "efd0a9b7.e547a8",
+                "caaf5e66.b1cb"
             ]
         ]
     },
     {
-        "id": "a4fedadd.ffdcf",
+        "id": "caaf5e66.b1cb",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4219.216827392578,
-        "y": 2402.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 4251.216796875,
+        "y": 1761.2860107421875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2cf5b91c.330536"
+                "5ec876cd.f1dea8"
             ]
         ]
     },
     {
-        "id": "2a55ff3d.a63f58",
+        "id": "efd0a9b7.e547a8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4221.216827392578,
-        "y": 2466.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 4253.216796875,
+        "y": 1825.2860107421875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f4cfd006.4df4a"
+                "72d34df6.13ce64"
             ]
         ]
     },
     {
-        "id": "f4cfd006.4df4a",
+        "id": "72d34df6.13ce64",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 4380.216827392578,
-        "y": 2485.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 4412.216796875,
+        "y": 1844.2860107421875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "2cf5b91c.330536",
+        "id": "5ec876cd.f1dea8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4384.216827392578,
-        "y": 2399.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 4416.216796875,
+        "y": 1758.2860107421875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "60521985.bf9fa8",
-                "1b11d7f2.c04e4"
+                "2854b6e2.b50402",
+                "1fbd987b.e2c578"
             ]
         ]
     },
     {
-        "id": "3e3a2fcb.29b168",
-        "type": "save",
-        "name": "save connectivity resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3998.216827392578,
-        "y": 2606.0001220703125,
-        "z": "d1eceead.adafe",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a24d2064.f8a7c",
-        "type": "execute",
-        "name": "execute UUID generator for connectivity domainB",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4043.216827392578,
-        "y": 2516.0001220703125,
-        "z": "d1eceead.adafe",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7f1c08c8.8cc28",
-        "type": "save",
-        "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
-        "comments": "",
-        "outputs": 1,
-        "x": 4125.216827392578,
-        "y": 2671.0001220703125,
-        "z": "d1eceead.adafe",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b114579a.337d4",
+        "id": "eef6ad07.9c7d5",
         "type": "save",
         "name": "get p-interface-dst from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3309.216827392578,
-        "y": 2479,
-        "z": "d1eceead.adafe",
+        "x": 3341.216796875,
+        "y": 1838.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e6e2e92d.d49f8",
-                "15d49e8e.f5c6d1",
-                "456db0bd.6c4e5"
+                "fd44019f.688f6",
+                "3eb019bb.1ee706",
+                "ef74e13b.116b3"
             ]
         ]
     },
     {
-        "id": "8e0a6f3b.01feb",
+        "id": "46101f8f.1fb8b8",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3270.216827392578,
-        "y": 2423,
-        "z": "d1eceead.adafe",
+        "x": 3302.216796875,
+        "y": 1782.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "3458f9fd.a9fdce",
+        "id": "d38e0865.514348",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3327.216827392578,
-        "y": 2141.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3353.216796875,
+        "y": 1577.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c48f1e5.b50d76",
-                "40db2833.3d6058"
+                "f536d783.2e1028",
+                "54ea75a9.fca1c4"
             ]
         ]
     },
     {
-        "id": "40db2833.3d6058",
+        "id": "54ea75a9.fca1c4",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3550.216827392578,
-        "y": 2127.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3576.216796875,
+        "y": 1563.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "57ecc3e9.705994"
+                "3ffa66c6.048e62"
             ]
         ]
     },
     {
-        "id": "c48f1e5.b50d76",
+        "id": "f536d783.2e1028",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3552.216827392578,
-        "y": 2160.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3578.216796875,
+        "y": 1596.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6a189760.03fff"
+                "73c7be78.48771"
             ]
         ]
     },
     {
-        "id": "6a189760.03fff",
+        "id": "73c7be78.48771",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 3695.216827392578,
-        "y": 2157.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3721.216796875,
+        "y": 1593.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "57ecc3e9.705994",
+        "id": "3ffa66c6.048e62",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3698.216827392578,
-        "y": 2120.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3724.216796875,
+        "y": 1556.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7ef10f50.4a98b",
-                "d3e48892.7c0638"
+                "116bcef1.41b689",
+                "bd9fbc09.ccb15"
             ]
         ]
     },
     {
-        "id": "7ef10f50.4a98b",
+        "id": "116bcef1.41b689",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 3892.216827392578,
-        "y": 2124,
-        "z": "d1eceead.adafe",
+        "x": 3918.216796875,
+        "y": 1559.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "341eac77.d5f56c",
+        "id": "2a8d98c8.2c78a",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3955.216827392578,
-        "y": 2756,
-        "z": "d1eceead.adafe",
+        "x": 3969.216766357422,
+        "y": 1939.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1d1b2999.e8eaf6"
+                "821e2eef.7d9ce8"
             ]
         ]
     },
     {
-        "id": "1d1b2999.e8eaf6",
+        "id": "821e2eef.7d9ce8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4161.216827392578,
-        "y": 2756,
-        "z": "d1eceead.adafe",
+        "x": 4175.216766357422,
+        "y": 1939.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2587a419.edf304"
+                "b9228d23.f35b1"
             ]
         ]
     },
     {
-        "id": "2587a419.edf304",
+        "id": "b9228d23.f35b1",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4378.502471923828,
-        "y": 2754.82177734375,
-        "z": "d1eceead.adafe",
+        "x": 4392.502410888672,
+        "y": 1938.1075439453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "596e064d.3e4868"
+                "1db12922.ce9147"
             ]
         ]
     },
     {
-        "id": "d3e48892.7c0638",
+        "id": "bd9fbc09.ccb15",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3914.216827392578,
-        "y": 2192,
-        "z": "d1eceead.adafe",
+        "x": 3940.216796875,
+        "y": 1627.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5d04022c.52094c",
-                "4363a204.88356c",
-                "d1632f49.e8bfd8"
+                "71a75cfd.cb2324",
+                "c5a92d1c.748898",
+                "d4c41231.0d38f"
             ]
         ]
     },
     {
-        "id": "5d04022c.52094c",
+        "id": "71a75cfd.cb2324",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4109.716949462891,
-        "y": 2144,
-        "z": "d1eceead.adafe",
+        "x": 4135.7169189453125,
+        "y": 1579.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "16d6f161.b988af"
+                "55c143a3.bf5e9c"
             ]
         ]
     },
     {
-        "id": "4363a204.88356c",
+        "id": "c5a92d1c.748898",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4101.716949462891,
-        "y": 2199,
-        "z": "d1eceead.adafe",
+        "x": 4127.7169189453125,
+        "y": 1634.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5ac71d3b.31ff94"
+                "a19a5afd.bfc2c"
             ]
         ]
     },
     {
-        "id": "d1632f49.e8bfd8",
+        "id": "d4c41231.0d38f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4106.716949462891,
-        "y": 2256,
-        "z": "d1eceead.adafe",
+        "x": 4132.7169189453125,
+        "y": 1691.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8e2e62d9.6dcb8"
+                "5c56b620.c82d88"
             ]
         ]
     },
     {
-        "id": "8e2e62d9.6dcb8",
+        "id": "5c56b620.c82d88",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4258.716949462891,
-        "y": 2257,
-        "z": "d1eceead.adafe",
+        "x": 4284.7169189453125,
+        "y": 1692.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "5ac71d3b.31ff94",
+        "id": "a19a5afd.bfc2c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4269.716949462891,
-        "y": 2202,
-        "z": "d1eceead.adafe",
+        "x": 4295.7169189453125,
+        "y": 1637.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "16d6f161.b988af",
+        "id": "55c143a3.bf5e9c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4254.099273681641,
-        "y": 2141.6556701660156,
-        "z": "d1eceead.adafe",
+        "x": 4280.0992431640625,
+        "y": 1576.9415588378906,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7d886bfd.e9ca4c"
+                "79a34acd.c9a0bc"
             ]
         ]
     },
     {
-        "id": "60521985.bf9fa8",
+        "id": "2854b6e2.b50402",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
         "comments": "",
-        "x": 4554.216827392578,
-        "y": 2360.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 4586.216796875,
+        "y": 1719.2860107421875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "1b11d7f2.c04e4",
+        "id": "1fbd987b.e2c578",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
         "comments": "",
-        "x": 4555.216827392578,
-        "y": 2465.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 4587.216796875,
+        "y": 1824.2860107421875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f5d8e7ee.5dd5b8",
+        "id": "8823cb9b.b21f5",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 4550.216827392578,
-        "y": 2414.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 4582.216796875,
+        "y": 1773.2860107421875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "596e064d.3e4868",
+        "id": "1db12922.ce9147",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4585.334014892578,
-        "y": 2744.3404541015625,
-        "z": "d1eceead.adafe",
+        "x": 4599.333953857422,
+        "y": 1927.626220703125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1d1ef4b9.b52cc3",
-                "aa09325d.47c72",
-                "f212860e.85526"
+                "4fe8713d.4f503",
+                "c4b73dd8.f86748",
+                "cf5e37a1.834b48"
             ]
         ]
     },
     {
-        "id": "1d1ef4b9.b52cc3",
+        "id": "4fe8713d.4f503",
         "type": "set",
         "name": "set destination ttp-id",
         "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4800.334014892578,
-        "y": 2706.3404541015625,
-        "z": "d1eceead.adafe",
+        "x": 4814.333953857422,
+        "y": 1889.626220703125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "aa09325d.47c72",
+        "id": "c4b73dd8.f86748",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4797.334014892578,
-        "y": 2745.3404541015625,
-        "z": "d1eceead.adafe",
+        "x": 4811.333953857422,
+        "y": 1928.626220703125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "391393be.95d72c"
+                "fd454717.5864e8"
             ]
         ]
     },
     {
-        "id": "f212860e.85526",
+        "id": "cf5e37a1.834b48",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4752.834014892578,
-        "y": 2787.3404541015625,
-        "z": "d1eceead.adafe",
+        "x": 4766.833953857422,
+        "y": 1970.626220703125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "391393be.95d72c",
+        "id": "fd454717.5864e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4977.834014892578,
-        "y": 2744.3404541015625,
-        "z": "d1eceead.adafe",
+        "x": 4991.833953857422,
+        "y": 1927.626220703125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "520819a9.ab1618"
+                "6021f32a.54d8fc"
             ]
         ]
     },
     {
-        "id": "520819a9.ab1618",
+        "id": "6021f32a.54d8fc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5135.834014892578,
-        "y": 2744.3404541015625,
-        "z": "d1eceead.adafe",
+        "x": 5149.833953857422,
+        "y": 1927.626220703125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3a6f0d92.f64ee2"
+                "1a613df3.ff444a"
             ]
         ]
     },
     {
-        "id": "3a6f0d92.f64ee2",
+        "id": "1a613df3.ff444a",
         "type": "set",
         "name": "set destination tunnel tp ip",
         "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 5342.834014892578,
-        "y": 2744.3404541015625,
-        "z": "d1eceead.adafe",
+        "x": 5356.833953857422,
+        "y": 1927.626220703125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "35d3101c.ddb4c",
+        "id": "1465bad2.a0d805",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4836.216827392578,
-        "y": 2160,
-        "z": "d1eceead.adafe",
+        "x": 4862.216796875,
+        "y": 1595.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "461a66b2.13a6c8"
+                "f75a0195.2a4c5"
             ]
         ]
     },
     {
-        "id": "461a66b2.13a6c8",
+        "id": "f75a0195.2a4c5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5013.216827392578,
-        "y": 2152,
-        "z": "d1eceead.adafe",
+        "x": 5039.216796875,
+        "y": 1587.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6cbb0705.4a3c5",
-                "670f0182.9fd968"
+                "1de23279.e8bad6",
+                "95237093.1f1c18"
             ]
         ]
     },
     {
-        "id": "7d886bfd.e9ca4c",
+        "id": "79a34acd.c9a0bc",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4438.216827392578,
-        "y": 2156,
-        "z": "d1eceead.adafe",
+        "x": 4464.216796875,
+        "y": 1591.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e2222250.60ef7"
+                "b5cddb2a.47fb5"
             ]
         ]
     },
     {
-        "id": "e2222250.60ef7",
+        "id": "b5cddb2a.47fb5",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4633.216827392578,
-        "y": 2156,
-        "z": "d1eceead.adafe",
+        "x": 4659.216796875,
+        "y": 1591.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "35d3101c.ddb4c",
-                "768c39b6.117ae"
+                "1465bad2.a0d805",
+                "a6e303e4.3eb668"
             ]
         ]
     },
     {
-        "id": "670f0182.9fd968",
+        "id": "95237093.1f1c18",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5221.216827392578,
-        "y": 2159,
-        "z": "d1eceead.adafe",
+        "x": 5247.216796875,
+        "y": 1594.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4e714dda.e8064c",
-                "6d43e638.f020f8",
-                "33cdbe70.d704f2"
+                "2d3d2acb.c107b6",
+                "fb5337e0.94ced8",
+                "752448e6.ec72a8"
             ]
         ]
     },
     {
-        "id": "9bab22e5.a35978",
+        "id": "6879e9be.d7aee",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5015.216827392578,
-        "y": 2225,
-        "z": "d1eceead.adafe",
+        "x": 5041.216796875,
+        "y": 1660.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3c5a22cd.c5b5a6"
+                "8691b2ec.22b9d8"
             ]
         ]
     },
     {
-        "id": "768c39b6.117ae",
+        "id": "a6e303e4.3eb668",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4838.216827392578,
-        "y": 2233,
-        "z": "d1eceead.adafe",
+        "x": 4864.216796875,
+        "y": 1668.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "9bab22e5.a35978"
+                "6879e9be.d7aee"
             ]
         ]
     },
     {
-        "id": "6cbb0705.4a3c5",
+        "id": "1de23279.e8bad6",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainB id",
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5251.216827392578,
-        "y": 2107,
-        "z": "d1eceead.adafe",
+        "x": 5277.216796875,
+        "y": 1542.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "3c5a22cd.c5b5a6",
+        "id": "8691b2ec.22b9d8",
         "type": "set",
         "name": "set domainB ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5250.216827392578,
-        "y": 2349,
-        "z": "d1eceead.adafe",
+        "x": 5254.216796875,
+        "y": 1726.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "4e714dda.e8064c",
+        "id": "2d3d2acb.c107b6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5431.216827392578,
-        "y": 2150,
-        "z": "d1eceead.adafe",
+        "x": 5457.216796875,
+        "y": 1585.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c3b341d5.27524"
+                "a3e7410.2b3c44"
             ]
         ]
     },
     {
-        "id": "6d43e638.f020f8",
+        "id": "fb5337e0.94ced8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5423.216827392578,
-        "y": 2205,
-        "z": "d1eceead.adafe",
+        "x": 5449.216796875,
+        "y": 1640.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5319e635.03496"
+                "656cbbf6.41438c"
             ]
         ]
     },
     {
-        "id": "33cdbe70.d704f2",
+        "id": "752448e6.ec72a8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5428.216827392578,
-        "y": 2262,
-        "z": "d1eceead.adafe",
+        "x": 5454.216796875,
+        "y": 1697.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "bf85165f.b30b4"
+                "6bb525a1.9cb52c"
             ]
         ]
     },
     {
-        "id": "bf85165f.b30b4",
+        "id": "6bb525a1.9cb52c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5580.216827392578,
-        "y": 2263,
-        "z": "d1eceead.adafe",
+        "x": 5606.216796875,
+        "y": 1698.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "5319e635.03496",
+        "id": "656cbbf6.41438c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5591.216827392578,
-        "y": 2208,
-        "z": "d1eceead.adafe",
+        "x": 5617.216796875,
+        "y": 1643.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c3b341d5.27524",
+        "id": "a3e7410.2b3c44",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5575.599151611328,
-        "y": 2147.6556701660156,
-        "z": "d1eceead.adafe",
+        "x": 5601.59912109375,
+        "y": 1582.9415588378906,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5a4d43b1.7dbc0c"
+                "99742e42.2fdbd8"
             ]
         ]
     },
     {
-        "id": "5a4d43b1.7dbc0c",
+        "id": "99742e42.2fdbd8",
         "type": "set",
         "name": "set controller domainB data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5790.216827392578,
-        "y": 2144,
-        "z": "d1eceead.adafe",
+        "x": 5816.216796875,
+        "y": 1579.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "83634982.62f32",
+        "id": "78d4922e.8ebe04",
         "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": 3288.883331298828,
-        "y": 1754,
-        "z": "d1eceead.adafe",
-        "wires": []
-    },
-    {
-        "id": "51304efd.d01998",
-        "type": "comment",
-        "name": "This is it (should be)",
-        "info": "",
-        "comments": "",
-        "x": 4510.883331298828,
-        "y": 1037,
-        "z": "d1eceead.adafe",
-        "wires": []
-    },
-    {
-        "id": "8cad1e9f.c00c5",
-        "type": "comment",
-        "name": "This is it (should be)",
-        "info": "",
-        "comments": "",
-        "x": 4502.883331298828,
-        "y": 1127,
-        "z": "d1eceead.adafe",
+        "x": 3314.88330078125,
+        "y": 1449.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a78c5989.f5207",
+        "id": "c220ecdf.76a978",
         "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": 3269.883331298828,
-        "y": 2610,
-        "z": "d1eceead.adafe",
+        "x": 3301.88330078125,
+        "y": 1969.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "5f144ff2.8e6388",
-        "type": "save",
-        "name": "save connectivityA relationship to UNI-LEAF, in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 3401.883331298828,
-        "y": 1860,
-        "z": "d1eceead.adafe",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f39161b8.c95518",
-        "type": "save",
-        "name": "save LEAF UNI in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-p-interface-short`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3308.883331298828,
-        "y": 1807,
-        "z": "d1eceead.adafe",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8af2638e.140428",
+        "id": "b4f5dada.48378",
         "type": "execute",
         "name": "execute UUID generator for ethernet-service-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 2426.883331298828,
-        "y": 185,
-        "z": "d1eceead.adafe",
+        "y": 162.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "b2d6bb83.745318",
+        "id": "5db562b1.71111c",
         "type": "set",
         "name": "set new ethernet-service-name",
         "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
         "comments": "",
         "x": 2360.883331298828,
-        "y": 221,
-        "z": "d1eceead.adafe",
+        "y": 198.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "efb9627d.c73688",
+        "id": "3f2dec8d.5c3844",
         "type": "comment",
         "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",
         "info": "",
         "comments": "",
         "x": 2545.883331298828,
-        "y": 148,
-        "z": "d1eceead.adafe",
+        "y": 125.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "7954d1dd.93732",
+        "id": "8ae1ae92.9d4708",
         "type": "comment",
         "name": "NOT NEEDED ANYMORE?",
         "info": "",
         "comments": "",
-        "x": 4036.883331298828,
-        "y": 1838,
-        "z": "d1eceead.adafe",
+        "x": 4072.88330078125,
+        "y": 1427.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "48007645.c6e248",
+        "id": "f4b4f4b0.73db2",
         "type": "comment",
         "name": "NOT NEEDED ANYMORE?",
         "info": "",
         "comments": "",
-        "x": 4014.883331298828,
-        "y": 2708,
-        "z": "d1eceead.adafe",
+        "x": 4028.883270263672,
+        "y": 1891.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "e22daf3c.82e7c8",
+        "id": "4304e2aa.cc073c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3441.8837890625,
-        "y": 7480.999969482422,
-        "z": "d1eceead.adafe",
+        "x": 2737.8836669921875,
+        "y": 7259.28564453125,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "ba2fa114.256608",
+        "id": "f849984b.dddac",
         "type": "comment",
         "name": "START OF DELETE OPERATION",
         "info": "",
         "comments": "",
-        "x": 3288.88330078125,
-        "y": 2939.999969482422,
-        "z": "d1eceead.adafe",
+        "x": 3296.88330078125,
+        "y": 2451.2857360839844,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "cea904e8.518f5",
+        "id": "ff6310d.2048a7",
         "type": "save",
         "name": "delete LEAF uni resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3874.566650390625,
-        "y": 3129.400115966797,
-        "z": "d1eceead.adafe",
+        "x": 3880.566650390625,
+        "y": 2552.6858520507812,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "8c6f82a5.234d18",
+        "id": "14f1d608.fff342",
         "type": "save",
         "name": "get LEAF uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.LEAF.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.leafuni\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3245.566650390625,
-        "y": 3059.400115966797,
-        "z": "d1eceead.adafe",
+        "x": 3251.566650390625,
+        "y": 2532.6858520507812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "980e282b.21ebf",
-                "62337ab9.8b1c5c",
-                "ac27f627.a68b4"
+                "30a4f59e.3fde12",
+                "98adc704.004778",
+                "91611e7f.d3eaa8"
             ]
         ]
     },
     {
-        "id": "62337ab9.8b1c5c",
+        "id": "98adc704.004778",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3473.0576171875,
-        "y": 3031.974090576172,
-        "z": "d1eceead.adafe",
+        "x": 3479.0576171875,
+        "y": 2505.2598266601562,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a4aab25a.3920c"
+                "94257401.34831"
             ]
         ]
     },
     {
-        "id": "ac27f627.a68b4",
+        "id": "91611e7f.d3eaa8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3468.566650390625,
-        "y": 3076.4000549316406,
-        "z": "d1eceead.adafe",
+        "x": 3474.566650390625,
+        "y": 2549.685791015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "98b8996.e5a3fe8"
+                "c2c26a41.57e9c"
             ]
         ]
     },
     {
-        "id": "a4aab25a.3920c",
+        "id": "94257401.34831",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3635.629150390625,
-        "y": 3031.259796142578,
-        "z": "d1eceead.adafe",
+        "x": 3641.629150390625,
+        "y": 2504.5455322265625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "98b8996.e5a3fe8",
+        "id": "c2c26a41.57e9c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3636.566650390625,
-        "y": 3076.4000549316406,
-        "z": "d1eceead.adafe",
+        "x": 3642.566650390625,
+        "y": 2549.685791015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "980e282b.21ebf",
+        "id": "30a4f59e.3fde12",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3480.566650390625,
-        "y": 3126.400115966797,
-        "z": "d1eceead.adafe",
+        "x": 3486.566650390625,
+        "y": 2599.6858520507812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "50a09dc8.f07414"
+                "4d0f2575.137edc"
             ]
         ]
     },
     {
-        "id": "50a09dc8.f07414",
+        "id": "4d0f2575.137edc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3632.88330078125,
-        "y": 3129.999969482422,
-        "z": "d1eceead.adafe",
+        "x": 3638.88330078125,
+        "y": 2603.2857055664062,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "839bae2a.5eaff8",
-                "cea904e8.518f5",
-                "8b478b6f.069ff8"
+                "589d867c.eeacb",
+                "ff6310d.2048a7",
+                "84152b78.a442c8",
+                "1e88543b.84a814"
             ]
         ]
     },
     {
-        "id": "839bae2a.5eaff8",
+        "id": "589d867c.eeacb",
         "type": "set",
         "name": "set bwToBeDecreased tpid cvlan",
         "xml": "<set>\n<parameter name='bwToBeDecreased' value=\"`$tmp.aai.leafuni.data-source`\" />\n<parameter name='tpid' value='`$tmp.aai.leafuni.tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.leafuni.cvlan`' />\n\n\n",
         "comments": "",
-        "x": 3877.566650390625,
-        "y": 3072.400115966797,
-        "z": "d1eceead.adafe",
+        "x": 3883.566650390625,
+        "y": 2495.6858520507812,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "5a01c9ff.aa79b8",
+        "id": "243640c4.1190f8",
         "type": "comment",
         "name": "Update ROOT UNI's bw",
         "info": "",
         "comments": "",
-        "x": 3833.566650390625,
-        "y": 3235.199920654297,
-        "z": "d1eceead.adafe",
+        "x": 3845.566650390625,
+        "y": 2606.4857177734375,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "e327e4d5.a4e2b",
+        "id": "83d2a0c.fbf83e",
         "type": "save",
         "name": "update ROOT UNI in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4435.566650390625,
-        "y": 3340.199920654297,
-        "z": "d1eceead.adafe",
+        "x": 4523.566650390625,
+        "y": 2649.4857177734375,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "8b478b6f.069ff8",
+        "id": "84152b78.a442c8",
         "type": "save",
         "name": "get root uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3825.56640625,
-        "y": 3281.199920654297,
-        "z": "d1eceead.adafe",
+        "x": 3837.56640625,
+        "y": 2652.4857177734375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b9a017aa.207728",
-                "1cc16855.ddb44",
-                "cca9f79e.b7e85"
+                "ee63dcff.30bad",
+                "80208a9d.4e9bb",
+                "3e7ba9dc.c77e76"
             ]
         ]
     },
     {
-        "id": "1cc16855.ddb44",
+        "id": "80208a9d.4e9bb",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4053.057373046875,
-        "y": 3253.773895263672,
-        "z": "d1eceead.adafe",
+        "x": 4141.057373046875,
+        "y": 2563.0596923828125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "dd7a8720.93a36"
+                "ee49c3d8.4041d8"
             ]
         ]
     },
     {
-        "id": "cca9f79e.b7e85",
+        "id": "3e7ba9dc.c77e76",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4048.56640625,
-        "y": 3298.1998596191406,
-        "z": "d1eceead.adafe",
+        "x": 4136.56640625,
+        "y": 2607.4856567382812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "bfa4184f.a70f18"
+                "e34757d5.3f1ff8"
             ]
         ]
     },
     {
-        "id": "dd7a8720.93a36",
+        "id": "ee49c3d8.4041d8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 4215.62890625,
-        "y": 3253.059600830078,
-        "z": "d1eceead.adafe",
+        "x": 4303.62890625,
+        "y": 2562.3453979492188,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "bfa4184f.a70f18",
+        "id": "e34757d5.3f1ff8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4216.56640625,
-        "y": 3298.1998596191406,
-        "z": "d1eceead.adafe",
+        "x": 4304.56640625,
+        "y": 2607.4856567382812,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "51dfcdd2.a7dd1c",
+        "id": "be9d3338.5121d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4213.56640625,
-        "y": 3348.199920654297,
-        "z": "d1eceead.adafe",
+        "x": 4301.56640625,
+        "y": 2657.4857177734375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f4f7b843.eb2a48",
-                "e327e4d5.a4e2b"
+                "933a8e8f.7ef918",
+                "83d2a0c.fbf83e"
             ]
         ]
     },
     {
-        "id": "b9a017aa.207728",
+        "id": "ee63dcff.30bad",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4044.56640625,
-        "y": 3348.199920654297,
-        "z": "d1eceead.adafe",
+        "x": 4132.56640625,
+        "y": 2657.4857177734375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "51dfcdd2.a7dd1c"
+                "be9d3338.5121d"
             ]
         ]
     },
     {
-        "id": "f4f7b843.eb2a48",
+        "id": "933a8e8f.7ef918",
         "type": "set",
         "name": "set new bw",
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",
         "comments": "",
-        "x": 4395.567138671875,
-        "y": 3290.199920654297,
-        "z": "d1eceead.adafe",
+        "x": 4483.567138671875,
+        "y": 2599.4857177734375,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "7302cb88.8e6284",
+        "id": "21e69316.d31a3c",
         "type": "comment",
         "name": "Delete LEAF UNI",
         "info": "",
         "comments": "",
-        "x": 3825.88330078125,
-        "y": 3013.999969482422,
-        "z": "d1eceead.adafe",
+        "x": 3831.88330078125,
+        "y": 2437.2857055664062,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "5b4e5a5d.18c714",
+        "id": "45cb1d93.9cef0c",
         "type": "set",
         "name": "set current-provider-id and current-cvlan-id",
         "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
         "comments": "",
         "x": 3311.749969482422,
-        "y": 3792.6000366210938,
-        "z": "d1eceead.adafe",
+        "y": 3769.8858032226562,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a7a1bb48.b43ec8",
+        "id": "95cc6144.fb6bd8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3444.749969482422,
-        "y": 3840.6000366210938,
-        "z": "d1eceead.adafe",
+        "y": 3817.8858032226562,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "7b0989f8.4cdbd",
+        "id": "21aeddc1.06f77a",
         "type": "switchNode",
         "name": "switch found-connectivity?",
         "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3266.749969482422,
-        "y": 3892.4000854492188,
-        "z": "d1eceead.adafe",
+        "y": 3869.6858520507812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "723122ee.60b394",
-                "1f79397f.9ef707"
+                "218077ad.f30d3",
+                "a4239ce5.8829c"
             ]
         ]
     },
     {
-        "id": "723122ee.60b394",
+        "id": "218077ad.f30d3",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3459.749969482422,
-        "y": 3893.4000854492188,
-        "z": "d1eceead.adafe",
+        "y": 3870.6858520507812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "fc2d1c85.b4eee"
+                "dcbbe6d2.fa9028"
             ]
         ]
     },
     {
-        "id": "fc2d1c85.b4eee",
+        "id": "dcbbe6d2.fa9028",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"LEAF CONN DOES NOT EXIST BUT IT SHOULD BE.\" />\n\n",
         "comments": "",
         "x": 3603.749969482422,
-        "y": 3889.6000366210938,
-        "z": "d1eceead.adafe",
+        "y": 3866.8858032226562,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "1f79397f.9ef707",
+        "id": "a4239ce5.8829c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3463.749969482422,
-        "y": 3937.4000854492188,
-        "z": "d1eceead.adafe",
+        "y": 3914.6858520507812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6275f59c.0890b4"
+                "338c28da.4908c8"
             ]
         ]
     },
     {
-        "id": "6275f59c.0890b4",
+        "id": "338c28da.4908c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -3767,165 +3643,165 @@
         "comments": "",
         "outputs": 1,
         "x": 3602.749969482422,
-        "y": 3932.4000854492188,
-        "z": "d1eceead.adafe",
+        "y": 3909.6858520507812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "810f11d9.c59a7",
-                "852c933b.a9e98",
-                "dd94c766.3611e8"
+                "40a81b6.e879ce4",
+                "fe7c3ff6.ce34b8",
+                "af03ee84.d16068"
             ]
         ]
     },
     {
-        "id": "810f11d9.c59a7",
+        "id": "40a81b6.e879ce4",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 3853.149627685547,
-        "y": 3940.9166870117188,
-        "z": "d1eceead.adafe",
+        "y": 3918.2024536132812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4f7025f7.9e0214"
+                "3fc00cbe.f344f4"
             ]
         ]
     },
     {
-        "id": "4f7025f7.9e0214",
+        "id": "3fc00cbe.f344f4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4075.149627685547,
-        "y": 3918.9166870117188,
-        "z": "d1eceead.adafe",
+        "y": 3896.2024536132812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c1dfdbf7.de4f68"
+                "57d9d04a.beb888"
             ]
         ]
     },
     {
-        "id": "c1dfdbf7.de4f68",
+        "id": "57d9d04a.beb888",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4235.149139404297,
-        "y": 3898.9166870117188,
-        "z": "d1eceead.adafe",
+        "y": 3876.2024536132812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "811e3163.5710b"
+                "5fa67fdd.e511b8"
             ]
         ]
     },
     {
-        "id": "7642582a.7718e8",
+        "id": "b9bbd69a.136aa8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4388.149658203125,
-        "y": 3879.916717529297,
-        "z": "d1eceead.adafe",
+        "y": 3857.2024841308594,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b019880c.9753e",
-                "f61cef0c.bbc238"
+                "17e2ea6.f8df196",
+                "947c4850.aa8df"
             ]
         ]
     },
     {
-        "id": "b019880c.9753e",
+        "id": "17e2ea6.f8df196",
         "type": "set",
         "name": "set tmp.stillHasUni to TRUE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",
         "comments": "",
         "x": 4584.649871826172,
-        "y": 3847.9999389648438,
-        "z": "d1eceead.adafe",
+        "y": 3825.2857055664062,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "852c933b.a9e98",
+        "id": "fe7c3ff6.ce34b8",
         "type": "set",
         "name": "set tmp.stillHasUn tmp.keepVPNBs to FALSE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='false' />\n<parameter name='tmp.keepVPNBs' value='false' />\n",
         "comments": "",
         "x": 3959.64990234375,
-        "y": 3859.999969482422,
-        "z": "d1eceead.adafe",
+        "y": 3837.2857360839844,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "dd94c766.3611e8",
+        "id": "af03ee84.d16068",
         "type": "switchNode",
         "name": "switch tmp.keepVPNBs?",
         "xml": "\n<switch test=\"`$tmp.keepVPNBs`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3767.64990234375,
-        "y": 4281.000213623047,
-        "z": "d1eceead.adafe",
+        "y": 4258.285980224609,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "73d16500.5c0ae4",
-                "d3a70ceb.c50b78"
+                "77a80484.fb13cc",
+                "a722846c.585ad"
             ]
         ]
     },
     {
-        "id": "f61cef0c.bbc238",
+        "id": "947c4850.aa8df",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 4552.88330078125,
-        "y": 3915.999969482422,
-        "z": "d1eceead.adafe",
+        "y": 3893.2857360839844,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "d3a70ceb.c50b78",
+        "id": "a722846c.585ad",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 154.65066528320312,
-        "y": 5345.000457763672,
-        "z": "d1eceead.adafe",
+        "y": 5322.286224365234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4a51985e.972e68"
+                "c0a1014a.3ea75"
             ]
         ]
     },
     {
-        "id": "73d16500.5c0ae4",
+        "id": "77a80484.fb13cc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3988.650634765625,
-        "y": 4383.000213623047,
-        "z": "d1eceead.adafe",
+        "y": 4360.285980224609,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "25f72ad2.47990e"
+                "8774c38d.ee5b7"
             ]
         ]
     },
     {
-        "id": "25f72ad2.47990e",
+        "id": "8774c38d.ee5b7",
         "type": "block",
         "name": "block",
         "xml": "<block>",
@@ -3933,208 +3809,209 @@
         "comments": "",
         "outputs": 1,
         "x": 4131.650634765625,
-        "y": 4379.000213623047,
-        "z": "d1eceead.adafe",
+        "y": 4356.285980224609,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6e8bafff.64fc88",
-                "dcf23a76.fb4f5",
-                "f889b68d.197d9",
-                "69806916.62139",
-                "32064458.33cdf4",
-                "9c7a66fb.560d48",
-                "2b19eccb.73cf0c",
-                "987f769f.1ba7f8"
+                "f67d6e8d.c4ab",
+                "1d885097.bf6b2f",
+                "bd8e5c03.dfc108",
+                "19328269.e896be",
+                "93e60704.65dbd",
+                "8b3d1eff.18e008",
+                "ffd8a757.b8a3f",
+                "b33560b0.1278c",
+                "fc616200.2baf58"
             ]
         ]
     },
     {
-        "id": "316316fc.4e3ac2",
+        "id": "9c91ac5e.705b8",
         "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": 181,
-        "y": 5301.000457763672,
-        "z": "d1eceead.adafe",
+        "y": 5278.286224365234,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "32c3f6b1.304972",
+        "id": "fa1b93d9.936e7",
         "type": "comment",
         "name": "There are still other UNIs in this connectivity that share same OLT node. Only update bw of the vpn-bindings involved",
         "info": "(1) keepVPNBs == true, means there are still other UNIs in this\nsame domain and same connectivity that share the same OLT node.\n\n- Only update bw of the vpn-bindings involved -- DONE\n- upadte bw in ROOT UNI -- DONE\n- change ROOT conn status to Modified -- DONE\n- delete LEAF UNI in AAI -- DONE\n- delete LEAF UNI in LEAF ethernet service PNC -- DONE\n- DON'T delete the connectivities of LEAF and ROOT -- DONE\nAlso update the ethernet services",
         "comments": "",
         "x": 4007.884033203125,
-        "y": 4346.000213623047,
-        "z": "d1eceead.adafe",
+        "y": 4323.285980224609,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "7adbe8ea.ad8838",
+        "id": "30095233.787426",
         "type": "set",
         "name": "set srcTtp OTN layer",
         "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",
         "comments": "",
         "x": 4820.667724609375,
-        "y": 4536.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4514.069427490234,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "ee3b3067.d425a8",
+        "id": "298f2b5b.0aab2c",
         "type": "switchNode",
         "name": "switch provider-id domainA",
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5165.667724609375,
-        "y": 4398.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4376.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "76f6067d.796678"
+                "1597a82b.d6bf2"
             ]
         ]
     },
     {
-        "id": "fc93f53c.f481d",
+        "id": "1126bc47.b4d98c",
         "type": "for",
         "name": "for netwidx..allNetworksList_length",
         "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
         "comments": "",
         "outputs": 1,
         "x": 4872.667724609375,
-        "y": 4392.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4370.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ee3b3067.d425a8"
+                "298f2b5b.0aab2c"
             ]
         ]
     },
     {
-        "id": "3f4440b0.d66f8",
+        "id": "9ba49429.2785d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5127.667724609375,
-        "y": 4349.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4327.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "27f65669.8e0af2",
+        "id": "ace3cbea.15731",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
         "comments": "",
         "x": 4816.667724609375,
-        "y": 4444.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4422.069427490234,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "410c70eb.214758",
+        "id": "1d3af694.aab3a1",
         "type": "set",
         "name": "set tmp.pce-src-node",
         "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",
         "comments": "",
         "x": 4824.667724609375,
-        "y": 4489.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4467.069427490234,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "e258b42d.2c46d8",
+        "id": "7a0d3acc.4e0354",
         "type": "set",
         "name": "unset otnTopoIdSrc",
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
         "comments": "",
         "x": 4821.667724609375,
-        "y": 4342.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4320.069427490234,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "76f6067d.796678",
+        "id": "1597a82b.d6bf2",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5074.667724609375,
-        "y": 4466.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4444.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "acca9da1.cc4618"
+                "247fb61.2b27f4a"
             ]
         ]
     },
     {
-        "id": "acca9da1.cc4618",
+        "id": "247fb61.2b27f4a",
         "type": "switchNode",
         "name": "switch te-topo-id",
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5259.667724609375,
-        "y": 4465.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4443.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f448b4f8.c120e"
+                "d2d679f0.fa9e7"
             ]
         ]
     },
     {
-        "id": "f448b4f8.c120e",
+        "id": "d2d679f0.fa9e7",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5451.667724609375,
-        "y": 4468.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4446.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "19985725.a5eca1"
+                "7d11177c.7fa498"
             ]
         ]
     },
     {
-        "id": "19985725.a5eca1",
+        "id": "7d11177c.7fa498",
         "type": "set",
         "name": "set otnTopoIdSrc",
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
         "x": 5623.667724609375,
-        "y": 4464.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4442.069427490234,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "ab4edace.9f77f",
+        "id": "b338f208.2e8e8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4999.667724609375,
-        "y": 4579.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4557.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "6e8bafff.64fc88",
+        "id": "f67d6e8d.c4ab",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -4142,232 +4019,232 @@
         "comments": "",
         "outputs": 1,
         "x": 4516.667724609375,
-        "y": 4364.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4342.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "30c992c8.4db58e",
-                "c2728b20.458338",
-                "27f65669.8e0af2",
-                "410c70eb.214758",
-                "7adbe8ea.ad8838",
-                "fc93f53c.f481d",
-                "ab4edace.9f77f"
+                "6c238e2f.cfa52",
+                "97e28bb1.9f6bb8",
+                "ace3cbea.15731",
+                "1d3af694.aab3a1",
+                "30095233.787426",
+                "1126bc47.b4d98c",
+                "b338f208.2e8e8"
             ]
         ]
     },
     {
-        "id": "2e6e6c8a.c892fc",
+        "id": "44415c7f.4f5f24",
         "type": "comment",
         "name": "The following section is to find srcTtp OTN layer (its long name)",
         "info": "The following section is to find srcTtp OTN layer (its long name)",
         "comments": "",
         "x": 4501.667724609375,
-        "y": 4298.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4276.069427490234,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c2728b20.458338",
+        "id": "97e28bb1.9f6bb8",
         "type": "get-resource",
         "name": "get-resource network-resources-list",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
         "comments": "",
         "outputs": 1,
         "x": 4880.667724609375,
-        "y": 4285.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4263.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "cd41e347.c8a4d",
-                "5bcb3237.45bf24",
-                "3f4440b0.d66f8"
+                "153999c3.0eb42e",
+                "a208bb99.66b2e8",
+                "9ba49429.2785d"
             ]
         ]
     },
     {
-        "id": "cd41e347.c8a4d",
+        "id": "153999c3.0eb42e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5116.667724609375,
-        "y": 4268.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4246.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "5bcb3237.45bf24",
+        "id": "a208bb99.66b2e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5113.667724609375,
-        "y": 4309.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4287.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "30c992c8.4db58e",
+        "id": "6c238e2f.cfa52",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
         "comments": "",
         "x": 4829.667724609375,
-        "y": 4242.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4220.069427490234,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "dcf23a76.fb4f5",
+        "id": "1d885097.bf6b2f",
         "type": "set",
         "name": "unset tmp.aai.all-vpn-bindings",
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
         "comments": "",
         "x": 4336.667724609375,
-        "y": 4697.183563232422,
-        "z": "d1eceead.adafe",
+        "y": 4674.469329833984,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f549a24.b4e97e",
+        "id": "582ea235.e6de1c",
         "type": "comment",
         "name": "find all OTNs that have srcTtpOtnLayer and decrease their bandwidth",
         "info": "",
         "comments": "",
         "x": 4459.968017578125,
-        "y": 4736.183563232422,
-        "z": "d1eceead.adafe",
+        "y": 4713.469329833984,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f889b68d.197d9",
+        "id": "bd8e5c03.dfc108",
         "type": "save",
         "name": "get all-vpn-bindings from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
         "comments": "",
         "outputs": 1,
         "x": 4357.968017578125,
-        "y": 4771.183563232422,
-        "z": "d1eceead.adafe",
+        "y": 4748.469329833984,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f7fe6bc0.f9d1a8",
-                "b939c13a.bd148",
-                "63930841.13965"
+                "d0e71616.8c817",
+                "148e0bed.377164",
+                "3b175283.95d6be"
             ]
         ]
     },
     {
-        "id": "f7fe6bc0.f9d1a8",
+        "id": "d0e71616.8c817",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4562.968017578125,
-        "y": 4768.183563232422,
-        "z": "d1eceead.adafe",
+        "y": 4745.469329833984,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "85787fa.a0f0d8"
+                "39c739fc.a6fe6e"
             ]
         ]
     },
     {
-        "id": "b939c13a.bd148",
+        "id": "148e0bed.377164",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4546.458984375,
-        "y": 4829.757598876953,
-        "z": "d1eceead.adafe",
+        "y": 4807.043365478516,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c496c4d4.109c78"
+                "3e1fb649.3101ea"
             ]
         ]
     },
     {
-        "id": "63930841.13965",
+        "id": "3b175283.95d6be",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4543.968017578125,
-        "y": 4873.183563232422,
-        "z": "d1eceead.adafe",
+        "y": 4850.469329833984,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "bb1ebaa9.c2fac"
+                "681b836.365687c"
             ]
         ]
     },
     {
-        "id": "85787fa.a0f0d8",
+        "id": "39c739fc.a6fe6e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4730.96826171875,
-        "y": 4763.183563232422,
-        "z": "d1eceead.adafe",
+        "y": 4740.469329833984,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6a7a29b4.6659c"
+                "93e92e1a.778be8"
             ]
         ]
     },
     {
-        "id": "c496c4d4.109c78",
+        "id": "3e1fb649.3101ea",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 4709.0303955078125,
-        "y": 4830.0433349609375,
-        "z": "d1eceead.adafe",
+        "y": 4807.3291015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "bb1ebaa9.c2fac",
+        "id": "681b836.365687c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 4710.968017578125,
-        "y": 4872.183563232422,
-        "z": "d1eceead.adafe",
+        "y": 4849.469329833984,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "6a7a29b4.6659c",
+        "id": "93e92e1a.778be8",
         "type": "for",
         "name": "for vpnidx in all-vpn-bindings",
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 4968.96826171875,
-        "y": 4768.183563232422,
-        "z": "d1eceead.adafe",
+        "y": 4745.469329833984,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2e12f618.b174b2"
+                "27f30922.4e6a66"
             ]
         ]
     },
     {
-        "id": "2e12f618.b174b2",
+        "id": "27f30922.4e6a66",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4375,74 +4252,74 @@
         "comments": "",
         "outputs": 1,
         "x": 5202.968017578125,
-        "y": 4775.183563232422,
-        "z": "d1eceead.adafe",
+        "y": 4752.469329833984,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1b37b556.addac3"
+                "e449a33.b8b696"
             ]
         ]
     },
     {
-        "id": "3df57bb4.1a97cc",
+        "id": "e77a7161.49d068",
         "type": "comment",
         "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
         "info": "",
         "comments": "",
         "x": 5119.783935546875,
-        "y": 4846.349884033203,
-        "z": "d1eceead.adafe",
+        "y": 4823.635650634766,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "1b37b556.addac3",
+        "id": "e449a33.b8b696",
         "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": 5063.783935546875,
-        "y": 4895.349884033203,
-        "z": "d1eceead.adafe",
+        "y": 4872.635650634766,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c62dd674.fd73f",
-                "37627bf2.c03934"
+                "62a1336b.ab309c",
+                "57ed2482.36942c"
             ]
         ]
     },
     {
-        "id": "37627bf2.c03934",
+        "id": "57ed2482.36942c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5306.784423828125,
-        "y": 4936.349395751953,
-        "z": "d1eceead.adafe",
+        "y": 4913.635162353516,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "c62dd674.fd73f",
+        "id": "62a1336b.ab309c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5317.7841796875,
-        "y": 4893.349609375,
-        "z": "d1eceead.adafe",
+        "y": 4870.6353759765625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b2c9765c.25999"
+                "6f96293b.020fc"
             ]
         ]
     },
     {
-        "id": "a5ecb13c.9c7548",
+        "id": "48fa24ff.a12f6c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4450,213 +4327,213 @@
         "comments": "",
         "outputs": 1,
         "x": 5544.767578125,
-        "y": 4900.76611328125,
-        "z": "d1eceead.adafe",
+        "y": 4878.0518798828125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "78a5ede3.09cc54",
-                "aecf8872.1d5c4",
-                "657d43b1.13c254"
+                "d949e407.7d96c8",
+                "ba00ef86.599998",
+                "e04480f3.8af1b"
             ]
         ]
     },
     {
-        "id": "9d348107.818aa",
+        "id": "a4fcb041.b0aaf8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 5709.8173828125,
-        "y": 4785.766571044922,
-        "z": "d1eceead.adafe",
+        "y": 4763.052337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "99f28c5d.95abe8"
+                "dc33bc78.b33dc"
             ]
         ]
     },
     {
-        "id": "99f28c5d.95abe8",
+        "id": "dc33bc78.b33dc",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5901.8173828125,
-        "y": 4774.766815185547,
-        "z": "d1eceead.adafe",
+        "y": 4752.052581787109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "9a75bdf9.10641"
+                "88251130.694fa8"
             ]
         ]
     },
     {
-        "id": "78a5ede3.09cc54",
+        "id": "d949e407.7d96c8",
         "type": "set",
         "name": "unset tmp.aai.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
         "comments": "",
         "x": 5658.334228515625,
-        "y": 4675.983612060547,
-        "z": "d1eceead.adafe",
+        "y": 4653.269378662109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "aecf8872.1d5c4",
+        "id": "ba00ef86.599998",
         "type": "set",
         "name": "set tmp.aai.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
         "comments": "",
         "x": 5650.334228515625,
-        "y": 4724.983612060547,
-        "z": "d1eceead.adafe",
+        "y": 4702.269378662109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "657d43b1.13c254",
+        "id": "e04480f3.8af1b",
         "type": "save",
         "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $bwToBeDecreased`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
         "x": 5881.751220703125,
-        "y": 4906.149627685547,
-        "z": "d1eceead.adafe",
+        "y": 4883.435394287109,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "f1c96228.a5339",
+        "id": "e369ae1d.045348",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
         "comments": "",
         "outputs": 1,
         "x": 5833.401123046875,
-        "y": 4953.466522216797,
-        "z": "d1eceead.adafe",
+        "y": 4930.752288818359,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "75d6304c.089cd8",
+        "id": "7bcaed73.c4335c",
         "type": "comment",
         "name": "decrease the bw of the-vpn-binding and change status to modified",
         "info": "decrease the bw of the-vpn-binding\nchange status to modified\n",
         "comments": "",
         "x": 5905.751220703125,
-        "y": 4867.149627685547,
-        "z": "d1eceead.adafe",
+        "y": 4844.435394287109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "9a75bdf9.10641",
+        "id": "88251130.694fa8",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6083.8173828125,
-        "y": 4753.766815185547,
-        "z": "d1eceead.adafe",
+        "y": 4731.052581787109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b5ad886.81af5f8"
+                "3faa0ed9.e49512"
             ]
         ]
     },
     {
-        "id": "b5ad886.81af5f8",
+        "id": "3faa0ed9.e49512",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 6245.8173828125,
-        "y": 4742.766815185547,
-        "z": "d1eceead.adafe",
+        "y": 4720.052581787109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6f94f7eb.f4d818",
-                "269fac18.2bb21c"
+                "1f4e4f1d.0faeb9",
+                "71f57a2d.ed1434"
             ]
         ]
     },
     {
-        "id": "6f94f7eb.f4d818",
+        "id": "1f4e4f1d.0faeb9",
         "type": "set",
         "name": "unset tmp.the-connectivity",
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",
         "comments": "",
         "x": 6442.8173828125,
-        "y": 4671.766815185547,
-        "z": "d1eceead.adafe",
+        "y": 4649.052581787109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "269fac18.2bb21c",
+        "id": "71f57a2d.ed1434",
         "type": "set",
         "name": "set tmp.the-connectivity",
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />\n",
         "comments": "",
         "x": 6440.2841796875,
-        "y": 4770.983612060547,
-        "z": "d1eceead.adafe",
+        "y": 4748.269378662109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a984d0c7.8574d",
+        "id": "5e5dd175.2ee1b",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3097.800048828125,
-        "y": 3229.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3207.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "49347bae.3e2974",
+        "id": "95f11825.f517d8",
         "type": "switchNode",
         "name": "switch found-middle-man?",
         "xml": "<switch test='`$found-middle-man`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2974.800048828125,
-        "y": 3339.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3317.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7b835f88.3b076",
-                "7490c0ec.4dda5"
+                "eda02ee3.547818",
+                "24ae5a23.6efcde"
             ]
         ]
     },
     {
-        "id": "7b835f88.3b076",
+        "id": "eda02ee3.547818",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3158.800048828125,
-        "y": 3318.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3296.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5b141b7a.8f28f4"
+                "25d89b5b.fea624"
             ]
         ]
     },
     {
-        "id": "5b141b7a.8f28f4",
+        "id": "25d89b5b.fea624",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4664,43 +4541,43 @@
         "comments": "",
         "outputs": 1,
         "x": 3301.800048828125,
-        "y": 3318.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3296.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "94596646.a7e4f"
+                "a5e21959.30c488"
             ]
         ]
     },
     {
-        "id": "94596646.a7e4f",
+        "id": "a5e21959.30c488",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"LEAF CONN DOES NOT EXIST BUT IT SHOULD BE.\" />\n\n",
         "comments": "",
         "x": 3477.800048828125,
-        "y": 3316.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3294.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "7490c0ec.4dda5",
+        "id": "24ae5a23.6efcde",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3156.800048828125,
-        "y": 3373.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3351.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a3855d70.dbb87"
+                "2aa846fb.1fdfe2"
             ]
         ]
     },
     {
-        "id": "a3855d70.dbb87",
+        "id": "2aa846fb.1fdfe2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4708,216 +4585,216 @@
         "comments": "",
         "outputs": 1,
         "x": 3003.800048828125,
-        "y": 3506.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3484.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5b4e5a5d.18c714",
-                "a7a1bb48.b43ec8",
-                "7b0989f8.4cdbd",
-                "b98b1ba5.429c1",
-                "37657916.72f08e",
-                "cc0c619e.32de58"
+                "45cb1d93.9cef0c",
+                "95cc6144.fb6bd8",
+                "21aeddc1.06f77a",
+                "ab0940a1.911a68",
+                "6d6cc518.e0ec9c",
+                "3c679d7f.fbbb22"
             ]
         ]
     },
     {
-        "id": "a5a62e88.7d802",
+        "id": "522b1854.031bc",
         "type": "comment",
         "name": "Find LEAF connectivity",
         "info": "",
         "comments": "",
         "x": 3225.88330078125,
-        "y": 3746.999969482422,
-        "z": "d1eceead.adafe",
+        "y": 3724.2857360839844,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "b98b1ba5.429c1",
+        "id": "ab0940a1.911a68",
         "type": "set",
         "name": "set tmp.MMstillHasUni to FALSE",
         "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='false' />\n",
         "comments": "",
         "x": 3308.333251953125,
-        "y": 3519.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3497.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "37657916.72f08e",
+        "id": "6d6cc518.e0ec9c",
         "type": "for",
         "name": "for each relationship of middle-man-conn",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 3306.8330078125,
-        "y": 3565.716766357422,
-        "z": "d1eceead.adafe",
+        "y": 3543.0025329589844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1a4c3937.32a93f"
+                "f5f202e7.9ae08"
             ]
         ]
     },
     {
-        "id": "1a4c3937.32a93f",
+        "id": "f5f202e7.9ae08",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3569.8330078125,
-        "y": 3560.716766357422,
-        "z": "d1eceead.adafe",
+        "y": 3538.0025329589844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "95d80a37.7eef5"
+                "186eedb6.79ae82"
             ]
         ]
     },
     {
-        "id": "95d80a37.7eef5",
+        "id": "186eedb6.79ae82",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3729.83251953125,
-        "y": 3540.716766357422,
-        "z": "d1eceead.adafe",
+        "y": 3518.0025329589844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "9608373.19689c8"
+                "e8fee7bd.fc2ef8"
             ]
         ]
     },
     {
-        "id": "d9ea756c.06e5e",
+        "id": "774ecc4a.3ad124",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4498.833740234375,
-        "y": 3575.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 5066.834228515625,
+        "y": 3549.0025634765625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "29278691.db117a",
-                "29bad35d.650d14",
-                "a6af6c62.1a6b5"
+                "9464a805.69d21",
+                "af3bd9a1.948688",
+                "da386631.67d8c8"
             ]
         ]
     },
     {
-        "id": "29278691.db117a",
+        "id": "9464a805.69d21",
         "type": "set",
         "name": "set tmp.MMstillHasUni to TRUE",
         "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='true' />\n",
         "comments": "",
-        "x": 4738.334228515625,
-        "y": 3524.800018310547,
-        "z": "d1eceead.adafe",
+        "x": 5306.334716796875,
+        "y": 3498.0858154296875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "29bad35d.650d14",
+        "id": "af3bd9a1.948688",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4671.567657470703,
-        "y": 3597.800048828125,
-        "z": "d1eceead.adafe",
+        "x": 5239.568145751953,
+        "y": 3571.0858459472656,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "4465f9ec.e3dbb",
+        "id": "17da0805.f3e8a8",
         "type": "comment",
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",
         "info": "",
         "comments": "",
         "x": 4432.88427734375,
-        "y": 5128.000213623047,
-        "z": "d1eceead.adafe",
+        "y": 5105.285980224609,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "69806916.62139",
+        "id": "19328269.e896be",
         "type": "set",
         "name": "set tmp.leafconn.",
         "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",
         "comments": "",
         "x": 4331.317138671875,
-        "y": 5179.916717529297,
-        "z": "d1eceead.adafe",
+        "y": 5157.202484130859,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "2b19eccb.73cf0c",
+        "id": "ffd8a757.b8a3f",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4482.317138671875,
-        "y": 5622.916717529297,
-        "z": "d1eceead.adafe",
+        "y": 5600.202484130859,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "987f769f.1ba7f8",
+        "id": "b33560b0.1278c",
         "type": "switchNode",
         "name": "switch found-root-connectivity",
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4297.317138671875,
-        "y": 5689.916717529297,
-        "z": "d1eceead.adafe",
+        "y": 5667.202484130859,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c7979e94.4deb18",
-                "5e8c956f.69a854"
+                "e0079417.8b765",
+                "94134a14.38a09"
             ]
         ]
     },
     {
-        "id": "c7979e94.4deb18",
+        "id": "e0079417.8b765",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4562.317138671875,
-        "y": 5674.916717529297,
-        "z": "d1eceead.adafe",
+        "y": 5652.202484130859,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4a28d2a5.936924"
+                "c191059e.ace948"
             ]
         ]
     },
     {
-        "id": "5e8c956f.69a854",
+        "id": "94134a14.38a09",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4558.317138671875,
-        "y": 5722.916717529297,
-        "z": "d1eceead.adafe",
+        "y": 5700.202484130859,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "213fbf95.d03c8"
+                "21c0ccb3.89b3cc"
             ]
         ]
     },
     {
-        "id": "4a28d2a5.936924",
+        "id": "c191059e.ace948",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4925,116 +4802,116 @@
         "comments": "",
         "outputs": 1,
         "x": 4718.317138671875,
-        "y": 5670.916717529297,
-        "z": "d1eceead.adafe",
+        "y": 5648.202484130859,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a96c5a1a.d66bf"
+                "ea983e85.321ce"
             ]
         ]
     },
     {
-        "id": "213fbf95.d03c8",
+        "id": "21c0ccb3.89b3cc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
         "comments": "",
         "x": 4706.317138671875,
-        "y": 5717.916717529297,
-        "z": "d1eceead.adafe",
+        "y": 5695.202484130859,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "4e8315f.b9446ec",
+        "id": "11ee9928.b9a3cf",
         "type": "set",
         "name": "set tmp.rootconn.",
         "xml": "<set>\n<parameter name='tmp.rootconn.' value=\"`$tmp.aai.ROOT.connectivity.`\" />\n\n\n",
         "comments": "",
         "x": 5138.3173828125,
-        "y": 5612.916717529297,
-        "z": "d1eceead.adafe",
+        "y": 5590.202484130859,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "aa7d5d8.eb8bca",
+        "id": "3a447acf.2b1f0e",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.leafconn.access-provider-id + '-clientId-' +\n                                                   $tmp.leafconn.access-client-id + '-topologyId-' +\n                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.leafconn.access-node-id`\" />\n",
         "comments": "",
         "x": 4540.734130859375,
-        "y": 5209.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5186.486175537109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "32064458.33cdf4",
+        "id": "93e60704.65dbd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4311.734130859375,
-        "y": 5298.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5275.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "aa7d5d8.eb8bca",
-                "3165c974.539e06"
+                "3a447acf.2b1f0e",
+                "a0d0d144.703df8"
             ]
         ]
     },
     {
-        "id": "3165c974.539e06",
+        "id": "a0d0d144.703df8",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 4547.734130859375,
-        "y": 5291.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5268.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4cddcbba.102194",
-                "d5cd17da.64e6a",
-                "9d33157c.077f3"
+                "93bdcc8d.eca238",
+                "76b31045.74e9",
+                "e9dc2865.72e928"
             ]
         ]
     },
     {
-        "id": "4cddcbba.102194",
+        "id": "93bdcc8d.eca238",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4743.2342529296875,
-        "y": 5243.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5220.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "658952ec.d50f2c"
+                "87ddaf65.395498"
             ]
         ]
     },
     {
-        "id": "d5cd17da.64e6a",
+        "id": "76b31045.74e9",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4735.2342529296875,
-        "y": 5298.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5275.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f87d3f72.db25b"
+                "fe3d7591.8ed12"
             ]
         ]
     },
     {
-        "id": "658952ec.d50f2c",
+        "id": "87ddaf65.395498",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5042,219 +4919,219 @@
         "comments": "",
         "outputs": 1,
         "x": 4887.6165771484375,
-        "y": 5242.8560791015625,
-        "z": "d1eceead.adafe",
+        "y": 5220.141845703125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5e03d50d.e31174"
+                "ad455c8f.ae00e8"
             ]
         ]
     },
     {
-        "id": "5e03d50d.e31174",
+        "id": "ad455c8f.ae00e8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 5071.734130859375,
-        "y": 5241.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5218.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "81fcac6e.c2cbb"
+                "d25e267a.3e533"
             ]
         ]
     },
     {
-        "id": "81fcac6e.c2cbb",
+        "id": "d25e267a.3e533",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5266.734130859375,
-        "y": 5241.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5218.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "23740bd0.c54174"
+                "93445f98.6a2b88"
             ]
         ]
     },
     {
-        "id": "9d33157c.077f3",
+        "id": "e9dc2865.72e928",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4740.2342529296875,
-        "y": 5355.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5332.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d477847d.474a8"
+                "d3c476f6.a94bf"
             ]
         ]
     },
     {
-        "id": "d477847d.474a8",
+        "id": "d3c476f6.a94bf",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 4892.2342529296875,
-        "y": 5356.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5333.486175537109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f87d3f72.db25b",
+        "id": "fe3d7591.8ed12",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 4903.2342529296875,
-        "y": 5299.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5276.486175537109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "e3023af7.680d7",
+        "id": "a6955939.7a731",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5648.734130859375,
-        "y": 5245.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5222.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "31c1897e.fbb116",
-                "b906e4f7.66368",
-                "ac0e0ca2.883cb"
+                "9484e895.44a448",
+                "50aee0a4.445958",
+                "f7a12344.c8bde8"
             ]
         ]
     },
     {
-        "id": "23740bd0.c54174",
+        "id": "93445f98.6a2b88",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5469.734130859375,
-        "y": 5245.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5222.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e3023af7.680d7"
+                "a6955939.7a731"
             ]
         ]
     },
     {
-        "id": "b906e4f7.66368",
+        "id": "50aee0a4.445958",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
         "x": 5854.734130859375,
-        "y": 5258.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5235.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "df7977a7.075b8",
-                "f17bde95.882498",
-                "61e2d23e.358d1c"
+                "1af8bb44.7d7ad5",
+                "48532c3d.63b2f4",
+                "af6d67e.1e33f98"
             ]
         ]
     },
     {
-        "id": "31c1897e.fbb116",
+        "id": "9484e895.44a448",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 5884.734130859375,
-        "y": 5206.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5183.486175537109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "df7977a7.075b8",
+        "id": "1af8bb44.7d7ad5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6064.734130859375,
-        "y": 5249.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5226.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7ac6fe75.62b4e"
+                "751438ac.f3ea9"
             ]
         ]
     },
     {
-        "id": "f17bde95.882498",
+        "id": "48532c3d.63b2f4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6056.734130859375,
-        "y": 5304.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5281.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "671c9934.2cd48"
+                "1ab525ea.2aee0a"
             ]
         ]
     },
     {
-        "id": "61e2d23e.358d1c",
+        "id": "af6d67e.1e33f98",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6061.734130859375,
-        "y": 5361.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5338.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a6615570.50c968"
+                "658bf37d.2cc724"
             ]
         ]
     },
     {
-        "id": "a6615570.50c968",
+        "id": "658bf37d.2cc724",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 6213.734130859375,
-        "y": 5362.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5339.486175537109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "671c9934.2cd48",
+        "id": "1ab525ea.2aee0a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 6224.734130859375,
-        "y": 5307.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5284.486175537109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "7ac6fe75.62b4e",
+        "id": "751438ac.f3ea9",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5262,82 +5139,82 @@
         "comments": "",
         "outputs": 1,
         "x": 6209.116455078125,
-        "y": 5246.8560791015625,
-        "z": "d1eceead.adafe",
+        "y": 5224.141845703125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6989c737.25d068"
+                "3d7e0062.7d2af"
             ]
         ]
     },
     {
-        "id": "6989c737.25d068",
+        "id": "3d7e0062.7d2af",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
         "x": 6423.734130859375,
-        "y": 5243.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5220.486175537109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "ac0e0ca2.883cb",
+        "id": "f7a12344.c8bde8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 5804.734130859375,
-        "y": 5322.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5299.486175537109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "9c7a66fb.560d48",
+        "id": "8b3d1eff.18e008",
         "type": "execute",
         "name": "execute RestApiCallNode Delete LEAF UNI of ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.LEAF.uni-p-interface-long`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 4453.234375,
-        "y": 5402.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5380.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1e28e096.7499f7",
-                "cc9e5694.f9d17"
+                "ee0f617b.5bd02",
+                "8e2d6022.079658"
             ]
         ]
     },
     {
-        "id": "1e28e096.7499f7",
+        "id": "ee0f617b.5bd02",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4813.734130859375,
-        "y": 5410.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5388.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "906e379.3b93848"
+                "e5f9197d.04b6c"
             ]
         ]
     },
     {
-        "id": "906e379.3b93848",
+        "id": "e5f9197d.04b6c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 4971.734130859375,
-        "y": 5410.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5388.085784912109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "90be5ca9.028288",
+        "id": "b5f90852.29b69",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -5345,97 +5222,97 @@
         "comments": "",
         "outputs": 1,
         "x": 4975.234130859375,
-        "y": 5450.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5428.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "cc9e5694.f9d17",
+        "id": "8e2d6022.079658",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4817.734130859375,
-        "y": 5450.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5428.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "90be5ca9.028288"
+                "b5f90852.29b69"
             ]
         ]
     },
     {
-        "id": "921095c8.3bc23",
+        "id": "ffe0ea3.8a4d998",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5126.451171875,
-        "y": 5664.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5642.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "fb4f4697.4dc5f",
-                "7ea31674.99e1d8"
+                "6146efb2.cf13d",
+                "9351cf54.365048"
             ]
         ]
     },
     {
-        "id": "7ea31674.99e1d8",
+        "id": "9351cf54.365048",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 5368.450927734375,
-        "y": 5614.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5592.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "10743e5b.0b6182",
-                "5598183a.212ab",
-                "9c9074e9.bbaff8"
+                "d35be3cf.cc2028",
+                "74f2b735.4a4b38",
+                "4e1edc90.74b29c"
             ]
         ]
     },
     {
-        "id": "10743e5b.0b6182",
+        "id": "d35be3cf.cc2028",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5563.951171875,
-        "y": 5548.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5526.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "767943d2.64a144"
+                "8c6be2ce.3abef8"
             ]
         ]
     },
     {
-        "id": "5598183a.212ab",
+        "id": "74f2b735.4a4b38",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5559.951171875,
-        "y": 5604.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5582.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "74a77564.40268c"
+                "17a91916.50ea6f"
             ]
         ]
     },
     {
-        "id": "767943d2.64a144",
+        "id": "8c6be2ce.3abef8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5443,114 +5320,114 @@
         "comments": "",
         "outputs": 1,
         "x": 5708.3333740234375,
-        "y": 5566.4556884765625,
-        "z": "d1eceead.adafe",
+        "y": 5543.741455078125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "10049f5.85364e1"
+                "41f50adf.154854"
             ]
         ]
     },
     {
-        "id": "10049f5.85364e1",
+        "id": "41f50adf.154854",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 5892.450927734375,
-        "y": 5564.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5542.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "72e5612b.857e68"
+                "92f6a716.223fa8"
             ]
         ]
     },
     {
-        "id": "9c9074e9.bbaff8",
+        "id": "4e1edc90.74b29c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5569.951171875,
-        "y": 5649.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5627.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "952a99b1.f3f0e"
+                "9e924b4c.b75db"
             ]
         ]
     },
     {
-        "id": "952a99b1.f3f0e",
+        "id": "9e924b4c.b75db",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 5748.951171875,
-        "y": 5665.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5643.085784912109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "74a77564.40268c",
+        "id": "17a91916.50ea6f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 5730.951171875,
-        "y": 5617.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5595.085784912109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f64c3a10.6bbc38",
+        "id": "21c4fa1a.b93b46",
         "type": "execute",
         "name": "execute RestApiCallNode Delete UNI of ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.rootconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.ROOT.uni-p-interface-long`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 5279.951171875,
-        "y": 5720.399627685547,
-        "z": "d1eceead.adafe",
+        "y": 5697.685394287109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "cd722628.03685",
-                "76458c1b.1a62ac"
+                "95033c2a.09c67",
+                "f1a877c4.a203d8"
             ]
         ]
     },
     {
-        "id": "cd722628.03685",
+        "id": "95033c2a.09c67",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5628.451171875,
-        "y": 5702.399627685547,
-        "z": "d1eceead.adafe",
+        "y": 5679.685394287109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d04dd9dc.2f2dc8"
+                "76c41eff.4cfe88"
             ]
         ]
     },
     {
-        "id": "d04dd9dc.2f2dc8",
+        "id": "76c41eff.4cfe88",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 5884.451171875,
-        "y": 5705.399627685547,
-        "z": "d1eceead.adafe",
+        "y": 5682.685394287109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "1006a530.30b813",
+        "id": "eb3b6335.123de8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -5558,190 +5435,190 @@
         "comments": "",
         "outputs": 1,
         "x": 5836.951171875,
-        "y": 5746.399627685547,
-        "z": "d1eceead.adafe",
+        "y": 5723.685394287109,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "76458c1b.1a62ac",
+        "id": "f1a877c4.a203d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5638.451171875,
-        "y": 5751.399627685547,
-        "z": "d1eceead.adafe",
+        "y": 5728.685394287109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1006a530.30b813"
+                "eb3b6335.123de8"
             ]
         ]
     },
     {
-        "id": "fb4f4697.4dc5f",
+        "id": "6146efb2.cf13d",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.rootconn.access-provider-id + '-clientId-' +\n                                                   $tmp.rootconn.access-client-id + '-topologyId-' +\n                                                   $tmp.rootconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.rootconn.access-node-id`\" />\n",
         "comments": "",
         "x": 5361.450927734375,
-        "y": 5532.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5510.085784912109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "72e5612b.857e68",
+        "id": "92f6a716.223fa8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6087.450927734375,
-        "y": 5564.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5542.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3625dda5.38707a"
+                "bd55517c.f87f1"
             ]
         ]
     },
     {
-        "id": "402ab8f9.3aa18",
+        "id": "8bf8b16.3c18f5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 6469.450927734375,
-        "y": 5568.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5546.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4697e13e.13b02",
-                "6c3ba6ac.e7c21",
-                "34e0c57a.0e712a"
+                "1bd48f8a.cba628",
+                "1ea10909.ec8b57",
+                "ecac1508.b763"
             ]
         ]
     },
     {
-        "id": "3625dda5.38707a",
+        "id": "bd55517c.f87f1",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6290.450927734375,
-        "y": 5568.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5546.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "402ab8f9.3aa18"
+                "8bf8b16.3c18f5"
             ]
         ]
     },
     {
-        "id": "6c3ba6ac.e7c21",
+        "id": "1ea10909.ec8b57",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
         "x": 6675.450927734375,
-        "y": 5581.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5559.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2e31a205.2611fe",
-                "c9f11bf6.38bb98",
-                "99cec3e1.6d2f68"
+                "830127bc.8c4c18",
+                "adc00906.538428",
+                "5c009e0.e4c98e4"
             ]
         ]
     },
     {
-        "id": "4697e13e.13b02",
+        "id": "1bd48f8a.cba628",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 6705.450927734375,
-        "y": 5529.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5507.085784912109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "2e31a205.2611fe",
+        "id": "830127bc.8c4c18",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6885.450927734375,
-        "y": 5572.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5550.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2ba283a1.e08d44"
+                "ea1d97d5.52d0a"
             ]
         ]
     },
     {
-        "id": "c9f11bf6.38bb98",
+        "id": "adc00906.538428",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6877.450927734375,
-        "y": 5627.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5605.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3af9cd94.f12ff2"
+                "283c974a.c2fc28"
             ]
         ]
     },
     {
-        "id": "99cec3e1.6d2f68",
+        "id": "5c009e0.e4c98e4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6882.450927734375,
-        "y": 5684.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5662.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c501098b.50507"
+                "dbf169ab.c4c478"
             ]
         ]
     },
     {
-        "id": "c501098b.50507",
+        "id": "dbf169ab.c4c478",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 7034.450927734375,
-        "y": 5685.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5663.085784912109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "3af9cd94.f12ff2",
+        "id": "283c974a.c2fc28",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 7045.450927734375,
-        "y": 5630.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5608.085784912109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "2ba283a1.e08d44",
+        "id": "ea1d97d5.52d0a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5749,38 +5626,38 @@
         "comments": "",
         "outputs": 1,
         "x": 7029.833251953125,
-        "y": 5570.4556884765625,
-        "z": "d1eceead.adafe",
+        "y": 5547.741455078125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "bca9e0da.72619"
+                "eea057d1.d2c178"
             ]
         ]
     },
     {
-        "id": "bca9e0da.72619",
+        "id": "eea057d1.d2c178",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
         "x": 7244.450927734375,
-        "y": 5566.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5544.085784912109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "34e0c57a.0e712a",
+        "id": "ecac1508.b763",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 6625.450927734375,
-        "y": 5645.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5623.085784912109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "9608373.19689c8",
+        "id": "e8fee7bd.fc2ef8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5788,77 +5665,77 @@
         "comments": "",
         "outputs": 1,
         "x": 3854.88330078125,
-        "y": 3534.999969482422,
-        "z": "d1eceead.adafe",
+        "y": 3512.2857360839844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6e45c64.2629238",
-                "354c7fc8.6d8de"
+                "4b07eb9e.ad1084",
+                "449a6f75.ecc4d"
             ]
         ]
     },
     {
-        "id": "6e45c64.2629238",
+        "id": "4b07eb9e.ad1084",
         "type": "set",
         "name": "set tmp.mmUNI-id-long",
         "xml": "<set>\n<parameter name='tmp.mmUNI-id-long' value='`$middle-man-conn.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",
         "comments": "",
         "x": 4045.466552734375,
-        "y": 3477.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3455.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "354c7fc8.6d8de",
+        "id": "449a6f75.ecc4d",
         "type": "switchNode",
         "name": "switch tmp.mmUNI-id-long != ROOT UNI",
         "xml": "\n<switch test=\"`$tmp.mmUNI-id-long != $tmp.ROOT.uni-p-interface-long`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4092.466552734375,
-        "y": 3548.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3526.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6bdb2c16.23fc7c",
-                "5820e4e6.95b47c"
+                "a5622a5e.b03c68",
+                "1b2b72f4.a20bdd"
             ]
         ]
     },
     {
-        "id": "6bdb2c16.23fc7c",
+        "id": "a5622a5e.b03c68",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4330.884033203125,
-        "y": 3507.999969482422,
-        "z": "d1eceead.adafe",
+        "y": 3485.2857360839844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d4fcba65.f8c8f"
+                "d22a60e2.fd2778"
             ]
         ]
     },
     {
-        "id": "5820e4e6.95b47c",
+        "id": "1b2b72f4.a20bdd",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4337.884246826172,
-        "y": 3564.9999389648438,
-        "z": "d1eceead.adafe",
+        "y": 3542.2857055664062,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d9ea756c.06e5e"
+                "b7814ecb.1580d"
             ]
         ]
     },
     {
-        "id": "d4fcba65.f8c8f",
+        "id": "d22a60e2.fd2778",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5866,126 +5743,126 @@
         "comments": "",
         "outputs": 1,
         "x": 4458.884521484375,
-        "y": 3503.999969482422,
-        "z": "d1eceead.adafe",
+        "y": 3481.2857360839844,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "cc0c619e.32de58",
+        "id": "3c679d7f.fbbb22",
         "type": "set",
         "name": "set tmp.MMonlyHasROOT to TRUE",
         "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='true' />\n",
         "comments": "",
         "x": 3314.083251953125,
-        "y": 3462.400115966797,
-        "z": "d1eceead.adafe",
+        "y": 3439.6858825683594,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a6af6c62.1a6b5",
+        "id": "da386631.67d8c8",
         "type": "set",
         "name": "set tmp.MMonlyHasROOT to FALSE",
         "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='false' />\n",
         "comments": "",
-        "x": 4727.9169921875,
-        "y": 3468.400115966797,
-        "z": "d1eceead.adafe",
+        "x": 5295.91748046875,
+        "y": 3441.6859130859375,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "811e3163.5710b",
+        "id": "5fa67fdd.e511b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4407.6669921875,
-        "y": 3984.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 3961.9024353027344,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "aa9298d8.acde8",
-                "a5e5763f.58bb2"
+                "a814439f.bac2e",
+                "f8d770ba.37d44"
             ]
         ]
     },
     {
-        "id": "aa9298d8.acde8",
+        "id": "a814439f.bac2e",
         "type": "set",
         "name": "set tmp.uni.id",
         "xml": "<set>\n<parameter name='tmp.uni.id' value='`$tmp.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",
         "comments": "",
         "x": 4580.5498046875,
-        "y": 3980.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 3957.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a5e5763f.58bb2",
+        "id": "f8d770ba.37d44",
         "type": "save",
         "name": "get uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.uni.id\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4583.5498046875,
-        "y": 4027.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4004.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4df6bcf4.a4f44c",
-                "89771ed8.977b78",
-                "d1de1d5b.be978"
+                "7fc95f5b.ec381",
+                "28603ae9.d6e726",
+                "f736ad43.136778"
             ]
         ]
     },
     {
-        "id": "4df6bcf4.a4f44c",
+        "id": "7fc95f5b.ec381",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4755.5498046875,
-        "y": 4011.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 3988.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f65d0563.51b9e"
+                "47e06d70.96544c"
             ]
         ]
     },
     {
-        "id": "89771ed8.977b78",
+        "id": "28603ae9.d6e726",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4756.040771484375,
-        "y": 4056.850372314453,
-        "z": "d1eceead.adafe",
+        "y": 4034.1361389160156,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "d1de1d5b.be978",
+        "id": "f736ad43.136778",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4756.5498046875,
-        "y": 4097.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4074.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "f65d0563.51b9e",
+        "id": "47e06d70.96544c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -5993,165 +5870,165 @@
         "comments": "",
         "outputs": 1,
         "x": 4916.5498046875,
-        "y": 4007.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 3984.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "41e51ce8.c7bbd4",
-                "9fcba756.d0c298",
-                "99817ef0.1be558"
+                "db3d2916.05167",
+                "b1e93bbf.154be8",
+                "2727d594.264d9a"
             ]
         ]
     },
     {
-        "id": "d2f62a11.bbccd",
+        "id": "3055c73f.990de",
         "type": "comment",
         "name": "find the node part of the uni.id (uni-tp-id-node-part)",
         "info": "",
         "comments": "",
         "x": 5249.5498046875,
-        "y": 3938.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 3915.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "9fcba756.d0c298",
+        "id": "b1e93bbf.154be8",
         "type": "execute",
         "name": "execute split id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
         "x": 5184.5498046875,
-        "y": 3995.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 3972.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ad91a307.53dc18",
-                "66b6c9a.ce41eb8"
+                "8ed99d07.46ccf",
+                "dfad78a0.2e2798"
             ]
         ]
     },
     {
-        "id": "66b6c9a.ce41eb8",
+        "id": "dfad78a0.2e2798",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5407.5498046875,
-        "y": 3981.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 3958.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f5696a58.3dcae"
+                "40b7643c.aa9b44"
             ]
         ]
     },
     {
-        "id": "ad91a307.53dc18",
+        "id": "8ed99d07.46ccf",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5409.5498046875,
-        "y": 4014.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 3991.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "cd5f81cd.b325a8"
+                "2c3f5774.427218"
             ]
         ]
     },
     {
-        "id": "f5696a58.3dcae",
+        "id": "40b7643c.aa9b44",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5555.5498046875,
-        "y": 3974.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 3951.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "520c18e.4c672e8"
+                "49b755b0.ff456c"
             ]
         ]
     },
     {
-        "id": "cd5f81cd.b325a8",
+        "id": "2c3f5774.427218",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
         "x": 5552.5498046875,
-        "y": 4011.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 3988.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "520c18e.4c672e8",
+        "id": "49b755b0.ff456c",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.uni.pnf-name' value=\"`$param-prefix-uni-pnfName[0] + '-' +\n                                                   $param-prefix-uni-pnfName[1] + '-' +\n                                                   $param-prefix-uni-pnfName[2] + '-' +\n                                                   $param-prefix-uni-pnfName[3] + '-' +\n                                                   $param-prefix-uni-pnfName[4] + '-' +\n                                                   $param-prefix-uni-pnfName[5] + '-' +\n                                                   $param-prefix-uni-pnfName[6] + '-' +\n                                                   $param-prefix-uni-pnfName[7] + '-' +\n                                                   $param-prefix-uni-pnfName[8]`\" />\n",
         "comments": "",
         "x": 5732.5498046875,
-        "y": 3974.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 3951.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "41e51ce8.c7bbd4",
+        "id": "db3d2916.05167",
         "type": "switchNode",
         "name": "switch uni-tp-id-node-part is the same as the LEAF node",
         "xml": "<switch test='`$tmp.uni.pnf-name == $tmp.LEAF.pnf-name-long`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5228.5498046875,
-        "y": 4129.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4106.562103271484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f5a5405e.ab64e8",
-                "39efe4c8.977e5c"
+                "76a8963f.4621b8",
+                "22179ab4.cea27e"
             ]
         ]
     },
     {
-        "id": "f5a5405e.ab64e8",
+        "id": "76a8963f.4621b8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5509.5498046875,
-        "y": 4106.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4083.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "76dcdb2b.58523c"
+                "cdc60b24.0ad9a8"
             ]
         ]
     },
     {
-        "id": "39efe4c8.977e5c",
+        "id": "22179ab4.cea27e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5502.5498046875,
-        "y": 4165.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4142.562103271484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e34b9d00.f34da8"
+                "5846229.a88c65c"
             ]
         ]
     },
     {
-        "id": "76dcdb2b.58523c",
+        "id": "cdc60b24.0ad9a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -6159,14 +6036,14 @@
         "comments": "",
         "outputs": 1,
         "x": 5639.5498046875,
-        "y": 4110.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4087.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "e34b9d00.f34da8",
+        "id": "5846229.a88c65c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -6174,276 +6051,276 @@
         "comments": "",
         "outputs": 1,
         "x": 5644.5498046875,
-        "y": 4164.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4141.562103271484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d870e573.0525d",
-                "daec44c5.c4ca2"
+                "a9c7c427.af4688",
+                "fe9fa034.5cb01"
             ]
         ]
     },
     {
-        "id": "d870e573.0525d",
+        "id": "a9c7c427.af4688",
         "type": "set",
         "name": "set no-pce-call",
         "xml": "<set>\n<parameter name='no-pce-call' value=\"true\" />\n",
         "comments": "",
         "x": 5836.5498046875,
-        "y": 4131.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4108.562103271484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "77e6d570.0136ec",
+        "id": "98a16c7e.29ab68",
         "type": "set",
         "name": "set middle-man-conn",
         "xml": "<set>\n<parameter name='middle-man-conn.' value='`$tmp.aai.all-connectivities.connectivity[$connidx].`' />\n",
         "comments": "",
         "x": 5852.5498046875,
-        "y": 4183.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4160.562103271484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "daec44c5.c4ca2",
+        "id": "fe9fa034.5cb01",
         "type": "set",
         "name": "set tmp.stillHasUni and tmp.keepVPNBs to TRUE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n<parameter name='tmp.keepVPNBs' value='true' />\n",
         "comments": "",
         "x": 5870.83349609375,
-        "y": 4252.866668701172,
-        "z": "d1eceead.adafe",
+        "y": 4230.152435302734,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "99817ef0.1be558",
+        "id": "2727d594.264d9a",
         "type": "set",
         "name": "set tmp.stillHasUni to TRUE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",
         "comments": "",
         "x": 5147.533203125,
-        "y": 4078.766571044922,
-        "z": "d1eceead.adafe",
+        "y": 4056.0523376464844,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "4a51985e.972e68",
+        "id": "c0a1014a.3ea75",
         "type": "switchNode",
         "name": "switch tmp.stillHasUni?",
         "xml": "\n<switch test=\"`$tmp.stillHasUni`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 383.7339172363281,
-        "y": 5348.966278076172,
-        "z": "d1eceead.adafe",
+        "y": 5326.252044677734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "35e41a11.58bd1e",
-                "8fea1632.f2d7a"
+                "5bc4629f.a764e4",
+                "36ea940e.f6b704"
             ]
         ]
     },
     {
-        "id": "2a89b0c9.686c5",
+        "id": "529ae160.378f78",
         "type": "save",
         "name": "get root uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
         "comments": "",
         "outputs": 1,
         "x": 4288.516357421875,
-        "y": 5512.850067138672,
-        "z": "d1eceead.adafe",
+        "y": 5490.135833740234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "11eb64db.01f3fb",
-                "edc304ba.5ec56",
-                "e3707812.01b138"
+                "e3e4b7ad.cfce5",
+                "2311d61f.89de52",
+                "cab68c6b.abd21"
             ]
         ]
     },
     {
-        "id": "8fd56902.a16fd8",
+        "id": "2b4c8a8a.8bc066",
         "type": "comment",
         "name": "Update ROOT UNI's bw -- ALREADY DONE",
         "info": "",
         "comments": "",
         "x": 4286.516845703125,
-        "y": 5464.850311279297,
-        "z": "d1eceead.adafe",
+        "y": 5442.136077880859,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "fe5a805b.6befb8",
+        "id": "89e149ab.f2e7c8",
         "type": "save",
         "name": "update ROOT UNI in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
         "comments": "",
         "outputs": 1,
         "x": 4903.5166015625,
-        "y": 5582.850311279297,
-        "z": "d1eceead.adafe",
+        "y": 5560.136077880859,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "edc304ba.5ec56",
+        "id": "2311d61f.89de52",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4506.007568359375,
-        "y": 5483.424285888672,
-        "z": "d1eceead.adafe",
+        "y": 5460.710052490234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d06cf255.10cad"
+                "983c2552.f1f49"
             ]
         ]
     },
     {
-        "id": "e3707812.01b138",
+        "id": "cab68c6b.abd21",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4501.5166015625,
-        "y": 5527.850250244141,
-        "z": "d1eceead.adafe",
+        "y": 5505.136016845703,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c2ada4d7.cf23a"
+                "62a8aa1.663f1d4"
             ]
         ]
     },
     {
-        "id": "d06cf255.10cad",
+        "id": "983c2552.f1f49",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 4668.5791015625,
-        "y": 5482.709991455078,
-        "z": "d1eceead.adafe",
+        "y": 5459.995758056641,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c2ada4d7.cf23a",
+        "id": "62a8aa1.663f1d4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 4669.5166015625,
-        "y": 5527.850250244141,
-        "z": "d1eceead.adafe",
+        "y": 5505.136016845703,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "487370c3.c16b7",
+        "id": "d78e13a5.01de9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4666.5166015625,
-        "y": 5577.850311279297,
-        "z": "d1eceead.adafe",
+        "y": 5555.136077880859,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6c262f9d.59d16",
-                "fe5a805b.6befb8"
+                "7bde7792.d9b138",
+                "89e149ab.f2e7c8"
             ]
         ]
     },
     {
-        "id": "11eb64db.01f3fb",
+        "id": "e3e4b7ad.cfce5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4497.5166015625,
-        "y": 5577.850311279297,
-        "z": "d1eceead.adafe",
+        "y": 5555.136077880859,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "487370c3.c16b7"
+                "d78e13a5.01de9"
             ]
         ]
     },
     {
-        "id": "6c262f9d.59d16",
+        "id": "7bde7792.d9b138",
         "type": "set",
         "name": "set new bw",
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",
         "comments": "",
         "x": 4859.517578125,
-        "y": 5502.850311279297,
-        "z": "d1eceead.adafe",
+        "y": 5480.136077880859,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "472764ad.0e5da4",
+        "id": "cf4ce975.93215",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
         "x": 5288.216796875,
-        "y": 5440.616912841797,
-        "z": "d1eceead.adafe",
+        "y": 5417.902679443359,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a96c5a1a.d66bf",
+        "id": "ea983e85.321ce",
         "type": "save",
         "name": "update ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
         "x": 5314,
-        "y": 5482.817108154297,
-        "z": "d1eceead.adafe",
+        "y": 5460.102874755859,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "35e41a11.58bd1e",
+        "id": "5bc4629f.a764e4",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 567.8836059570312,
-        "y": 5399.999969482422,
-        "z": "d1eceead.adafe",
+        "y": 5377.285736083984,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "49ab1cdc.2b3dfc"
+                "867bdfac.94705"
             ]
         ]
     },
     {
-        "id": "8fea1632.f2d7a",
+        "id": "36ea940e.f6b704",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 550.883544921875,
-        "y": 5321.999969482422,
-        "z": "d1eceead.adafe",
+        "y": 5299.285736083984,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "44e1ece4.47debc"
+                "ab9e57cf.8ef448"
             ]
         ]
     },
     {
-        "id": "71bd2e28.fdc428",
+        "id": "eb7859d4.8fd35",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -6451,121 +6328,122 @@
         "comments": "",
         "outputs": 1,
         "x": 679.8833923339844,
-        "y": 4408.999694824219,
-        "z": "d1eceead.adafe",
+        "y": 4386.285461425781,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ab47ddf.140532",
-                "d3485e4a.cbde48",
-                "964a9d6b.511ef",
-                "58993466.bcba34",
-                "b72e55ab.bc6bd8",
-                "8d45971b.519e08"
+                "8a11a728.e1b1d8",
+                "7438f980.400318",
+                "6c2db8ea.27724",
+                "a48617f3.9f6e4",
+                "5ff63bef.c5afdc",
+                "78f62ea.0af84d",
+                "d07ac0db.fa9818"
             ]
         ]
     },
     {
-        "id": "ab47ddf.140532",
+        "id": "8a11a728.e1b1d8",
         "type": "set",
         "name": "set tmp.leafconn.",
         "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",
         "comments": "",
         "x": 931.5667419433594,
-        "y": 4387.049499511719,
-        "z": "d1eceead.adafe",
+        "y": 4364.335266113281,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "83fd3013.a6f008",
+        "id": "8aa064fb.543668",
         "type": "comment",
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",
         "info": "",
         "comments": "",
         "x": 1033.1338806152344,
-        "y": 4335.132995605469,
-        "z": "d1eceead.adafe",
+        "y": 4312.418762207031,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "8b20d7ab.715e18",
+        "id": "821af189.946d58",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.leafconn.access-provider-id + '-clientId-' +\n                                                   $tmp.leafconn.access-client-id + '-topologyId-' +\n                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.leafconn.access-node-id`\" />\n",
         "comments": "",
         "x": 1140.9837341308594,
-        "y": 4416.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4393.618957519531,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "d3485e4a.cbde48",
+        "id": "7438f980.400318",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 911.9837341308594,
-        "y": 4505.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4482.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8b20d7ab.715e18",
-                "3ddce0eb.9cdfd8"
+                "821af189.946d58",
+                "139cfd47.53e94b"
             ]
         ]
     },
     {
-        "id": "3ddce0eb.9cdfd8",
+        "id": "139cfd47.53e94b",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 1147.9837341308594,
-        "y": 4498.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4475.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c4f933ed.6c6328",
-                "c8f61cf.a6fdde",
-                "31635596.d79712"
+                "df64900d.741c98",
+                "681e1ffc.26592",
+                "ab39d1b3.416b58"
             ]
         ]
     },
     {
-        "id": "c4f933ed.6c6328",
+        "id": "df64900d.741c98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1343.4838562011719,
-        "y": 4450.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4427.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "40098ed2.4f4dd"
+                "6f395e40.dc6b7"
             ]
         ]
     },
     {
-        "id": "c8f61cf.a6fdde",
+        "id": "681e1ffc.26592",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1335.4838562011719,
-        "y": 4505.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4482.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8f4995e7.00e5b8"
+                "b25568a6.369d78"
             ]
         ]
     },
     {
-        "id": "40098ed2.4f4dd",
+        "id": "6f395e40.dc6b7",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -6573,180 +6451,180 @@
         "comments": "",
         "outputs": 1,
         "x": 1487.8661804199219,
-        "y": 4449.988861083984,
-        "z": "d1eceead.adafe",
+        "y": 4427.274627685547,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4b557dbd.14d794"
+                "94a27fe.8c889"
             ]
         ]
     },
     {
-        "id": "4b557dbd.14d794",
+        "id": "94a27fe.8c889",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 1671.9837341308594,
-        "y": 4448.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4425.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a0958afe.9d1b"
+                "b448ea96.4c3af8"
             ]
         ]
     },
     {
-        "id": "a0958afe.9d1b",
+        "id": "b448ea96.4c3af8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1866.9837341308594,
-        "y": 4448.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4425.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "31026a11.2a4bde"
+                "77dc6e4f.3fb428"
             ]
         ]
     },
     {
-        "id": "31635596.d79712",
+        "id": "ab39d1b3.416b58",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1340.4838562011719,
-        "y": 4562.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4539.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c3c84b5.76fc5b8"
+                "42bc5c1d.fe55cc"
             ]
         ]
     },
     {
-        "id": "c3c84b5.76fc5b8",
+        "id": "42bc5c1d.fe55cc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 1492.4838562011719,
-        "y": 4563.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4540.618957519531,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "8f4995e7.00e5b8",
+        "id": "b25568a6.369d78",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 1503.4838562011719,
-        "y": 4506.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4483.618957519531,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "ca7cc65e.e299b",
+        "id": "80f1bf38.0bc68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2248.9837341308594,
-        "y": 4452.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4429.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7e1000fc.f7ace",
-                "10f0f2b8.28ecdd",
-                "1cf608fc.280f8f"
+                "cad7009f.f83538",
+                "d1a2dd14.715a78",
+                "689fc80.c15b238"
             ]
         ]
     },
     {
-        "id": "31026a11.2a4bde",
+        "id": "77dc6e4f.3fb428",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2069.9837341308594,
-        "y": 4452.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4429.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ca7cc65e.e299b"
+                "80f1bf38.0bc68"
             ]
         ]
     },
     {
-        "id": "964a9d6b.511ef",
+        "id": "6c2db8ea.27724",
         "type": "execute",
         "name": "execute RestApiCallNode Delete LEAF UNI of ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.LEAF.uni-p-interface-long`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 1053.4839782714844,
-        "y": 4609.932800292969,
-        "z": "d1eceead.adafe",
+        "y": 4587.218566894531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a14b7306.f0f088",
-                "edc3d42b.21d3d"
+                "c3b5c5e7.57693",
+                "cf1b7699.e71658"
             ]
         ]
     },
     {
-        "id": "edc3d42b.21d3d",
+        "id": "cf1b7699.e71658",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1417.9837341308594,
-        "y": 4657.932800292969,
-        "z": "d1eceead.adafe",
+        "y": 4635.218566894531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7d2a7da9.46fdfc"
+                "723bcced.729e54"
             ]
         ]
     },
     {
-        "id": "a14b7306.f0f088",
+        "id": "c3b5c5e7.57693",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1413.9837341308594,
-        "y": 4617.932800292969,
-        "z": "d1eceead.adafe",
+        "y": 4595.218566894531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "db3e9725.884648"
+                "408278c5.7e5798"
             ]
         ]
     },
     {
-        "id": "db3e9725.884648",
+        "id": "408278c5.7e5798",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 1571.9837341308594,
-        "y": 4617.932800292969,
-        "z": "d1eceead.adafe",
+        "y": 4595.218566894531,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "7d2a7da9.46fdfc",
+        "id": "723bcced.729e54",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -6754,113 +6632,113 @@
         "comments": "",
         "outputs": 1,
         "x": 1575.4837341308594,
-        "y": 4657.932800292969,
-        "z": "d1eceead.adafe",
+        "y": 4635.218566894531,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "10f0f2b8.28ecdd",
+        "id": "d1a2dd14.715a78",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
         "x": 2454.9837341308594,
-        "y": 4465.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4442.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "25e5e61.acf541a",
-                "12a14aa1.cf2fb5",
-                "c1a2b3a0.8c75c"
+                "e07edffa.c89278",
+                "8645511b.c4b66",
+                "a8a5443b.9b8a2"
             ]
         ]
     },
     {
-        "id": "7e1000fc.f7ace",
+        "id": "cad7009f.f83538",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 2484.9837341308594,
-        "y": 4413.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4390.618957519531,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "25e5e61.acf541a",
+        "id": "e07edffa.c89278",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2664.9837341308594,
-        "y": 4456.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4433.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5696d51e.dbfe64"
+                "cb5c9c8e.bb8ed8"
             ]
         ]
     },
     {
-        "id": "12a14aa1.cf2fb5",
+        "id": "8645511b.c4b66",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2656.9837341308594,
-        "y": 4511.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4488.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8d572a45.011df8"
+                "29fe474c.df75c8"
             ]
         ]
     },
     {
-        "id": "c1a2b3a0.8c75c",
+        "id": "a8a5443b.9b8a2",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2661.9837341308594,
-        "y": 4568.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4545.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "dddace6e.f9e9f"
+                "b28b1e53.869fb"
             ]
         ]
     },
     {
-        "id": "dddace6e.f9e9f",
+        "id": "b28b1e53.869fb",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 2813.9837341308594,
-        "y": 4569.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4546.618957519531,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "8d572a45.011df8",
+        "id": "29fe474c.df75c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 2824.9837341308594,
-        "y": 4514.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4491.618957519531,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "5696d51e.dbfe64",
+        "id": "cb5c9c8e.bb8ed8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -6868,101 +6746,101 @@
         "comments": "",
         "outputs": 1,
         "x": 2809.3660583496094,
-        "y": 4453.988861083984,
-        "z": "d1eceead.adafe",
+        "y": 4431.274627685547,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e4cea83c.4d71a"
+                "a908cc9.5d7f7b"
             ]
         ]
     },
     {
-        "id": "e4cea83c.4d71a",
+        "id": "a908cc9.5d7f7b",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
         "x": 3023.9837341308594,
-        "y": 4450.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4427.618957519531,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "1cf608fc.280f8f",
+        "id": "689fc80.c15b238",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 2404.9837341308594,
-        "y": 4529.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4506.618957519531,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "58993466.bcba34",
+        "id": "a48617f3.9f6e4",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 1082.5667419433594,
-        "y": 4830.049499511719,
-        "z": "d1eceead.adafe",
+        "y": 4807.335266113281,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "b72e55ab.bc6bd8",
+        "id": "5ff63bef.c5afdc",
         "type": "switchNode",
         "name": "switch found-root-connectivity",
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 897.5667419433594,
-        "y": 4897.049499511719,
-        "z": "d1eceead.adafe",
+        "y": 4874.335266113281,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "191ee334.0f09fd",
-                "b8911820.2c8f68"
+                "bcfca35c.21654",
+                "62c7d864.119b88"
             ]
         ]
     },
     {
-        "id": "191ee334.0f09fd",
+        "id": "bcfca35c.21654",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1162.5667419433594,
-        "y": 4882.049499511719,
-        "z": "d1eceead.adafe",
+        "y": 4859.335266113281,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "328aa2d2.c36a96"
+                "f4258877.5e35f"
             ]
         ]
     },
     {
-        "id": "b8911820.2c8f68",
+        "id": "62c7d864.119b88",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1158.5667419433594,
-        "y": 4930.049499511719,
-        "z": "d1eceead.adafe",
+        "y": 4907.335266113281,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "88b54a6f.ba3898"
+                "3fb79094.abfaa8"
             ]
         ]
     },
     {
-        "id": "328aa2d2.c36a96",
+        "id": "f4258877.5e35f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -6970,66 +6848,66 @@
         "comments": "",
         "outputs": 1,
         "x": 1318.5667419433594,
-        "y": 4878.049499511719,
-        "z": "d1eceead.adafe",
+        "y": 4855.335266113281,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4a7a1b00.5fe524"
+                "2140ac57.1e83f4"
             ]
         ]
     },
     {
-        "id": "88b54a6f.ba3898",
+        "id": "3fb79094.abfaa8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
         "comments": "",
         "x": 1306.5667419433594,
-        "y": 4925.049499511719,
-        "z": "d1eceead.adafe",
+        "y": 4902.335266113281,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "d5cdb27.e4e575",
+        "id": "8db3fd20.37f318",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
         "x": 1587.4664001464844,
-        "y": 4828.749694824219,
-        "z": "d1eceead.adafe",
+        "y": 4806.035461425781,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "4a7a1b00.5fe524",
+        "id": "2140ac57.1e83f4",
         "type": "save",
         "name": "update ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
         "x": 1613.2496032714844,
-        "y": 4870.949890136719,
-        "z": "d1eceead.adafe",
+        "y": 4848.235656738281,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "1003b628.8cf272",
+        "id": "440b33d.dbb8acc",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-delete-VPNBs",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 1026.8833923339844,
-        "y": 4144.316589355469,
-        "z": "d1eceead.adafe",
+        "y": 4121.602355957031,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "44e1ece4.47debc",
+        "id": "ab9e57cf.8ef448",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -7037,17 +6915,17 @@
         "comments": "",
         "outputs": 1,
         "x": 632.8834228515625,
-        "y": 4148.999725341797,
-        "z": "d1eceead.adafe",
+        "y": 4126.285491943359,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1003b628.8cf272",
-                "71bd2e28.fdc428"
+                "440b33d.dbb8acc",
+                "eb7859d4.8fd35"
             ]
         ]
     },
     {
-        "id": "49ab1cdc.2b3dfc",
+        "id": "867bdfac.94705",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -7055,643 +6933,646 @@
         "comments": "",
         "outputs": 1,
         "x": 716.3333740234375,
-        "y": 5401.516571044922,
-        "z": "d1eceead.adafe",
+        "y": 5378.802337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "723c2903.f58428",
-                "98b88954.793148",
-                "b393338f.3c0a5",
-                "119574e6.129413"
+                "c644609d.44bce",
+                "e7413115.aec04",
+                "d006cbe4.5a677",
+                "c786893c.7012b"
             ]
         ]
     },
     {
-        "id": "723c2903.f58428",
+        "id": "c644609d.44bce",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-delete-VPNBs",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1067.7166748046875,
-        "y": 5332.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1077.7166748046875,
+        "y": 5141.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "98b88954.793148",
+        "id": "e7413115.aec04",
         "type": "save",
         "name": "delete LEAF connectivity resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 978.7166748046875,
-        "y": 5401.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 988.7166748046875,
+        "y": 5210.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "b393338f.3c0a5",
+        "id": "d006cbe4.5a677",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 869.88330078125,
-        "y": 5636.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 879.88330078125,
+        "y": 5445.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "df7f814b.30dca",
-                "680a6c2d.c81304",
-                "f02d2a13.d0aa48"
+                "614e61f8.50b5f",
+                "96d6a1ec.c795b",
+                "90aff610.9959f8"
             ]
         ]
     },
     {
-        "id": "c8c4cb96.f9d8b",
+        "id": "7ca77be7.05ec8c",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 2585.882568359375,
-        "y": 5523.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2588.882568359375,
+        "y": 5370.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "43900724.7021a8",
-                "b5fd98a.36736e8",
-                "3c26b3f8.230acc"
+                "a9496568.146b9",
+                "c5f96edd.835cb8",
+                "e018fe0a.acb8a"
             ]
         ]
     },
     {
-        "id": "de9e1e1d.dcbc3",
+        "id": "b9815115.2c557",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2535.882568359375,
-        "y": 5587.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2538.882568359375,
+        "y": 5434.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "d2b1cccb.1f5468",
+        "id": "d05f3809.7521c8",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 2615.882568359375,
-        "y": 5471.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2618.882568359375,
+        "y": 5318.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "43900724.7021a8",
+        "id": "a9496568.146b9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2795.882568359375,
-        "y": 5514.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2906.8826904296875,
+        "y": 5301.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "dc7a8a3b.a925f8"
+                "b7511521.12ea3"
             ]
         ]
     },
     {
-        "id": "b5fd98a.36736e8",
+        "id": "c5f96edd.835cb8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2787.882568359375,
-        "y": 5569.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2898.8826904296875,
+        "y": 5356.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c1ab7307.8305a8"
+                "d009936c.baaf78"
             ]
         ]
     },
     {
-        "id": "3c26b3f8.230acc",
+        "id": "e018fe0a.acb8a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2792.882568359375,
-        "y": 5626.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2903.8826904296875,
+        "y": 5413.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f1d869f8.b644e"
+                "a8c24324.12cd38"
             ]
         ]
     },
     {
-        "id": "f1d869f8.b644e",
+        "id": "a8c24324.12cd38",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 2944.882568359375,
-        "y": 5627.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 3055.8826904296875,
+        "y": 5414.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c1ab7307.8305a8",
+        "id": "d009936c.baaf78",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 2955.882568359375,
-        "y": 5572.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 3066.8826904296875,
+        "y": 5359.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "dc7a8a3b.a925f8",
+        "id": "b7511521.12ea3",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2940.264892578125,
-        "y": 5512.1722412109375,
-        "z": "d1eceead.adafe",
+        "x": 3051.2650146484375,
+        "y": 5299.458038330078,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "99f651cc.e3a158"
+                "87c431c3.fca34"
             ]
         ]
     },
     {
-        "id": "99f651cc.e3a158",
+        "id": "87c431c3.fca34",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 3154.882568359375,
-        "y": 5508.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 3265.8826904296875,
+        "y": 5295.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "df7f814b.30dca",
+        "id": "614e61f8.50b5f",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.the-connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.the-connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.the-connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.the-connectivity.access-node-id`\" />\n",
         "comments": "",
-        "x": 1151.88330078125,
-        "y": 5505.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1161.88330078125,
+        "y": 5314.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "1d552db6.d6aaca",
+        "id": "c0a00c52.f1e878",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1362.3834228515625,
-        "y": 5644.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1372.3834228515625,
+        "y": 5453.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2d69161c.7523aa"
+                "a9f88f76.4444c"
             ]
         ]
     },
     {
-        "id": "d7946986.6d0968",
+        "id": "62d1e19f.b39a2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1365.3834228515625,
-        "y": 5532.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1375.3834228515625,
+        "y": 5341.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b24f95b.8630968"
+                "957f349.e76e4c8"
             ]
         ]
     },
     {
-        "id": "9ea8b87c.75f8b",
+        "id": "b9cbc6ac.26846",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1357.3834228515625,
-        "y": 5587.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1367.3834228515625,
+        "y": 5396.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d1cfde55.05efd"
+                "48a6f350.0417c4"
             ]
         ]
     },
     {
-        "id": "b24f95b.8630968",
+        "id": "957f349.e76e4c8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1499.765625,
-        "y": 5527.172332763672,
-        "z": "d1eceead.adafe",
+        "x": 1509.765625,
+        "y": 5336.4581298828125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "57f5a4ed.934544"
+                "d4741dab.7b5f78"
             ]
         ]
     },
     {
-        "id": "2d69161c.7523aa",
+        "id": "a9f88f76.4444c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 1514.3834228515625,
-        "y": 5645.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1524.3834228515625,
+        "y": 5454.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "d1cfde55.05efd",
+        "id": "48a6f350.0417c4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 1525.3834228515625,
-        "y": 5588.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1535.3834228515625,
+        "y": 5397.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "57f5a4ed.934544",
+        "id": "d4741dab.7b5f78",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1686.8828125,
-        "y": 5528.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1696.8828125,
+        "y": 5337.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "489e94a0.cb0724"
+                "93c0e1e7.1663a8"
             ]
         ]
     },
     {
-        "id": "489e94a0.cb0724",
+        "id": "93c0e1e7.1663a8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1914.8828125,
-        "y": 5521.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1924.8828125,
+        "y": 5330.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "70d2a39a.39c914"
+                "eb0c27f.1616058"
             ]
         ]
     },
     {
-        "id": "680a6c2d.c81304",
+        "id": "96d6a1ec.c795b",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 1169.88330078125,
-        "y": 5580.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1179.88330078125,
+        "y": 5389.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1d552db6.d6aaca",
-                "d7946986.6d0968",
-                "9ea8b87c.75f8b"
+                "c0a00c52.f1e878",
+                "62d1e19f.b39a2",
+                "b9cbc6ac.26846"
             ]
         ]
     },
     {
-        "id": "70d2a39a.39c914",
+        "id": "eb0c27f.1616058",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2120.8828125,
-        "y": 5518.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2130.8828125,
+        "y": 5327.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "11f0110f.f1cbd7"
+                "63e7e6f3.2a24f"
             ]
         ]
     },
     {
-        "id": "11f0110f.f1cbd7",
+        "id": "63e7e6f3.2a24f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2335.8822021484375,
-        "y": 5521.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2345.8822021484375,
+        "y": 5330.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d2b1cccb.1f5468",
-                "c8c4cb96.f9d8b",
-                "de9e1e1d.dcbc3"
+                "d05f3809.7521c8",
+                "7ca77be7.05ec8c",
+                "b9815115.2c557"
             ]
         ]
     },
     {
-        "id": "f02d2a13.d0aa48",
+        "id": "90aff610.9959f8",
         "type": "execute",
         "name": "execute RestApiCallNode Delete LEAF ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.the-connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1293.6500244140625,
-        "y": 5729.916473388672,
-        "z": "d1eceead.adafe",
+        "x": 1303.6500244140625,
+        "y": 5539.2022705078125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "73cc7454.46b21c",
-                "983cf462.7773e"
+                "b38f67ee.531ff",
+                "7cc55d59.0067b4"
             ]
         ]
     },
     {
-        "id": "73cc7454.46b21c",
+        "id": "b38f67ee.531ff",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1640.1500244140625,
-        "y": 5722.916473388672,
-        "z": "d1eceead.adafe",
+        "x": 1650.1500244140625,
+        "y": 5532.2022705078125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d64e37c.99aa9c8"
+                "bec12c24.0b2378"
             ]
         ]
     },
     {
-        "id": "983cf462.7773e",
+        "id": "7cc55d59.0067b4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1644.1500244140625,
-        "y": 5762.916473388672,
-        "z": "d1eceead.adafe",
+        "x": 1654.1500244140625,
+        "y": 5572.2022705078125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "63d68d1b.26356c"
+                "9701e6f5.8bd518"
             ]
         ]
     },
     {
-        "id": "d64e37c.99aa9c8",
+        "id": "bec12c24.0b2378",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
-        "x": 1798.1500244140625,
-        "y": 5722.916473388672,
-        "z": "d1eceead.adafe",
+        "x": 1808.1500244140625,
+        "y": 5532.2022705078125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "63d68d1b.26356c",
+        "id": "9701e6f5.8bd518",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1801.6500244140625,
-        "y": 5762.916473388672,
-        "z": "d1eceead.adafe",
+        "x": 1811.6500244140625,
+        "y": 5572.2022705078125,
+        "z": "1806503a.76a7a",
         "wires": [
-            []
+            [
+                "29311664.f24592"
+            ]
         ]
     },
     {
-        "id": "119574e6.129413",
+        "id": "c786893c.7012b",
         "type": "switchNode",
         "name": "switch tmp.MMstillHasUni?",
         "xml": "\n<switch test=\"`$tmp.MMstillHasUni`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 913.183349609375,
-        "y": 5891.716766357422,
-        "z": "d1eceead.adafe",
+        "y": 5869.002532958984,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "20383b77.9d13bc",
-                "9b5788ce.9c9408"
+                "a3861250.d254d8",
+                "3c90d5bf.82245a"
             ]
         ]
     },
     {
-        "id": "20383b77.9d13bc",
+        "id": "a3861250.d254d8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1105.183349609375,
-        "y": 5868.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 1107.183349609375,
+        "y": 5696.0025634765625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c8a5ff15.a0cc5"
+                "6ee92ba3.68178c"
             ]
         ]
     },
     {
-        "id": "9b5788ce.9c9408",
+        "id": "3c90d5bf.82245a",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1093.3500366210938,
-        "y": 6041.316864013672,
-        "z": "d1eceead.adafe",
+        "y": 6018.602630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "80ab1272.8cacd"
+                "31cd7353.b764a4"
             ]
         ]
     },
     {
-        "id": "c8a5ff15.a0cc5",
+        "id": "6ee92ba3.68178c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1253.35009765625,
-        "y": 5868.316864013672,
-        "z": "d1eceead.adafe",
+        "x": 1255.35009765625,
+        "y": 5695.6026611328125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b646edcc.5849d8",
-                "7aaef741.32dd88"
+                "94f88b26.f34ce",
+                "497fa775.3b5f3",
+                "e88fc760.9f3988"
             ]
         ]
     },
     {
-        "id": "b646edcc.5849d8",
+        "id": "94f88b26.f34ce",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1675.199951171875,
-        "y": 5839.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 1677.199951171875,
+        "y": 5667.0025634765625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "7aaef741.32dd88",
+        "id": "497fa775.3b5f3",
         "type": "switchNode",
         "name": "switch found-root-connectivity",
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1490.199951171875,
-        "y": 5906.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 1492.199951171875,
+        "y": 5734.0025634765625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f0373e80.9f5c1",
-                "17b9923a.e6ff36"
+                "ef60935.82bca7",
+                "9065d9f2.54ee4"
             ]
         ]
     },
     {
-        "id": "f0373e80.9f5c1",
+        "id": "ef60935.82bca7",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1755.199951171875,
-        "y": 5891.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 1757.199951171875,
+        "y": 5719.0025634765625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ea0794c3.5caad8"
+                "2819744b.f6ef4c"
             ]
         ]
     },
     {
-        "id": "17b9923a.e6ff36",
+        "id": "9065d9f2.54ee4",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1751.199951171875,
-        "y": 5939.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 1756.199951171875,
+        "y": 5767.0025634765625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f785b40a.2c0f08"
+                "8f406878.70a"
             ]
         ]
     },
     {
-        "id": "ea0794c3.5caad8",
+        "id": "2819744b.f6ef4c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1911.199951171875,
-        "y": 5887.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 1913.199951171875,
+        "y": 5715.0025634765625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c184cafd.df5108"
+                "450da1ad.43b1d"
             ]
         ]
     },
     {
-        "id": "f785b40a.2c0f08",
+        "id": "8f406878.70a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
         "comments": "",
-        "x": 1899.199951171875,
-        "y": 5934.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 1904.199951171875,
+        "y": 5762.0025634765625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c184cafd.df5108",
+        "id": "450da1ad.43b1d",
         "type": "save",
         "name": "update ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2219.8826904296875,
-        "y": 5881.617156982422,
-        "z": "d1eceead.adafe",
+        "x": 2221.8826904296875,
+        "y": 5708.9029541015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "c1da52d9.9cf468",
+        "id": "af8bca67.a28908",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
-        "x": 2194.0994873046875,
-        "y": 5839.416961669922,
-        "z": "d1eceead.adafe",
+        "x": 2196.0994873046875,
+        "y": 5666.7027587890625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "80ab1272.8cacd",
+        "id": "31cd7353.b764a4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -7699,502 +7580,503 @@
         "comments": "",
         "outputs": 1,
         "x": 1230.916748046875,
-        "y": 6040.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6017.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "49431e5b.e46588",
-                "1475339.a9ed04c"
+                "a74b089b.225b08",
+                "ce915ff5.c8d31",
+                "73f93f1a.1715d8"
             ]
         ]
     },
     {
-        "id": "49431e5b.e46588",
+        "id": "a74b089b.225b08",
         "type": "for",
         "name": "for each relationship of middle-man-conn",
         "xml": "<for index='rel-index' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1544.23291015625,
-        "y": 6034.816864013672,
-        "z": "d1eceead.adafe",
+        "x": 1536.2328491210938,
+        "y": 5951.1025390625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f57bdc9.9ead4a"
+                "1bf92ac3.705cd5"
             ]
         ]
     },
     {
-        "id": "f57bdc9.9ead4a",
+        "id": "1bf92ac3.705cd5",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1844.566650390625,
-        "y": 6029.816802978516,
-        "z": "d1eceead.adafe",
+        "y": 6007.102569580078,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ba35dccb.3b6bb8"
+                "adff6291.99a8f8"
             ]
         ]
     },
     {
-        "id": "ba35dccb.3b6bb8",
+        "id": "adff6291.99a8f8",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2024.2332763671875,
-        "y": 6029.81689453125,
-        "z": "d1eceead.adafe",
+        "y": 6007.1026611328125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "86341ec4.ccb728"
+                "b1717f1d.d23a28"
             ]
         ]
     },
     {
-        "id": "86341ec4.ccb728",
+        "id": "b1717f1d.d23a28",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $middle-man-conn.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
         "x": 2224.233154296875,
-        "y": 6029.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 6007.102630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "73b15a95.c45e6c",
-                "577c89f1.70257",
-                "ebf7b15b.49862"
+                "1b34e983.202196",
+                "d97ea61c.b38298",
+                "b46e47b0.7a7bf"
             ]
         ]
     },
     {
-        "id": "73b15a95.c45e6c",
+        "id": "1b34e983.202196",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2431.23291015625,
-        "y": 6079.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 6057.102630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d5e5b35.6604c5"
+                "10e803bb.23c354"
             ]
         ]
     },
     {
-        "id": "925dd5ef.2fc678",
+        "id": "f69a3337.dd69",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
         "x": 2408.466552734375,
-        "y": 6264.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6241.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "42725353.b4a374",
-                "1745f7ad.eada2",
-                "ebfc9334.bdf468"
+                "8e127971.6de7c",
+                "9a64470f.e555c",
+                "c5ecce15.749748"
             ]
         ]
     },
     {
-        "id": "6ac4c475.ce37cc",
+        "id": "1bd5cb93.6127c4",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1607.466552734375,
-        "y": 6179.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 1577.4664916992188,
+        "y": 6284.30224609375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "df9efed7.82417"
+                "5280d91a.703f48"
             ]
         ]
     },
     {
-        "id": "df9efed7.82417",
+        "id": "5280d91a.703f48",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1804.466552734375,
-        "y": 6193.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 1774.4664916992188,
+        "y": 6298.30224609375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "376f554a.32ded2",
-                "e86a8d88.08809"
+                "4a3e493f.526ac",
+                "404c9cef.17796c"
             ]
         ]
     },
     {
-        "id": "376f554a.32ded2",
+        "id": "4a3e493f.526ac",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1972.466552734375,
-        "y": 6186.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 1978.466552734375,
+        "y": 6201.30224609375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "bc2d7c0c.7cc4a8"
+                "e7cf2c0a.f8afd8"
             ]
         ]
     },
     {
-        "id": "bc2d7c0c.7cc4a8",
+        "id": "e7cf2c0a.f8afd8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2135.466552734375,
-        "y": 6186.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 2159.466552734375,
+        "y": 6217.30224609375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "925dd5ef.2fc678"
+                "f69a3337.dd69"
             ]
         ]
     },
     {
-        "id": "e86a8d88.08809",
+        "id": "404c9cef.17796c",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1988.466552734375,
-        "y": 6482.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6459.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "32fa6a7d.612076"
+                "55211637.c2f7e"
             ]
         ]
     },
     {
-        "id": "32fa6a7d.612076",
+        "id": "55211637.c2f7e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2151.466552734375,
-        "y": 6482.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6459.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6e62ca.5284a538"
+                "ad51c793.473678"
             ]
         ]
     },
     {
-        "id": "6e62ca.5284a538",
+        "id": "ad51c793.473678",
         "type": "save",
         "name": "delete uni resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2394.466552734375,
-        "y": 6482.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6459.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "91368e45.2e3cd8",
+        "id": "76246a63.c65c94",
         "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": 1362.466552734375,
-        "y": 7248.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 7225.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "d5e5b35.6604c5",
+        "id": "10e803bb.23c354",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1433.466552734375,
-        "y": 6177.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 1403.4664916992188,
+        "y": 6282.30224609375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6ac4c475.ce37cc",
-                "91368e45.2e3cd8",
-                "5c661b6d.db566c"
+                "1bd5cb93.6127c4",
+                "76246a63.c65c94",
+                "99412df0.04b4f8"
             ]
         ]
     },
     {
-        "id": "42725353.b4a374",
+        "id": "8e127971.6de7c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2619.466552734375,
-        "y": 6266.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6243.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "aedd4240.642968"
+                "e6c2ee89.d3aff"
             ]
         ]
     },
     {
-        "id": "1745f7ad.eada2",
+        "id": "9a64470f.e555c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2619.95751953125,
-        "y": 6311.590606689453,
-        "z": "d1eceead.adafe",
+        "y": 6288.876373291016,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6425bc45.5cdfcc"
+                "66f32499.9b808c"
             ]
         ]
     },
     {
-        "id": "ebfc9334.bdf468",
+        "id": "c5ecce15.749748",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2617.466552734375,
-        "y": 6355.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6332.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "337169e1.665c2e"
+                "fc5f97c.17990e8"
             ]
         ]
     },
     {
-        "id": "ebf7b15b.49862",
+        "id": "b46e47b0.7a7bf",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2455.282958984375,
-        "y": 5980.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 5957.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "577c89f1.70257",
+        "id": "d97ea61c.b38298",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2452.7919921875,
-        "y": 6024.042633056641,
-        "z": "d1eceead.adafe",
+        "y": 6001.328399658203,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "1475339.a9ed04c",
+        "id": "ce915ff5.c8d31",
         "type": "save",
         "name": "delete middle-man-conn resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1531.400146484375,
-        "y": 6109.416473388672,
-        "z": "d1eceead.adafe",
+        "x": 1533.4000854492188,
+        "y": 6012.7021484375,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "aedd4240.642968",
+        "id": "e6c2ee89.d3aff",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2785.466552734375,
-        "y": 6256.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6233.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "20a20b24.b18d74",
-                "da0ac321.ebd92",
-                "450533a8.9c748c",
-                "dc80e7d7.692bf8",
-                "7b453ddd.4a4edc"
+                "95de1448.b3be38",
+                "c13cc07f.32d48",
+                "89fea46.2857558",
+                "8c5b9c51.4573e8",
+                "a58a3e55.44161"
             ]
         ]
     },
     {
-        "id": "337169e1.665c2e",
+        "id": "fc5f97c.17990e8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 2784.466552734375,
-        "y": 6354.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6331.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "6425bc45.5cdfcc",
+        "id": "66f32499.9b808c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 2782.5289306640625,
-        "y": 6311.8763427734375,
-        "z": "d1eceead.adafe",
+        "y": 6289.162109375,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "20a20b24.b18d74",
+        "id": "95de1448.b3be38",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",
         "comments": "",
         "x": 3007.466552734375,
-        "y": 5974.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 5951.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "da0ac321.ebd92",
+        "id": "c13cc07f.32d48",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 3033.466552734375,
-        "y": 6091.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6068.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ab328def.9c2568",
-                "1e0d49ce.54650e",
-                "83f96b0e.23503"
+                "2f82e357.0b1ab4",
+                "be465fa4.6aba18",
+                "877ec4f6.c7b7a"
             ]
         ]
     },
     {
-        "id": "450533a8.9c748c",
+        "id": "89fea46.2857558",
         "type": "execute",
         "name": "execute RestApiCallNode Delete OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
         "x": 3136.466552734375,
-        "y": 6358.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6335.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e189248a.5308d8",
-                "42e13b38.68927c"
+                "2931cfbe.d3d97",
+                "162b2290.6fc605"
             ]
         ]
     },
     {
-        "id": "dc80e7d7.692bf8",
+        "id": "8c5b9c51.4573e8",
         "type": "switchNode",
         "name": "switch connectivity has ethernet service",
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3074.466552734375,
-        "y": 6493.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6470.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "75c39310.64e10c",
-                "865b2c0.812e658"
+                "df16efa0.bafe28",
+                "bc60ff9d.7739e8"
             ]
         ]
     },
     {
-        "id": "7b453ddd.4a4edc",
+        "id": "a58a3e55.44161",
         "type": "save",
         "name": "delete vpn-binding resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",
         "comments": "",
         "outputs": 1,
         "x": 3055.466552734375,
-        "y": 6609.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6586.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "ab328def.9c2568",
+        "id": "2f82e357.0b1ab4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3228.9666748046875,
-        "y": 6043.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6020.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7b2173a0.a25f4c"
+                "640fd481.180004"
             ]
         ]
     },
     {
-        "id": "1e0d49ce.54650e",
+        "id": "be465fa4.6aba18",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3220.9666748046875,
-        "y": 6098.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6075.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3e21d08a.9cf2d8"
+                "ecd8a620.92b268"
             ]
         ]
     },
     {
-        "id": "7b2173a0.a25f4c",
+        "id": "640fd481.180004",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -8202,176 +8084,176 @@
         "comments": "",
         "outputs": 1,
         "x": 3363.348876953125,
-        "y": 6037.672332763672,
-        "z": "d1eceead.adafe",
+        "y": 6014.958099365234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d783eb8.e8d4418"
+                "d1896cdb.8141"
             ]
         ]
     },
     {
-        "id": "83f96b0e.23503",
+        "id": "877ec4f6.c7b7a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3225.9666748046875,
-        "y": 6155.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6132.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "39d187f7.387c08"
+                "f05d5e82.949cd"
             ]
         ]
     },
     {
-        "id": "39d187f7.387c08",
+        "id": "f05d5e82.949cd",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 3377.9666748046875,
-        "y": 6156.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6133.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "3e21d08a.9cf2d8",
+        "id": "ecd8a620.92b268",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 3388.9666748046875,
-        "y": 6099.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6076.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "865b2c0.812e658",
+        "id": "bc60ff9d.7739e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3327.466552734375,
-        "y": 6471.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6448.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "772ac851.ed388"
+                "7d696f2d.0f345"
             ]
         ]
     },
     {
-        "id": "75c39310.64e10c",
+        "id": "df16efa0.bafe28",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
         "x": 3327.466552734375,
-        "y": 6527.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6504.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "d783eb8.e8d4418",
+        "id": "d1896cdb.8141",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 3550.466064453125,
-        "y": 6039.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6016.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "22737809.d5a598"
+                "a3649162.b60c9"
             ]
         ]
     },
     {
-        "id": "22737809.d5a598",
+        "id": "a3649162.b60c9",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3791.466064453125,
-        "y": 6030.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6007.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8e816736.3f1518"
+                "fd0af8f3.25299"
             ]
         ]
     },
     {
-        "id": "772ac851.ed388",
+        "id": "7d696f2d.0f345",
         "type": "execute",
         "name": "execute RestApiCallNode Delete ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 3677.466064453125,
-        "y": 6461.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6438.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7e278410.d4a45c",
-                "5323d43d.ae4a94"
+                "82ac773c.5adbc",
+                "f41b429.87576c"
             ]
         ]
     },
     {
-        "id": "e189248a.5308d8",
+        "id": "2931cfbe.d3d97",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3443.966064453125,
-        "y": 6383.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6360.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a38fc7bd.ddbeb"
+                "41ca7b34.32b314"
             ]
         ]
     },
     {
-        "id": "42e13b38.68927c",
+        "id": "162b2290.6fc605",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3444.966064453125,
-        "y": 6328.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6305.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ca98e797.f9c13"
+                "6e74c50f.6753f4"
             ]
         ]
     },
     {
-        "id": "a38fc7bd.ddbeb",
+        "id": "41ca7b34.32b314",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete OTN tunnel rest api\" />\n",
         "comments": "",
         "x": 3615.966064453125,
-        "y": 6381.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6358.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "ca98e797.f9c13",
+        "id": "6e74c50f.6753f4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -8379,80 +8261,80 @@
         "comments": "",
         "outputs": 1,
         "x": 3612.466064453125,
-        "y": 6330.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6307.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "63dcc10.1e934c",
+        "id": "d394aeb8.1e7718",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4148.4658203125,
-        "y": 5979.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 5956.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "cb51edb2.a6957",
-                "7da0f639.3db538",
-                "dfe02514.308cd"
+                "5381b334.945d34",
+                "5cfd9c1e.9cd7fc",
+                "293f88.0669c878"
             ]
         ]
     },
     {
-        "id": "8e816736.3f1518",
+        "id": "fd0af8f3.25299",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3997.466064453125,
-        "y": 6027.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6004.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "63dcc10.1e934c"
+                "d394aeb8.1e7718"
             ]
         ]
     },
     {
-        "id": "7e278410.d4a45c",
+        "id": "82ac773c.5adbc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4009.966064453125,
-        "y": 6435.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6412.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "21b3d920.ac879e"
+                "ecb5b8cc.eeda88"
             ]
         ]
     },
     {
-        "id": "5323d43d.ae4a94",
+        "id": "f41b429.87576c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4013.966064453125,
-        "y": 6475.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6452.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "da782471.0e218"
+                "308650c2.e2482"
             ]
         ]
     },
     {
-        "id": "da782471.0e218",
+        "id": "308650c2.e2482",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -8460,135 +8342,135 @@
         "comments": "",
         "outputs": 1,
         "x": 4201.466064453125,
-        "y": 6479.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6456.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "21b3d920.ac879e",
+        "id": "ecb5b8cc.eeda88",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 4197.966064453125,
-        "y": 6439.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6416.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "7da0f639.3db538",
+        "id": "5cfd9c1e.9cd7fc",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
         "x": 4354.4658203125,
-        "y": 5992.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 5969.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2a4fa91b.b928a6",
-                "3708f6c9.39ed2a",
-                "7ad7cb3f.866b74"
+                "c9280772.2e056",
+                "da69dce1.3d1cc8",
+                "c843a21f.72703"
             ]
         ]
     },
     {
-        "id": "cb51edb2.a6957",
+        "id": "5381b334.945d34",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 4384.4658203125,
-        "y": 5940.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 5917.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "2a4fa91b.b928a6",
+        "id": "c9280772.2e056",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4564.4658203125,
-        "y": 5983.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 5960.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "bee63261.4dfe28"
+                "1c355cab.e00983"
             ]
         ]
     },
     {
-        "id": "3708f6c9.39ed2a",
+        "id": "da69dce1.3d1cc8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4556.4658203125,
-        "y": 6038.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6015.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "9ceb2b97.8189"
+                "e5e939f4.c8003"
             ]
         ]
     },
     {
-        "id": "7ad7cb3f.866b74",
+        "id": "c843a21f.72703",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4561.4658203125,
-        "y": 6095.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6072.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "84d1d52.6203b28"
+                "29282b3d.cdea3c"
             ]
         ]
     },
     {
-        "id": "dfe02514.308cd",
+        "id": "293f88.0669c878",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 4304.4658203125,
-        "y": 6056.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6033.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "84d1d52.6203b28",
+        "id": "29282b3d.cdea3c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 4713.4658203125,
-        "y": 6096.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6073.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "9ceb2b97.8189",
+        "id": "e5e939f4.c8003",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 4724.4658203125,
-        "y": 6041.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6018.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "bee63261.4dfe28",
+        "id": "1c355cab.e00983",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -8596,88 +8478,88 @@
         "comments": "",
         "outputs": 1,
         "x": 4708.84814453125,
-        "y": 5980.6722412109375,
-        "z": "d1eceead.adafe",
+        "y": 5957.9580078125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "595ecbb0.cd7dfc"
+                "31ead1aa.38700e"
             ]
         ]
     },
     {
-        "id": "595ecbb0.cd7dfc",
+        "id": "31ead1aa.38700e",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
         "x": 4923.4658203125,
-        "y": 5977.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 5954.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "e8d2c16f.36acb",
+        "id": "6da29c89.3512ec",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",
         "comments": "",
         "x": 1659.2332763671875,
-        "y": 6774.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6751.902435302734,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "656fa541.af35f4",
+        "id": "23a2345e.db2bfc",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 1685.2332763671875,
-        "y": 6891.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6868.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "35de354f.e14d62",
-                "aedf728e.4bd508",
-                "d65aa6c1.4a58e"
+                "287bda60.70f306",
+                "564bb39c.806684",
+                "f782c941.aa2bd8"
             ]
         ]
     },
     {
-        "id": "35de354f.e14d62",
+        "id": "287bda60.70f306",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1880.7333984375,
-        "y": 6843.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6820.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5345535d.1f34d4"
+                "5eea5356.2a418c"
             ]
         ]
     },
     {
-        "id": "aedf728e.4bd508",
+        "id": "564bb39c.806684",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1872.7333984375,
-        "y": 6898.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6875.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "20bec1fa.80674e"
+                "918bf051.2e35e8"
             ]
         ]
     },
     {
-        "id": "5345535d.1f34d4",
+        "id": "5eea5356.2a418c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -8685,230 +8567,230 @@
         "comments": "",
         "outputs": 1,
         "x": 2015.1156005859375,
-        "y": 6838.272430419922,
-        "z": "d1eceead.adafe",
+        "y": 6815.558197021484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "eb473582.da829"
+                "a66aff1d.02ebd"
             ]
         ]
     },
     {
-        "id": "d65aa6c1.4a58e",
+        "id": "f782c941.aa2bd8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1877.7333984375,
-        "y": 6955.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6932.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "15a64cb6.b20343"
+                "ea358a06.2ba7c"
             ]
         ]
     },
     {
-        "id": "15a64cb6.b20343",
+        "id": "ea358a06.2ba7c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 2029.7333984375,
-        "y": 6956.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6933.902435302734,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "20bec1fa.80674e",
+        "id": "918bf051.2e35e8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 2040.7333984375,
-        "y": 6899.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6876.902435302734,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "eb473582.da829",
+        "id": "a66aff1d.02ebd",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 2202.2327880859375,
-        "y": 6839.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6816.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b73dec8d.f89198"
+                "dd540d27.8a572"
             ]
         ]
     },
     {
-        "id": "b73dec8d.f89198",
+        "id": "dd540d27.8a572",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2443.2327880859375,
-        "y": 6830.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6807.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1ceb2f26.68ec79"
+                "9d1b03ac.68f1d"
             ]
         ]
     },
     {
-        "id": "8e7e1d35.45d4c8",
+        "id": "e61d9898.b700f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2800.2325439453125,
-        "y": 6779.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6756.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a1ade3fe.d4148",
-                "2a08582e.e9a11",
-                "a2d9c162.524c1"
+                "1b4a271c.3007c1",
+                "a4a420aa.eed92",
+                "5a15942c.1c868c"
             ]
         ]
     },
     {
-        "id": "1ceb2f26.68ec79",
+        "id": "9d1b03ac.68f1d",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2649.2327880859375,
-        "y": 6827.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6804.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8e7e1d35.45d4c8"
+                "e61d9898.b700f8"
             ]
         ]
     },
     {
-        "id": "2a08582e.e9a11",
+        "id": "a4a420aa.eed92",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
         "x": 3006.2325439453125,
-        "y": 6792.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6769.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "cc4e4323.ff0c8",
-                "37454266.958e06",
-                "fc54918e.b07f78"
+                "e70e66a4.f92e28",
+                "3b5db284.72d976",
+                "a90d6b8f.8e3a5"
             ]
         ]
     },
     {
-        "id": "a2d9c162.524c1",
+        "id": "5a15942c.1c868c",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 2956.2325439453125,
-        "y": 6856.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6833.902435302734,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a1ade3fe.d4148",
+        "id": "1b4a271c.3007c1",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 3036.2325439453125,
-        "y": 6740.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6717.902435302734,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "cc4e4323.ff0c8",
+        "id": "e70e66a4.f92e28",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3216.2325439453125,
-        "y": 6783.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6760.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e3f7ab37.cd3338"
+                "2205be3e.8c882a"
             ]
         ]
     },
     {
-        "id": "37454266.958e06",
+        "id": "3b5db284.72d976",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3208.2325439453125,
-        "y": 6838.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6815.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c423f303.cf0fc"
+                "d93cd156.9d02f8"
             ]
         ]
     },
     {
-        "id": "fc54918e.b07f78",
+        "id": "a90d6b8f.8e3a5",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3213.2325439453125,
-        "y": 6895.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6872.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f7cc4fee.3d03d8"
+                "b772a1ff.e97338"
             ]
         ]
     },
     {
-        "id": "f7cc4fee.3d03d8",
+        "id": "b772a1ff.e97338",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 3365.2325439453125,
-        "y": 6896.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6873.902435302734,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c423f303.cf0fc",
+        "id": "d93cd156.9d02f8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 3376.2325439453125,
-        "y": 6841.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6818.902435302734,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "e3f7ab37.cd3338",
+        "id": "2205be3e.8c882a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -8916,141 +8798,141 @@
         "comments": "",
         "outputs": 1,
         "x": 3360.6148681640625,
-        "y": 6781.2723388671875,
-        "z": "d1eceead.adafe",
+        "y": 6758.55810546875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a32f770f.0bf93"
+                "9b8cbfdb.496af"
             ]
         ]
     },
     {
-        "id": "a32f770f.0bf93",
+        "id": "9b8cbfdb.496af",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
         "x": 3575.2325439453125,
-        "y": 6777.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6754.902435302734,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "5c661b6d.db566c",
+        "id": "99412df0.04b4f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 1451.2332763671875,
-        "y": 6902.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6879.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e8d2c16f.36acb",
-                "656fa541.af35f4",
-                "f25051a6.fa4e28"
+                "6da29c89.3512ec",
+                "23a2345e.db2bfc",
+                "4ea496a3.5a8a68"
             ]
         ]
     },
     {
-        "id": "f25051a6.fa4e28",
+        "id": "4ea496a3.5a8a68",
         "type": "switchNode",
         "name": "switch connectivity has ethernet service",
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1733.433349609375,
-        "y": 7043.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 7021.102630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "81385ecf.138098",
-                "de989c54.09997"
+                "fd259c6c.134fa8",
+                "9bf814bd.aca8b8"
             ]
         ]
     },
     {
-        "id": "de989c54.09997",
+        "id": "9bf814bd.aca8b8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1986.433349609375,
-        "y": 7021.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 6999.102630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "78a6b529.99c6a4"
+                "10bd46c.7fcbe39"
             ]
         ]
     },
     {
-        "id": "81385ecf.138098",
+        "id": "fd259c6c.134fa8",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
         "x": 1986.433349609375,
-        "y": 7077.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 7055.102630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "78a6b529.99c6a4",
+        "id": "10bd46c.7fcbe39",
         "type": "execute",
         "name": "execute RestApiCallNode Delete ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 2336.432861328125,
-        "y": 7011.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 6989.102630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a19873b6.a4d6e",
-                "94634cdd.23be6"
+                "cc57d141.f3e88",
+                "6b29798.5078f08"
             ]
         ]
     },
     {
-        "id": "a19873b6.a4d6e",
+        "id": "cc57d141.f3e88",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2668.932861328125,
-        "y": 6985.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 6963.102630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2dad16ef.224d22"
+                "e4bf775a.d74c18"
             ]
         ]
     },
     {
-        "id": "94634cdd.23be6",
+        "id": "6b29798.5078f08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2672.932861328125,
-        "y": 7025.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 7003.102630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4ffd9da0.18218c"
+                "9dbbe180.4c39c"
             ]
         ]
     },
     {
-        "id": "4ffd9da0.18218c",
+        "id": "9dbbe180.4c39c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -9058,85 +8940,85 @@
         "comments": "",
         "outputs": 1,
         "x": 2860.432861328125,
-        "y": 7029.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 7007.102630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "2dad16ef.224d22",
+        "id": "e4bf775a.d74c18",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 2856.932861328125,
-        "y": 6989.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 6967.102630615234,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "8d45971b.519e08",
+        "id": "78f62ea.0af84d",
         "type": "execute",
         "name": "execute RestApiCallNode Delete Underlay OTN tunnel from the LEAF ethernet Service",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/underlay/otn-tunnels=' + $tmp.underlayOTN`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 1089.25,
-        "y": 4729.39990234375,
-        "z": "d1eceead.adafe",
+        "y": 4706.6856689453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5dcba2e4.9fe114",
-                "1fae83d7.8f54e4"
+                "51c55595.1dd8cc",
+                "c498093d.59e4c8"
             ]
         ]
     },
     {
-        "id": "5dcba2e4.9fe114",
+        "id": "51c55595.1dd8cc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1517.749755859375,
-        "y": 4717.39990234375,
-        "z": "d1eceead.adafe",
+        "y": 4694.6856689453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "504ce75b.b6442"
+                "bc110a38.b317b"
             ]
         ]
     },
     {
-        "id": "1fae83d7.8f54e4",
+        "id": "c498093d.59e4c8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1521.749755859375,
-        "y": 4757.39990234375,
-        "z": "d1eceead.adafe",
+        "y": 4734.6856689453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2463a8bc.d76748"
+                "5805f739.dc8f9"
             ]
         ]
     },
     {
-        "id": "504ce75b.b6442",
+        "id": "bc110a38.b317b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 1675.749755859375,
-        "y": 4717.39990234375,
-        "z": "d1eceead.adafe",
+        "y": 4694.6856689453125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "2463a8bc.d76748",
+        "id": "5805f739.dc8f9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -9144,14 +9026,14 @@
         "comments": "",
         "outputs": 1,
         "x": 1679.249755859375,
-        "y": 4757.39990234375,
-        "z": "d1eceead.adafe",
+        "y": 4734.6856689453125,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "b2c9765c.25999",
+        "id": "6f96293b.020fc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -9159,71 +9041,2085 @@
         "comments": "",
         "outputs": 1,
         "x": 5113,
-        "y": 5050,
-        "z": "d1eceead.adafe",
+        "y": 5027.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "86e944dc.0c4178",
-                "5fccecfa.290f3c",
-                "76c53fa0.8ab25"
+                "aad45f58.fbf018",
+                "2530767d.abaa5a",
+                "b9bc9e8d.66a4b8"
             ]
         ]
     },
     {
-        "id": "76c53fa0.8ab25",
+        "id": "b9bc9e8d.66a4b8",
         "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": 5340,
-        "y": 4995,
-        "z": "d1eceead.adafe",
+        "y": 4972.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "86e944dc.0c4178",
+        "id": "aad45f58.fbf018",
         "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": 5494,
-        "y": 5047,
-        "z": "d1eceead.adafe",
+        "y": 5024.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "5fccecfa.290f3c",
+        "id": "2530767d.abaa5a",
         "type": "switchNode",
         "name": "switch $foundVpnName",
         "xml": "<switch test=\"`$foundVpnName`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 5339,
-        "y": 5102,
-        "z": "d1eceead.adafe",
+        "y": 5079.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2a17f2a1.8a9c0e"
+                "5fd0edea.97a1fc"
             ]
         ]
     },
     {
-        "id": "2a17f2a1.8a9c0e",
+        "id": "5fd0edea.97a1fc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5518,
-        "y": 5101,
-        "z": "d1eceead.adafe",
+        "y": 5078.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "48fa24ff.a12f6c"
+            ]
+        ]
+    },
+    {
+        "id": "79dba259.2612cc",
+        "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": 3380.249969482422,
+        "y": 433.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "11c024cf.1cb7db",
+        "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": 3344.249969482422,
+        "y": 683.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "8bfce836.dcd148",
+        "type": "switchNode",
+        "name": "switch secondary empty?",
+        "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3347.666473388672,
+        "y": 725.5357360839844,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "2011ad7a.50e2d2",
+                "3e343af8.ce24be"
+            ]
+        ]
+    },
+    {
+        "id": "2011ad7a.50e2d2",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3586.6663513183594,
+        "y": 561.5357666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "1f12a88c.b01c37"
+            ]
+        ]
+    },
+    {
+        "id": "3e343af8.ce24be",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3595.6663513183594,
+        "y": 608.5357666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "d6d1ae0e.a40e7"
+            ]
+        ]
+    },
+    {
+        "id": "d6d1ae0e.a40e7",
+        "type": "set",
+        "name": "set hasSecondary true",
+        "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",
+        "comments": "",
+        "x": 3809.6663513183594,
+        "y": 602.5357666015625,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "1f12a88c.b01c37",
+        "type": "set",
+        "name": "set hasSecondary false",
+        "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",
+        "comments": "",
+        "x": 3813.6663513183594,
+        "y": 558.5357666015625,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "41d8ce05.5caae",
+        "type": "outcome",
+        "name": "SECONDARY-ROOT",
+        "xml": "<outcome value='SECONDARY-ROOT'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4175.700408935547,
+        "y": 511.9857177734375,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "57b53193.85d2e8"
+            ]
+        ]
+    },
+    {
+        "id": "57b53193.85d2e8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4349.700408935547,
+        "y": 506.9857177734375,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "2292f0ec.6f9e9",
+                "f8b394d0.6213f"
+            ]
+        ]
+    },
+    {
+        "id": "2292f0ec.6f9e9",
+        "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": 4593.700653076172,
+        "y": 498.9857177734375,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "f8b394d0.6213f",
+        "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": 4539.700653076172,
+        "y": 538.9857177734375,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "4bc67983.47c6f",
+        "type": "outcome",
+        "name": "SECONDARY-ROOT",
+        "xml": "<outcome value='SECONDARY-ROOT'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4144.700408935547,
+        "y": 741.3857421875,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "ca96ae7a.f7e118"
+            ]
+        ]
+    },
+    {
+        "id": "ca96ae7a.f7e118",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4302.700164794922,
+        "y": 784.3855590820312,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "bdef3637.91db48",
+                "b84fc7dd.a088f8"
+            ]
+        ]
+    },
+    {
+        "id": "bdef3637.91db48",
+        "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": 4524.700164794922,
+        "y": 770.3856811523438,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "b84fc7dd.a088f8",
+        "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": 4470.700164794922,
+        "y": 810.3856811523438,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "ec6aad53.7d628",
+        "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": 3356.133270263672,
+        "y": 977.6190185546875,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "60b6baf9.326c5c",
+                "fffcc6ce.01cc38",
+                "232b371a.13f76"
+            ]
+        ]
+    },
+    {
+        "id": "60b6baf9.326c5c",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3596.133270263672,
+        "y": 960.6190185546875,
+        "z": "1806503a.76a7a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fffcc6ce.01cc38",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3591.642333984375,
+        "y": 1003.0450744628906,
+        "z": "1806503a.76a7a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "232b371a.13f76",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3595.642303466797,
+        "y": 1051.0450439453125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "b996a975.9f4ee8"
+            ]
+        ]
+    },
+    {
+        "id": "b996a975.9f4ee8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3751.133270263672,
+        "y": 1020.6189575195312,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a5ecb13c.9c7548"
+                "2df3eeae.ae260a"
             ]
         ]
+    },
+    {
+        "id": "2df3eeae.ae260a",
+        "type": "switchNode",
+        "name": "switch nr type",
+        "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3873.133270263672,
+        "y": 967.6189575195312,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "30af5545.05a802",
+                "294528ca.16e348",
+                "fdf4c0e0.5eff08"
+            ]
+        ]
+    },
+    {
+        "id": "30af5545.05a802",
+        "type": "outcome",
+        "name": "ROOT",
+        "xml": "<outcome value='ROOT'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4109.133270263672,
+        "y": 817.6189575195312,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "58899b33.3d8864"
+            ]
+        ]
+    },
+    {
+        "id": "294528ca.16e348",
+        "type": "outcome",
+        "name": "LEAF",
+        "xml": "<outcome value='LEAF'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4105.133270263672,
+        "y": 873.6189575195312,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "2016713.cf9120e"
+            ]
+        ]
+    },
+    {
+        "id": "58899b33.3d8864",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4235.133270263672,
+        "y": 825.6189575195312,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "23e1076f.823948",
+                "e01e107b.4a322"
+            ]
+        ]
+    },
+    {
+        "id": "2016713.cf9120e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4238.133270263672,
+        "y": 878.6189575195312,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "42b53bab.59e5ec",
+                "9f9141a1.5b5a98"
+            ]
+        ]
+    },
+    {
+        "id": "fdf4c0e0.5eff08",
+        "type": "outcome",
+        "name": "SECONDARY-ROOT",
+        "xml": "<outcome value='SECONDARY-ROOT'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4098.133270263672,
+        "y": 951.6189575195312,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "7151cb9d.fcc3b4"
+            ]
+        ]
+    },
+    {
+        "id": "7151cb9d.fcc3b4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4254.133270263672,
+        "y": 972.6189575195312,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "16090c67.366d8c",
+                "877ec323.7c8b08"
+            ]
+        ]
+    },
+    {
+        "id": "23e1076f.823948",
+        "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": 4482.133270263672,
+        "y": 855.6189575195312,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "e01e107b.4a322",
+        "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": 4474.133270263672,
+        "y": 897.6189575195312,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "42b53bab.59e5ec",
+        "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": 4475.133270263672,
+        "y": 949.6189575195312,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "9f9141a1.5b5a98",
+        "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": 4462.133270263672,
+        "y": 989.6189575195312,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "877ec323.7c8b08",
+        "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": 4436.133270263672,
+        "y": 1083.6189575195312,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "16090c67.366d8c",
+        "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": 4498.133270263672,
+        "y": 1039.6189575195312,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "2a307068.85126",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3700.13330078125,
+        "y": 2223.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "5e91bdef.ec251c",
+                "edfa6b23.11ec28"
+            ]
+        ]
+    },
+    {
+        "id": "268e9ec4.4facea",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3527.466796875,
+        "y": 2224.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "2a307068.85126"
+            ]
+        ]
+    },
+    {
+        "id": "15820d3a.1e0693",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3536.957763671875,
+        "y": 2266.8598022460938,
+        "z": "1806503a.76a7a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5a5c2368.a7e5dc",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3525.466796875,
+        "y": 2313.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5e91bdef.ec251c",
+        "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": 3990.466796875,
+        "y": 2239.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "fab0baab.63daf",
+                "4fbe9a1d.f89b1c"
+            ]
+        ]
+    },
+    {
+        "id": "4fbe9a1d.f89b1c",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4213.466796875,
+        "y": 2194.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "e7a6f67c.223ba8"
+            ]
+        ]
+    },
+    {
+        "id": "fab0baab.63daf",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4215.466796875,
+        "y": 2258.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "e4fc9765.fde21"
+            ]
+        ]
+    },
+    {
+        "id": "ad2e0fde.b44de8",
+        "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": 3321.466796875,
+        "y": 2245.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "268e9ec4.4facea",
+                "15820d3a.1e0693",
+                "5a5c2368.a7e5dc"
+            ]
+        ]
+    },
+    {
+        "id": "8876fe3a.88e278",
+        "type": "comment",
+        "name": "Question?",
+        "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
+        "comments": "",
+        "x": 3260.466796875,
+        "y": 2203.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "c02bc34.16c814",
+        "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": 3341.466796875,
+        "y": 2093.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "85d9fc70.3a0b8",
+                "63a7add0.8255ec"
+            ]
+        ]
+    },
+    {
+        "id": "63a7add0.8255ec",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3564.466796875,
+        "y": 2079.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "39d5594f.5d224e"
+            ]
+        ]
+    },
+    {
+        "id": "85d9fc70.3a0b8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3566.466796875,
+        "y": 2112.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "39d5594f.5d224e",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3712.466796875,
+        "y": 2072.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "cf9e5f0.1f2092",
+                "6b6736af.eb70a"
+            ]
+        ]
+    },
+    {
+        "id": "cf9e5f0.1f2092",
+        "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": 3904.4666748046875,
+        "y": 2009.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "edfa6b23.11ec28",
+        "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": 3971.466796875,
+        "y": 2370.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "c80278c9.710488"
+            ]
+        ]
+    },
+    {
+        "id": "c80278c9.710488",
+        "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": 4177.466796875,
+        "y": 2370.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "7e2cf131.a58a08"
+            ]
+        ]
+    },
+    {
+        "id": "6b6736af.eb70a",
+        "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": 3926.4666748046875,
+        "y": 2077.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "9d1ec1c.6f0f9c",
+                "f4e7e55c.530698",
+                "d7c76719.0fc4b"
+            ]
+        ]
+    },
+    {
+        "id": "9d1ec1c.6f0f9c",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4121.966796875,
+        "y": 2029.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "13bd6284.e3089d"
+            ]
+        ]
+    },
+    {
+        "id": "f4e7e55c.530698",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4113.966796875,
+        "y": 2084.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "56e4b2a7.59d05c"
+            ]
+        ]
+    },
+    {
+        "id": "d7c76719.0fc4b",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4118.966796875,
+        "y": 2141.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "67615599.b73f0c"
+            ]
+        ]
+    },
+    {
+        "id": "67615599.b73f0c",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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": 4270.966796875,
+        "y": 2142.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "13bd6284.e3089d",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4266.34912109375,
+        "y": 2026.9414367675781,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "3bd0a776.cdf68"
+            ]
+        ]
+    },
+    {
+        "id": "d87e7a94.9bda08",
+        "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": 3322.13330078125,
+        "y": 2338.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "3b2ac73.1b40638",
+        "type": "comment",
+        "name": "NOT NEEDED ANYMORE?",
+        "info": "",
+        "comments": "",
+        "x": 4001.133270263672,
+        "y": 2314.285614013672,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "e4fc9765.fde21",
+        "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": 4374.466796875,
+        "y": 2277.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "e7a6f67c.223ba8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4378.466796875,
+        "y": 2191.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "ab9c8c2d.c18e8",
+                "2a323f5f.e64b7"
+            ]
+        ]
+    },
+    {
+        "id": "7e2cf131.a58a08",
+        "type": "outcome",
+        "name": "tunnel-termination-point",
+        "xml": "<outcome value='tunnel-termination-point'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4394.75244140625,
+        "y": 2369.1075439453125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "cefe725b.0f41e8"
+            ]
+        ]
+    },
+    {
+        "id": "56e4b2a7.59d05c",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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": 4281.966796875,
+        "y": 2087.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "ab9c8c2d.c18e8",
+        "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": 4548.466796875,
+        "y": 2152.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "2a323f5f.e64b7",
+        "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": 4549.466796875,
+        "y": 2257.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "89cd5649.143b88",
+        "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": 4544.466796875,
+        "y": 2206.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "cefe725b.0f41e8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4601.583984375,
+        "y": 2358.626220703125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "a03cf587.06cef8",
+                "a11cf500.909288",
+                "7b4cfab6.8e3e3c"
+            ]
+        ]
+    },
+    {
+        "id": "a03cf587.06cef8",
+        "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": 4816.583984375,
+        "y": 2320.626220703125,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "a11cf500.909288",
+        "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": 4813.583984375,
+        "y": 2359.626220703125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "1d4bbcf2.4e364b"
+            ]
+        ]
+    },
+    {
+        "id": "7b4cfab6.8e3e3c",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 4769.083984375,
+        "y": 2401.626220703125,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "5a11b9ac.0be8e",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4850.466796875,
+        "y": 2111.285888671875,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "9451ac43.685578"
+            ]
+        ]
+    },
+    {
+        "id": "3bd0a776.cdf68",
+        "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": 4450.4666748046875,
+        "y": 2041.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "baa608db.a0fe08"
+            ]
+        ]
+    },
+    {
+        "id": "baa608db.a0fe08",
+        "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": 4647.466796875,
+        "y": 2107.285888671875,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "5a11b9ac.0be8e",
+                "41776d15.aa3ae4"
+            ]
+        ]
+    },
+    {
+        "id": "41776d15.aa3ae4",
+        "type": "outcome",
+        "name": "network-resource",
+        "xml": "<outcome value='network-resource'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 4852.466796875,
+        "y": 2184.285888671875,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "e63bdf76.82117"
+            ]
+        ]
+    },
+    {
+        "id": "1d4bbcf2.4e364b",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4994.083984375,
+        "y": 2358.626220703125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "65012ff0.bac99"
+            ]
+        ]
+    },
+    {
+        "id": "65012ff0.bac99",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5152.083984375,
+        "y": 2358.626220703125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "8f16bdf7.24b18"
+            ]
+        ]
+    },
+    {
+        "id": "8f16bdf7.24b18",
+        "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": 5359.083984375,
+        "y": 2358.626220703125,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "9451ac43.685578",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5027.466796875,
+        "y": 2103.285888671875,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "801b98ce.90edc",
+                "5fb93bf0.4b325c"
+            ]
+        ]
+    },
+    {
+        "id": "5fb93bf0.4b325c",
+        "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": 5235.466796875,
+        "y": 2110.285888671875,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "44bfb2a0.4cab3c",
+                "f1164e18.e0f19",
+                "7ca3e4f2.88fb4c"
+            ]
+        ]
+    },
+    {
+        "id": "e63bdf76.82117",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5029.466796875,
+        "y": 2176.285888671875,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "de27c7f7.c9276"
+            ]
+        ]
+    },
+    {
+        "id": "801b98ce.90edc",
+        "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": 5265.466796875,
+        "y": 2058.285888671875,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "de27c7f7.c9276",
+        "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": 5264.466796875,
+        "y": 2300.285888671875,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "44bfb2a0.4cab3c",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5445.466796875,
+        "y": 2101.285888671875,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "e82fded9.073898"
+            ]
+        ]
+    },
+    {
+        "id": "f1164e18.e0f19",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5437.466796875,
+        "y": 2156.285888671875,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "85250ba4.806898"
+            ]
+        ]
+    },
+    {
+        "id": "7ca3e4f2.88fb4c",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5442.466796875,
+        "y": 2213.285888671875,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "7d5613c0.f5f4cc"
+            ]
+        ]
+    },
+    {
+        "id": "7d5613c0.f5f4cc",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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": 5594.466796875,
+        "y": 2214.285888671875,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "85250ba4.806898",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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": 5605.466796875,
+        "y": 2159.285888671875,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "e82fded9.073898",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5589.84912109375,
+        "y": 2098.9415588378906,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "7c8249af.5ed848"
+            ]
+        ]
+    },
+    {
+        "id": "7c8249af.5ed848",
+        "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": 5804.466796875,
+        "y": 2095.285888671875,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "1e88543b.84a814",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3836.13330078125,
+        "y": 2707.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "4bbf44dd.c34104"
+            ]
+        ]
+    },
+    {
+        "id": "4bbf44dd.c34104",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4027.13330078125,
+        "y": 2711.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "ca18cabf.134c3"
+            ]
+        ]
+    },
+    {
+        "id": "ca18cabf.134c3",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4154.13330078125,
+        "y": 2710.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "ef98dd66.570548"
+            ]
+        ]
+    },
+    {
+        "id": "ef98dd66.570548",
+        "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": 4380.467041015625,
+        "y": 2703.619384765625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "c3cc04e3.9995e8",
+                "96ef8840.c20b2",
+                "50ef7648.d143f"
+            ]
+        ]
+    },
+    {
+        "id": "c3cc04e3.9995e8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4747.466796875,
+        "y": 2597.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "625acc3d.d4dd04"
+            ]
+        ]
+    },
+    {
+        "id": "96ef8840.c20b2",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4742.975830078125,
+        "y": 2642.0452270507812,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "b87c29ed.e7a1d8"
+            ]
+        ]
+    },
+    {
+        "id": "50ef7648.d143f",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4738.975830078125,
+        "y": 2692.0452880859375,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "2796810b.682956"
+            ]
+        ]
+    },
+    {
+        "id": "96d93656.6958b8",
+        "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": 5186.976318359375,
+        "y": 2687.04541015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "625acc3d.d4dd04",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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": 4910.038330078125,
+        "y": 2596.9049682617188,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "b87c29ed.e7a1d8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "comments": "",
+        "x": 4910.975830078125,
+        "y": 2642.0452270507812,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "2796810b.682956",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4907.975830078125,
+        "y": 2692.0452880859375,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "5a769bdf.551e9c",
+                "96d93656.6958b8"
+            ]
+        ]
+    },
+    {
+        "id": "5a769bdf.551e9c",
+        "type": "set",
+        "name": "set new bw",
+        "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source - $bwToBeDecreased`' />\n",
+        "comments": "",
+        "x": 5089.9765625,
+        "y": 2634.0452880859375,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "b7814ecb.1580d",
+        "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": 4624.467041015625,
+        "y": 3547.6190185546875,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "cf2467a.3e0e698"
+            ]
+        ]
+    },
+    {
+        "id": "cf2467a.3e0e698",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4914.467041015625,
+        "y": 3549.6190185546875,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "774ecc4a.3ad124"
+            ]
+        ]
+    },
+    {
+        "id": "fc616200.2baf58",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4277,
+        "y": 5777.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "b0c64a0a.29dee8"
+            ]
+        ]
+    },
+    {
+        "id": "b0c64a0a.29dee8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4468,
+        "y": 5781.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "b39a4675.08bbf"
+            ]
+        ]
+    },
+    {
+        "id": "b39a4675.08bbf",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4595,
+        "y": 5780.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "6b59d25.075b22c"
+            ]
+        ]
+    },
+    {
+        "id": "6b59d25.075b22c",
+        "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": 4820.3330078125,
+        "y": 5782.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "84c8a22.08a86e",
+                "8ae9054d.68fd08"
+            ]
+        ]
+    },
+    {
+        "id": "84c8a22.08a86e",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5030.3330078125,
+        "y": 5759.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "93a0772f.9be09"
+            ]
+        ]
+    },
+    {
+        "id": "8ae9054d.68fd08",
+        "type": "outcomeTrue",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5035.3330078125,
+        "y": 5808.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "2db83bd3.7a132c"
+            ]
+        ]
+    },
+    {
+        "id": "93a0772f.9be09",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5156.3330078125,
+        "y": 5759.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2db83bd3.7a132c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5153.3330078125,
+        "y": 5815.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "81928378.5f469",
+                "9b2406e3.5e7a08"
+            ]
+        ]
+    },
+    {
+        "id": "81928378.5f469",
+        "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": 5467.3330078125,
+        "y": 5874.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "6888e6dc.67e04",
+        "type": "comment",
+        "name": "Update connectivity status to modified",
+        "info": "",
+        "comments": "",
+        "x": 5399.550048828125,
+        "y": 5826.4190673828125,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "9b2406e3.5e7a08",
+        "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": 5598,
+        "y": 5784.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d07ac0db.fa9818",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 868,
+        "y": 4974.6187744140625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "a4f6e106.afc2d"
+            ]
+        ]
+    },
+    {
+        "id": "a4f6e106.afc2d",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1059,
+        "y": 4978.6187744140625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "617b198c.79c0a"
+            ]
+        ]
+    },
+    {
+        "id": "617b198c.79c0a",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1186,
+        "y": 4977.6187744140625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "f89a9d64.adeb98"
+            ]
+        ]
+    },
+    {
+        "id": "f89a9d64.adeb98",
+        "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": 1411.3330078125,
+        "y": 4979.6187744140625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "6035813d.1e7338",
+                "b4705906.43572"
+            ]
+        ]
+    },
+    {
+        "id": "6035813d.1e7338",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1621.3330078125,
+        "y": 4956.6187744140625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "b1155932.92831"
+            ]
+        ]
+    },
+    {
+        "id": "b4705906.43572",
+        "type": "outcomeTrue",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1626.3330078125,
+        "y": 5005.6187744140625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "62407b64.a07c9c"
+            ]
+        ]
+    },
+    {
+        "id": "b1155932.92831",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1747.3330078125,
+        "y": 4956.6187744140625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "62407b64.a07c9c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1744.3330078125,
+        "y": 5012.6187744140625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "d0271ecc.53e168",
+                "83be22a.f7cdb6"
+            ]
+        ]
+    },
+    {
+        "id": "83be22a.f7cdb6",
+        "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": 2189,
+        "y": 4981.6187744140625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d29b17e9.2cbf8",
+        "type": "comment",
+        "name": "Update connectivity status to modified",
+        "info": "",
+        "comments": "",
+        "x": 1990.550048828125,
+        "y": 5023.4185791015625,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "d0271ecc.53e168",
+        "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": 2058.3330078125,
+        "y": 5071.6187744140625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e88fc760.9f3988",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1470.3333740234375,
+        "y": 5815.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "c0695dac.6b173"
+            ]
+        ]
+    },
+    {
+        "id": "c0695dac.6b173",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1661.3333740234375,
+        "y": 5819.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "a704fbb5.caa0b"
+            ]
+        ]
+    },
+    {
+        "id": "a704fbb5.caa0b",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1788.3333740234375,
+        "y": 5818.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "bc272657.983128"
+            ]
+        ]
+    },
+    {
+        "id": "bc272657.983128",
+        "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": 2013.6663818359375,
+        "y": 5820.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "31bdfa25.d18a2e",
+                "c242900c.77afd8"
+            ]
+        ]
+    },
+    {
+        "id": "31bdfa25.d18a2e",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2223.6663818359375,
+        "y": 5797.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "9d78f5ef.5cf228"
+            ]
+        ]
+    },
+    {
+        "id": "c242900c.77afd8",
+        "type": "outcomeTrue",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2228.6663818359375,
+        "y": 5846.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "d542d85e.71ea7"
+            ]
+        ]
+    },
+    {
+        "id": "9d78f5ef.5cf228",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2349.6663818359375,
+        "y": 5797.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d542d85e.71ea7",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2346.6663818359375,
+        "y": 5853.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "d23f59ed.73bc4",
+                "2e5ee108.277b9e"
+            ]
+        ]
+    },
+    {
+        "id": "2e5ee108.277b9e",
+        "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": 2791.3333740234375,
+        "y": 5822.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "868b21d1.a7652",
+        "type": "comment",
+        "name": "Update connectivity status to modified",
+        "info": "",
+        "comments": "",
+        "x": 2592.8834228515625,
+        "y": 5864.4190673828125,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "d23f59ed.73bc4",
+        "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": 2660.6663818359375,
+        "y": 5912.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "73f93f1a.1715d8",
+        "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": 1520.7666625976562,
+        "y": 6121,
+        "z": "1806503a.76a7a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5f7e37aa.0d2258",
+        "type": "set",
+        "name": "set parameters",
+        "xml": "<set>\n<parameter name='subscriptionId' value='`$rcvd-bandwidth-value`' />\n",
+        "comments": "",
+        "x": 1452.800048828125,
+        "y": 6062.39990234375,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "29311664.f24592",
+        "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": 2069.433349609375,
+        "y": 5569.2333984375,
+        "z": "1806503a.76a7a",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file