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=5fb058b72d4f3cf3dcbb32a532649ee516149702;hb=934becd6c3b0ecce44b1652820c6b4960ed5636f;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..5fb058b7 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": "b3c61f0e.0e195",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 171.88333129882812,
-        "y": 174,
-        "z": "d1eceead.adafe",
+        "x": 183.56666564941406,
+        "y": 161.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2ad94242.d34e8e"
+                "a48494fd.8b7d"
             ]
         ]
     },
     {
-        "id": "2ad94242.d34e8e",
+        "id": "a48494fd.8b7d",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,9208 +22,11104 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 456.1690216064453,
-        "y": 235.23810863494873,
-        "z": "d1eceead.adafe",
+        "x": 481.8523864746094,
+        "y": 217.8047742843628,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "86bffa6e.8633f8"
+                "6868eec5.8eff3"
             ]
         ]
     },
     {
-        "id": "86bffa6e.8633f8",
+        "id": "6868eec5.8eff3",
         "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",
+        "x": 487.99530029296875,
+        "y": 302.5666961669922,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "47cd43dd.6a0c84"
+                "42b0c518.6297dc"
             ]
         ]
     },
     {
-        "id": "47cd43dd.6a0c84",
+        "id": "42b0c518.6297dc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 811.8833312988281,
-        "y": 379,
-        "z": "d1eceead.adafe",
+        "x": 837.5666961669922,
+        "y": 361.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "17095ff1.ceb8e",
-                "f2cac95d.2dd4f",
-                "41a5db6f.16b124"
+                "fec7e153.ea24b",
+                "30575656.398222",
+                "189baf2e.d72529"
             ]
         ]
     },
     {
-        "id": "17095ff1.ceb8e",
+        "id": "fec7e153.ea24b",
         "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",
+        "x": 1138.9001922607422,
+        "y": 632.4969635009766,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "f2cac95d.2dd4f",
+        "id": "30575656.398222",
         "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",
+        "x": 1160.3286590576172,
+        "y": 334.8999786376953,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d39ef031.51bcf8",
-                "d0a14c94.f617f8",
-                "66ff38b5.215e28"
+                "27345488.79731c",
+                "7e08d842.a4058",
+                "14b3e2f5.681565"
             ]
         ]
     },
     {
-        "id": "d39ef031.51bcf8",
+        "id": "27345488.79731c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1359.6452941894531,
-        "y": 210.33331298828125,
-        "z": "d1eceead.adafe",
+        "x": 1385.3286590576172,
+        "y": 192.8999786376953,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6bec9327.9503c4"
+                "a8487fba.2cb09"
             ]
         ]
     },
     {
-        "id": "d0a14c94.f617f8",
+        "id": "7e08d842.a4058",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1355.1362609863281,
-        "y": 279.9073486328125,
-        "z": "d1eceead.adafe",
+        "x": 1380.8196258544922,
+        "y": 262.47401428222656,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "73227915.55ca3"
+                "26698778.b41f38"
             ]
         ]
     },
     {
-        "id": "66ff38b5.215e28",
+        "id": "14b3e2f5.681565",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1343.6452941894531,
-        "y": 326.33331298828125,
-        "z": "d1eceead.adafe",
+        "x": 1369.3286590576172,
+        "y": 308.8999786376953,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5c121a7a.2c527c"
+                "e03cea3a.82881"
             ]
         ]
     },
     {
-        "id": "dcc088f.fb3b378",
+        "id": "b94ba14f.99f16",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 1113.6452941894531,
-        "y": 240.33331298828125,
-        "z": "d1eceead.adafe",
+        "x": 1139.3286590576172,
+        "y": 222.8999786376953,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "41a5db6f.16b124",
+        "id": "189baf2e.d72529",
         "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",
+        "x": 1127.3286590576172,
+        "y": 274.8999786376953,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "6bec9327.9503c4",
+        "id": "a8487fba.2cb09",
         "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",
+        "x": 1625.5666961669922,
+        "y": 189.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "52c7d728.b872f8",
-                "31624b25.4a6dec"
+                "7bdf94e9.87c2bc",
+                "770405a0.0ddc6c"
             ]
         ]
     },
     {
-        "id": "73227915.55ca3",
+        "id": "26698778.b41f38",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 1535.6290740966797,
+        "y": 265.4264373779297,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "5c121a7a.2c527c",
+        "id": "e03cea3a.82881",
         "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",
+        "x": 1539.5666961669922,
+        "y": 309.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "52c7d728.b872f8",
+        "id": "7bdf94e9.87c2bc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1804.8833312988281,
-        "y": 244,
-        "z": "d1eceead.adafe",
+        "x": 1830.5666961669922,
+        "y": 226.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b08352cf.6ac34"
+                "79eb131c.176e44"
             ]
         ]
     },
     {
-        "id": "31624b25.4a6dec",
+        "id": "770405a0.0ddc6c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1814.8833312988281,
-        "y": 171,
-        "z": "d1eceead.adafe",
+        "x": 1840.5666961669922,
+        "y": 153.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "b08352cf.6ac34",
+        "id": "79eb131c.176e44",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1797.8833312988281,
-        "y": 319,
-        "z": "d1eceead.adafe",
+        "x": 1823.5666961669922,
+        "y": 301.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "bdd428b9.6fddd",
-                "8710bcb7.6e657",
-                "6f728611.a8a3e",
-                "6d42412e.61e8d",
-                "e22daf3c.82e7c8"
+                "9d4673ee.891e5",
+                "1a86601d.154a48",
+                "d6a895b8.ea711",
+                "3f0be5e9.f7ecd2",
+                "eca8d05b.38fb78"
             ]
         ]
     },
     {
-        "id": "50e447ae.0fde38",
+        "id": "fd1dcea.f15be3",
         "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",
+        "x": 2309.566696166992,
+        "y": 352.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "27d61e5e.f12fe2",
-                "2c908c8d.59c394",
-                "32fadd2c.e0a1c2"
+                "2555bbc5.26f19c",
+                "93423d46.b14978",
+                "4c790d06.05e3ec"
             ]
         ]
     },
     {
-        "id": "27d61e5e.f12fe2",
+        "id": "2555bbc5.26f19c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2499.883331298828,
-        "y": 437,
-        "z": "d1eceead.adafe",
+        "x": 2525.566696166992,
+        "y": 419.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4e35bc34.a92d94"
+                "cc8af145.1212b8"
             ]
         ]
     },
     {
-        "id": "2c908c8d.59c394",
+        "id": "93423d46.b14978",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2500.374298095703,
-        "y": 336.573974609375,
-        "z": "d1eceead.adafe",
+        "x": 2526.057662963867,
+        "y": 319.14064025878906,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6fdcac69.b07bec"
+                "fbfefea4.a2d338"
             ]
         ]
     },
     {
-        "id": "32fadd2c.e0a1c2",
+        "id": "4c790d06.05e3ec",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2495.883331298828,
-        "y": 386,
-        "z": "d1eceead.adafe",
+        "x": 2521.566696166992,
+        "y": 368.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "71176ed6.70694"
+                "d962a49c.c504b8"
             ]
         ]
     },
     {
-        "id": "bdd428b9.6fddd",
+        "id": "9d4673ee.891e5",
         "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",
+        "x": 2026.5666961669922,
+        "y": 333.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7043f926.26b93",
-                "50e447ae.0fde38",
-                "8af2638e.140428",
-                "b2d6bb83.745318"
+                "d3206ca7.c31d1",
+                "fd1dcea.f15be3",
+                "426ddfc0.c628b",
+                "d0874bda.7e1ac"
             ]
         ]
     },
     {
-        "id": "7043f926.26b93",
+        "id": "d3206ca7.c31d1",
         "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",
+        "x": 2306.566696166992,
+        "y": 271.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "6d42412e.61e8d",
+        "id": "3f0be5e9.f7ecd2",
         "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",
+        "x": 2000.5666961669922,
+        "y": 283.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "8710bcb7.6e657",
+        "id": "1a86601d.154a48",
         "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",
+        "x": 2043.5666961669922,
+        "y": 142.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "6f728611.a8a3e",
+        "id": "d6a895b8.ea711",
         "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",
+        "x": 2055.566696166992,
+        "y": 183.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "8a5a98d5.6ebb1",
+        "id": "c8d3ec04.e3f8a8",
         "type": "comment",
         "name": "The following two nodes are for PCE",
         "info": "",
         "comments": "",
-        "x": 2054.883331298828,
-        "y": 113,
-        "z": "d1eceead.adafe",
+        "x": 2080.566696166992,
+        "y": 95.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2303563c.e9131a",
+        "id": "d7434469.de441",
         "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",
+        "x": 2000.5666961669922,
+        "y": 229.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "6fdcac69.b07bec",
+        "id": "fbfefea4.a2d338",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 2704.566696166992,
+        "y": 321.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "71176ed6.70694",
+        "id": "d962a49c.c504b8",
         "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",
+        "x": 2704.504196166992,
+        "y": 370.70692443847656,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "4e35bc34.a92d94",
+        "id": "cc8af145.1212b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2680.820831298828,
-        "y": 439.1402587890625,
-        "z": "d1eceead.adafe",
+        "x": 2706.504196166992,
+        "y": 421.70692443847656,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6a0085f3.85f3dc"
+                "30ad22b3.c0b5e6"
             ]
         ]
     },
     {
-        "id": "6a0085f3.85f3dc",
+        "id": "30ad22b3.c0b5e6",
         "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",
+        "x": 2999.504196166992,
+        "y": 368.70692443847656,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "47170bd3.47cd24",
-                "41231d4a.3c5914",
-                "413cb45a.a52f94"
+                "5234d98d.9f94d",
+                "83314642.8bc358",
+                "55523c43.af8514"
             ]
         ]
     },
     {
-        "id": "41231d4a.3c5914",
+        "id": "83314642.8bc358",
         "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": 3302.995132446289,
+        "y": 25.280899047851562,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ddcd6972.1cc26"
+                "f9033318.3a82e"
             ]
         ]
     },
     {
-        "id": "ddcd6972.1cc26",
+        "id": "f9033318.3a82e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3480.566665649414,
+        "y": 25.566665649414062,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "413cb45a.a52f94",
+        "id": "55523c43.af8514",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3242.820831298828,
-        "y": 328.1402587890625,
-        "z": "d1eceead.adafe",
+        "x": 3298.504165649414,
+        "y": 74.70692443847656,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "29789682.9a5ca2"
+                "ed442c0e.cae2b8"
             ]
         ]
     },
     {
-        "id": "29789682.9a5ca2",
+        "id": "ed442c0e.cae2b8",
         "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": 3480.504165649414,
+        "y": 74.70692443847656,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "47170bd3.47cd24",
+        "id": "5234d98d.9f94d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3246.820831298828,
-        "y": 379.1402587890625,
-        "z": "d1eceead.adafe",
+        "x": 3302.504165649414,
+        "y": 125.70692443847656,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5d602163.27f0b"
+                "7ab56666.401778"
             ]
         ]
     },
     {
-        "id": "5d602163.27f0b",
+        "id": "7ab56666.401778",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3426.820831298828,
-        "y": 379.1402587890625,
-        "z": "d1eceead.adafe",
+        "x": 3482.504165649414,
+        "y": 125.70692443847656,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "dd9e7161.bb7c"
+                "6c101067.0de5e8"
             ]
         ]
     },
     {
-        "id": "dd9e7161.bb7c",
+        "id": "6c101067.0de5e8",
         "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",
+        "x": 3018.566696166992,
+        "y": 496.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e567be5f.46cf",
-                "117d3c85.14baf3"
+                "646ab584.76e45c",
+                "ffe35827.b1255"
             ]
         ]
     },
     {
-        "id": "117d3c85.14baf3",
+        "id": "ffe35827.b1255",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3302.883331298828,
-        "y": 521,
-        "z": "d1eceead.adafe",
+        "x": 3358.566665649414,
+        "y": 267.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "e567be5f.46cf",
+        "id": "646ab584.76e45c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3301.883331298828,
-        "y": 575,
-        "z": "d1eceead.adafe",
+        "x": 3357.566665649414,
+        "y": 321.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1aa53c9a.ee4c73"
+                "7579f2ad.787884"
             ]
         ]
     },
     {
-        "id": "16e58d5c.45543b",
+        "id": "76ff4ece.4716a",
         "type": "outcome",
         "name": "network-policy",
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4046.883331298828,
-        "y": 529,
-        "z": "d1eceead.adafe",
+        "x": 4102.566665649414,
+        "y": 275.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e0a75ebb.a4e0a"
+                "522d04a5.cf337c"
             ]
         ]
     },
     {
-        "id": "e0a75ebb.a4e0a",
+        "id": "522d04a5.cf337c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4223.883209228516,
-        "y": 521.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 4279.566543579102,
+        "y": 268.56654357910156,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "64783b1d.9ea984",
-                "aa6dd372.e093d"
+                "ff700b35.f88fd",
+                "a95b674a.f71a"
             ]
         ]
     },
     {
-        "id": "1aa53c9a.ee4c73",
+        "id": "7579f2ad.787884",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3465.883331298828,
-        "y": 501,
-        "z": "d1eceead.adafe",
+        "x": 3521.566665649414,
+        "y": 247.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9d9386aa.4ba0f",
-                "a5c7d0d0.70a6f8"
+                "687e4dd8.df6004",
+                "7a6c4648.75b9a"
             ]
         ]
     },
     {
-        "id": "9d9386aa.4ba0f",
+        "id": "687e4dd8.df6004",
         "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": 3802.566665649414,
+        "y": 203.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ac9ffe20.350ab8"
+                "498ba81e.b961f8"
             ]
         ]
     },
     {
-        "id": "ac9ffe20.350ab8",
+        "id": "498ba81e.b961f8",
         "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": 4064.566665649414,
+        "y": 203.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "16e58d5c.45543b"
+                "76ff4ece.4716a"
             ]
         ]
     },
     {
-        "id": "64783b1d.9ea984",
+        "id": "ff700b35.f88fd",
         "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": 4522.566543579102,
+        "y": 225.56654357910156,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "aa6dd372.e093d",
+        "id": "a95b674a.f71a",
         "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": 4511.566543579102,
+        "y": 280.56654357910156,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a2aec981.c05928",
-                "c6a2ea9c.683df",
-                "b8928013.256998"
+                "4864ccac.4c9fb4",
+                "b78f5441.c1bfd",
+                "4088ff64.ba745"
             ]
         ]
     },
     {
-        "id": "b8928013.256998",
+        "id": "4088ff64.ba745",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4708.883331298828,
-        "y": 420,
-        "z": "d1eceead.adafe",
+        "x": 4764.566665649414,
+        "y": 166.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "83be4f6.3f006b"
+                "745cd258.155a8c"
             ]
         ]
     },
     {
-        "id": "83be4f6.3f006b",
+        "id": "745cd258.155a8c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4913.138198852539,
+        "y": 166.85243225097656,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "586d6db7.c2d804",
+        "id": "d814f814.02812",
         "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": 4912.075698852539,
+        "y": 210.99269104003906,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "c6a2ea9c.683df",
+        "id": "b78f5441.c1bfd",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4697.392364501953,
-        "y": 464.426025390625,
-        "z": "d1eceead.adafe",
+        "x": 4753.075698852539,
+        "y": 210.99269104003906,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "586d6db7.c2d804"
+                "d814f814.02812"
             ]
         ]
     },
     {
-        "id": "a2aec981.c05928",
+        "id": "4864ccac.4c9fb4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4704.392364501953,
-        "y": 543.426025390625,
-        "z": "d1eceead.adafe",
+        "x": 4760.075698852539,
+        "y": 289.99269104003906,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4d4b39ee.fece78"
+                "efd9fdb1.0f83a"
             ]
         ]
     },
     {
-        "id": "4d4b39ee.fece78",
+        "id": "efd9fdb1.0f83a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4843.392364501953,
-        "y": 543.426025390625,
-        "z": "d1eceead.adafe",
+        "x": 4899.075698852539,
+        "y": 289.99269104003906,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "68714312.362fe4",
-                "860808d4.582b4"
+                "f2ffc2c8.9c3d6",
+                "ca4f06f7.bf7198"
             ]
         ]
     },
     {
-        "id": "68714312.362fe4",
+        "id": "f2ffc2c8.9c3d6",
         "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": 5104.566665649414,
+        "y": 287.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "860808d4.582b4",
+        "id": "ca4f06f7.bf7198",
         "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": 5103.566665649414,
+        "y": 333.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a5c7d0d0.70a6f8",
+        "id": "7a6c4648.75b9a",
         "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": 3619.566665649414,
+        "y": 319.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "91204981.e8b1c8"
+                "2b038d01.8bcf5a"
             ]
         ]
     },
     {
-        "id": "91204981.e8b1c8",
+        "id": "2b038d01.8bcf5a",
         "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": 3899.566665649414,
+        "y": 319.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "815c7496.5664a8"
+                "924692b1.dbe118"
             ]
         ]
     },
     {
-        "id": "815c7496.5664a8",
+        "id": "924692b1.dbe118",
         "type": "outcome",
         "name": "logical-link",
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2256.8834533691406,
-        "y": 826.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 2282.5668182373047,
+        "y": 808.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2e1a5e6a.390622"
+                "e627a5b7.666348"
             ]
         ]
     },
     {
-        "id": "2e1a5e6a.390622",
+        "id": "e627a5b7.666348",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2433.883331298828,
-        "y": 819,
-        "z": "d1eceead.adafe",
+        "x": 2459.566696166992,
+        "y": 801.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "fda12a63.354948",
-                "9acb494f.3c831"
+                "abe018e3.2ab958",
+                "b299dbd0.7106d8"
             ]
         ]
     },
     {
-        "id": "fda12a63.354948",
+        "id": "abe018e3.2ab958",
         "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",
+        "x": 2702.566696166992,
+        "y": 758.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "9acb494f.3c831",
+        "id": "b299dbd0.7106d8",
         "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",
+        "x": 2691.566696166992,
+        "y": 813.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2cf3e7af.84ed7",
-                "7720ff91.14ecb8",
-                "6208751c.cb4214"
+                "73425fcf.6d608",
+                "9a2fb745.49c558",
+                "c8c584c4.60469"
             ]
         ]
     },
     {
-        "id": "2cf3e7af.84ed7",
+        "id": "73425fcf.6d608",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2957.374298095703,
-        "y": 809.573974609375,
-        "z": "d1eceead.adafe",
+        "x": 2983.057662963867,
+        "y": 792.1406402587891,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "644aada5.da5074"
+                "11a6918b.0ed79e"
             ]
         ]
     },
     {
-        "id": "7720ff91.14ecb8",
+        "id": "9a2fb745.49c558",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2945.883331298828,
-        "y": 854,
-        "z": "d1eceead.adafe",
+        "x": 2971.566696166992,
+        "y": 836.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b4b18b88.8b8778"
+                "147fb75c.cecad1"
             ]
         ]
     },
     {
-        "id": "644aada5.da5074",
+        "id": "11a6918b.0ed79e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 3131.629196166992,
+        "y": 792.4264068603516,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "b4b18b88.8b8778",
+        "id": "147fb75c.cecad1",
         "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",
+        "x": 3130.566696166992,
+        "y": 836.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "6208751c.cb4214",
+        "id": "c8c584c4.60469",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2952.883331298828,
-        "y": 933,
-        "z": "d1eceead.adafe",
+        "x": 2978.566696166992,
+        "y": 915.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f4a1f138.8436a"
+                "18430aa7.b0cd65"
             ]
         ]
     },
     {
-        "id": "f4a1f138.8436a",
+        "id": "18430aa7.b0cd65",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3091.883331298828,
-        "y": 933,
-        "z": "d1eceead.adafe",
+        "x": 3117.566696166992,
+        "y": 915.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "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"
+                "a56438ce.7b3648",
+                "cd9c4fe8.e67498",
+                "b8cad49c.dd7ca",
+                "768c9bf8.5beb74",
+                "6f1a328d.ae400c",
+                "b16688a0.4defc",
+                "2c1d8b21.e96e8c",
+                "63cddf09.26d868",
+                "9d9de9db.5c38b8",
+                "e5f9b3dc.c2f9f",
+                "169ca3b9.4d31a4",
+                "1c28fc30.faaf74",
+                "19822907.e2052f",
+                "e8ad32eb.9df94",
+                "cf9533e5.c2371",
+                "22a945f9.085212",
+                "94938481.855978",
+                "7edb995a.421908",
+                "f054f8f8.d1b3a",
+                "dab7847.8f75af8",
+                "71a7eba7.ddb6fc",
+                "a71111e6.40602"
             ]
         ]
     },
     {
-        "id": "fe79d8e9.168438",
+        "id": "ece3c8dc.fca8e",
         "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": 3461.566635131836,
+        "y": 389.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "64b776d1.df13b8",
+        "id": "a56438ce.7b3648",
         "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": 3442.566635131836,
+        "y": 489.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "dc895d5a.f09ef",
+        "id": "1c28fc30.faaf74",
         "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": 3396.566635131836,
+        "y": 540.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "cf58d1a3.b75bc8",
+        "id": "cd9c4fe8.e67498",
         "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": 3370.566635131836,
+        "y": 589.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a4d7ff96.ceb5f8",
+        "id": "b8cad49c.dd7ca",
         "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": 3369.566635131836,
+        "y": 638.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "4f57fa4.5908a84",
+        "id": "768c9bf8.5beb74",
         "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": 3378.566635131836,
+        "y": 776.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "722a434e.2a3adc",
-                "e8fe3cd4.c3586",
-                "fdbfe007.1ea3b"
+                "fe7f9a9e.cf1db8",
+                "156916f6.f1ec61",
+                "66ef43c6.2e3d64"
             ]
         ]
     },
     {
-        "id": "93281de6.9193c8",
+        "id": "6f1a328d.ae400c",
         "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": 3371.566635131836,
+        "y": 837.5665435791016,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b372ac3d.0a4b1",
-                "d24aa16b.e47da",
-                "419032bc.a4963c"
+                "6dadc494.d9aa04",
+                "672f337a.746964",
+                "bcaed2fe.1f9ae"
             ]
         ]
     },
     {
-        "id": "722a434e.2a3adc",
+        "id": "fe7f9a9e.cf1db8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3536.883331298828,
-        "y": 884,
-        "z": "d1eceead.adafe",
+        "x": 3627.566390991211,
+        "y": 671.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "aae0d761.ec3158"
+                "cc05b9e7.0fc9a"
             ]
         ]
     },
     {
-        "id": "e8fe3cd4.c3586",
+        "id": "156916f6.f1ec61",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3532.392364501953,
-        "y": 933.426025390625,
-        "z": "d1eceead.adafe",
+        "x": 3621.075424194336,
+        "y": 712.9926910400391,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "af62b91c.6bf638"
+                "4587637b.94db5c"
             ]
         ]
     },
     {
-        "id": "fdbfe007.1ea3b",
+        "id": "66ef43c6.2e3d64",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3536.392364501953,
-        "y": 986.426025390625,
-        "z": "d1eceead.adafe",
+        "x": 3616.075424194336,
+        "y": 762.9926910400391,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "72360610.10f7e"
+                "1eb5ad40.d06413"
             ]
         ]
     },
     {
-        "id": "aae0d761.ec3158",
+        "id": "cc05b9e7.0fc9a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3776.137924194336,
+        "y": 670.8524322509766,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "af62b91c.6bf638",
+        "id": "4587637b.94db5c",
         "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": 3766.075424194336,
+        "y": 720.9926910400391,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "b372ac3d.0a4b1",
+        "id": "6dadc494.d9aa04",
         "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": 3592.566635131836,
+        "y": 823.5665435791016,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "3bdfccb0.f2d08c"
+                "1b1304b9.a5e66b"
             ]
         ]
     },
     {
-        "id": "d24aa16b.e47da",
+        "id": "672f337a.746964",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3543.392364501953,
-        "y": 1106.4259033203125,
-        "z": "d1eceead.adafe",
+        "x": 3588.075668334961,
+        "y": 872.9925689697266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "57f2def1.81f4e"
+                "e774fced.6104a8"
             ]
         ]
     },
     {
-        "id": "419032bc.a4963c",
+        "id": "bcaed2fe.1f9ae",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3544.392364501953,
-        "y": 1159.4259033203125,
-        "z": "d1eceead.adafe",
+        "x": 3589.075668334961,
+        "y": 925.9925689697266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "91fe26d2.5b80d"
+                "c076d47b.eaded"
             ]
         ]
     },
     {
-        "id": "3bdfccb0.f2d08c",
+        "id": "1b1304b9.a5e66b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3745.1380157470703,
+        "y": 828.8523101806641,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "57f2def1.81f4e",
+        "id": "e774fced.6104a8",
         "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": 3731.075668334961,
+        "y": 872.9925689697266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "72360610.10f7e",
+        "id": "1eb5ad40.d06413",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3697.883331298828,
-        "y": 986,
-        "z": "d1eceead.adafe",
+        "x": 3788.566390991211,
+        "y": 773.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "21ff581a.7d3f68"
+                "7f2b8c9b.099c14"
             ]
         ]
     },
     {
-        "id": "91fe26d2.5b80d",
+        "id": "c076d47b.eaded",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3697.883331298828,
-        "y": 1158.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3742.566635131836,
+        "y": 925.5665435791016,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f4949055.0aa838"
+                "8445401a.e44628"
             ]
         ]
     },
     {
-        "id": "21ff581a.7d3f68",
+        "id": "7f2b8c9b.099c14",
         "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": 3949.566635131836,
+        "y": 660.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d771576e.5459b",
-                "743ce77.86c2e98"
+                "b0a8e75a.0829b8",
+                "40b074e3.b8cf9c",
+                "9b9082d.d33238"
             ]
         ]
     },
     {
-        "id": "f4949055.0aa838",
+        "id": "8445401a.e44628",
         "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": 3941.566635131836,
+        "y": 845.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "854204ac.64311",
-                "5401ccd6.c2c2e4"
+                "65174d4b.beb5c4",
+                "b443365d.1a3bf",
+                "a01fe37.2547ea"
             ]
         ]
     },
     {
-        "id": "d771576e.5459b",
+        "id": "b0a8e75a.0829b8",
         "type": "outcome",
         "name": "ROOT",
         "xml": "<outcome value='ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4045.883331298828,
-        "y": 965,
-        "z": "d1eceead.adafe",
+        "x": 4173.567123413086,
+        "y": 364.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2e04d27d.5faff6"
+                "9aca5d50.3d0028"
             ]
         ]
     },
     {
-        "id": "743ce77.86c2e98",
+        "id": "40b074e3.b8cf9c",
         "type": "outcome",
         "name": "LEAF",
         "xml": "<outcome value='LEAF'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4047.883331298828,
-        "y": 1019,
-        "z": "d1eceead.adafe",
+        "x": 4175.567123413086,
+        "y": 418.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "12c64a9b.27d615"
+                "d411ea2f.0fea6"
             ]
         ]
     },
     {
-        "id": "854204ac.64311",
+        "id": "65174d4b.beb5c4",
         "type": "outcome",
         "name": "ROOT",
         "xml": "<outcome value='ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4046.883331298828,
-        "y": 1129,
-        "z": "d1eceead.adafe",
+        "x": 4139.567123413086,
+        "y": 624.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a8347389.2ab3b"
+                "b1818ac5.01eff"
             ]
         ]
     },
     {
-        "id": "5401ccd6.c2c2e4",
+        "id": "b443365d.1a3bf",
         "type": "outcome",
         "name": "LEAF",
         "xml": "<outcome value='LEAF'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4048.883331298828,
-        "y": 1183,
-        "z": "d1eceead.adafe",
+        "x": 4141.567123413086,
+        "y": 678.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "49b6f3ad.a55ac4"
+                "7efc1cf.1fed664"
             ]
         ]
     },
     {
-        "id": "20ddeea0.a0e9ea",
+        "id": "f6cae941.406738",
         "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": 4483.567123413086,
+        "y": 316.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a4916484.b95cf",
+        "id": "71276df1.c00474",
         "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": 4476.567123413086,
+        "y": 414.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2f347429.e690cc",
+        "id": "18b30ce8.3b3b9b",
         "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": 4455.567123413086,
+        "y": 597.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "cad2e783.60fc68",
+        "id": "bdb5a388.dc57d",
         "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": 4459.567123413086,
+        "y": 690.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "b1d86e33.3aa378",
+        "id": "365f833d.25b8d4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3579.883331298828,
-        "y": 1604,
-        "z": "d1eceead.adafe",
+        "x": 3635.566665649414,
+        "y": 1350.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a5f9a85c.99ac48"
+                "9fbce841.2e2e5"
             ]
         ]
     },
     {
-        "id": "a4982a5c.ee1f08",
+        "id": "374e0e92.acb9ca",
         "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": 3645.057632446289,
+        "y": 1393.1407012939453,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "bbb83480.f4afb8"
+                "544f9b1.6ea9ce4"
             ]
         ]
     },
     {
-        "id": "9afba595.5831a",
+        "id": "a1cbd1ad.ad2c18",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3577.883331298828,
-        "y": 1693,
-        "z": "d1eceead.adafe",
+        "x": 3633.566665649414,
+        "y": 1439.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "eeac5d42.037ff"
+                "875bb611.eebb3"
             ]
         ]
     },
     {
-        "id": "a9f44662.0eb94",
+        "id": "def43ac8.216f6",
         "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": 3335.566665649414,
+        "y": 1312.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2fd6be0.ec30642",
+        "id": "2c1d8b21.e96e8c",
         "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": 3378.566665649414,
+        "y": 1377.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b1d86e33.3aa378",
-                "a4982a5c.ee1f08",
-                "9afba595.5831a"
+                "365f833d.25b8d4",
+                "374e0e92.acb9ca",
+                "a1cbd1ad.ad2c18"
             ]
         ]
     },
     {
-        "id": "279a0c66.95b87c",
+        "id": "b16688a0.4defc",
         "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": 3379.566635131836,
+        "y": 1129.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ab7f6387.a06298",
-                "178d0fab.57c17"
+                "34aa1b4f.ba281c",
+                "141fecfc.2b9053"
             ]
         ]
     },
     {
-        "id": "178d0fab.57c17",
+        "id": "141fecfc.2b9053",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3546.883331298828,
-        "y": 1287,
-        "z": "d1eceead.adafe",
+        "x": 3602.566635131836,
+        "y": 1115.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "174b650f.6f4cdb"
+                "6c70ba9f.edd1f4"
             ]
         ]
     },
     {
-        "id": "ab7f6387.a06298",
+        "id": "34aa1b4f.ba281c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3548.883331298828,
-        "y": 1320,
-        "z": "d1eceead.adafe",
+        "x": 3604.566635131836,
+        "y": 1148.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "109222da.cab295"
+                "809a76b0.69bfb"
             ]
         ]
     },
     {
-        "id": "a5f9a85c.99ac48",
+        "id": "9fbce841.2e2e5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3752.549835205078,
-        "y": 1603,
-        "z": "d1eceead.adafe",
+        "x": 3808.233169555664,
+        "y": 1349.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f0dfffc5.29d178",
-                "acd2704e.4ae308"
+                "d947a96b.ec0e98",
+                "78e35528.26de5c"
             ]
         ]
     },
     {
-        "id": "bbb83480.f4afb8",
+        "id": "544f9b1.6ea9ce4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3798.6290435791016,
+        "y": 1396.4264373779297,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "eeac5d42.037ff",
+        "id": "875bb611.eebb3",
         "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": 3802.566665649414,
+        "y": 1440.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "f0dfffc5.29d178",
+        "id": "d947a96b.ec0e98",
         "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": 4072.566665649414,
+        "y": 1333.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "11bdf0f4.508487",
-                "23d1e1ad.23f75e"
+                "15bba4b9.d2a05b",
+                "3ad9867a.e42d4a"
             ]
         ]
     },
     {
-        "id": "23d1e1ad.23f75e",
+        "id": "3ad9867a.e42d4a",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4239.883331298828,
-        "y": 1542,
-        "z": "d1eceead.adafe",
+        "x": 4295.566665649414,
+        "y": 1288.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "3fc7a366.f1683c"
+                "6b929f53.c8f4f8"
             ]
         ]
     },
     {
-        "id": "11bdf0f4.508487",
+        "id": "15bba4b9.d2a05b",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4241.883331298828,
-        "y": 1606,
-        "z": "d1eceead.adafe",
+        "x": 4297.566665649414,
+        "y": 1352.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d6cac3a3.d1f4"
+                "1ee9816c.cbffbf"
             ]
         ]
     },
     {
-        "id": "d6cac3a3.d1f4",
+        "id": "1ee9816c.cbffbf",
         "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": 4459.566665649414,
+        "y": 1348.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "3fc7a366.f1683c",
+        "id": "6b929f53.c8f4f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4404.883331298828,
-        "y": 1539,
-        "z": "d1eceead.adafe",
+        "x": 4460.566665649414,
+        "y": 1285.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d54289dc.18d288",
-                "cc99bc89.a9c058"
+                "2ecc2d46.f12c7a",
+                "9183827d.0d9718"
             ]
         ]
     },
     {
-        "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": "809a76b0.69bfb",
         "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": 3747.566635131836,
+        "y": 1145.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "174b650f.6f4cdb",
+        "id": "6c70ba9f.edd1f4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3694.883331298828,
-        "y": 1280,
-        "z": "d1eceead.adafe",
+        "x": 3750.566635131836,
+        "y": 1108.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6b9c6245.ea050c",
-                "ab33cb14.ff6cc8"
+                "920604a0.fd0cf",
+                "ad826b52.8e9fa"
             ]
         ]
     },
     {
-        "id": "6b9c6245.ea050c",
+        "id": "920604a0.fd0cf",
         "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": 3942.566635131836,
+        "y": 1110.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "acd2704e.4ae308",
+        "id": "78e35528.26de5c",
         "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": 4032.566665649414,
+        "y": 1465.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "73a0105b.ac0e58"
+                "75c2427c.8c10cc"
             ]
         ]
     },
     {
-        "id": "73a0105b.ac0e58",
+        "id": "75c2427c.8c10cc",
         "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": 4238.566665649414,
+        "y": 1465.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6dbfb157.d8359"
+                "5fbadc48.b9fad4"
             ]
         ]
     },
     {
-        "id": "6dbfb157.d8359",
+        "id": "5fbadc48.b9fad4",
         "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": 4453.852310180664,
+        "y": 1465.388442993164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "616def67.e5a25"
+                "4d8b1a53.4482f4"
             ]
         ]
     },
     {
-        "id": "ab33cb14.ff6cc8",
+        "id": "ad826b52.8e9fa",
         "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": 3939.566635131836,
+        "y": 1175.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e7bde0a4.3a223",
-                "856b3a3e.33dd18",
-                "ec1837c2.7e65e8"
+                "70c21f01.ccf8c",
+                "fd021df7.11e338",
+                "df54403.64867c"
             ]
         ]
     },
     {
-        "id": "e7bde0a4.3a223",
+        "id": "70c21f01.ccf8c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4079.3834533691406,
-        "y": 1299,
-        "z": "d1eceead.adafe",
+        "x": 4135.066757202148,
+        "y": 1127.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a049038b.508d4"
+                "37006658.3814c2"
             ]
         ]
     },
     {
-        "id": "856b3a3e.33dd18",
+        "id": "fd021df7.11e338",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4071.3834533691406,
-        "y": 1354,
-        "z": "d1eceead.adafe",
+        "x": 4127.066757202148,
+        "y": 1182.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f843f7f2.8c64b8"
+                "24c12ef7.012c52"
             ]
         ]
     },
     {
-        "id": "ec1837c2.7e65e8",
+        "id": "df54403.64867c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4076.3834533691406,
-        "y": 1411,
-        "z": "d1eceead.adafe",
+        "x": 4132.066757202148,
+        "y": 1239.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "47e459e1.2a9ce"
+                "2b777797.09f0b8"
             ]
         ]
     },
     {
-        "id": "47e459e1.2a9ce",
+        "id": "2b777797.09f0b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4284.066757202148,
+        "y": 1240.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "f843f7f2.8c64b8",
+        "id": "24c12ef7.012c52",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4295.066757202148,
+        "y": 1185.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a049038b.508d4",
+        "id": "37006658.3814c2",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4223.765777587891,
-        "y": 1296.6556701660156,
-        "z": "d1eceead.adafe",
+        "x": 4279.449081420898,
+        "y": 1125.2223358154297,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b2d1999f.753708"
+                "9c96e054.d5da8"
             ]
         ]
     },
     {
-        "id": "b2d1999f.753708",
+        "id": "9c96e054.d5da8",
         "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": 4473.566635131836,
+        "y": 1169.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9b22416d.9cdac8"
+                "efaf74dd.57cd28"
             ]
         ]
     },
     {
-        "id": "cc99bc89.a9c058",
+        "id": "9183827d.0d9718",
         "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": 4630.566665649414,
+        "y": 1243.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "d54289dc.18d288",
+        "id": "2ecc2d46.f12c7a",
         "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": 4631.566665649414,
+        "y": 1351.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "46e18359.07aad4",
+        "id": "e06b7ada.eb82e8",
         "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": 4632.566665649414,
+        "y": 1300.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "616def67.e5a25",
+        "id": "4d8b1a53.4482f4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4599.000518798828,
-        "y": 1871.34033203125,
-        "z": "d1eceead.adafe",
+        "x": 4660.683853149414,
+        "y": 1465.906997680664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6d0c5fcb.438328",
-                "40a1c35d.17991c",
-                "6c800e67.6aa9c8"
+                "dced3e1c.40e48",
+                "5a4be8c3.e9f088",
+                "301c508b.710a5"
             ]
         ]
     },
     {
-        "id": "6d0c5fcb.438328",
+        "id": "dced3e1c.40e48",
         "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": 4875.683853149414,
+        "y": 1427.906997680664,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "40a1c35d.17991c",
+        "id": "5a4be8c3.e9f088",
         "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": 4872.683853149414,
+        "y": 1466.906997680664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9de28790.cf8c7"
+                "34a88173.395bbe"
             ]
         ]
     },
     {
-        "id": "6c800e67.6aa9c8",
+        "id": "301c508b.710a5",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4766.500518798828,
-        "y": 1914.34033203125,
-        "z": "d1eceead.adafe",
+        "x": 4828.183853149414,
+        "y": 1508.906997680664,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "9de28790.cf8c7",
+        "id": "34a88173.395bbe",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4991.500518798828,
-        "y": 1871.34033203125,
-        "z": "d1eceead.adafe",
+        "x": 5053.183853149414,
+        "y": 1465.906997680664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e5173d49.fc3368"
+                "91aa780.576ce08"
             ]
         ]
     },
     {
-        "id": "376d58a4.adb2a",
+        "id": "46f94459.4a6e34",
         "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": 4861.566665649414,
+        "y": 1061.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "60247fbe.4b6c2"
+                "eb72bb20.19559"
             ]
         ]
     },
     {
-        "id": "60247fbe.4b6c2",
+        "id": "eb72bb20.19559",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4982.883331298828,
-        "y": 1307,
-        "z": "d1eceead.adafe",
+        "x": 5038.566665649414,
+        "y": 1053.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4270b940.4f6ac",
-                "65b48891.d54c3"
+                "32b5afac.4ae738",
+                "92ed0f08.6c0c2"
             ]
         ]
     },
     {
-        "id": "9b22416d.9cdac8",
+        "id": "efaf74dd.57cd28",
         "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": 4664.566635131836,
+        "y": 1159.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "376d58a4.adb2a",
-                "59d37917.573538"
+                "46f94459.4a6e34",
+                "95ea5c2d.7d46e8"
             ]
         ]
     },
     {
-        "id": "59d37917.573538",
+        "id": "95ea5c2d.7d46e8",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4808.883331298828,
-        "y": 1389,
-        "z": "d1eceead.adafe",
+        "x": 4864.566665649414,
+        "y": 1135.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b8751b8b.fb4f58"
+                "93430c1b.104ce"
             ]
         ]
     },
     {
-        "id": "b8751b8b.fb4f58",
+        "id": "93430c1b.104ce",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4985.883331298828,
-        "y": 1381,
-        "z": "d1eceead.adafe",
+        "x": 5041.566665649414,
+        "y": 1127.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "673e159e.9038cc"
+                "78b310b8.dd74"
             ]
         ]
     },
     {
-        "id": "e5173d49.fc3368",
+        "id": "91aa780.576ce08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5149.500518798828,
-        "y": 1871.34033203125,
-        "z": "d1eceead.adafe",
+        "x": 5211.183853149414,
+        "y": 1465.906997680664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e816a090.0c423"
+                "5b4e25f5.7b14e4"
             ]
         ]
     },
     {
-        "id": "e816a090.0c423",
+        "id": "5b4e25f5.7b14e4",
         "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": 5418.183853149414,
+        "y": 1465.906997680664,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "65b48891.d54c3",
+        "id": "92ed0f08.6c0c2",
         "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": 5246.566665649414,
+        "y": 1060.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "12ca2f18.a3fcb1",
-                "2eff6a6f.1256be",
-                "ae932fb7.b2f368"
+                "322d8e2.13d36f2",
+                "a2041883.aae29",
+                "fe986e1.586ed1"
             ]
         ]
     },
     {
-        "id": "4270b940.4f6ac",
+        "id": "32b5afac.4ae738",
         "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": 5276.566665649414,
+        "y": 1008.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "12ca2f18.a3fcb1",
+        "id": "322d8e2.13d36f2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5400.883331298828,
-        "y": 1305,
-        "z": "d1eceead.adafe",
+        "x": 5456.566665649414,
+        "y": 1051.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "19df6125.66c90f"
+                "9ca79008.c70bf8"
             ]
         ]
     },
     {
-        "id": "2eff6a6f.1256be",
+        "id": "a2041883.aae29",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5392.883331298828,
-        "y": 1360,
-        "z": "d1eceead.adafe",
+        "x": 5448.566665649414,
+        "y": 1106.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5900b30a.9db0cc"
+                "ec84ed8c.59c368"
             ]
         ]
     },
     {
-        "id": "ae932fb7.b2f368",
+        "id": "fe986e1.586ed1",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5397.883331298828,
-        "y": 1417,
-        "z": "d1eceead.adafe",
+        "x": 5453.566665649414,
+        "y": 1163.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "abcfe080.ae7e7"
+                "ae200af1.d5e5c8"
             ]
         ]
     },
     {
-        "id": "abcfe080.ae7e7",
+        "id": "ae200af1.d5e5c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5605.566665649414,
+        "y": 1164.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "5900b30a.9db0cc",
+        "id": "ec84ed8c.59c368",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5616.566665649414,
+        "y": 1109.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "19df6125.66c90f",
+        "id": "9ca79008.c70bf8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5545.265655517578,
-        "y": 1302.6556701660156,
-        "z": "d1eceead.adafe",
+        "x": 5600.948989868164,
+        "y": 1049.2223358154297,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "db94bf6b.c81da8"
+                "e75f84ea.1b627"
             ]
         ]
     },
     {
-        "id": "673e159e.9038cc",
+        "id": "78b310b8.dd74",
         "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": 5276.566665649414,
+        "y": 1251.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "db94bf6b.c81da8",
+        "id": "e75f84ea.1b627",
         "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": 5815.566665649414,
+        "y": 1045.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "653ea460.331594",
+        "id": "d425ccce.04f6a",
         "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": 4471.567123413086,
+        "y": 352.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "3ff377ce.541508",
+        "id": "72647ac9.fcc034",
         "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": 4472.567092895508,
+        "y": 456.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2e04d27d.5faff6",
+        "id": "9aca5d50.3d0028",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4168.883331298828,
-        "y": 959,
-        "z": "d1eceead.adafe",
+        "x": 4296.567123413086,
+        "y": 358.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "20ddeea0.a0e9ea",
-                "653ea460.331594"
+                "f6cae941.406738",
+                "d425ccce.04f6a"
             ]
         ]
     },
     {
-        "id": "12c64a9b.27d615",
+        "id": "d411ea2f.0fea6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4174.883331298828,
-        "y": 1023,
-        "z": "d1eceead.adafe",
+        "x": 4302.567123413086,
+        "y": 422.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a4916484.b95cf",
-                "3ff377ce.541508"
+                "71276df1.c00474",
+                "72647ac9.fcc034"
             ]
         ]
     },
     {
-        "id": "a8347389.2ab3b",
+        "id": "b1818ac5.01eff",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4174.883331298828,
-        "y": 1129,
-        "z": "d1eceead.adafe",
+        "x": 4267.567123413086,
+        "y": 624.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2f347429.e690cc",
-                "64f47a9a.5541ec"
+                "18b30ce8.3b3b9b",
+                "e0b34ba1.74f538"
             ]
         ]
     },
     {
-        "id": "49b6f3ad.a55ac4",
+        "id": "7efc1cf.1fed664",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4177.883331298828,
-        "y": 1182,
-        "z": "d1eceead.adafe",
+        "x": 4270.567123413086,
+        "y": 677.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "cad2e783.60fc68",
-                "93b1477b.b7ce28"
+                "bdb5a388.dc57d",
+                "f08a6dfd.10adf"
             ]
         ]
     },
     {
-        "id": "64f47a9a.5541ec",
+        "id": "e0b34ba1.74f538",
         "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": 4441.567123413086,
+        "y": 637.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "93b1477b.b7ce28",
+        "id": "f08a6dfd.10adf",
         "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": 4444.567123413086,
+        "y": 728.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "bcceae66.215ea8",
+        "id": "e27939d4.dc1f9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3709.883331298828,
-        "y": 2443,
-        "z": "d1eceead.adafe",
+        "x": 3767.566665649414,
+        "y": 1807.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "fa55cad.2f0ddb8",
-                "341eac77.d5f56c"
+                "e945ebed.eb7548",
+                "77e0d458.7dce6c"
             ]
         ]
     },
     {
-        "id": "e6e2e92d.d49f8",
+        "id": "f47a2634.b211d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3537.216827392578,
-        "y": 2444,
-        "z": "d1eceead.adafe",
+        "x": 3594.900161743164,
+        "y": 1808.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "bcceae66.215ea8"
+                "e27939d4.dc1f9"
             ]
         ]
     },
     {
-        "id": "15d49e8e.f5c6d1",
+        "id": "4a8297d6.2a928",
         "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": 3604.391128540039,
+        "y": 1851.1408233642578,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b6575c89.a4dbd8"
+                "5c13cfc7.d7d798"
             ]
         ]
     },
     {
-        "id": "456db0bd.6c4e5",
+        "id": "aeb5511b.98c418",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3535.216827392578,
-        "y": 2533,
-        "z": "d1eceead.adafe",
+        "x": 3592.900161743164,
+        "y": 1897.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f1a4c78.c749938"
+                "6967c0f4.670908"
             ]
         ]
     },
     {
-        "id": "b6575c89.a4dbd8",
+        "id": "5c13cfc7.d7d798",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3757.9625396728516,
+        "y": 1854.4265594482422,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "f1a4c78.c749938",
+        "id": "6967c0f4.670908",
         "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": 3761.900161743164,
+        "y": 1898.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "fa55cad.2f0ddb8",
+        "id": "e945ebed.eb7548",
         "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": 4053.900161743164,
+        "y": 1811.566909790039,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2a55ff3d.a63f58",
-                "a4fedadd.ffdcf"
+                "e55a817f.49527",
+                "d5120a58.c5add"
             ]
         ]
     },
     {
-        "id": "a4fedadd.ffdcf",
+        "id": "d5120a58.c5add",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4219.216827392578,
-        "y": 2402.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 4276.900161743164,
+        "y": 1766.566909790039,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2cf5b91c.330536"
+                "754abe34.cc3b8"
             ]
         ]
     },
     {
-        "id": "2a55ff3d.a63f58",
+        "id": "e55a817f.49527",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4221.216827392578,
-        "y": 2466.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 4278.900161743164,
+        "y": 1830.566909790039,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f4cfd006.4df4a"
+                "1b1e2d9b.600bda"
             ]
         ]
     },
     {
-        "id": "f4cfd006.4df4a",
+        "id": "1b1e2d9b.600bda",
         "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": 4437.900161743164,
+        "y": 1849.566909790039,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2cf5b91c.330536",
+        "id": "754abe34.cc3b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4384.216827392578,
-        "y": 2399.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 4441.900161743164,
+        "y": 1763.566909790039,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "60521985.bf9fa8",
-                "1b11d7f2.c04e4"
+                "e1fca79d.bcc158",
+                "d062e564.f9cc3"
             ]
         ]
     },
     {
-        "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": "9d9de9db.5c38b8",
         "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": 3366.900161743164,
+        "y": 1843.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e6e2e92d.d49f8",
-                "15d49e8e.f5c6d1",
-                "456db0bd.6c4e5"
+                "f47a2634.b211d8",
+                "4a8297d6.2a928",
+                "aeb5511b.98c418"
             ]
         ]
     },
     {
-        "id": "8e0a6f3b.01feb",
+        "id": "dcd55e2.3f6482",
         "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": 3327.900161743164,
+        "y": 1787.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "3458f9fd.a9fdce",
+        "id": "63cddf09.26d868",
         "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": 3378.900161743164,
+        "y": 1582.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c48f1e5.b50d76",
-                "40db2833.3d6058"
+                "43aff4f9.b6b3e4",
+                "25e76471.03af04"
             ]
         ]
     },
     {
-        "id": "40db2833.3d6058",
+        "id": "25e76471.03af04",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3550.216827392578,
-        "y": 2127.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3601.900161743164,
+        "y": 1568.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "57ecc3e9.705994"
+                "a96745eb.fd51a8"
             ]
         ]
     },
     {
-        "id": "c48f1e5.b50d76",
+        "id": "43aff4f9.b6b3e4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3552.216827392578,
-        "y": 2160.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3603.900161743164,
+        "y": 1601.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6a189760.03fff"
+                "65d2388d.31966"
             ]
         ]
     },
     {
-        "id": "6a189760.03fff",
+        "id": "65d2388d.31966",
         "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": 3746.900161743164,
+        "y": 1598.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "57ecc3e9.705994",
+        "id": "a96745eb.fd51a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3698.216827392578,
-        "y": 2120.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3749.900161743164,
+        "y": 1561.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7ef10f50.4a98b",
-                "d3e48892.7c0638"
+                "e299d57.a910ca8",
+                "f2c7502b.08699"
             ]
         ]
     },
     {
-        "id": "7ef10f50.4a98b",
+        "id": "e299d57.a910ca8",
         "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": 3943.900161743164,
+        "y": 1564.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "341eac77.d5f56c",
+        "id": "77e0d458.7dce6c",
         "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": 3994.900131225586,
+        "y": 1944.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1d1b2999.e8eaf6"
+                "e086896d.a84a3"
             ]
         ]
     },
     {
-        "id": "1d1b2999.e8eaf6",
+        "id": "e086896d.a84a3",
         "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": 4200.900131225586,
+        "y": 1944.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2587a419.edf304"
+                "7b35902c.38cf98"
             ]
         ]
     },
     {
-        "id": "2587a419.edf304",
+        "id": "7b35902c.38cf98",
         "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": 4418.185775756836,
+        "y": 1943.388442993164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "596e064d.3e4868"
+                "3adb3c4.e1dbc44"
             ]
         ]
     },
     {
-        "id": "d3e48892.7c0638",
+        "id": "f2c7502b.08699",
         "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": 3965.900161743164,
+        "y": 1632.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5d04022c.52094c",
-                "4363a204.88356c",
-                "d1632f49.e8bfd8"
+                "816c398a.a95008",
+                "793de235.310dbc",
+                "438956b5.03e5"
             ]
         ]
     },
     {
-        "id": "5d04022c.52094c",
+        "id": "816c398a.a95008",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4109.716949462891,
-        "y": 2144,
-        "z": "d1eceead.adafe",
+        "x": 4161.400283813477,
+        "y": 1584.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "16d6f161.b988af"
+                "c1f38920.d25ea"
             ]
         ]
     },
     {
-        "id": "4363a204.88356c",
+        "id": "793de235.310dbc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4101.716949462891,
-        "y": 2199,
-        "z": "d1eceead.adafe",
+        "x": 4153.400283813477,
+        "y": 1639.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5ac71d3b.31ff94"
+                "cab6de35.b52228"
             ]
         ]
     },
     {
-        "id": "d1632f49.e8bfd8",
+        "id": "438956b5.03e5",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4106.716949462891,
-        "y": 2256,
-        "z": "d1eceead.adafe",
+        "x": 4158.400283813477,
+        "y": 1696.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "8e2e62d9.6dcb8"
+                "a8484dc0.47884"
             ]
         ]
     },
     {
-        "id": "8e2e62d9.6dcb8",
+        "id": "a8484dc0.47884",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4310.400283813477,
+        "y": 1697.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "5ac71d3b.31ff94",
+        "id": "cab6de35.b52228",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4321.400283813477,
+        "y": 1642.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "16d6f161.b988af",
+        "id": "c1f38920.d25ea",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4254.099273681641,
-        "y": 2141.6556701660156,
-        "z": "d1eceead.adafe",
+        "x": 4305.782608032227,
+        "y": 1582.2224578857422,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7d886bfd.e9ca4c"
+                "afe15cf0.f36818"
             ]
         ]
     },
     {
-        "id": "60521985.bf9fa8",
+        "id": "e1fca79d.bcc158",
         "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": 4611.900161743164,
+        "y": 1724.566909790039,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1b11d7f2.c04e4",
+        "id": "d062e564.f9cc3",
         "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": 4612.900161743164,
+        "y": 1829.566909790039,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "f5d8e7ee.5dd5b8",
+        "id": "808f1d51.43ea1",
         "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": 4607.900161743164,
+        "y": 1778.566909790039,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "596e064d.3e4868",
+        "id": "3adb3c4.e1dbc44",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4585.334014892578,
-        "y": 2744.3404541015625,
-        "z": "d1eceead.adafe",
+        "x": 4625.017318725586,
+        "y": 1932.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1d1ef4b9.b52cc3",
-                "aa09325d.47c72",
-                "f212860e.85526"
+                "d9f1d004.ab36e8",
+                "c34231fa.58e828",
+                "e0d690d7.a8c998"
             ]
         ]
     },
     {
-        "id": "1d1ef4b9.b52cc3",
+        "id": "d9f1d004.ab36e8",
         "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": 4840.017318725586,
+        "y": 1894.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "aa09325d.47c72",
+        "id": "c34231fa.58e828",
         "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": 4837.017318725586,
+        "y": 1933.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "391393be.95d72c"
+                "1c725cd0.b941cb"
             ]
         ]
     },
     {
-        "id": "f212860e.85526",
+        "id": "e0d690d7.a8c998",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4752.834014892578,
-        "y": 2787.3404541015625,
-        "z": "d1eceead.adafe",
+        "x": 4792.517318725586,
+        "y": 1975.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "391393be.95d72c",
+        "id": "1c725cd0.b941cb",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4977.834014892578,
-        "y": 2744.3404541015625,
-        "z": "d1eceead.adafe",
+        "x": 5017.517318725586,
+        "y": 1932.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "520819a9.ab1618"
+                "d4ead200.f358d"
             ]
         ]
     },
     {
-        "id": "520819a9.ab1618",
+        "id": "d4ead200.f358d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5135.834014892578,
-        "y": 2744.3404541015625,
-        "z": "d1eceead.adafe",
+        "x": 5175.517318725586,
+        "y": 1932.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "3a6f0d92.f64ee2"
+                "21d1a6b2.01b042"
             ]
         ]
     },
     {
-        "id": "3a6f0d92.f64ee2",
+        "id": "21d1a6b2.01b042",
         "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": 5382.517318725586,
+        "y": 1932.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "35d3101c.ddb4c",
+        "id": "4c098907.41a99",
         "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": 4887.900161743164,
+        "y": 1600.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "461a66b2.13a6c8"
+                "801eca00.935f68"
             ]
         ]
     },
     {
-        "id": "461a66b2.13a6c8",
+        "id": "801eca00.935f68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5013.216827392578,
-        "y": 2152,
-        "z": "d1eceead.adafe",
+        "x": 5064.900161743164,
+        "y": 1592.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6cbb0705.4a3c5",
-                "670f0182.9fd968"
+                "387f801c.205ae8",
+                "9175f1b.049129"
             ]
         ]
     },
     {
-        "id": "7d886bfd.e9ca4c",
+        "id": "afe15cf0.f36818",
         "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": 4489.900161743164,
+        "y": 1596.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e2222250.60ef7"
+                "311e9242.e1d87e"
             ]
         ]
     },
     {
-        "id": "e2222250.60ef7",
+        "id": "311e9242.e1d87e",
         "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": 4684.900161743164,
+        "y": 1596.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "35d3101c.ddb4c",
-                "768c39b6.117ae"
+                "4c098907.41a99",
+                "349df30f.7cba04"
             ]
         ]
     },
     {
-        "id": "670f0182.9fd968",
+        "id": "9175f1b.049129",
         "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": 5272.900161743164,
+        "y": 1599.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4e714dda.e8064c",
-                "6d43e638.f020f8",
-                "33cdbe70.d704f2"
+                "42985b25.52fcec",
+                "e5b701e3.8392b",
+                "3efd20ec.3f4778"
             ]
         ]
     },
     {
-        "id": "9bab22e5.a35978",
+        "id": "b70a777b.22a5f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5015.216827392578,
-        "y": 2225,
-        "z": "d1eceead.adafe",
+        "x": 5066.900161743164,
+        "y": 1665.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "3c5a22cd.c5b5a6"
+                "8a34b29e.6de5e8"
             ]
         ]
     },
     {
-        "id": "768c39b6.117ae",
+        "id": "349df30f.7cba04",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4838.216827392578,
-        "y": 2233,
-        "z": "d1eceead.adafe",
+        "x": 4889.900161743164,
+        "y": 1673.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9bab22e5.a35978"
+                "b70a777b.22a5f8"
             ]
         ]
     },
     {
-        "id": "6cbb0705.4a3c5",
+        "id": "387f801c.205ae8",
         "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": 5302.900161743164,
+        "y": 1547.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "3c5a22cd.c5b5a6",
+        "id": "8a34b29e.6de5e8",
         "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": 5279.900161743164,
+        "y": 1731.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "4e714dda.e8064c",
+        "id": "42985b25.52fcec",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5431.216827392578,
-        "y": 2150,
-        "z": "d1eceead.adafe",
+        "x": 5482.900161743164,
+        "y": 1590.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c3b341d5.27524"
+                "16d18a71.6daf16"
             ]
         ]
     },
     {
-        "id": "6d43e638.f020f8",
+        "id": "e5b701e3.8392b",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5423.216827392578,
-        "y": 2205,
-        "z": "d1eceead.adafe",
+        "x": 5474.900161743164,
+        "y": 1645.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5319e635.03496"
+                "6ba1c131.2a9348"
             ]
         ]
     },
     {
-        "id": "33cdbe70.d704f2",
+        "id": "3efd20ec.3f4778",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5428.216827392578,
-        "y": 2262,
-        "z": "d1eceead.adafe",
+        "x": 5479.900161743164,
+        "y": 1702.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "bf85165f.b30b4"
+                "e5aceb1d.a2ff7"
             ]
         ]
     },
     {
-        "id": "bf85165f.b30b4",
+        "id": "e5aceb1d.a2ff7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5631.900161743164,
+        "y": 1703.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "5319e635.03496",
+        "id": "6ba1c131.2a9348",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5642.900161743164,
+        "y": 1648.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "c3b341d5.27524",
+        "id": "16d18a71.6daf16",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5575.599151611328,
-        "y": 2147.6556701660156,
-        "z": "d1eceead.adafe",
+        "x": 5627.282485961914,
+        "y": 1588.2224578857422,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5a4d43b1.7dbc0c"
+                "c4efa7e8.819f98"
             ]
         ]
     },
     {
-        "id": "5a4d43b1.7dbc0c",
+        "id": "c4efa7e8.819f98",
         "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": 5841.900161743164,
+        "y": 1584.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "83634982.62f32",
+        "id": "e5f9b3dc.c2f9f",
         "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",
+        "x": 3340.566665649414,
+        "y": 1454.566665649414,
+        "z": "1b4ba1fc.83240e",
         "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",
-        "wires": []
-    },
-    {
-        "id": "a78c5989.f5207",
+        "id": "169ca3b9.4d31a4",
         "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": 3327.566665649414,
+        "y": 1974.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "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": "426ddfc0.c628b",
         "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",
+        "x": 2452.566696166992,
+        "y": 167.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "b2d6bb83.745318",
+        "id": "d0874bda.7e1ac",
         "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",
+        "x": 2386.566696166992,
+        "y": 203.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "efb9627d.c73688",
+        "id": "2daf88d4.4069b",
         "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",
+        "x": 2571.566696166992,
+        "y": 130.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "7954d1dd.93732",
+        "id": "4d0caa12.a83adc",
         "type": "comment",
         "name": "NOT NEEDED ANYMORE?",
         "info": "",
         "comments": "",
-        "x": 4036.883331298828,
-        "y": 1838,
-        "z": "d1eceead.adafe",
+        "x": 4098.566665649414,
+        "y": 1432.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "48007645.c6e248",
+        "id": "325da1a4.661aa6",
         "type": "comment",
         "name": "NOT NEEDED ANYMORE?",
         "info": "",
         "comments": "",
-        "x": 4014.883331298828,
-        "y": 2708,
-        "z": "d1eceead.adafe",
+        "x": 4054.566635131836,
+        "y": 1896.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e22daf3c.82e7c8",
+        "id": "eca8d05b.38fb78",
         "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": 2763.5670318603516,
+        "y": 7264.566543579102,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "ba2fa114.256608",
+        "id": "9a99585.3b52728",
         "type": "comment",
         "name": "START OF DELETE OPERATION",
         "info": "",
         "comments": "",
-        "x": 3288.88330078125,
-        "y": 2939.999969482422,
-        "z": "d1eceead.adafe",
+        "x": 3322.566665649414,
+        "y": 2456.566635131836,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "cea904e8.518f5",
+        "id": "e1bb190b.e249c8",
         "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": 3906.250015258789,
+        "y": 2557.966751098633,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "8c6f82a5.234d18",
+        "id": "19822907.e2052f",
         "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": 3277.250015258789,
+        "y": 2537.966751098633,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "980e282b.21ebf",
-                "62337ab9.8b1c5c",
-                "ac27f627.a68b4"
+                "3e98cd57.b05732",
+                "c601135d.8ebcb8",
+                "224a5da0.cc93c2"
             ]
         ]
     },
     {
-        "id": "62337ab9.8b1c5c",
+        "id": "c601135d.8ebcb8",
         "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": 3504.740982055664,
+        "y": 2510.540725708008,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a4aab25a.3920c"
+                "ad084de2.e988e8"
             ]
         ]
     },
     {
-        "id": "ac27f627.a68b4",
+        "id": "224a5da0.cc93c2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3468.566650390625,
-        "y": 3076.4000549316406,
-        "z": "d1eceead.adafe",
+        "x": 3500.250015258789,
+        "y": 2554.9666900634766,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "98b8996.e5a3fe8"
+                "dcac28ad.d4a36"
             ]
         ]
     },
     {
-        "id": "a4aab25a.3920c",
+        "id": "ad084de2.e988e8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3667.312515258789,
+        "y": 2509.826431274414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "98b8996.e5a3fe8",
+        "id": "dcac28ad.d4a36",
         "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": 3668.250015258789,
+        "y": 2554.9666900634766,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "980e282b.21ebf",
+        "id": "3e98cd57.b05732",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3480.566650390625,
-        "y": 3126.400115966797,
-        "z": "d1eceead.adafe",
+        "x": 3512.250015258789,
+        "y": 2604.966751098633,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "50a09dc8.f07414"
+                "eb73cd4.3d8393"
             ]
         ]
     },
     {
-        "id": "50a09dc8.f07414",
+        "id": "eb73cd4.3d8393",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3632.88330078125,
-        "y": 3129.999969482422,
-        "z": "d1eceead.adafe",
+        "x": 3664.566665649414,
+        "y": 2608.566604614258,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "839bae2a.5eaff8",
-                "cea904e8.518f5",
-                "8b478b6f.069ff8"
+                "24f11631.71c6d2",
+                "e1bb190b.e249c8",
+                "5066cd38.1c6414",
+                "5dc3af5e.92a278"
             ]
         ]
     },
     {
-        "id": "839bae2a.5eaff8",
+        "id": "24f11631.71c6d2",
         "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": 3909.250015258789,
+        "y": 2500.966751098633,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "5a01c9ff.aa79b8",
+        "id": "80dbb6de.b49838",
         "type": "comment",
         "name": "Update ROOT UNI's bw",
         "info": "",
         "comments": "",
-        "x": 3833.566650390625,
-        "y": 3235.199920654297,
-        "z": "d1eceead.adafe",
+        "x": 3871.250015258789,
+        "y": 2611.766616821289,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e327e4d5.a4e2b",
+        "id": "45c0e5f4.f4ad34",
         "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": 4549.250015258789,
+        "y": 2654.766616821289,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "8b478b6f.069ff8",
+        "id": "5066cd38.1c6414",
         "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": 3863.249771118164,
+        "y": 2657.766616821289,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b9a017aa.207728",
-                "1cc16855.ddb44",
-                "cca9f79e.b7e85"
+                "a6e50ef0.8e2c5",
+                "13029608.69349a",
+                "208dd481.7b2554"
             ]
         ]
     },
     {
-        "id": "1cc16855.ddb44",
+        "id": "13029608.69349a",
         "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": 4166.740737915039,
+        "y": 2568.340591430664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "dd7a8720.93a36"
+                "a4cd8e0.5d99ef"
             ]
         ]
     },
     {
-        "id": "cca9f79e.b7e85",
+        "id": "208dd481.7b2554",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4048.56640625,
-        "y": 3298.1998596191406,
-        "z": "d1eceead.adafe",
+        "x": 4162.249771118164,
+        "y": 2612.766555786133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "bfa4184f.a70f18"
+                "a8fd408a.63278"
             ]
         ]
     },
     {
-        "id": "dd7a8720.93a36",
+        "id": "a4cd8e0.5d99ef",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4329.312271118164,
+        "y": 2567.6262969970703,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "bfa4184f.a70f18",
+        "id": "a8fd408a.63278",
         "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": 4330.249771118164,
+        "y": 2612.766555786133,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "51dfcdd2.a7dd1c",
+        "id": "108d95bc.e243b2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4213.56640625,
-        "y": 3348.199920654297,
-        "z": "d1eceead.adafe",
+        "x": 4327.249771118164,
+        "y": 2662.766616821289,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f4f7b843.eb2a48",
-                "e327e4d5.a4e2b"
+                "6fb618e0.320358",
+                "45c0e5f4.f4ad34"
             ]
         ]
     },
     {
-        "id": "b9a017aa.207728",
+        "id": "a6e50ef0.8e2c5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4044.56640625,
-        "y": 3348.199920654297,
-        "z": "d1eceead.adafe",
+        "x": 4158.249771118164,
+        "y": 2662.766616821289,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "51dfcdd2.a7dd1c"
+                "108d95bc.e243b2"
             ]
         ]
     },
     {
-        "id": "f4f7b843.eb2a48",
+        "id": "6fb618e0.320358",
         "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": 4509.250503540039,
+        "y": 2604.766616821289,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "7302cb88.8e6284",
+        "id": "501ef6fe.de27d8",
         "type": "comment",
         "name": "Delete LEAF UNI",
         "info": "",
         "comments": "",
-        "x": 3825.88330078125,
-        "y": 3013.999969482422,
-        "z": "d1eceead.adafe",
+        "x": 3857.566665649414,
+        "y": 2442.566604614258,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "5b4e5a5d.18c714",
+        "id": "13751b77.2d6a35",
         "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",
+        "x": 3337.433334350586,
+        "y": 3775.166702270508,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a7a1bb48.b43ec8",
+        "id": "42ae91e0.cfd958",
         "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",
+        "x": 3470.433334350586,
+        "y": 3823.166702270508,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "7b0989f8.4cdbd",
+        "id": "f0c980e9.4c97f",
         "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",
+        "x": 3292.433334350586,
+        "y": 3874.966751098633,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "723122ee.60b394",
-                "1f79397f.9ef707"
+                "ddd00137.0625f8",
+                "49bc5de5.143edc"
             ]
         ]
     },
     {
-        "id": "723122ee.60b394",
+        "id": "ddd00137.0625f8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3459.749969482422,
-        "y": 3893.4000854492188,
-        "z": "d1eceead.adafe",
+        "x": 3485.433334350586,
+        "y": 3875.966751098633,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "fc2d1c85.b4eee"
+                "baae6201.7fdf3"
             ]
         ]
     },
     {
-        "id": "fc2d1c85.b4eee",
+        "id": "baae6201.7fdf3",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 3629.433334350586,
+        "y": 3872.166702270508,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1f79397f.9ef707",
+        "id": "49bc5de5.143edc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3463.749969482422,
-        "y": 3937.4000854492188,
-        "z": "d1eceead.adafe",
+        "x": 3489.433334350586,
+        "y": 3919.966751098633,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6275f59c.0890b4"
+                "8955d942.ba6bc"
             ]
         ]
     },
     {
-        "id": "6275f59c.0890b4",
+        "id": "8955d942.ba6bc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3602.749969482422,
-        "y": 3932.4000854492188,
-        "z": "d1eceead.adafe",
+        "x": 3628.433334350586,
+        "y": 3914.966751098633,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "810f11d9.c59a7",
-                "852c933b.a9e98",
-                "dd94c766.3611e8"
+                "2c8b9b3a.156d1c",
+                "942c3741.17e638",
+                "ea29b2fb.fa9b"
             ]
         ]
     },
     {
-        "id": "810f11d9.c59a7",
+        "id": "2c8b9b3a.156d1c",
         "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",
+        "x": 3878.832992553711,
+        "y": 3923.483352661133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4f7025f7.9e0214"
+                "829ce491.bb75d8"
             ]
         ]
     },
     {
-        "id": "4f7025f7.9e0214",
+        "id": "829ce491.bb75d8",
         "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",
+        "x": 4100.832992553711,
+        "y": 3901.483352661133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c1dfdbf7.de4f68"
+                "b35a1aab.3a595"
             ]
         ]
     },
     {
-        "id": "c1dfdbf7.de4f68",
+        "id": "b35a1aab.3a595",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4235.149139404297,
-        "y": 3898.9166870117188,
-        "z": "d1eceead.adafe",
+        "x": 4260.832504272461,
+        "y": 3881.483352661133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "811e3163.5710b"
+                "335ed745.f60fb8"
             ]
         ]
     },
     {
-        "id": "7642582a.7718e8",
+        "id": "f8921006.06e1a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4388.149658203125,
-        "y": 3879.916717529297,
-        "z": "d1eceead.adafe",
+        "x": 4413.833023071289,
+        "y": 3862.483383178711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b019880c.9753e",
-                "f61cef0c.bbc238"
+                "8d9ae5c3.a9c288",
+                "b59230eb.4dd598"
             ]
         ]
     },
     {
-        "id": "b019880c.9753e",
+        "id": "8d9ae5c3.a9c288",
         "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",
+        "x": 4610.333236694336,
+        "y": 3830.566604614258,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "852c933b.a9e98",
+        "id": "942c3741.17e638",
         "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",
+        "x": 3985.333267211914,
+        "y": 3842.566635131836,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "dd94c766.3611e8",
+        "id": "ea29b2fb.fa9b",
         "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",
+        "x": 3793.333267211914,
+        "y": 4263.566879272461,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "73d16500.5c0ae4",
-                "d3a70ceb.c50b78"
+                "1074f3a1.e40104",
+                "49cd5621.2fb45"
             ]
         ]
     },
     {
-        "id": "f61cef0c.bbc238",
+        "id": "b59230eb.4dd598",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4552.88330078125,
-        "y": 3915.999969482422,
-        "z": "d1eceead.adafe",
+        "x": 4578.566665649414,
+        "y": 3898.566635131836,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "d3a70ceb.c50b78",
+        "id": "49cd5621.2fb45",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 154.65066528320312,
-        "y": 5345.000457763672,
-        "z": "d1eceead.adafe",
+        "x": 180.3340301513672,
+        "y": 5327.567123413086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4a51985e.972e68"
+                "94db503d.b50288"
             ]
         ]
     },
     {
-        "id": "73d16500.5c0ae4",
+        "id": "1074f3a1.e40104",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3988.650634765625,
-        "y": 4383.000213623047,
-        "z": "d1eceead.adafe",
+        "x": 4014.333999633789,
+        "y": 4365.566879272461,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "25f72ad2.47990e"
+                "98bce2a7.eae0e8"
             ]
         ]
     },
     {
-        "id": "25f72ad2.47990e",
+        "id": "98bce2a7.eae0e8",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4131.650634765625,
-        "y": 4379.000213623047,
-        "z": "d1eceead.adafe",
+        "x": 4157.333999633789,
+        "y": 4361.566879272461,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6e8bafff.64fc88",
-                "dcf23a76.fb4f5",
-                "f889b68d.197d9",
-                "69806916.62139",
-                "32064458.33cdf4",
-                "9c7a66fb.560d48",
-                "2b19eccb.73cf0c",
-                "987f769f.1ba7f8"
+                "700868f.6d62d18",
+                "9e6ef63b.470c28",
+                "98c15798.fc2c28",
+                "a474eb09.bdcea",
+                "4e75594e.323fe8",
+                "8985192.1ed6868",
+                "bbed6bed.031a08",
+                "9b06d9ac.c2c2b",
+                "35800841.c29e7"
             ]
         ]
     },
     {
-        "id": "316316fc.4e3ac2",
+        "id": "7a0c4e0f.7452f",
         "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",
+        "x": 206.68336486816406,
+        "y": 5283.567123413086,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "32c3f6b1.304972",
+        "id": "7ce224df.f32d34",
         "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",
+        "x": 4033.567398071289,
+        "y": 4328.566879272461,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "7adbe8ea.ad8838",
+        "id": "eb1e9e05.cb15c8",
         "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",
+        "x": 4846.351089477539,
+        "y": 4519.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "ee3b3067.d425a8",
+        "id": "1fff7e41.5e97da",
         "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",
+        "x": 5191.351089477539,
+        "y": 4381.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "76f6067d.796678"
+                "384897a.b5a9568"
             ]
         ]
     },
     {
-        "id": "fc93f53c.f481d",
+        "id": "3095386e.cc8938",
         "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",
+        "x": 4898.351089477539,
+        "y": 4375.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ee3b3067.d425a8"
+                "1fff7e41.5e97da"
             ]
         ]
     },
     {
-        "id": "3f4440b0.d66f8",
+        "id": "31c473ae.f4e764",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5127.667724609375,
-        "y": 4349.783660888672,
-        "z": "d1eceead.adafe",
+        "x": 5153.351089477539,
+        "y": 4332.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "27f65669.8e0af2",
+        "id": "ca81f202.b30418",
         "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",
+        "x": 4842.351089477539,
+        "y": 4427.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "410c70eb.214758",
+        "id": "b2478692.ea1d6",
         "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",
+        "x": 4850.351089477539,
+        "y": 4472.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e258b42d.2c46d8",
+        "id": "eb2b76ee.d20fa8",
         "type": "set",
         "name": "unset otnTopoIdSrc",
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
         "comments": "",
-        "x": 4821.667724609375,
-        "y": 4342.783660888672,
-        "z": "d1eceead.adafe",
+        "x": 4847.351089477539,
+        "y": 4325.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "76f6067d.796678",
+        "id": "384897a.b5a9568",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5074.667724609375,
-        "y": 4466.783660888672,
-        "z": "d1eceead.adafe",
+        "x": 5100.351089477539,
+        "y": 4449.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "acca9da1.cc4618"
+                "a1cf1e6d.96424"
             ]
         ]
     },
     {
-        "id": "acca9da1.cc4618",
+        "id": "a1cf1e6d.96424",
         "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",
+        "x": 5285.351089477539,
+        "y": 4448.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f448b4f8.c120e"
+                "e54e7c9a.d7146"
             ]
         ]
     },
     {
-        "id": "f448b4f8.c120e",
+        "id": "e54e7c9a.d7146",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5451.667724609375,
-        "y": 4468.783660888672,
-        "z": "d1eceead.adafe",
+        "x": 5477.351089477539,
+        "y": 4451.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "19985725.a5eca1"
+                "88338270.bbe028"
             ]
         ]
     },
     {
-        "id": "19985725.a5eca1",
+        "id": "88338270.bbe028",
         "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",
+        "x": 5649.351089477539,
+        "y": 4447.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "ab4edace.9f77f",
+        "id": "5518c3fe.6c8f7c",
         "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",
+        "x": 5025.351089477539,
+        "y": 4562.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "6e8bafff.64fc88",
+        "id": "700868f.6d62d18",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4516.667724609375,
-        "y": 4364.783660888672,
-        "z": "d1eceead.adafe",
+        "x": 4542.351089477539,
+        "y": 4347.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "30c992c8.4db58e",
-                "c2728b20.458338",
-                "27f65669.8e0af2",
-                "410c70eb.214758",
-                "7adbe8ea.ad8838",
-                "fc93f53c.f481d",
-                "ab4edace.9f77f"
+                "7996b8d7.d892b8",
+                "fc1f2ae1.cce1f",
+                "ca81f202.b30418",
+                "b2478692.ea1d6",
+                "eb1e9e05.cb15c8",
+                "3095386e.cc8938",
+                "5518c3fe.6c8f7c"
             ]
         ]
     },
     {
-        "id": "2e6e6c8a.c892fc",
+        "id": "aec75daf.8805f",
         "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",
+        "x": 4527.351089477539,
+        "y": 4281.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "c2728b20.458338",
+        "id": "fc1f2ae1.cce1f",
         "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",
+        "x": 4906.351089477539,
+        "y": 4268.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "cd41e347.c8a4d",
-                "5bcb3237.45bf24",
-                "3f4440b0.d66f8"
+                "74fcf491.6cb18c",
+                "27200085.4f11f",
+                "31c473ae.f4e764"
             ]
         ]
     },
     {
-        "id": "cd41e347.c8a4d",
+        "id": "74fcf491.6cb18c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5116.667724609375,
-        "y": 4268.783660888672,
-        "z": "d1eceead.adafe",
+        "x": 5142.351089477539,
+        "y": 4251.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "5bcb3237.45bf24",
+        "id": "27200085.4f11f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5113.667724609375,
-        "y": 4309.783660888672,
-        "z": "d1eceead.adafe",
+        "x": 5139.351089477539,
+        "y": 4292.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "30c992c8.4db58e",
+        "id": "7996b8d7.d892b8",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
         "comments": "",
-        "x": 4829.667724609375,
-        "y": 4242.783660888672,
-        "z": "d1eceead.adafe",
+        "x": 4855.351089477539,
+        "y": 4225.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "dcf23a76.fb4f5",
+        "id": "9e6ef63b.470c28",
         "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",
+        "x": 4362.351089477539,
+        "y": 4679.750228881836,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "f549a24.b4e97e",
+        "id": "d0de5ca9.0d9ed8",
         "type": "comment",
         "name": "find all OTNs that have srcTtpOtnLayer and decrease their bandwidth",
         "info": "",
         "comments": "",
-        "x": 4459.968017578125,
-        "y": 4736.183563232422,
-        "z": "d1eceead.adafe",
+        "x": 4485.651382446289,
+        "y": 4718.750228881836,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "f889b68d.197d9",
+        "id": "98c15798.fc2c28",
         "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",
+        "x": 4383.651382446289,
+        "y": 4753.750228881836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f7fe6bc0.f9d1a8",
-                "b939c13a.bd148",
-                "63930841.13965"
+                "435ca159.b40ef",
+                "d725cba9.49bb",
+                "47bda61e.d52e08"
             ]
         ]
     },
     {
-        "id": "f7fe6bc0.f9d1a8",
+        "id": "435ca159.b40ef",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4562.968017578125,
-        "y": 4768.183563232422,
-        "z": "d1eceead.adafe",
+        "x": 4588.651382446289,
+        "y": 4750.750228881836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "85787fa.a0f0d8"
+                "293c4671.01eaaa"
             ]
         ]
     },
     {
-        "id": "b939c13a.bd148",
+        "id": "d725cba9.49bb",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4546.458984375,
-        "y": 4829.757598876953,
-        "z": "d1eceead.adafe",
+        "x": 4572.142349243164,
+        "y": 4812.324264526367,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c496c4d4.109c78"
+                "107ae3d6.bea87c"
             ]
         ]
     },
     {
-        "id": "63930841.13965",
+        "id": "47bda61e.d52e08",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4543.968017578125,
-        "y": 4873.183563232422,
-        "z": "d1eceead.adafe",
+        "x": 4569.651382446289,
+        "y": 4855.750228881836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "bb1ebaa9.c2fac"
+                "b006b7ef.442db8"
             ]
         ]
     },
     {
-        "id": "85787fa.a0f0d8",
+        "id": "293c4671.01eaaa",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4730.96826171875,
-        "y": 4763.183563232422,
-        "z": "d1eceead.adafe",
+        "x": 4756.651626586914,
+        "y": 4745.750228881836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6a7a29b4.6659c"
+                "94070507.2dec4"
             ]
         ]
     },
     {
-        "id": "c496c4d4.109c78",
+        "id": "107ae3d6.bea87c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 4734.713760375977,
+        "y": 4812.610000610352,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "bb1ebaa9.c2fac",
+        "id": "b006b7ef.442db8",
         "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",
+        "x": 4736.651382446289,
+        "y": 4854.750228881836,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "6a7a29b4.6659c",
+        "id": "94070507.2dec4",
         "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",
+        "x": 4994.651626586914,
+        "y": 4750.750228881836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2e12f618.b174b2"
+                "db3073d6.6320c8"
             ]
         ]
     },
     {
-        "id": "2e12f618.b174b2",
+        "id": "db3073d6.6320c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5202.968017578125,
-        "y": 4775.183563232422,
-        "z": "d1eceead.adafe",
+        "x": 5228.651382446289,
+        "y": 4757.750228881836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1b37b556.addac3"
+                "37f340bd.0a3438"
             ]
         ]
     },
     {
-        "id": "3df57bb4.1a97cc",
+        "id": "fcec711e.ca4568",
         "type": "comment",
         "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
         "info": "",
         "comments": "",
-        "x": 5119.783935546875,
-        "y": 4846.349884033203,
-        "z": "d1eceead.adafe",
+        "x": 5145.467300415039,
+        "y": 4828.916549682617,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1b37b556.addac3",
+        "id": "37f340bd.0a3438",
         "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",
+        "x": 5089.467300415039,
+        "y": 4877.916549682617,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c62dd674.fd73f",
-                "37627bf2.c03934"
+                "ab022fe7.308e68",
+                "3eb6abc9.a7b9b4"
             ]
         ]
     },
     {
-        "id": "37627bf2.c03934",
+        "id": "3eb6abc9.a7b9b4",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5306.784423828125,
-        "y": 4936.349395751953,
-        "z": "d1eceead.adafe",
+        "x": 5332.467788696289,
+        "y": 4918.916061401367,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "c62dd674.fd73f",
+        "id": "ab022fe7.308e68",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5317.7841796875,
-        "y": 4893.349609375,
-        "z": "d1eceead.adafe",
+        "x": 5343.467544555664,
+        "y": 4875.916275024414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b2c9765c.25999"
+                "82036bd3.d2b678"
             ]
         ]
     },
     {
-        "id": "a5ecb13c.9c7548",
+        "id": "8f49a5ce.76f168",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5544.767578125,
-        "y": 4900.76611328125,
-        "z": "d1eceead.adafe",
+        "x": 5570.450942993164,
+        "y": 4883.332778930664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "78a5ede3.09cc54",
-                "aecf8872.1d5c4",
-                "657d43b1.13c254"
+                "c997366c.5a655",
+                "3dbdc2ab.0fbd3e",
+                "bd51e31d.644ad8"
             ]
         ]
     },
     {
-        "id": "9d348107.818aa",
+        "id": "cd343233.3d4178",
         "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",
+        "x": 5735.500747680664,
+        "y": 4768.333236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "99f28c5d.95abe8"
+                "355f9f95.f927e8"
             ]
         ]
     },
     {
-        "id": "99f28c5d.95abe8",
+        "id": "355f9f95.f927e8",
         "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",
+        "x": 5927.500747680664,
+        "y": 4757.333480834961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9a75bdf9.10641"
+                "d2bb482a.6b0258"
             ]
         ]
     },
     {
-        "id": "78a5ede3.09cc54",
+        "id": "c997366c.5a655",
         "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",
+        "x": 5684.017593383789,
+        "y": 4658.550277709961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "aecf8872.1d5c4",
+        "id": "3dbdc2ab.0fbd3e",
         "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",
+        "x": 5676.017593383789,
+        "y": 4707.550277709961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "657d43b1.13c254",
+        "id": "bd51e31d.644ad8",
         "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",
+        "x": 5907.434585571289,
+        "y": 4888.716293334961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "f1c96228.a5339",
+        "id": "284b8a46.878cde",
         "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",
+        "x": 5859.084487915039,
+        "y": 4936.033187866211,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "75d6304c.089cd8",
+        "id": "d8829575.9f3a28",
         "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",
+        "x": 5931.434585571289,
+        "y": 4849.716293334961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "9a75bdf9.10641",
+        "id": "d2bb482a.6b0258",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6083.8173828125,
-        "y": 4753.766815185547,
-        "z": "d1eceead.adafe",
+        "x": 6109.500747680664,
+        "y": 4736.333480834961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b5ad886.81af5f8"
+                "c2a155f5.9faa88"
             ]
         ]
     },
     {
-        "id": "b5ad886.81af5f8",
+        "id": "c2a155f5.9faa88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6245.8173828125,
-        "y": 4742.766815185547,
-        "z": "d1eceead.adafe",
+        "x": 6271.500747680664,
+        "y": 4725.333480834961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6f94f7eb.f4d818",
-                "269fac18.2bb21c"
+                "560d06d2.09f708",
+                "97054905.242338"
             ]
         ]
     },
     {
-        "id": "6f94f7eb.f4d818",
+        "id": "560d06d2.09f708",
         "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",
+        "x": 6468.500747680664,
+        "y": 4654.333480834961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "269fac18.2bb21c",
+        "id": "97054905.242338",
         "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",
+        "x": 6465.967544555664,
+        "y": 4753.550277709961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a984d0c7.8574d",
+        "id": "e8ad32eb.9df94",
         "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",
+        "x": 3123.483413696289,
+        "y": 3212.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "49347bae.3e2974",
+        "id": "cf9533e5.c2371",
         "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",
+        "x": 3000.483413696289,
+        "y": 3322.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7b835f88.3b076",
-                "7490c0ec.4dda5"
+                "6d545915.394bc",
+                "8fea5bf9.a101b8"
             ]
         ]
     },
     {
-        "id": "7b835f88.3b076",
+        "id": "6d545915.394bc",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3158.800048828125,
-        "y": 3318.800018310547,
-        "z": "d1eceead.adafe",
+        "x": 3184.483413696289,
+        "y": 3301.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5b141b7a.8f28f4"
+                "a2317561.56953"
             ]
         ]
     },
     {
-        "id": "5b141b7a.8f28f4",
+        "id": "a2317561.56953",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3301.800048828125,
-        "y": 3318.800018310547,
-        "z": "d1eceead.adafe",
+        "x": 3327.483413696289,
+        "y": 3301.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "94596646.a7e4f"
+                "a264af99.117e28"
             ]
         ]
     },
     {
-        "id": "94596646.a7e4f",
+        "id": "a264af99.117e28",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 3503.483413696289,
+        "y": 3299.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "7490c0ec.4dda5",
+        "id": "8fea5bf9.a101b8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3156.800048828125,
-        "y": 3373.800018310547,
-        "z": "d1eceead.adafe",
+        "x": 3182.483413696289,
+        "y": 3356.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a3855d70.dbb87"
+                "3fcc1946.2227c6"
             ]
         ]
     },
     {
-        "id": "a3855d70.dbb87",
+        "id": "3fcc1946.2227c6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3003.800048828125,
-        "y": 3506.800018310547,
-        "z": "d1eceead.adafe",
+        "x": 3029.483413696289,
+        "y": 3489.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5b4e5a5d.18c714",
-                "a7a1bb48.b43ec8",
-                "7b0989f8.4cdbd",
-                "b98b1ba5.429c1",
-                "37657916.72f08e",
-                "cc0c619e.32de58"
+                "13751b77.2d6a35",
+                "42ae91e0.cfd958",
+                "f0c980e9.4c97f",
+                "15cfd0d2.c7223f",
+                "566cdb6f.69a6a4",
+                "130e3d11.8bda33"
             ]
         ]
     },
     {
-        "id": "a5a62e88.7d802",
+        "id": "b391ba6b.5d625",
         "type": "comment",
         "name": "Find LEAF connectivity",
         "info": "",
         "comments": "",
-        "x": 3225.88330078125,
-        "y": 3746.999969482422,
-        "z": "d1eceead.adafe",
+        "x": 3251.566665649414,
+        "y": 3729.566635131836,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "b98b1ba5.429c1",
+        "id": "15cfd0d2.c7223f",
         "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",
+        "x": 3334.016616821289,
+        "y": 3502.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "37657916.72f08e",
+        "id": "566cdb6f.69a6a4",
         "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",
+        "x": 3332.516372680664,
+        "y": 3548.283432006836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1a4c3937.32a93f"
+                "69987cbf.ba882c"
             ]
         ]
     },
     {
-        "id": "1a4c3937.32a93f",
+        "id": "69987cbf.ba882c",
         "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",
+        "x": 3595.516372680664,
+        "y": 3543.283432006836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "95d80a37.7eef5"
+                "6b4b309c.a784f8"
             ]
         ]
     },
     {
-        "id": "95d80a37.7eef5",
+        "id": "6b4b309c.a784f8",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3729.83251953125,
-        "y": 3540.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 3755.515884399414,
+        "y": 3523.283432006836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9608373.19689c8"
+                "537f8032.a139c8"
             ]
         ]
     },
     {
-        "id": "d9ea756c.06e5e",
+        "id": "608ff90c.2e5fc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4498.833740234375,
-        "y": 3575.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 5092.517593383789,
+        "y": 3554.283462524414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "29278691.db117a",
-                "29bad35d.650d14",
-                "a6af6c62.1a6b5"
+                "b2d28e5c.e8fb18",
+                "d55c5cbc.26dad8",
+                "99b14097.a9c1b8"
             ]
         ]
     },
     {
-        "id": "29278691.db117a",
+        "id": "b2d28e5c.e8fb18",
         "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": 5332.018081665039,
+        "y": 3503.366714477539,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "29bad35d.650d14",
+        "id": "d55c5cbc.26dad8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4671.567657470703,
-        "y": 3597.800048828125,
-        "z": "d1eceead.adafe",
+        "x": 5265.251510620117,
+        "y": 3576.366744995117,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "4465f9ec.e3dbb",
+        "id": "3b35e0ea.5843e8",
         "type": "comment",
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",
         "info": "",
         "comments": "",
-        "x": 4432.88427734375,
-        "y": 5128.000213623047,
-        "z": "d1eceead.adafe",
+        "x": 4458.567642211914,
+        "y": 5110.566879272461,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "69806916.62139",
+        "id": "a474eb09.bdcea",
         "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",
+        "x": 4357.000503540039,
+        "y": 5162.483383178711,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2b19eccb.73cf0c",
+        "id": "bbed6bed.031a08",
         "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",
+        "x": 4508.000503540039,
+        "y": 5605.483383178711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "987f769f.1ba7f8",
+        "id": "9b06d9ac.c2c2b",
         "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",
+        "x": 4323.000503540039,
+        "y": 5672.483383178711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c7979e94.4deb18",
-                "5e8c956f.69a854"
+                "da6e8509.7a87a8",
+                "16a08f38.4e9a49"
             ]
         ]
     },
     {
-        "id": "c7979e94.4deb18",
+        "id": "da6e8509.7a87a8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4562.317138671875,
-        "y": 5674.916717529297,
-        "z": "d1eceead.adafe",
+        "x": 4588.000503540039,
+        "y": 5657.483383178711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4a28d2a5.936924"
+                "c2e76143.b6b218"
             ]
         ]
     },
     {
-        "id": "5e8c956f.69a854",
+        "id": "16a08f38.4e9a49",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4558.317138671875,
-        "y": 5722.916717529297,
-        "z": "d1eceead.adafe",
+        "x": 4584.000503540039,
+        "y": 5705.483383178711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "213fbf95.d03c8"
+                "8fe2e656.247af"
             ]
         ]
     },
     {
-        "id": "4a28d2a5.936924",
+        "id": "c2e76143.b6b218",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4718.317138671875,
-        "y": 5670.916717529297,
-        "z": "d1eceead.adafe",
+        "x": 4744.000503540039,
+        "y": 5653.483383178711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a96c5a1a.d66bf"
+                "9d183ed0.0c624"
             ]
         ]
     },
     {
-        "id": "213fbf95.d03c8",
+        "id": "8fe2e656.247af",
         "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",
+        "x": 4732.000503540039,
+        "y": 5700.483383178711,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "4e8315f.b9446ec",
+        "id": "2c1c4698.bb1b8a",
         "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",
+        "x": 5164.000747680664,
+        "y": 5595.483383178711,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "aa7d5d8.eb8bca",
+        "id": "39f2eed6.a40982",
         "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",
+        "x": 4566.417495727539,
+        "y": 5191.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "32064458.33cdf4",
+        "id": "4e75594e.323fe8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4311.734130859375,
-        "y": 5298.200408935547,
-        "z": "d1eceead.adafe",
+        "x": 4337.417495727539,
+        "y": 5280.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "aa7d5d8.eb8bca",
-                "3165c974.539e06"
+                "39f2eed6.a40982",
+                "ec0a5547.230718"
             ]
         ]
     },
     {
-        "id": "3165c974.539e06",
+        "id": "ec0a5547.230718",
         "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",
+        "x": 4573.417495727539,
+        "y": 5273.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4cddcbba.102194",
-                "d5cd17da.64e6a",
-                "9d33157c.077f3"
+                "f4f0abfb.959d98",
+                "6d247b2e.c14f4c",
+                "ac6604fb.6b0698"
             ]
         ]
     },
     {
-        "id": "4cddcbba.102194",
+        "id": "f4f0abfb.959d98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4743.2342529296875,
-        "y": 5243.200408935547,
-        "z": "d1eceead.adafe",
+        "x": 4768.917617797852,
+        "y": 5225.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "658952ec.d50f2c"
+                "7a4a15ea.cb5f7c"
             ]
         ]
     },
     {
-        "id": "d5cd17da.64e6a",
+        "id": "6d247b2e.c14f4c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4735.2342529296875,
-        "y": 5298.200408935547,
-        "z": "d1eceead.adafe",
+        "x": 4760.917617797852,
+        "y": 5280.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f87d3f72.db25b"
+                "9d792ff5.12f1d8"
             ]
         ]
     },
     {
-        "id": "658952ec.d50f2c",
+        "id": "7a4a15ea.cb5f7c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4887.6165771484375,
-        "y": 5242.8560791015625,
-        "z": "d1eceead.adafe",
+        "x": 4913.299942016602,
+        "y": 5225.422744750977,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5e03d50d.e31174"
+                "22a044c0.3de0ec"
             ]
         ]
     },
     {
-        "id": "5e03d50d.e31174",
+        "id": "22a044c0.3de0ec",
         "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",
+        "x": 5097.417495727539,
+        "y": 5223.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "81fcac6e.c2cbb"
+                "afda241e.dc7d4"
             ]
         ]
     },
     {
-        "id": "81fcac6e.c2cbb",
+        "id": "afda241e.dc7d4",
         "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",
+        "x": 5292.417495727539,
+        "y": 5223.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "23740bd0.c54174"
+                "7162d2d.84a60ac"
             ]
         ]
     },
     {
-        "id": "9d33157c.077f3",
+        "id": "ac6604fb.6b0698",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4740.2342529296875,
-        "y": 5355.200408935547,
-        "z": "d1eceead.adafe",
+        "x": 4765.917617797852,
+        "y": 5337.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d477847d.474a8"
+                "cc0a2fe1.d0b358"
             ]
         ]
     },
     {
-        "id": "d477847d.474a8",
+        "id": "cc0a2fe1.d0b358",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 4917.917617797852,
+        "y": 5338.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "f87d3f72.db25b",
+        "id": "9d792ff5.12f1d8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 4928.917617797852,
+        "y": 5281.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e3023af7.680d7",
+        "id": "9e3505a2.ad7f68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5648.734130859375,
-        "y": 5245.200408935547,
-        "z": "d1eceead.adafe",
+        "x": 5674.417495727539,
+        "y": 5227.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "31c1897e.fbb116",
-                "b906e4f7.66368",
-                "ac0e0ca2.883cb"
+                "ea7ae99e.7714a",
+                "97767b77.532b48",
+                "bd9bb3b2.0d8698"
             ]
         ]
     },
     {
-        "id": "23740bd0.c54174",
+        "id": "7162d2d.84a60ac",
         "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",
+        "x": 5495.417495727539,
+        "y": 5227.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e3023af7.680d7"
+                "9e3505a2.ad7f68"
             ]
         ]
     },
     {
-        "id": "b906e4f7.66368",
+        "id": "97767b77.532b48",
         "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",
+        "x": 5880.417495727539,
+        "y": 5240.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "df7977a7.075b8",
-                "f17bde95.882498",
-                "61e2d23e.358d1c"
+                "8ede340c.5a66c8",
+                "74477750.32976",
+                "ea5203af.a882c8"
             ]
         ]
     },
     {
-        "id": "31c1897e.fbb116",
+        "id": "ea7ae99e.7714a",
         "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",
+        "x": 5910.417495727539,
+        "y": 5188.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "df7977a7.075b8",
+        "id": "8ede340c.5a66c8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6064.734130859375,
-        "y": 5249.200408935547,
-        "z": "d1eceead.adafe",
+        "x": 6090.417495727539,
+        "y": 5231.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7ac6fe75.62b4e"
+                "5e0e6cb.070b594"
             ]
         ]
     },
     {
-        "id": "f17bde95.882498",
+        "id": "74477750.32976",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6056.734130859375,
-        "y": 5304.200408935547,
-        "z": "d1eceead.adafe",
+        "x": 6082.417495727539,
+        "y": 5286.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "671c9934.2cd48"
+                "8bfb7c50.692e68"
             ]
         ]
     },
     {
-        "id": "61e2d23e.358d1c",
+        "id": "ea5203af.a882c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6061.734130859375,
-        "y": 5361.200408935547,
-        "z": "d1eceead.adafe",
+        "x": 6087.417495727539,
+        "y": 5343.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a6615570.50c968"
+                "1d7cc732.18ead1"
             ]
         ]
     },
     {
-        "id": "a6615570.50c968",
+        "id": "1d7cc732.18ead1",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 6239.417495727539,
+        "y": 5344.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "671c9934.2cd48",
+        "id": "8bfb7c50.692e68",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 6250.417495727539,
+        "y": 5289.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "7ac6fe75.62b4e",
+        "id": "5e0e6cb.070b594",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6209.116455078125,
-        "y": 5246.8560791015625,
-        "z": "d1eceead.adafe",
+        "x": 6234.799819946289,
+        "y": 5229.422744750977,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6989c737.25d068"
+                "20b06727.e2f538"
             ]
         ]
     },
     {
-        "id": "6989c737.25d068",
+        "id": "20b06727.e2f538",
         "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",
+        "x": 6449.417495727539,
+        "y": 5225.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "ac0e0ca2.883cb",
+        "id": "bd9bb3b2.0d8698",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5804.734130859375,
-        "y": 5322.200408935547,
-        "z": "d1eceead.adafe",
+        "x": 5830.417495727539,
+        "y": 5304.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "9c7a66fb.560d48",
+        "id": "8985192.1ed6868",
         "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",
+        "x": 4478.917739868164,
+        "y": 5385.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1e28e096.7499f7",
-                "cc9e5694.f9d17"
+                "62c705b1.502d1c",
+                "1b875464.e01f44"
             ]
         ]
     },
     {
-        "id": "1e28e096.7499f7",
+        "id": "62c705b1.502d1c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4813.734130859375,
-        "y": 5410.800018310547,
-        "z": "d1eceead.adafe",
+        "x": 4839.417495727539,
+        "y": 5393.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "906e379.3b93848"
+                "d191549e.030218"
             ]
         ]
     },
     {
-        "id": "906e379.3b93848",
+        "id": "d191549e.030218",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 4997.417495727539,
+        "y": 5393.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "90be5ca9.028288",
+        "id": "18bca107.e50237",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4975.234130859375,
-        "y": 5450.800018310547,
-        "z": "d1eceead.adafe",
+        "x": 5000.917495727539,
+        "y": 5433.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "cc9e5694.f9d17",
+        "id": "1b875464.e01f44",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4817.734130859375,
-        "y": 5450.800018310547,
-        "z": "d1eceead.adafe",
+        "x": 4843.417495727539,
+        "y": 5433.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "90be5ca9.028288"
+                "18bca107.e50237"
             ]
         ]
     },
     {
-        "id": "921095c8.3bc23",
+        "id": "8380c690.faafc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5126.451171875,
-        "y": 5664.800018310547,
-        "z": "d1eceead.adafe",
+        "x": 5152.134536743164,
+        "y": 5647.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "fb4f4697.4dc5f",
-                "7ea31674.99e1d8"
+                "1f713bf9.1daaec",
+                "39b06195.a8d3be"
             ]
         ]
     },
     {
-        "id": "7ea31674.99e1d8",
+        "id": "39b06195.a8d3be",
         "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",
+        "x": 5394.134292602539,
+        "y": 5597.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "10743e5b.0b6182",
-                "5598183a.212ab",
-                "9c9074e9.bbaff8"
+                "fbd8ede5.0e2c68",
+                "fe4285c6.cb2308",
+                "3fecf8f4.4ce3f"
             ]
         ]
     },
     {
-        "id": "10743e5b.0b6182",
+        "id": "fbd8ede5.0e2c68",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5563.951171875,
-        "y": 5548.800018310547,
-        "z": "d1eceead.adafe",
+        "x": 5589.634536743164,
+        "y": 5531.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "767943d2.64a144"
+                "10a1ac3d.04aa44"
             ]
         ]
     },
     {
-        "id": "5598183a.212ab",
+        "id": "fe4285c6.cb2308",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5559.951171875,
-        "y": 5604.800018310547,
-        "z": "d1eceead.adafe",
+        "x": 5585.634536743164,
+        "y": 5587.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "74a77564.40268c"
+                "f166d116.9a8368"
             ]
         ]
     },
     {
-        "id": "767943d2.64a144",
+        "id": "10a1ac3d.04aa44",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5708.3333740234375,
-        "y": 5566.4556884765625,
-        "z": "d1eceead.adafe",
+        "x": 5734.016738891602,
+        "y": 5549.022354125977,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "10049f5.85364e1"
+                "2f38d9ab.5bfbbe"
             ]
         ]
     },
     {
-        "id": "10049f5.85364e1",
+        "id": "2f38d9ab.5bfbbe",
         "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",
+        "x": 5918.134292602539,
+        "y": 5547.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "72e5612b.857e68"
+                "e1d73c4d.409db8"
             ]
         ]
     },
     {
-        "id": "9c9074e9.bbaff8",
+        "id": "3fecf8f4.4ce3f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5569.951171875,
-        "y": 5649.800018310547,
-        "z": "d1eceead.adafe",
+        "x": 5595.634536743164,
+        "y": 5632.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "952a99b1.f3f0e"
+                "ba50366d.81301"
             ]
         ]
     },
     {
-        "id": "952a99b1.f3f0e",
+        "id": "ba50366d.81301",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 5774.634536743164,
+        "y": 5648.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "74a77564.40268c",
+        "id": "f166d116.9a8368",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 5756.634536743164,
+        "y": 5600.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "f64c3a10.6bbc38",
+        "id": "1d5ce61.ba31c9a",
         "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",
+        "x": 5305.634536743164,
+        "y": 5702.966293334961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "cd722628.03685",
-                "76458c1b.1a62ac"
+                "8374d45d.c41588",
+                "6d72c625.482d5"
             ]
         ]
     },
     {
-        "id": "cd722628.03685",
+        "id": "8374d45d.c41588",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5628.451171875,
-        "y": 5702.399627685547,
-        "z": "d1eceead.adafe",
+        "x": 5654.134536743164,
+        "y": 5684.966293334961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d04dd9dc.2f2dc8"
+                "53e0b67e.6fc768"
             ]
         ]
     },
     {
-        "id": "d04dd9dc.2f2dc8",
+        "id": "53e0b67e.6fc768",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 5910.134536743164,
+        "y": 5687.966293334961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1006a530.30b813",
+        "id": "1ee806c.abb34f9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5836.951171875,
-        "y": 5746.399627685547,
-        "z": "d1eceead.adafe",
+        "x": 5862.634536743164,
+        "y": 5728.966293334961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "76458c1b.1a62ac",
+        "id": "6d72c625.482d5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5638.451171875,
-        "y": 5751.399627685547,
-        "z": "d1eceead.adafe",
+        "x": 5664.134536743164,
+        "y": 5733.966293334961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1006a530.30b813"
+                "1ee806c.abb34f9"
             ]
         ]
     },
     {
-        "id": "fb4f4697.4dc5f",
+        "id": "1f713bf9.1daaec",
         "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",
+        "x": 5387.134292602539,
+        "y": 5515.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "72e5612b.857e68",
+        "id": "e1d73c4d.409db8",
         "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",
+        "x": 6113.134292602539,
+        "y": 5547.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "3625dda5.38707a"
+                "b323e9c9.c4083"
             ]
         ]
     },
     {
-        "id": "402ab8f9.3aa18",
+        "id": "be7ed337.773238",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6469.450927734375,
-        "y": 5568.800018310547,
-        "z": "d1eceead.adafe",
+        "x": 6495.134292602539,
+        "y": 5551.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4697e13e.13b02",
-                "6c3ba6ac.e7c21",
-                "34e0c57a.0e712a"
+                "1a0db354.43c10d",
+                "711b7fd1.39246",
+                "1b22d01c.0f5988"
             ]
         ]
     },
     {
-        "id": "3625dda5.38707a",
+        "id": "b323e9c9.c4083",
         "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",
+        "x": 6316.134292602539,
+        "y": 5551.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "402ab8f9.3aa18"
+                "be7ed337.773238"
             ]
         ]
     },
     {
-        "id": "6c3ba6ac.e7c21",
+        "id": "711b7fd1.39246",
         "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",
+        "x": 6701.134292602539,
+        "y": 5564.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2e31a205.2611fe",
-                "c9f11bf6.38bb98",
-                "99cec3e1.6d2f68"
+                "d1222469.959ab8",
+                "2ce3fcd5.8dd1cc",
+                "95dec9e7.124ae"
             ]
         ]
     },
     {
-        "id": "4697e13e.13b02",
+        "id": "1a0db354.43c10d",
         "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",
+        "x": 6731.134292602539,
+        "y": 5512.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2e31a205.2611fe",
+        "id": "d1222469.959ab8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6885.450927734375,
-        "y": 5572.800018310547,
-        "z": "d1eceead.adafe",
+        "x": 6911.134292602539,
+        "y": 5555.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2ba283a1.e08d44"
+                "15af61ce.93dc56"
             ]
         ]
     },
     {
-        "id": "c9f11bf6.38bb98",
+        "id": "2ce3fcd5.8dd1cc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6877.450927734375,
-        "y": 5627.800018310547,
-        "z": "d1eceead.adafe",
+        "x": 6903.134292602539,
+        "y": 5610.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "3af9cd94.f12ff2"
+                "85d2a0c5.7b74c"
             ]
         ]
     },
     {
-        "id": "99cec3e1.6d2f68",
+        "id": "95dec9e7.124ae",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6882.450927734375,
-        "y": 5684.800018310547,
-        "z": "d1eceead.adafe",
+        "x": 6908.134292602539,
+        "y": 5667.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c501098b.50507"
+                "6c15ae6.0ebeb5"
             ]
         ]
     },
     {
-        "id": "c501098b.50507",
+        "id": "6c15ae6.0ebeb5",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 7060.134292602539,
+        "y": 5668.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "3af9cd94.f12ff2",
+        "id": "85d2a0c5.7b74c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 7071.134292602539,
+        "y": 5613.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2ba283a1.e08d44",
+        "id": "15af61ce.93dc56",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 7029.833251953125,
-        "y": 5570.4556884765625,
-        "z": "d1eceead.adafe",
+        "x": 7055.516616821289,
+        "y": 5553.022354125977,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "bca9e0da.72619"
+                "370a475d.301248"
             ]
         ]
     },
     {
-        "id": "bca9e0da.72619",
+        "id": "370a475d.301248",
         "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",
+        "x": 7270.134292602539,
+        "y": 5549.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "34e0c57a.0e712a",
+        "id": "1b22d01c.0f5988",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 6625.450927734375,
-        "y": 5645.800018310547,
-        "z": "d1eceead.adafe",
+        "x": 6651.134292602539,
+        "y": 5628.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "9608373.19689c8",
+        "id": "537f8032.a139c8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3854.88330078125,
-        "y": 3534.999969482422,
-        "z": "d1eceead.adafe",
+        "x": 3880.566665649414,
+        "y": 3517.566635131836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6e45c64.2629238",
-                "354c7fc8.6d8de"
+                "4c0087b1.a54ff",
+                "543f9693.a47c"
             ]
         ]
     },
     {
-        "id": "6e45c64.2629238",
+        "id": "4c0087b1.a54ff",
         "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",
+        "x": 4071.149917602539,
+        "y": 3460.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "354c7fc8.6d8de",
+        "id": "543f9693.a47c",
         "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",
+        "x": 4118.149917602539,
+        "y": 3531.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6bdb2c16.23fc7c",
-                "5820e4e6.95b47c"
+                "e4164ac6.db6c38",
+                "5e838a6b.5e0f0c"
             ]
         ]
     },
     {
-        "id": "6bdb2c16.23fc7c",
+        "id": "e4164ac6.db6c38",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4330.884033203125,
-        "y": 3507.999969482422,
-        "z": "d1eceead.adafe",
+        "x": 4356.567398071289,
+        "y": 3490.566635131836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d4fcba65.f8c8f"
+                "4d697267.53d1ec"
             ]
         ]
     },
     {
-        "id": "5820e4e6.95b47c",
+        "id": "5e838a6b.5e0f0c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4337.884246826172,
-        "y": 3564.9999389648438,
-        "z": "d1eceead.adafe",
+        "x": 4363.567611694336,
+        "y": 3547.566604614258,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d9ea756c.06e5e"
+                "fa76b584.bdbd9"
             ]
         ]
     },
     {
-        "id": "d4fcba65.f8c8f",
+        "id": "4d697267.53d1ec",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4458.884521484375,
-        "y": 3503.999969482422,
-        "z": "d1eceead.adafe",
+        "x": 4484.567886352539,
+        "y": 3486.566635131836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "cc0c619e.32de58",
+        "id": "130e3d11.8bda33",
         "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",
+        "x": 3339.766616821289,
+        "y": 3444.966781616211,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a6af6c62.1a6b5",
+        "id": "99b14097.a9c1b8",
         "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": 5321.600845336914,
+        "y": 3446.966812133789,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "811e3163.5710b",
+        "id": "335ed745.f60fb8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4407.6669921875,
-        "y": 3984.616668701172,
-        "z": "d1eceead.adafe",
+        "x": 4433.350357055664,
+        "y": 3967.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "aa9298d8.acde8",
-                "a5e5763f.58bb2"
+                "64f170e7.ccc2d",
+                "d03c542e.06f138"
             ]
         ]
     },
     {
-        "id": "aa9298d8.acde8",
+        "id": "64f170e7.ccc2d",
         "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",
+        "x": 4606.233169555664,
+        "y": 3962.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a5e5763f.58bb2",
+        "id": "d03c542e.06f138",
         "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",
+        "x": 4609.233169555664,
+        "y": 4009.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4df6bcf4.a4f44c",
-                "89771ed8.977b78",
-                "d1de1d5b.be978"
+                "d5d4471e.75f138",
+                "fea86c4e.6eb66",
+                "9876b951.6d5f9"
             ]
         ]
     },
     {
-        "id": "4df6bcf4.a4f44c",
+        "id": "d5d4471e.75f138",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4755.5498046875,
-        "y": 4011.276336669922,
-        "z": "d1eceead.adafe",
+        "x": 4781.233169555664,
+        "y": 3993.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f65d0563.51b9e"
+                "c08f73d3.bbadb"
             ]
         ]
     },
     {
-        "id": "89771ed8.977b78",
+        "id": "fea86c4e.6eb66",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4756.040771484375,
-        "y": 4056.850372314453,
-        "z": "d1eceead.adafe",
+        "x": 4781.724136352539,
+        "y": 4039.417037963867,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "d1de1d5b.be978",
+        "id": "9876b951.6d5f9",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4756.5498046875,
-        "y": 4097.276336669922,
-        "z": "d1eceead.adafe",
+        "x": 4782.233169555664,
+        "y": 4079.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "f65d0563.51b9e",
+        "id": "c08f73d3.bbadb",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4916.5498046875,
-        "y": 4007.276336669922,
-        "z": "d1eceead.adafe",
+        "x": 4942.233169555664,
+        "y": 3989.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "41e51ce8.c7bbd4",
-                "9fcba756.d0c298",
-                "99817ef0.1be558"
+                "71418de6.0d2394",
+                "d8794541.6fe0d",
+                "69521be3.cd51ac"
             ]
         ]
     },
     {
-        "id": "d2f62a11.bbccd",
+        "id": "7f40068a.c630c8",
         "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",
+        "x": 5275.233169555664,
+        "y": 3920.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "9fcba756.d0c298",
+        "id": "d8794541.6fe0d",
         "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",
+        "x": 5210.233169555664,
+        "y": 3977.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ad91a307.53dc18",
-                "66b6c9a.ce41eb8"
+                "eb66d929.7d0b9",
+                "25fd01e0.613c0e"
             ]
         ]
     },
     {
-        "id": "66b6c9a.ce41eb8",
+        "id": "25fd01e0.613c0e",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5407.5498046875,
-        "y": 3981.276336669922,
-        "z": "d1eceead.adafe",
+        "x": 5433.233169555664,
+        "y": 3963.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f5696a58.3dcae"
+                "b7f38bd8.a0bf3"
             ]
         ]
     },
     {
-        "id": "ad91a307.53dc18",
+        "id": "eb66d929.7d0b9",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5409.5498046875,
-        "y": 4014.276336669922,
-        "z": "d1eceead.adafe",
+        "x": 5435.233169555664,
+        "y": 3996.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "cd5f81cd.b325a8"
+                "23361310.a1a764"
             ]
         ]
     },
     {
-        "id": "f5696a58.3dcae",
+        "id": "b7f38bd8.a0bf3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5555.5498046875,
-        "y": 3974.276336669922,
-        "z": "d1eceead.adafe",
+        "x": 5581.233169555664,
+        "y": 3956.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "520c18e.4c672e8"
+                "16198ed9.69ab49"
             ]
         ]
     },
     {
-        "id": "cd5f81cd.b325a8",
+        "id": "23361310.a1a764",
         "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",
+        "x": 5578.233169555664,
+        "y": 3993.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "520c18e.4c672e8",
+        "id": "16198ed9.69ab49",
         "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",
+        "x": 5758.233169555664,
+        "y": 3956.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "41e51ce8.c7bbd4",
+        "id": "71418de6.0d2394",
         "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",
+        "x": 5254.233169555664,
+        "y": 4111.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f5a5405e.ab64e8",
-                "39efe4c8.977e5c"
+                "adaeb862.473368",
+                "2ff17e89.b4833a"
             ]
         ]
     },
     {
-        "id": "f5a5405e.ab64e8",
+        "id": "adaeb862.473368",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5509.5498046875,
-        "y": 4106.276336669922,
-        "z": "d1eceead.adafe",
+        "x": 5535.233169555664,
+        "y": 4088.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "76dcdb2b.58523c"
+                "b52ce206.918da8"
             ]
         ]
     },
     {
-        "id": "39efe4c8.977e5c",
+        "id": "2ff17e89.b4833a",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5502.5498046875,
-        "y": 4165.276336669922,
-        "z": "d1eceead.adafe",
+        "x": 5528.233169555664,
+        "y": 4147.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e34b9d00.f34da8"
+                "b7c68567.02237"
             ]
         ]
     },
     {
-        "id": "76dcdb2b.58523c",
+        "id": "b52ce206.918da8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5639.5498046875,
-        "y": 4110.276336669922,
-        "z": "d1eceead.adafe",
+        "x": 5665.233169555664,
+        "y": 4092.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "e34b9d00.f34da8",
+        "id": "b7c68567.02237",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5644.5498046875,
-        "y": 4164.276336669922,
-        "z": "d1eceead.adafe",
+        "x": 5670.233169555664,
+        "y": 4146.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d870e573.0525d",
-                "daec44c5.c4ca2"
+                "e0f7b55.335ff48",
+                "cb97a1e2.dfe9f8"
             ]
         ]
     },
     {
-        "id": "d870e573.0525d",
+        "id": "e0f7b55.335ff48",
         "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",
+        "x": 5862.233169555664,
+        "y": 4113.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "77e6d570.0136ec",
+        "id": "8511bfc9.24e818",
         "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",
+        "x": 5878.233169555664,
+        "y": 4165.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "daec44c5.c4ca2",
+        "id": "cb97a1e2.dfe9f8",
         "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",
+        "x": 5896.516860961914,
+        "y": 4235.433334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "99817ef0.1be558",
+        "id": "69521be3.cd51ac",
         "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",
+        "x": 5173.216567993164,
+        "y": 4061.333236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "4a51985e.972e68",
+        "id": "94db503d.b50288",
         "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",
+        "x": 409.4172821044922,
+        "y": 5331.532943725586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "35e41a11.58bd1e",
-                "8fea1632.f2d7a"
+                "98c37402.345048",
+                "44b19987.103118"
             ]
         ]
     },
     {
-        "id": "2a89b0c9.686c5",
+        "id": "5e023344.61a9f4",
         "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",
+        "x": 4314.199722290039,
+        "y": 5495.416732788086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "11eb64db.01f3fb",
-                "edc304ba.5ec56",
-                "e3707812.01b138"
+                "76f7324c.5ab6f4",
+                "92aa08d0.816178",
+                "84add947.e60b78"
             ]
         ]
     },
     {
-        "id": "8fd56902.a16fd8",
+        "id": "26cdc27d.9e4c6e",
         "type": "comment",
         "name": "Update ROOT UNI's bw -- ALREADY DONE",
         "info": "",
         "comments": "",
-        "x": 4286.516845703125,
-        "y": 5464.850311279297,
-        "z": "d1eceead.adafe",
+        "x": 4312.200210571289,
+        "y": 5447.416976928711,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "fe5a805b.6befb8",
+        "id": "eb8b95c0.79475",
         "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",
+        "x": 4929.199966430664,
+        "y": 5565.416976928711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "edc304ba.5ec56",
+        "id": "92aa08d0.816178",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4506.007568359375,
-        "y": 5483.424285888672,
-        "z": "d1eceead.adafe",
+        "x": 4531.690933227539,
+        "y": 5465.990951538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d06cf255.10cad"
+                "8b26daec.dead98"
             ]
         ]
     },
     {
-        "id": "e3707812.01b138",
+        "id": "84add947.e60b78",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4501.5166015625,
-        "y": 5527.850250244141,
-        "z": "d1eceead.adafe",
+        "x": 4527.199966430664,
+        "y": 5510.416915893555,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c2ada4d7.cf23a"
+                "6ddd64cd.a4b574"
             ]
         ]
     },
     {
-        "id": "d06cf255.10cad",
+        "id": "8b26daec.dead98",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 4694.262466430664,
+        "y": 5465.276657104492,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "c2ada4d7.cf23a",
+        "id": "6ddd64cd.a4b574",
         "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",
+        "x": 4695.199966430664,
+        "y": 5510.416915893555,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "487370c3.c16b7",
+        "id": "5ac227ed.4c0b7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4666.5166015625,
-        "y": 5577.850311279297,
-        "z": "d1eceead.adafe",
+        "x": 4692.199966430664,
+        "y": 5560.416976928711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6c262f9d.59d16",
-                "fe5a805b.6befb8"
+                "176f7b0f.04a15d",
+                "eb8b95c0.79475"
             ]
         ]
     },
     {
-        "id": "11eb64db.01f3fb",
+        "id": "76f7324c.5ab6f4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4497.5166015625,
-        "y": 5577.850311279297,
-        "z": "d1eceead.adafe",
+        "x": 4523.199966430664,
+        "y": 5560.416976928711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "487370c3.c16b7"
+                "5ac227ed.4c0b7"
             ]
         ]
     },
     {
-        "id": "6c262f9d.59d16",
+        "id": "176f7b0f.04a15d",
         "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",
+        "x": 4885.200942993164,
+        "y": 5485.416976928711,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "472764ad.0e5da4",
+        "id": "2932b285.c1e58e",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
-        "x": 5288.216796875,
-        "y": 5440.616912841797,
-        "z": "d1eceead.adafe",
+        "x": 5313.900161743164,
+        "y": 5423.183578491211,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a96c5a1a.d66bf",
+        "id": "9d183ed0.0c624",
         "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",
+        "x": 5339.683364868164,
+        "y": 5465.383773803711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "35e41a11.58bd1e",
+        "id": "98c37402.345048",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 567.8836059570312,
-        "y": 5399.999969482422,
-        "z": "d1eceead.adafe",
+        "x": 593.5669708251953,
+        "y": 5382.566635131836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "49ab1cdc.2b3dfc"
+                "e53158e8.a8e898"
             ]
         ]
     },
     {
-        "id": "8fea1632.f2d7a",
+        "id": "44b19987.103118",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 550.883544921875,
-        "y": 5321.999969482422,
-        "z": "d1eceead.adafe",
+        "x": 576.5669097900391,
+        "y": 5304.566635131836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "44e1ece4.47debc"
+                "d82acda1.7d932"
             ]
         ]
     },
     {
-        "id": "71bd2e28.fdc428",
+        "id": "add9e89e.85dcc8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 679.8833923339844,
-        "y": 4408.999694824219,
-        "z": "d1eceead.adafe",
+        "x": 705.5667572021484,
+        "y": 4391.566360473633,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ab47ddf.140532",
-                "d3485e4a.cbde48",
-                "964a9d6b.511ef",
-                "58993466.bcba34",
-                "b72e55ab.bc6bd8",
-                "8d45971b.519e08"
+                "1b682749.fdf219",
+                "555aecf4.9d0abc",
+                "fa8f69fe.c57418",
+                "924743a9.bdd1d",
+                "eeb2edff.f77838",
+                "b3758874.8f232",
+                "9c7760f0.090d48"
             ]
         ]
     },
     {
-        "id": "ab47ddf.140532",
+        "id": "1b682749.fdf219",
         "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",
+        "x": 957.2501068115234,
+        "y": 4369.616165161133,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "83fd3013.a6f008",
+        "id": "20195ed4.4f043a",
         "type": "comment",
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",
         "info": "",
         "comments": "",
-        "x": 1033.1338806152344,
-        "y": 4335.132995605469,
-        "z": "d1eceead.adafe",
+        "x": 1058.8172454833984,
+        "y": 4317.699661254883,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "8b20d7ab.715e18",
+        "id": "9fa4061c.f2e2c8",
         "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",
+        "x": 1166.6670989990234,
+        "y": 4398.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "d3485e4a.cbde48",
+        "id": "555aecf4.9d0abc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 911.9837341308594,
-        "y": 4505.333190917969,
-        "z": "d1eceead.adafe",
+        "x": 937.6670989990234,
+        "y": 4487.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "8b20d7ab.715e18",
-                "3ddce0eb.9cdfd8"
+                "9fa4061c.f2e2c8",
+                "a9e7fb46.8bda4"
             ]
         ]
     },
     {
-        "id": "3ddce0eb.9cdfd8",
+        "id": "a9e7fb46.8bda4",
         "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",
+        "x": 1173.6670989990234,
+        "y": 4480.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c4f933ed.6c6328",
-                "c8f61cf.a6fdde",
-                "31635596.d79712"
+                "caf23ffe.0efab",
+                "c3c6018c.a6e8b8",
+                "a18cc13f.db156"
             ]
         ]
     },
     {
-        "id": "c4f933ed.6c6328",
+        "id": "caf23ffe.0efab",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1343.4838562011719,
-        "y": 4450.333190917969,
-        "z": "d1eceead.adafe",
+        "x": 1369.167221069336,
+        "y": 4432.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "40098ed2.4f4dd"
+                "f910fabf.7d6ff8"
             ]
         ]
     },
     {
-        "id": "c8f61cf.a6fdde",
+        "id": "c3c6018c.a6e8b8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1335.4838562011719,
-        "y": 4505.333190917969,
-        "z": "d1eceead.adafe",
+        "x": 1361.167221069336,
+        "y": 4487.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "8f4995e7.00e5b8"
+                "7989bd98.acfa84"
             ]
         ]
     },
     {
-        "id": "40098ed2.4f4dd",
+        "id": "f910fabf.7d6ff8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1487.8661804199219,
-        "y": 4449.988861083984,
-        "z": "d1eceead.adafe",
+        "x": 1513.549545288086,
+        "y": 4432.555526733398,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4b557dbd.14d794"
+                "ffb71773.7c6d48"
             ]
         ]
     },
     {
-        "id": "4b557dbd.14d794",
+        "id": "ffb71773.7c6d48",
         "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",
+        "x": 1697.6670989990234,
+        "y": 4430.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a0958afe.9d1b"
+                "a91274f1.8c8af"
             ]
         ]
     },
     {
-        "id": "a0958afe.9d1b",
+        "id": "a91274f1.8c8af",
         "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",
+        "x": 1892.6670989990234,
+        "y": 4430.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "31026a11.2a4bde"
+                "4cf12171.7f9938"
             ]
         ]
     },
     {
-        "id": "31635596.d79712",
+        "id": "a18cc13f.db156",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1340.4838562011719,
-        "y": 4562.333190917969,
-        "z": "d1eceead.adafe",
+        "x": 1366.167221069336,
+        "y": 4544.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c3c84b5.76fc5b8"
+                "3d61f539.cfb7aa"
             ]
         ]
     },
     {
-        "id": "c3c84b5.76fc5b8",
+        "id": "3d61f539.cfb7aa",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 1518.167221069336,
+        "y": 4545.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "8f4995e7.00e5b8",
+        "id": "7989bd98.acfa84",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 1529.167221069336,
+        "y": 4488.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "ca7cc65e.e299b",
+        "id": "a5cb8297.ace3c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2248.9837341308594,
-        "y": 4452.333190917969,
-        "z": "d1eceead.adafe",
+        "x": 2274.6670989990234,
+        "y": 4434.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7e1000fc.f7ace",
-                "10f0f2b8.28ecdd",
-                "1cf608fc.280f8f"
+                "2680c237.68eca6",
+                "fc040fd7.89c84",
+                "2a46caf5.5b4116"
             ]
         ]
     },
     {
-        "id": "31026a11.2a4bde",
+        "id": "4cf12171.7f9938",
         "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",
+        "x": 2095.6670989990234,
+        "y": 4434.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ca7cc65e.e299b"
+                "a5cb8297.ace3c"
             ]
         ]
     },
     {
-        "id": "964a9d6b.511ef",
+        "id": "fa8f69fe.c57418",
         "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",
+        "x": 1079.1673431396484,
+        "y": 4592.499465942383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a14b7306.f0f088",
-                "edc3d42b.21d3d"
+                "f60ef44c.acdc6",
+                "f2d3c91e.712808"
             ]
         ]
     },
     {
-        "id": "edc3d42b.21d3d",
+        "id": "f2d3c91e.712808",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1417.9837341308594,
-        "y": 4657.932800292969,
-        "z": "d1eceead.adafe",
+        "x": 1443.6670989990234,
+        "y": 4640.499465942383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7d2a7da9.46fdfc"
+                "95261a80.102e28"
             ]
         ]
     },
     {
-        "id": "a14b7306.f0f088",
+        "id": "f60ef44c.acdc6",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1413.9837341308594,
-        "y": 4617.932800292969,
-        "z": "d1eceead.adafe",
+        "x": 1439.6670989990234,
+        "y": 4600.499465942383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "db3e9725.884648"
+                "93ef3053.4d666"
             ]
         ]
     },
     {
-        "id": "db3e9725.884648",
+        "id": "93ef3053.4d666",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 1597.6670989990234,
+        "y": 4600.499465942383,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "7d2a7da9.46fdfc",
+        "id": "95261a80.102e28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1575.4837341308594,
-        "y": 4657.932800292969,
-        "z": "d1eceead.adafe",
+        "x": 1601.1670989990234,
+        "y": 4640.499465942383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "10f0f2b8.28ecdd",
+        "id": "fc040fd7.89c84",
         "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",
+        "x": 2480.6670989990234,
+        "y": 4447.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "25e5e61.acf541a",
-                "12a14aa1.cf2fb5",
-                "c1a2b3a0.8c75c"
+                "3d8ec7b4.a91e7",
+                "f9528a5a.50e1f8",
+                "f194c3a5.898d88"
             ]
         ]
     },
     {
-        "id": "7e1000fc.f7ace",
+        "id": "2680c237.68eca6",
         "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",
+        "x": 2510.6670989990234,
+        "y": 4395.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "25e5e61.acf541a",
+        "id": "3d8ec7b4.a91e7",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2664.9837341308594,
-        "y": 4456.333190917969,
-        "z": "d1eceead.adafe",
+        "x": 2690.6670989990234,
+        "y": 4438.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5696d51e.dbfe64"
+                "e578c39c.344a5"
             ]
         ]
     },
     {
-        "id": "12a14aa1.cf2fb5",
+        "id": "f9528a5a.50e1f8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2656.9837341308594,
-        "y": 4511.333190917969,
-        "z": "d1eceead.adafe",
+        "x": 2682.6670989990234,
+        "y": 4493.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "8d572a45.011df8"
+                "b1a83287.5e83a"
             ]
         ]
     },
     {
-        "id": "c1a2b3a0.8c75c",
+        "id": "f194c3a5.898d88",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2661.9837341308594,
-        "y": 4568.333190917969,
-        "z": "d1eceead.adafe",
+        "x": 2687.6670989990234,
+        "y": 4550.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "dddace6e.f9e9f"
+                "d1a6ffed.890f4"
             ]
         ]
     },
     {
-        "id": "dddace6e.f9e9f",
+        "id": "d1a6ffed.890f4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 2839.6670989990234,
+        "y": 4551.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "8d572a45.011df8",
+        "id": "b1a83287.5e83a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 2850.6670989990234,
+        "y": 4496.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "5696d51e.dbfe64",
+        "id": "e578c39c.344a5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2809.3660583496094,
-        "y": 4453.988861083984,
-        "z": "d1eceead.adafe",
+        "x": 2835.0494232177734,
+        "y": 4436.555526733398,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e4cea83c.4d71a"
+                "dfc70a8a.f85818"
             ]
         ]
     },
     {
-        "id": "e4cea83c.4d71a",
+        "id": "dfc70a8a.f85818",
         "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",
+        "x": 3049.6670989990234,
+        "y": 4432.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1cf608fc.280f8f",
+        "id": "2a46caf5.5b4116",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2404.9837341308594,
-        "y": 4529.333190917969,
-        "z": "d1eceead.adafe",
+        "x": 2430.6670989990234,
+        "y": 4511.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "58993466.bcba34",
+        "id": "924743a9.bdd1d",
         "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",
+        "x": 1108.2501068115234,
+        "y": 4812.616165161133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "b72e55ab.bc6bd8",
+        "id": "eeb2edff.f77838",
         "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",
+        "x": 923.2501068115234,
+        "y": 4879.616165161133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "191ee334.0f09fd",
-                "b8911820.2c8f68"
+                "33b186f1.cd717a",
+                "46c96756.fc5c58"
             ]
         ]
     },
     {
-        "id": "191ee334.0f09fd",
+        "id": "33b186f1.cd717a",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1162.5667419433594,
-        "y": 4882.049499511719,
-        "z": "d1eceead.adafe",
+        "x": 1188.2501068115234,
+        "y": 4864.616165161133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "328aa2d2.c36a96"
+                "cdcc95c0.40a4e8"
             ]
         ]
     },
     {
-        "id": "b8911820.2c8f68",
+        "id": "46c96756.fc5c58",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1158.5667419433594,
-        "y": 4930.049499511719,
-        "z": "d1eceead.adafe",
+        "x": 1184.2501068115234,
+        "y": 4912.616165161133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "88b54a6f.ba3898"
+                "5f6a4b73.d387f4"
             ]
         ]
     },
     {
-        "id": "328aa2d2.c36a96",
+        "id": "cdcc95c0.40a4e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1318.5667419433594,
-        "y": 4878.049499511719,
-        "z": "d1eceead.adafe",
+        "x": 1344.2501068115234,
+        "y": 4860.616165161133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4a7a1b00.5fe524"
+                "5134ba22.f81734"
             ]
         ]
     },
     {
-        "id": "88b54a6f.ba3898",
+        "id": "5f6a4b73.d387f4",
         "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",
+        "x": 1332.2501068115234,
+        "y": 4907.616165161133,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "d5cdb27.e4e575",
+        "id": "73beafc9.2c20a8",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
-        "x": 1587.4664001464844,
-        "y": 4828.749694824219,
-        "z": "d1eceead.adafe",
+        "x": 1613.1497650146484,
+        "y": 4811.316360473633,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "4a7a1b00.5fe524",
+        "id": "5134ba22.f81734",
         "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",
+        "x": 1638.9329681396484,
+        "y": 4853.516555786133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "1003b628.8cf272",
+        "id": "39215cce.b57e94",
         "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",
+        "x": 1052.5667572021484,
+        "y": 4126.883255004883,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "44e1ece4.47debc",
+        "id": "d82acda1.7d932",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 632.8834228515625,
-        "y": 4148.999725341797,
-        "z": "d1eceead.adafe",
+        "x": 658.5667877197266,
+        "y": 4131.566390991211,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1003b628.8cf272",
-                "71bd2e28.fdc428"
+                "39215cce.b57e94",
+                "add9e89e.85dcc8"
             ]
         ]
     },
     {
-        "id": "49ab1cdc.2b3dfc",
+        "id": "e53158e8.a8e898",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 716.3333740234375,
-        "y": 5401.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 742.0167388916016,
+        "y": 5384.083236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "723c2903.f58428",
-                "98b88954.793148",
-                "b393338f.3c0a5",
-                "119574e6.129413"
+                "5f6a4675.ad6e08",
+                "454309b7.55d6d8",
+                "1e655667.3c83ca",
+                "36ecf6b9.5afb0a"
             ]
         ]
     },
     {
-        "id": "723c2903.f58428",
+        "id": "5f6a4675.ad6e08",
         "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": 1103.4000396728516,
+        "y": 5147.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "98b88954.793148",
+        "id": "454309b7.55d6d8",
         "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": 1014.4000396728516,
+        "y": 5216.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "b393338f.3c0a5",
+        "id": "1e655667.3c83ca",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 869.88330078125,
-        "y": 5636.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 905.5666656494141,
+        "y": 5451.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "df7f814b.30dca",
-                "680a6c2d.c81304",
-                "f02d2a13.d0aa48"
+                "96f2f082.9a3518",
+                "4b895364.485e14",
+                "2fffa63d.405042"
             ]
         ]
     },
     {
-        "id": "c8c4cb96.f9d8b",
+        "id": "bd546556.218588",
         "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": 2614.565933227539,
+        "y": 5376.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "43900724.7021a8",
-                "b5fd98a.36736e8",
-                "3c26b3f8.230acc"
+                "d9b04f13.72ba2",
+                "6f67d0fd.f943c",
+                "d85e2a4.827e658"
             ]
         ]
     },
     {
-        "id": "de9e1e1d.dcbc3",
+        "id": "eb3b9787.8ee65",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2535.882568359375,
-        "y": 5587.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2564.565933227539,
+        "y": 5440.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "d2b1cccb.1f5468",
+        "id": "89310244.45d948",
         "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": 2644.565933227539,
+        "y": 5324.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "43900724.7021a8",
+        "id": "d9b04f13.72ba2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2795.882568359375,
-        "y": 5514.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2932.5660552978516,
+        "y": 5307.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "dc7a8a3b.a925f8"
+                "ca13eb43.a9266"
             ]
         ]
     },
     {
-        "id": "b5fd98a.36736e8",
+        "id": "6f67d0fd.f943c",
         "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": 2924.5660552978516,
+        "y": 5362.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c1ab7307.8305a8"
+                "7e30219a.74a1a8"
             ]
         ]
     },
     {
-        "id": "3c26b3f8.230acc",
+        "id": "d85e2a4.827e658",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2792.882568359375,
-        "y": 5626.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2929.5660552978516,
+        "y": 5419.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f1d869f8.b644e"
+                "1fa2a159.15189f"
             ]
         ]
     },
     {
-        "id": "f1d869f8.b644e",
+        "id": "1fa2a159.15189f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3081.5660552978516,
+        "y": 5420.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "c1ab7307.8305a8",
+        "id": "7e30219a.74a1a8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3092.5660552978516,
+        "y": 5365.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "dc7a8a3b.a925f8",
+        "id": "ca13eb43.a9266",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2940.264892578125,
-        "y": 5512.1722412109375,
-        "z": "d1eceead.adafe",
+        "x": 3076.9483795166016,
+        "y": 5304.73893737793,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "99f651cc.e3a158"
+                "3ed958.dd670ea8"
             ]
         ]
     },
     {
-        "id": "99f651cc.e3a158",
+        "id": "3ed958.dd670ea8",
         "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": 3291.5660552978516,
+        "y": 5301.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "df7f814b.30dca",
+        "id": "96f2f082.9a3518",
         "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": 1187.566665649414,
+        "y": 5320.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1d552db6.d6aaca",
+        "id": "bd5e9405.7c27a8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1362.3834228515625,
-        "y": 5644.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1398.0667877197266,
+        "y": 5459.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2d69161c.7523aa"
+                "de47c705.79a8b8"
             ]
         ]
     },
     {
-        "id": "d7946986.6d0968",
+        "id": "6b3e7adb.d2bb84",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1365.3834228515625,
-        "y": 5532.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1401.0667877197266,
+        "y": 5347.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b24f95b.8630968"
+                "a396ce34.a18e2"
             ]
         ]
     },
     {
-        "id": "9ea8b87c.75f8b",
+        "id": "a85067c1.2cd6d",
         "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": 1393.0667877197266,
+        "y": 5402.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d1cfde55.05efd"
+                "d6007294.f11f4"
             ]
         ]
     },
     {
-        "id": "b24f95b.8630968",
+        "id": "a396ce34.a18e2",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1499.765625,
-        "y": 5527.172332763672,
-        "z": "d1eceead.adafe",
+        "x": 1535.448989868164,
+        "y": 5341.739028930664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "57f5a4ed.934544"
+                "7dd1d4e7.a0f1bc"
             ]
         ]
     },
     {
-        "id": "2d69161c.7523aa",
+        "id": "de47c705.79a8b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1550.0667877197266,
+        "y": 5460.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "d1cfde55.05efd",
+        "id": "d6007294.f11f4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1561.0667877197266,
+        "y": 5403.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "57f5a4ed.934544",
+        "id": "7dd1d4e7.a0f1bc",
         "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": 1722.566177368164,
+        "y": 5343.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "489e94a0.cb0724"
+                "559db4ec.64792c"
             ]
         ]
     },
     {
-        "id": "489e94a0.cb0724",
+        "id": "559db4ec.64792c",
         "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": 1950.566177368164,
+        "y": 5336.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "70d2a39a.39c914"
+                "799fadac.e2e6ec"
             ]
         ]
     },
     {
-        "id": "680a6c2d.c81304",
+        "id": "4b895364.485e14",
         "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": 1205.566665649414,
+        "y": 5395.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1d552db6.d6aaca",
-                "d7946986.6d0968",
-                "9ea8b87c.75f8b"
+                "bd5e9405.7c27a8",
+                "6b3e7adb.d2bb84",
+                "a85067c1.2cd6d"
             ]
         ]
     },
     {
-        "id": "70d2a39a.39c914",
+        "id": "799fadac.e2e6ec",
         "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": 2156.566177368164,
+        "y": 5333.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "11f0110f.f1cbd7"
+                "7cbbce76.57d9f"
             ]
         ]
     },
     {
-        "id": "11f0110f.f1cbd7",
+        "id": "7cbbce76.57d9f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2335.8822021484375,
-        "y": 5521.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2371.5655670166016,
+        "y": 5336.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d2b1cccb.1f5468",
-                "c8c4cb96.f9d8b",
-                "de9e1e1d.dcbc3"
+                "89310244.45d948",
+                "bd546556.218588",
+                "eb3b9787.8ee65"
             ]
         ]
     },
     {
-        "id": "f02d2a13.d0aa48",
+        "id": "2fffa63d.405042",
         "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": 1329.3333892822266,
+        "y": 5544.483169555664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "73cc7454.46b21c",
-                "983cf462.7773e"
+                "fb4bb7df.e56c5",
+                "af1e6659.9dd9c8"
             ]
         ]
     },
     {
-        "id": "73cc7454.46b21c",
+        "id": "fb4bb7df.e56c5",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1640.1500244140625,
-        "y": 5722.916473388672,
-        "z": "d1eceead.adafe",
+        "x": 1675.8333892822266,
+        "y": 5537.483169555664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d64e37c.99aa9c8"
+                "84518bf4.248028"
             ]
         ]
     },
     {
-        "id": "983cf462.7773e",
+        "id": "af1e6659.9dd9c8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1644.1500244140625,
-        "y": 5762.916473388672,
-        "z": "d1eceead.adafe",
+        "x": 1679.8333892822266,
+        "y": 5577.483169555664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "63d68d1b.26356c"
+                "b347040e.1f286"
             ]
         ]
     },
     {
-        "id": "d64e37c.99aa9c8",
+        "id": "84518bf4.248028",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1833.8333892822266,
+        "y": 5537.483169555664,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "63d68d1b.26356c",
+        "id": "b347040e.1f286",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1801.6500244140625,
-        "y": 5762.916473388672,
-        "z": "d1eceead.adafe",
+        "x": 1837.3333892822266,
+        "y": 5577.483169555664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
-            []
+            [
+                "3d1d7271.d95cbe"
+            ]
         ]
     },
     {
-        "id": "119574e6.129413",
+        "id": "36ecf6b9.5afb0a",
         "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",
+        "x": 938.8667144775391,
+        "y": 5874.283432006836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "20383b77.9d13bc",
-                "9b5788ce.9c9408"
+                "4a5bd207.ca776c",
+                "b171c0.d456c64"
             ]
         ]
     },
     {
-        "id": "20383b77.9d13bc",
+        "id": "4a5bd207.ca776c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1105.183349609375,
-        "y": 5868.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 1132.866714477539,
+        "y": 5701.283462524414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c8a5ff15.a0cc5"
+                "b00c5aa2.01bbe8"
             ]
         ]
     },
     {
-        "id": "9b5788ce.9c9408",
+        "id": "b171c0.d456c64",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1093.3500366210938,
-        "y": 6041.316864013672,
-        "z": "d1eceead.adafe",
+        "x": 1119.0334014892578,
+        "y": 6023.883529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "80ab1272.8cacd"
+                "782b8611.563688"
             ]
         ]
     },
     {
-        "id": "c8a5ff15.a0cc5",
+        "id": "b00c5aa2.01bbe8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1253.35009765625,
-        "y": 5868.316864013672,
-        "z": "d1eceead.adafe",
+        "x": 1281.033462524414,
+        "y": 5700.883560180664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b646edcc.5849d8",
-                "7aaef741.32dd88"
+                "8daf379c.cd379",
+                "ae051555.1a065",
+                "5d9c1c4d.83462c"
             ]
         ]
     },
     {
-        "id": "b646edcc.5849d8",
+        "id": "8daf379c.cd379",
         "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": 1702.883316040039,
+        "y": 5672.283462524414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "7aaef741.32dd88",
+        "id": "ae051555.1a065",
         "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": 1517.883316040039,
+        "y": 5739.283462524414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f0373e80.9f5c1",
-                "17b9923a.e6ff36"
+                "f1328e61.aaecf8",
+                "75cc2f9e.02c51"
             ]
         ]
     },
     {
-        "id": "f0373e80.9f5c1",
+        "id": "f1328e61.aaecf8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1755.199951171875,
-        "y": 5891.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 1782.883316040039,
+        "y": 5724.283462524414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ea0794c3.5caad8"
+                "320d795a.de0396"
             ]
         ]
     },
     {
-        "id": "17b9923a.e6ff36",
+        "id": "75cc2f9e.02c51",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1751.199951171875,
-        "y": 5939.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 1781.883316040039,
+        "y": 5772.283462524414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f785b40a.2c0f08"
+                "9b6d9f14.bbdc1"
             ]
         ]
     },
     {
-        "id": "ea0794c3.5caad8",
+        "id": "320d795a.de0396",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1911.199951171875,
-        "y": 5887.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 1938.883316040039,
+        "y": 5720.283462524414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c184cafd.df5108"
+                "d445fc4a.df5c"
             ]
         ]
     },
     {
-        "id": "f785b40a.2c0f08",
+        "id": "9b6d9f14.bbdc1",
         "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": 1929.883316040039,
+        "y": 5767.283462524414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "c184cafd.df5108",
+        "id": "d445fc4a.df5c",
         "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": 2247.5660552978516,
+        "y": 5714.183853149414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "c1da52d9.9cf468",
+        "id": "d355d862.978bc",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
-        "x": 2194.0994873046875,
-        "y": 5839.416961669922,
-        "z": "d1eceead.adafe",
+        "x": 2221.7828521728516,
+        "y": 5671.983657836914,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "80ab1272.8cacd",
+        "id": "782b8611.563688",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1230.916748046875,
-        "y": 6040.616668701172,
-        "z": "d1eceead.adafe",
+        "x": 1256.600112915039,
+        "y": 6023.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "49431e5b.e46588",
-                "1475339.a9ed04c"
+                "dfb91948.e397a8",
+                "a8afb078.60b068",
+                "9067b91d.deea4"
             ]
         ]
     },
     {
-        "id": "49431e5b.e46588",
+        "id": "dfb91948.e397a8",
         "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": 1561.9162139892578,
+        "y": 5956.383438110352,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f57bdc9.9ead4a"
+                "9cf25842.080a8"
             ]
         ]
     },
     {
-        "id": "f57bdc9.9ead4a",
+        "id": "9cf25842.080a8",
         "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",
+        "x": 1870.250015258789,
+        "y": 6012.38346862793,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ba35dccb.3b6bb8"
+                "6539b459.18686c"
             ]
         ]
     },
     {
-        "id": "ba35dccb.3b6bb8",
+        "id": "6539b459.18686c",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2024.2332763671875,
-        "y": 6029.81689453125,
-        "z": "d1eceead.adafe",
+        "x": 2049.9166412353516,
+        "y": 6012.383560180664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "86341ec4.ccb728"
+                "eb5ca2dd.0acd08"
             ]
         ]
     },
     {
-        "id": "86341ec4.ccb728",
+        "id": "eb5ca2dd.0acd08",
         "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",
+        "x": 2249.916519165039,
+        "y": 6012.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "73b15a95.c45e6c",
-                "577c89f1.70257",
-                "ebf7b15b.49862"
+                "d2d794d6.23b038",
+                "fd78cb11.7b7858",
+                "dc3bf10c.53584"
             ]
         ]
     },
     {
-        "id": "73b15a95.c45e6c",
+        "id": "d2d794d6.23b038",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2431.23291015625,
-        "y": 6079.816864013672,
-        "z": "d1eceead.adafe",
+        "x": 2456.916275024414,
+        "y": 6062.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d5e5b35.6604c5"
+                "2ee18ab4.452c46"
             ]
         ]
     },
     {
-        "id": "925dd5ef.2fc678",
+        "id": "6518db29.e12ccc",
         "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",
+        "x": 2434.149917602539,
+        "y": 6246.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "42725353.b4a374",
-                "1745f7ad.eada2",
-                "ebfc9334.bdf468"
+                "1586acc8.b40733",
+                "3f4ac64b.7a4a4a",
+                "c51a0fc1.cf0b78"
             ]
         ]
     },
     {
-        "id": "6ac4c475.ce37cc",
+        "id": "2ead9053.75b73",
         "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": 1603.1498565673828,
+        "y": 6289.583145141602,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "df9efed7.82417"
+                "606f2389.64cdcc"
             ]
         ]
     },
     {
-        "id": "df9efed7.82417",
+        "id": "606f2389.64cdcc",
         "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": 1800.1498565673828,
+        "y": 6303.583145141602,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "376f554a.32ded2",
-                "e86a8d88.08809"
+                "c7f0bc3b.019c9",
+                "c9900403.e4a84"
             ]
         ]
     },
     {
-        "id": "376f554a.32ded2",
+        "id": "c7f0bc3b.019c9",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1972.466552734375,
-        "y": 6186.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 2004.149917602539,
+        "y": 6206.583145141602,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "bc2d7c0c.7cc4a8"
+                "b4e58d4e.4eaf1"
             ]
         ]
     },
     {
-        "id": "bc2d7c0c.7cc4a8",
+        "id": "b4e58d4e.4eaf1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2135.466552734375,
-        "y": 6186.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 2185.149917602539,
+        "y": 6222.583145141602,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "925dd5ef.2fc678"
+                "6518db29.e12ccc"
             ]
         ]
     },
     {
-        "id": "e86a8d88.08809",
+        "id": "c9900403.e4a84",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1988.466552734375,
-        "y": 6482.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 2014.149917602539,
+        "y": 6464.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "32fa6a7d.612076"
+                "5c8dbf44.909798"
             ]
         ]
     },
     {
-        "id": "32fa6a7d.612076",
+        "id": "5c8dbf44.909798",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2151.466552734375,
-        "y": 6482.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 2177.149917602539,
+        "y": 6464.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6e62ca.5284a538"
+                "972de022.0ff4c8"
             ]
         ]
     },
     {
-        "id": "6e62ca.5284a538",
+        "id": "972de022.0ff4c8",
         "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",
+        "x": 2420.149917602539,
+        "y": 6464.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "91368e45.2e3cd8",
+        "id": "d7d50183.fdbf5",
         "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",
+        "x": 1388.149917602539,
+        "y": 7230.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "d5e5b35.6604c5",
+        "id": "2ee18ab4.452c46",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1433.466552734375,
-        "y": 6177.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 1429.1498565673828,
+        "y": 6287.583145141602,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6ac4c475.ce37cc",
-                "91368e45.2e3cd8",
-                "5c661b6d.db566c"
+                "2ead9053.75b73",
+                "d7d50183.fdbf5",
+                "e2860ec7.2879b"
             ]
         ]
     },
     {
-        "id": "42725353.b4a374",
+        "id": "1586acc8.b40733",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2619.466552734375,
-        "y": 6266.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 2645.149917602539,
+        "y": 6248.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "aedd4240.642968"
+                "31acc7de.eb35a"
             ]
         ]
     },
     {
-        "id": "1745f7ad.eada2",
+        "id": "3f4ac64b.7a4a4a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2619.95751953125,
-        "y": 6311.590606689453,
-        "z": "d1eceead.adafe",
+        "x": 2645.640884399414,
+        "y": 6294.157272338867,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6425bc45.5cdfcc"
+                "a537397f.244a6"
             ]
         ]
     },
     {
-        "id": "ebfc9334.bdf468",
+        "id": "c51a0fc1.cf0b78",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2617.466552734375,
-        "y": 6355.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 2643.149917602539,
+        "y": 6337.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "337169e1.665c2e"
+                "c765f98e.c8b24"
             ]
         ]
     },
     {
-        "id": "ebf7b15b.49862",
+        "id": "dc3bf10c.53584",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2455.282958984375,
-        "y": 5980.616668701172,
-        "z": "d1eceead.adafe",
+        "x": 2480.966323852539,
+        "y": 5963.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "577c89f1.70257",
+        "id": "fd78cb11.7b7858",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2452.7919921875,
-        "y": 6024.042633056641,
-        "z": "d1eceead.adafe",
+        "x": 2478.475357055664,
+        "y": 6006.609298706055,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "1475339.a9ed04c",
+        "id": "a8afb078.60b068",
         "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": 1559.0834503173828,
+        "y": 6017.983047485352,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "aedd4240.642968",
+        "id": "31acc7de.eb35a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2785.466552734375,
-        "y": 6256.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 2811.149917602539,
+        "y": 6238.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "20a20b24.b18d74",
-                "da0ac321.ebd92",
-                "450533a8.9c748c",
-                "dc80e7d7.692bf8",
-                "7b453ddd.4a4edc"
+                "d6296a84.0c07b",
+                "f2b7ba42.95aca8",
+                "d7abab02.efd25",
+                "933064b1.3f6b68",
+                "31b8d600.38568a"
             ]
         ]
     },
     {
-        "id": "337169e1.665c2e",
+        "id": "c765f98e.c8b24",
         "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",
+        "x": 2810.149917602539,
+        "y": 6336.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "6425bc45.5cdfcc",
+        "id": "a537397f.244a6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 2808.2122955322266,
+        "y": 6294.443008422852,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "20a20b24.b18d74",
+        "id": "d6296a84.0c07b",
         "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",
+        "x": 3033.149917602539,
+        "y": 5956.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "da0ac321.ebd92",
+        "id": "f2b7ba42.95aca8",
         "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",
+        "x": 3059.149917602539,
+        "y": 6073.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ab328def.9c2568",
-                "1e0d49ce.54650e",
-                "83f96b0e.23503"
+                "c16bbe6e.2f18e8",
+                "8e5054c2.6d8be8",
+                "8a22e0f4.ac84d"
             ]
         ]
     },
     {
-        "id": "450533a8.9c748c",
+        "id": "d7abab02.efd25",
         "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",
+        "x": 3162.149917602539,
+        "y": 6340.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e189248a.5308d8",
-                "42e13b38.68927c"
+                "fc236214.f51f38",
+                "6b8cfbc.a2c4d84"
             ]
         ]
     },
     {
-        "id": "dc80e7d7.692bf8",
+        "id": "933064b1.3f6b68",
         "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",
+        "x": 3100.149917602539,
+        "y": 6475.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "75c39310.64e10c",
-                "865b2c0.812e658"
+                "2126f3a4.668d54",
+                "a948f36a.4c2d08"
             ]
         ]
     },
     {
-        "id": "7b453ddd.4a4edc",
+        "id": "31b8d600.38568a",
         "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",
+        "x": 3081.149917602539,
+        "y": 6591.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "ab328def.9c2568",
+        "id": "c16bbe6e.2f18e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3228.9666748046875,
-        "y": 6043.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 3254.6500396728516,
+        "y": 6025.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7b2173a0.a25f4c"
+                "78bd184e.3e97c8"
             ]
         ]
     },
     {
-        "id": "1e0d49ce.54650e",
+        "id": "8e5054c2.6d8be8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3220.9666748046875,
-        "y": 6098.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 3246.6500396728516,
+        "y": 6080.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "3e21d08a.9cf2d8"
+                "12475557.66bd73"
             ]
         ]
     },
     {
-        "id": "7b2173a0.a25f4c",
+        "id": "78bd184e.3e97c8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3363.348876953125,
-        "y": 6037.672332763672,
-        "z": "d1eceead.adafe",
+        "x": 3389.032241821289,
+        "y": 6020.238998413086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d783eb8.e8d4418"
+                "6ef9af4.3be5bd"
             ]
         ]
     },
     {
-        "id": "83f96b0e.23503",
+        "id": "8a22e0f4.ac84d",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3225.9666748046875,
-        "y": 6155.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 3251.6500396728516,
+        "y": 6137.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "39d187f7.387c08"
+                "28978481.66e84c"
             ]
         ]
     },
     {
-        "id": "39d187f7.387c08",
+        "id": "28978481.66e84c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 3403.6500396728516,
+        "y": 6138.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "3e21d08a.9cf2d8",
+        "id": "12475557.66bd73",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 3414.6500396728516,
+        "y": 6081.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "865b2c0.812e658",
+        "id": "a948f36a.4c2d08",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3327.466552734375,
-        "y": 6471.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 3353.149917602539,
+        "y": 6453.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "772ac851.ed388"
+                "a8dc909e.5f43f8"
             ]
         ]
     },
     {
-        "id": "75c39310.64e10c",
+        "id": "2126f3a4.668d54",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3327.466552734375,
-        "y": 6527.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 3353.149917602539,
+        "y": 6509.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "d783eb8.e8d4418",
+        "id": "6ef9af4.3be5bd",
         "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",
+        "x": 3576.149429321289,
+        "y": 6021.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "22737809.d5a598"
+                "3b761727.cf2a9"
             ]
         ]
     },
     {
-        "id": "22737809.d5a598",
+        "id": "3b761727.cf2a9",
         "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",
+        "x": 3817.149429321289,
+        "y": 6012.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "8e816736.3f1518"
+                "68d5173c.b0347"
             ]
         ]
     },
     {
-        "id": "772ac851.ed388",
+        "id": "a8dc909e.5f43f8",
         "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",
+        "x": 3703.149429321289,
+        "y": 6443.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7e278410.d4a45c",
-                "5323d43d.ae4a94"
+                "dcfeac9e.5fc9a8",
+                "8f5d17cf.8dabd"
             ]
         ]
     },
     {
-        "id": "e189248a.5308d8",
+        "id": "fc236214.f51f38",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3443.966064453125,
-        "y": 6383.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 3469.649429321289,
+        "y": 6365.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a38fc7bd.ddbeb"
+                "f765e05b.501478"
             ]
         ]
     },
     {
-        "id": "42e13b38.68927c",
+        "id": "6b8cfbc.a2c4d84",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3444.966064453125,
-        "y": 6328.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 3470.649429321289,
+        "y": 6310.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ca98e797.f9c13"
+                "4d6a8560.f17a1c"
             ]
         ]
     },
     {
-        "id": "a38fc7bd.ddbeb",
+        "id": "f765e05b.501478",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 3641.649429321289,
+        "y": 6363.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "ca98e797.f9c13",
+        "id": "4d6a8560.f17a1c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3612.466064453125,
-        "y": 6330.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 3638.149429321289,
+        "y": 6312.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "63dcc10.1e934c",
+        "id": "432d0671.cb443",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4148.4658203125,
-        "y": 5979.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 4174.149185180664,
+        "y": 5961.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "cb51edb2.a6957",
-                "7da0f639.3db538",
-                "dfe02514.308cd"
+                "78d865b4.b939ac",
+                "5830c911.f22ee",
+                "aa227269.131cb"
             ]
         ]
     },
     {
-        "id": "8e816736.3f1518",
+        "id": "68d5173c.b0347",
         "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",
+        "x": 4023.149429321289,
+        "y": 6009.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "63dcc10.1e934c"
+                "432d0671.cb443"
             ]
         ]
     },
     {
-        "id": "7e278410.d4a45c",
+        "id": "dcfeac9e.5fc9a8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4009.966064453125,
-        "y": 6435.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 4035.649429321289,
+        "y": 6417.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "21b3d920.ac879e"
+                "7c5aa740.2ac998"
             ]
         ]
     },
     {
-        "id": "5323d43d.ae4a94",
+        "id": "8f5d17cf.8dabd",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4013.966064453125,
-        "y": 6475.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 4039.649429321289,
+        "y": 6457.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "da782471.0e218"
+                "61ae232.1605c5c"
             ]
         ]
     },
     {
-        "id": "da782471.0e218",
+        "id": "61ae232.1605c5c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4201.466064453125,
-        "y": 6479.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 4227.149429321289,
+        "y": 6461.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "21b3d920.ac879e",
+        "id": "7c5aa740.2ac998",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 4223.649429321289,
+        "y": 6421.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "7da0f639.3db538",
+        "id": "5830c911.f22ee",
         "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",
+        "x": 4380.149185180664,
+        "y": 5974.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2a4fa91b.b928a6",
-                "3708f6c9.39ed2a",
-                "7ad7cb3f.866b74"
+                "9672ea53.f6fc4",
+                "10a5745e.fad27c",
+                "4c3d97fc.40ae6"
             ]
         ]
     },
     {
-        "id": "cb51edb2.a6957",
+        "id": "78d865b4.b939ac",
         "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",
+        "x": 4410.149185180664,
+        "y": 5922.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2a4fa91b.b928a6",
+        "id": "9672ea53.f6fc4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4564.4658203125,
-        "y": 5983.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 4590.149185180664,
+        "y": 5965.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "bee63261.4dfe28"
+                "a62535f9.bce6d8"
             ]
         ]
     },
     {
-        "id": "3708f6c9.39ed2a",
+        "id": "10a5745e.fad27c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4556.4658203125,
-        "y": 6038.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 4582.149185180664,
+        "y": 6020.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9ceb2b97.8189"
+                "f6286309.b286"
             ]
         ]
     },
     {
-        "id": "7ad7cb3f.866b74",
+        "id": "4c3d97fc.40ae6",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4561.4658203125,
-        "y": 6095.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 4587.149185180664,
+        "y": 6077.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "84d1d52.6203b28"
+                "5b2489d7.40c81"
             ]
         ]
     },
     {
-        "id": "dfe02514.308cd",
+        "id": "aa227269.131cb",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4304.4658203125,
-        "y": 6056.016571044922,
-        "z": "d1eceead.adafe",
+        "x": 4330.149185180664,
+        "y": 6038.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "84d1d52.6203b28",
+        "id": "5b2489d7.40c81",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 4739.149185180664,
+        "y": 6078.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "9ceb2b97.8189",
+        "id": "f6286309.b286",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 4750.149185180664,
+        "y": 6023.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "bee63261.4dfe28",
+        "id": "a62535f9.bce6d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4708.84814453125,
-        "y": 5980.6722412109375,
-        "z": "d1eceead.adafe",
+        "x": 4734.531509399414,
+        "y": 5963.238906860352,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "595ecbb0.cd7dfc"
+                "34794224.ac9ad6"
             ]
         ]
     },
     {
-        "id": "595ecbb0.cd7dfc",
+        "id": "34794224.ac9ad6",
         "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",
+        "x": 4949.149185180664,
+        "y": 5959.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e8d2c16f.36acb",
+        "id": "8d1e7ba3.e7c148",
         "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",
+        "x": 1684.9166412353516,
+        "y": 6757.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "656fa541.af35f4",
+        "id": "6711b1e6.015f5",
         "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",
+        "x": 1710.9166412353516,
+        "y": 6874.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "35de354f.e14d62",
-                "aedf728e.4bd508",
-                "d65aa6c1.4a58e"
+                "89c94611.e7551",
+                "372b07e6.2f493",
+                "93b4846e.f3d23"
             ]
         ]
     },
     {
-        "id": "35de354f.e14d62",
+        "id": "89c94611.e7551",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1880.7333984375,
-        "y": 6843.616668701172,
-        "z": "d1eceead.adafe",
+        "x": 1906.416763305664,
+        "y": 6826.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5345535d.1f34d4"
+                "bdc72764.d7a65"
             ]
         ]
     },
     {
-        "id": "aedf728e.4bd508",
+        "id": "372b07e6.2f493",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1872.7333984375,
-        "y": 6898.616668701172,
-        "z": "d1eceead.adafe",
+        "x": 1898.416763305664,
+        "y": 6881.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "20bec1fa.80674e"
+                "4210f39b.7722f4"
             ]
         ]
     },
     {
-        "id": "5345535d.1f34d4",
+        "id": "bdc72764.d7a65",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2015.1156005859375,
-        "y": 6838.272430419922,
-        "z": "d1eceead.adafe",
+        "x": 2040.7989654541016,
+        "y": 6820.839096069336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "eb473582.da829"
+                "8221a60d.0a6"
             ]
         ]
     },
     {
-        "id": "d65aa6c1.4a58e",
+        "id": "93b4846e.f3d23",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1877.7333984375,
-        "y": 6955.616668701172,
-        "z": "d1eceead.adafe",
+        "x": 1903.416763305664,
+        "y": 6938.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "15a64cb6.b20343"
+                "534b689.ea55a98"
             ]
         ]
     },
     {
-        "id": "15a64cb6.b20343",
+        "id": "534b689.ea55a98",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 2055.416763305664,
+        "y": 6939.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "20bec1fa.80674e",
+        "id": "4210f39b.7722f4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 2066.416763305664,
+        "y": 6882.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "eb473582.da829",
+        "id": "8221a60d.0a6",
         "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",
+        "x": 2227.9161529541016,
+        "y": 6822.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b73dec8d.f89198"
+                "70fb3446.1294d4"
             ]
         ]
     },
     {
-        "id": "b73dec8d.f89198",
+        "id": "70fb3446.1294d4",
         "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",
+        "x": 2468.9161529541016,
+        "y": 6813.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1ceb2f26.68ec79"
+                "7728eab2.206384"
             ]
         ]
     },
     {
-        "id": "8e7e1d35.45d4c8",
+        "id": "5e0f68b.e6e5b18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2800.2325439453125,
-        "y": 6779.616668701172,
-        "z": "d1eceead.adafe",
+        "x": 2825.9159088134766,
+        "y": 6762.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a1ade3fe.d4148",
-                "2a08582e.e9a11",
-                "a2d9c162.524c1"
+                "1f9f6b0b.3a7bad",
+                "3a372a08.82b95e",
+                "20000492.69e4a4"
             ]
         ]
     },
     {
-        "id": "1ceb2f26.68ec79",
+        "id": "7728eab2.206384",
         "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",
+        "x": 2674.9161529541016,
+        "y": 6810.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "8e7e1d35.45d4c8"
+                "5e0f68b.e6e5b18"
             ]
         ]
     },
     {
-        "id": "2a08582e.e9a11",
+        "id": "3a372a08.82b95e",
         "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",
+        "x": 3031.9159088134766,
+        "y": 6775.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "cc4e4323.ff0c8",
-                "37454266.958e06",
-                "fc54918e.b07f78"
+                "78de1b03.bad77c",
+                "d65c6861.1c4098",
+                "dc64de9d.8956c8"
             ]
         ]
     },
     {
-        "id": "a2d9c162.524c1",
+        "id": "20000492.69e4a4",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2956.2325439453125,
-        "y": 6856.616668701172,
-        "z": "d1eceead.adafe",
+        "x": 2981.9159088134766,
+        "y": 6839.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a1ade3fe.d4148",
+        "id": "1f9f6b0b.3a7bad",
         "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",
+        "x": 3061.9159088134766,
+        "y": 6723.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "cc4e4323.ff0c8",
+        "id": "78de1b03.bad77c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3216.2325439453125,
-        "y": 6783.616668701172,
-        "z": "d1eceead.adafe",
+        "x": 3241.9159088134766,
+        "y": 6766.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e3f7ab37.cd3338"
+                "13eb6200.778f26"
             ]
         ]
     },
     {
-        "id": "37454266.958e06",
+        "id": "d65c6861.1c4098",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3208.2325439453125,
-        "y": 6838.616668701172,
-        "z": "d1eceead.adafe",
+        "x": 3233.9159088134766,
+        "y": 6821.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c423f303.cf0fc"
+                "bff87948.e35e"
             ]
         ]
     },
     {
-        "id": "fc54918e.b07f78",
+        "id": "dc64de9d.8956c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3213.2325439453125,
-        "y": 6895.616668701172,
-        "z": "d1eceead.adafe",
+        "x": 3238.9159088134766,
+        "y": 6878.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f7cc4fee.3d03d8"
+                "573969ab.842a48"
             ]
         ]
     },
     {
-        "id": "f7cc4fee.3d03d8",
+        "id": "573969ab.842a48",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 3390.9159088134766,
+        "y": 6879.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "c423f303.cf0fc",
+        "id": "bff87948.e35e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 3401.9159088134766,
+        "y": 6824.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e3f7ab37.cd3338",
+        "id": "13eb6200.778f26",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3360.6148681640625,
-        "y": 6781.2723388671875,
-        "z": "d1eceead.adafe",
+        "x": 3386.2982330322266,
+        "y": 6763.839004516602,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a32f770f.0bf93"
+                "f7bc1d31.5e03a"
             ]
         ]
     },
     {
-        "id": "a32f770f.0bf93",
+        "id": "f7bc1d31.5e03a",
         "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",
+        "x": 3600.9159088134766,
+        "y": 6760.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "5c661b6d.db566c",
+        "id": "e2860ec7.2879b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1451.2332763671875,
-        "y": 6902.616668701172,
-        "z": "d1eceead.adafe",
+        "x": 1476.9166412353516,
+        "y": 6885.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e8d2c16f.36acb",
-                "656fa541.af35f4",
-                "f25051a6.fa4e28"
+                "8d1e7ba3.e7c148",
+                "6711b1e6.015f5",
+                "91e5ef44.c1379"
             ]
         ]
     },
     {
-        "id": "f25051a6.fa4e28",
+        "id": "91e5ef44.c1379",
         "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",
+        "x": 1759.116714477539,
+        "y": 7026.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "81385ecf.138098",
-                "de989c54.09997"
+                "9d430c54.8affb",
+                "4e9e0184.b64f38"
             ]
         ]
     },
     {
-        "id": "de989c54.09997",
+        "id": "4e9e0184.b64f38",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1986.433349609375,
-        "y": 7021.816864013672,
-        "z": "d1eceead.adafe",
+        "x": 2012.116714477539,
+        "y": 7004.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "78a6b529.99c6a4"
+                "8c955553.2a5b4"
             ]
         ]
     },
     {
-        "id": "81385ecf.138098",
+        "id": "9d430c54.8affb",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1986.433349609375,
-        "y": 7077.816864013672,
-        "z": "d1eceead.adafe",
+        "x": 2012.116714477539,
+        "y": 7060.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "78a6b529.99c6a4",
+        "id": "8c955553.2a5b4",
         "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",
+        "x": 2362.116226196289,
+        "y": 6994.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a19873b6.a4d6e",
-                "94634cdd.23be6"
+                "7b6e5c2.eee3ea4",
+                "23885c26.87d57c"
             ]
         ]
     },
     {
-        "id": "a19873b6.a4d6e",
+        "id": "7b6e5c2.eee3ea4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2668.932861328125,
-        "y": 6985.816864013672,
-        "z": "d1eceead.adafe",
+        "x": 2694.616226196289,
+        "y": 6968.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2dad16ef.224d22"
+                "6e7264f6.b603bc"
             ]
         ]
     },
     {
-        "id": "94634cdd.23be6",
+        "id": "23885c26.87d57c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2672.932861328125,
-        "y": 7025.816864013672,
-        "z": "d1eceead.adafe",
+        "x": 2698.616226196289,
+        "y": 7008.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4ffd9da0.18218c"
+                "7c20df87.4ce228"
             ]
         ]
     },
     {
-        "id": "4ffd9da0.18218c",
+        "id": "7c20df87.4ce228",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2860.432861328125,
-        "y": 7029.816864013672,
-        "z": "d1eceead.adafe",
+        "x": 2886.116226196289,
+        "y": 7012.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "2dad16ef.224d22",
+        "id": "6e7264f6.b603bc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 2882.616226196289,
+        "y": 6972.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "8d45971b.519e08",
+        "id": "b3758874.8f232",
         "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",
+        "x": 1114.933364868164,
+        "y": 4711.966567993164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5dcba2e4.9fe114",
-                "1fae83d7.8f54e4"
+                "d41942d3.562958",
+                "ebe016f8.97161"
             ]
         ]
     },
     {
-        "id": "5dcba2e4.9fe114",
+        "id": "d41942d3.562958",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1517.749755859375,
-        "y": 4717.39990234375,
-        "z": "d1eceead.adafe",
+        "x": 1543.433120727539,
+        "y": 4699.966567993164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "504ce75b.b6442"
+                "5ea52c46.125904"
             ]
         ]
     },
     {
-        "id": "1fae83d7.8f54e4",
+        "id": "ebe016f8.97161",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1521.749755859375,
-        "y": 4757.39990234375,
-        "z": "d1eceead.adafe",
+        "x": 1547.433120727539,
+        "y": 4739.966567993164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2463a8bc.d76748"
+                "f81bc98a.2445d"
             ]
         ]
     },
     {
-        "id": "504ce75b.b6442",
+        "id": "5ea52c46.125904",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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",
+        "x": 1701.433120727539,
+        "y": 4699.966567993164,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2463a8bc.d76748",
+        "id": "f81bc98a.2445d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1679.249755859375,
-        "y": 4757.39990234375,
-        "z": "d1eceead.adafe",
+        "x": 1704.933120727539,
+        "y": 4739.966567993164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "b2c9765c.25999",
+        "id": "82036bd3.d2b678",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5113,
-        "y": 5050,
-        "z": "d1eceead.adafe",
+        "x": 5138.683364868164,
+        "y": 5032.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "86e944dc.0c4178",
-                "5fccecfa.290f3c",
-                "76c53fa0.8ab25"
+                "54859efe.15c158",
+                "fd20f3ef.b5a108",
+                "bf190cd2.45b99"
             ]
         ]
     },
     {
-        "id": "76c53fa0.8ab25",
+        "id": "bf190cd2.45b99",
         "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",
+        "x": 5365.683364868164,
+        "y": 4977.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "86e944dc.0c4178",
+        "id": "54859efe.15c158",
         "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",
+        "x": 5519.683364868164,
+        "y": 5029.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "5fccecfa.290f3c",
+        "id": "fd20f3ef.b5a108",
         "type": "switchNode",
         "name": "switch $foundVpnName",
         "xml": "<switch test=\"`$foundVpnName`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5339,
-        "y": 5102,
-        "z": "d1eceead.adafe",
+        "x": 5364.683364868164,
+        "y": 5084.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "290514d0.09f59c"
+            ]
+        ]
+    },
+    {
+        "id": "290514d0.09f59c",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5543.683364868164,
+        "y": 5083.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "8f49a5ce.76f168"
+            ]
+        ]
+    },
+    {
+        "id": "22a945f9.085212",
+        "type": "set",
+        "name": "unset secondary related variables",
+        "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",
+        "comments": "",
+        "x": 3405.933334350586,
+        "y": 438.56666564941406,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "94938481.855978",
+        "type": "set",
+        "name": "set network-route-three",
+        "xml": "<set>\n<parameter name='network-route-three' value=\"`$tmp.aai.logical-link.segment-id`\" />\n\n\n",
+        "comments": "",
+        "x": 3369.933334350586,
+        "y": 688.5666656494141,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "7edb995a.421908",
+        "type": "switchNode",
+        "name": "switch secondary empty?",
+        "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3373.349838256836,
+        "y": 730.8166351318359,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2a17f2a1.8a9c0e"
+                "2aad068d.f37552",
+                "160f6f1.9c78f91"
             ]
         ]
     },
     {
-        "id": "2a17f2a1.8a9c0e",
+        "id": "2aad068d.f37552",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5518,
-        "y": 5101,
-        "z": "d1eceead.adafe",
+        "x": 3612.3497161865234,
+        "y": 566.8166656494141,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "1be1e31f.1947f5"
+            ]
+        ]
+    },
+    {
+        "id": "160f6f1.9c78f91",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3621.3497161865234,
+        "y": 613.8166656494141,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "939cd6fd.61434"
+            ]
+        ]
+    },
+    {
+        "id": "939cd6fd.61434",
+        "type": "set",
+        "name": "set hasSecondary true",
+        "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",
+        "comments": "",
+        "x": 3835.3497161865234,
+        "y": 607.8166656494141,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "1be1e31f.1947f5",
+        "type": "set",
+        "name": "set hasSecondary false",
+        "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",
+        "comments": "",
+        "x": 3839.3497161865234,
+        "y": 563.8166656494141,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "9b9082d.d33238",
+        "type": "outcome",
+        "name": "SECONDARY-ROOT",
+        "xml": "<outcome value='SECONDARY-ROOT'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4201.383773803711,
+        "y": 517.2666168212891,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "5bb9e60d.7c50c8"
+            ]
+        ]
+    },
+    {
+        "id": "5bb9e60d.7c50c8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4375.383773803711,
+        "y": 512.2666168212891,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "7a7e54e9.bf28b4",
+                "1946febe.bd9461"
+            ]
+        ]
+    },
+    {
+        "id": "7a7e54e9.bf28b4",
+        "type": "set",
+        "name": "set network-route-SECONDARY-ROOT",
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
+        "comments": "",
+        "x": 4619.384017944336,
+        "y": 504.26661682128906,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "1946febe.bd9461",
+        "type": "set",
+        "name": "set network-route-C",
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
+        "comments": "",
+        "x": 4565.384017944336,
+        "y": 544.2666168212891,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "a01fe37.2547ea",
+        "type": "outcome",
+        "name": "SECONDARY-ROOT",
+        "xml": "<outcome value='SECONDARY-ROOT'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4170.383773803711,
+        "y": 746.6666412353516,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "918e4345.efda7"
+            ]
+        ]
+    },
+    {
+        "id": "918e4345.efda7",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4328.383529663086,
+        "y": 789.6664581298828,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "6e675e43.dde0d8",
+                "80002079.3161b8"
+            ]
+        ]
+    },
+    {
+        "id": "6e675e43.dde0d8",
+        "type": "set",
+        "name": "set network-route-SECONDARY-ROOT",
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+        "comments": "",
+        "x": 4550.383529663086,
+        "y": 775.6665802001953,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "80002079.3161b8",
+        "type": "set",
+        "name": "set network-route-C",
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+        "comments": "",
+        "x": 4496.383529663086,
+        "y": 815.6665802001953,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "f054f8f8.d1b3a",
+        "type": "save",
+        "name": "get network-route-three from aai",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",
+        "comments": "",
+        "outputs": 1,
+        "x": 3381.816635131836,
+        "y": 982.8999176025391,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "36902805.8d90e",
+                "becbd8eb.e312f8",
+                "8659a4ac.581568"
+            ]
+        ]
+    },
+    {
+        "id": "36902805.8d90e",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3621.816635131836,
+        "y": 965.8999176025391,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "becbd8eb.e312f8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3617.325698852539,
+        "y": 1008.3259735107422,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8659a4ac.581568",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3621.325668334961,
+        "y": 1056.325942993164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "3e8b9bd4.673dec"
+            ]
+        ]
+    },
+    {
+        "id": "3e8b9bd4.673dec",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3776.816635131836,
+        "y": 1025.8998565673828,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "dcd7f0d5.69944"
+            ]
+        ]
+    },
+    {
+        "id": "dcd7f0d5.69944",
+        "type": "switchNode",
+        "name": "switch nr type",
+        "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3898.816635131836,
+        "y": 972.8998565673828,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a5ecb13c.9c7548"
+                "b21b1a8d.ec399",
+                "40a89314.47b21c",
+                "f3bd5a06.f854e"
             ]
         ]
+    },
+    {
+        "id": "b21b1a8d.ec399",
+        "type": "outcome",
+        "name": "ROOT",
+        "xml": "<outcome value='ROOT'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4134.816635131836,
+        "y": 822.8998565673828,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "c5a6386c.ce6e1"
+            ]
+        ]
+    },
+    {
+        "id": "40a89314.47b21c",
+        "type": "outcome",
+        "name": "LEAF",
+        "xml": "<outcome value='LEAF'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4130.816635131836,
+        "y": 878.8998565673828,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "12081a23.d55f7e"
+            ]
+        ]
+    },
+    {
+        "id": "c5a6386c.ce6e1",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4260.816635131836,
+        "y": 830.8998565673828,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "bedffac2.d82048",
+                "6105d759.fbeec8"
+            ]
+        ]
+    },
+    {
+        "id": "12081a23.d55f7e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4263.816635131836,
+        "y": 883.8998565673828,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "7ef90f2d.cab8",
+                "728a110f.c5d4a8"
+            ]
+        ]
+    },
+    {
+        "id": "f3bd5a06.f854e",
+        "type": "outcome",
+        "name": "SECONDARY-ROOT",
+        "xml": "<outcome value='SECONDARY-ROOT'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4123.816635131836,
+        "y": 956.8998565673828,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "a50b1577.32615"
+            ]
+        ]
+    },
+    {
+        "id": "a50b1577.32615",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4279.816635131836,
+        "y": 977.8998565673828,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "8c375d88.8bcbe",
+                "79733ca8.98d714"
+            ]
+        ]
+    },
+    {
+        "id": "bedffac2.d82048",
+        "type": "set",
+        "name": "set network-route-ROOT",
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+        "comments": "",
+        "x": 4507.816635131836,
+        "y": 860.8998565673828,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "6105d759.fbeec8",
+        "type": "set",
+        "name": "set network-route-B",
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+        "comments": "",
+        "x": 4499.816635131836,
+        "y": 902.8998565673828,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "7ef90f2d.cab8",
+        "type": "set",
+        "name": "set network-route-LEAF",
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+        "comments": "",
+        "x": 4500.816635131836,
+        "y": 954.8998565673828,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "728a110f.c5d4a8",
+        "type": "set",
+        "name": "set network-route-A",
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+        "comments": "",
+        "x": 4487.816635131836,
+        "y": 994.8998565673828,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "79733ca8.98d714",
+        "type": "set",
+        "name": "set network-route-C",
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
+        "comments": "",
+        "x": 4461.816635131836,
+        "y": 1088.8998565673828,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "8c375d88.8bcbe",
+        "type": "set",
+        "name": "set network-route-SECONDARY-ROOT",
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
+        "comments": "",
+        "x": 4523.816635131836,
+        "y": 1044.8998565673828,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "663710d5.9b6118",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3725.816665649414,
+        "y": 2228.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "4284e0ad.37004",
+                "54bef6f2.4fc7a"
+            ]
+        ]
+    },
+    {
+        "id": "16d496be.188cb9",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3553.150161743164,
+        "y": 2229.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "663710d5.9b6118"
+            ]
+        ]
+    },
+    {
+        "id": "545ddc0c.5d5ecc",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3562.641128540039,
+        "y": 2272.1407012939453,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5e1fc0e8.d800d8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3551.150161743164,
+        "y": 2318.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4284e0ad.37004",
+        "type": "execute",
+        "name": "execute split tp-id to get pnf-name",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC\"/>\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4016.150161743164,
+        "y": 2244.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "7adfe0fe.0b09c",
+                "70e2db35.da559c"
+            ]
+        ]
+    },
+    {
+        "id": "70e2db35.da559c",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4239.150161743164,
+        "y": 2199.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "624b6d74.0c220c"
+            ]
+        ]
+    },
+    {
+        "id": "7adfe0fe.0b09c",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4241.150161743164,
+        "y": 2263.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "44c8e026.3089e"
+            ]
+        ]
+    },
+    {
+        "id": "71a7eba7.ddb6fc",
+        "type": "save",
+        "name": "get p-interface-dst from aai",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3347.150161743164,
+        "y": 2250.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "16d496be.188cb9",
+                "545ddc0c.5d5ecc",
+                "5e1fc0e8.d800d8"
+            ]
+        ]
+    },
+    {
+        "id": "720f0fd3.e06eb",
+        "type": "comment",
+        "name": "Question?",
+        "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
+        "comments": "",
+        "x": 3286.150161743164,
+        "y": 2208.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "dab7847.8f75af8",
+        "type": "execute",
+        "name": "execute split tp-id to get pnf-name",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3367.150161743164,
+        "y": 2098.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "bb6830ab.78043",
+                "943e3a24.27d0d"
+            ]
+        ]
+    },
+    {
+        "id": "943e3a24.27d0d",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3590.150161743164,
+        "y": 2084.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "14789ba.27922e4"
+            ]
+        ]
+    },
+    {
+        "id": "bb6830ab.78043",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3592.150161743164,
+        "y": 2117.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "14789ba.27922e4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3738.150161743164,
+        "y": 2077.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "f084bd9b.374fe",
+                "635334a7.ad5104"
+            ]
+        ]
+    },
+    {
+        "id": "f084bd9b.374fe",
+        "type": "set",
+        "name": "set pnf-name",
+        "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",
+        "comments": "",
+        "x": 3930.1500396728516,
+        "y": 2014.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "54bef6f2.4fc7a",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3997.150161743164,
+        "y": 2375.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "2fc07773.c6e698"
+            ]
+        ]
+    },
+    {
+        "id": "2fc07773.c6e698",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4203.150161743164,
+        "y": 2375.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "eda47f6d.73a9a"
+            ]
+        ]
+    },
+    {
+        "id": "635334a7.ad5104",
+        "type": "get-resource",
+        "name": "get-resource src pnf",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3952.1500396728516,
+        "y": 2082.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "fd3d2e45.ba5c18",
+                "6f65faaa.29e51c",
+                "979b3e61.62e1e8"
+            ]
+        ]
+    },
+    {
+        "id": "fd3d2e45.ba5c18",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4147.650161743164,
+        "y": 2034.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "76cbe983.f31c3"
+            ]
+        ]
+    },
+    {
+        "id": "6f65faaa.29e51c",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4139.650161743164,
+        "y": 2089.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "ad429934.3c84f"
+            ]
+        ]
+    },
+    {
+        "id": "979b3e61.62e1e8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4144.650161743164,
+        "y": 2146.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "bbff5204.a70cf8"
+            ]
+        ]
+    },
+    {
+        "id": "bbff5204.a70cf8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+        "comments": "",
+        "x": 4296.650161743164,
+        "y": 2147.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "76cbe983.f31c3",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4292.032485961914,
+        "y": 2032.2223358154297,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "181d9117.3dc1c7"
+            ]
+        ]
+    },
+    {
+        "id": "a71111e6.40602",
+        "type": "set",
+        "name": "set SECONDARY-ROOT stuff",
+        "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",
+        "comments": "",
+        "x": 3347.816665649414,
+        "y": 2343.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "f86bd22d.6a796",
+        "type": "comment",
+        "name": "NOT NEEDED ANYMORE?",
+        "info": "",
+        "comments": "",
+        "x": 4026.816635131836,
+        "y": 2319.5665130615234,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "44c8e026.3089e",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
+        "comments": "",
+        "x": 4400.150161743164,
+        "y": 2282.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "624b6d74.0c220c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4404.150161743164,
+        "y": 2196.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "6725a861.5cac68",
+                "116c17e7.39a43"
+            ]
+        ]
+    },
+    {
+        "id": "eda47f6d.73a9a",
+        "type": "outcome",
+        "name": "tunnel-termination-point",
+        "xml": "<outcome value='tunnel-termination-point'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4420.435806274414,
+        "y": 2374.388442993164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "c2e9db6e.5e8918"
+            ]
+        ]
+    },
+    {
+        "id": "ad429934.3c84f",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+        "comments": "",
+        "x": 4307.650161743164,
+        "y": 2092.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "6725a861.5cac68",
+        "type": "set",
+        "name": "set ltpId",
+        "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",
+        "comments": "",
+        "x": 4574.150161743164,
+        "y": 2157.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "116c17e7.39a43",
+        "type": "set",
+        "name": "set pnf-name",
+        "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",
+        "comments": "",
+        "x": 4575.150161743164,
+        "y": 2262.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "d91f7d75.bbcbd8",
+        "type": "comment",
+        "name": "TODO: FIXME",
+        "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
+        "comments": "",
+        "x": 4570.150161743164,
+        "y": 2211.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "c2e9db6e.5e8918",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4627.267349243164,
+        "y": 2363.9071197509766,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "a655b2d0.b12cf8",
+                "1b13a85a.c9fe7",
+                "4c91f5f3.8ae07c"
+            ]
+        ]
+    },
+    {
+        "id": "a655b2d0.b12cf8",
+        "type": "set",
+        "name": "set destination ttp-id",
+        "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 4842.267349243164,
+        "y": 2325.9071197509766,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "1b13a85a.c9fe7",
+        "type": "get-resource",
+        "name": "get-resource src TTP",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4839.267349243164,
+        "y": 2364.9071197509766,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "14ad9c89.4bb913"
+            ]
+        ]
+    },
+    {
+        "id": "4c91f5f3.8ae07c",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 4794.767349243164,
+        "y": 2406.9071197509766,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "5e825807.3f1cc",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4876.150161743164,
+        "y": 2116.5667877197266,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "fd8902be.b515c8"
+            ]
+        ]
+    },
+    {
+        "id": "181d9117.3dc1c7",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4476.150039672852,
+        "y": 2046.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "b70e554c.645b38"
+            ]
+        ]
+    },
+    {
+        "id": "b70e554c.645b38",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4673.150161743164,
+        "y": 2112.5667877197266,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "5e825807.3f1cc",
+                "25292003.2c4df"
+            ]
+        ]
+    },
+    {
+        "id": "25292003.2c4df",
+        "type": "outcome",
+        "name": "network-resource",
+        "xml": "<outcome value='network-resource'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 4878.150161743164,
+        "y": 2189.5667877197266,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "c08bfda1.3541a8"
+            ]
+        ]
+    },
+    {
+        "id": "14ad9c89.4bb913",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5019.767349243164,
+        "y": 2363.9071197509766,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "f56384d9.606e1"
+            ]
+        ]
+    },
+    {
+        "id": "f56384d9.606e1",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5177.767349243164,
+        "y": 2363.9071197509766,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "a47e1ae7.393b38"
+            ]
+        ]
+    },
+    {
+        "id": "a47e1ae7.393b38",
+        "type": "set",
+        "name": "set destination tunnel tp ip",
+        "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",
+        "comments": "",
+        "x": 5384.767349243164,
+        "y": 2363.9071197509766,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "fd8902be.b515c8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5053.150161743164,
+        "y": 2108.5667877197266,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "3983145.c01d1ec",
+                "ded6bcc1.37b508"
+            ]
+        ]
+    },
+    {
+        "id": "ded6bcc1.37b508",
+        "type": "execute",
+        "name": "get esr-thirdparty-sdnc",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 5261.150161743164,
+        "y": 2115.5667877197266,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "15291f10.bfa1d1",
+                "4ad88ea0.313028",
+                "9de78895.27ba68"
+            ]
+        ]
+    },
+    {
+        "id": "c08bfda1.3541a8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5055.150161743164,
+        "y": 2181.5667877197266,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "757e0ab3.492124"
+            ]
+        ]
+    },
+    {
+        "id": "3983145.c01d1ec",
+        "type": "set",
+        "name": "set esr-thirdparty-sdnc domainC id",
+        "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 5291.150161743164,
+        "y": 2063.5667877197266,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "757e0ab3.492124",
+        "type": "set",
+        "name": "set domainC ethernet layer network-id",
+        "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 5290.150161743164,
+        "y": 2305.5667877197266,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "15291f10.bfa1d1",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5471.150161743164,
+        "y": 2106.5667877197266,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "f933124d.0d0d48"
+            ]
+        ]
+    },
+    {
+        "id": "4ad88ea0.313028",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5463.150161743164,
+        "y": 2161.5667877197266,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "708c5d46.721ab4"
+            ]
+        ]
+    },
+    {
+        "id": "9de78895.27ba68",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5468.150161743164,
+        "y": 2218.5667877197266,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "c3cc12ab.3cd488"
+            ]
+        ]
+    },
+    {
+        "id": "c3cc12ab.3cd488",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+        "comments": "",
+        "x": 5620.150161743164,
+        "y": 2219.5667877197266,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "708c5d46.721ab4",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+        "comments": "",
+        "x": 5631.150161743164,
+        "y": 2164.5667877197266,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "f933124d.0d0d48",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5615.532485961914,
+        "y": 2104.222457885742,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "2ba1c8df.2a738"
+            ]
+        ]
+    },
+    {
+        "id": "2ba1c8df.2a738",
+        "type": "set",
+        "name": "set controller domainC data",
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
+        "comments": "",
+        "x": 5830.150161743164,
+        "y": 2100.5667877197266,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "5dc3af5e.92a278",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3861.816665649414,
+        "y": 2712.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "a2e190cc.8d4f1"
+            ]
+        ]
+    },
+    {
+        "id": "a2e190cc.8d4f1",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4052.816665649414,
+        "y": 2716.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "d5cbc45b.cf7e18"
+            ]
+        ]
+    },
+    {
+        "id": "d5cbc45b.cf7e18",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4179.816665649414,
+        "y": 2715.566665649414,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "9dcfaa3c.2df838"
+            ]
+        ]
+    },
+    {
+        "id": "9dcfaa3c.2df838",
+        "type": "save",
+        "name": "get secondary root uni from aai",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4406.150405883789,
+        "y": 2708.9002838134766,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "9b50524c.8f5e2",
+                "d7d45f06.b90c18",
+                "a735aab1.9f93a8"
+            ]
+        ]
+    },
+    {
+        "id": "9b50524c.8f5e2",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4773.150161743164,
+        "y": 2602.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "c267b95.509ac48"
+            ]
+        ]
+    },
+    {
+        "id": "d7d45f06.b90c18",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4768.659194946289,
+        "y": 2647.326126098633,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "bfc554f5.bfe79"
+            ]
+        ]
+    },
+    {
+        "id": "a735aab1.9f93a8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4764.659194946289,
+        "y": 2697.326187133789,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "6ab7706d.b84f78"
+            ]
+        ]
+    },
+    {
+        "id": "5ae763e6.35d8f4",
+        "type": "save",
+        "name": "update SECONDARY-ROOT UNI in AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5212.659683227539,
+        "y": 2692.3263092041016,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c267b95.509ac48",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
+        "comments": "",
+        "x": 4935.721694946289,
+        "y": 2602.1858673095703,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "bfc554f5.bfe79",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "comments": "",
+        "x": 4936.659194946289,
+        "y": 2647.326126098633,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "6ab7706d.b84f78",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4933.659194946289,
+        "y": 2697.326187133789,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "3400e5b4.3cd32a",
+                "5ae763e6.35d8f4"
+            ]
+        ]
+    },
+    {
+        "id": "3400e5b4.3cd32a",
+        "type": "set",
+        "name": "set new bw",
+        "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source - $bwToBeDecreased`' />\n",
+        "comments": "",
+        "x": 5115.659927368164,
+        "y": 2639.326187133789,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "fa76b584.bdbd9",
+        "type": "switchNode",
+        "name": "switch tmp.mmUNI-id-long != SECONDARY-ROOT UNI",
+        "xml": "\n<switch test=\"`$tmp.mmUNI-id-long != $tmp.SECONDARY-ROOT.uni-p-interface-long`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4650.150405883789,
+        "y": 3552.899917602539,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "ef9b97c4.4f1c68"
+            ]
+        ]
+    },
+    {
+        "id": "ef9b97c4.4f1c68",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4940.150405883789,
+        "y": 3554.899917602539,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "608ff90c.2e5fc"
+            ]
+        ]
+    },
+    {
+        "id": "35800841.c29e7",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4302.683364868164,
+        "y": 5782.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "23246adb.7861de"
+            ]
+        ]
+    },
+    {
+        "id": "23246adb.7861de",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4493.683364868164,
+        "y": 5786.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "f3b9dd7.5ea102"
+            ]
+        ]
+    },
+    {
+        "id": "f3b9dd7.5ea102",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4620.683364868164,
+        "y": 5785.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "60b7ba2f.bc3c0c"
+            ]
+        ]
+    },
+    {
+        "id": "60b7ba2f.bc3c0c",
+        "type": "switchNode",
+        "name": "switch 2-ROOTS in same domain?",
+        "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4846.016372680664,
+        "y": 5787.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "2443ceec.623df2",
+                "ad2ba37e.796088"
+            ]
+        ]
+    },
+    {
+        "id": "2443ceec.623df2",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5056.016372680664,
+        "y": 5764.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "bd893034.6b25e8"
+            ]
+        ]
+    },
+    {
+        "id": "ad2ba37e.796088",
+        "type": "outcomeTrue",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5061.016372680664,
+        "y": 5813.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "d0993207.1b217"
+            ]
+        ]
+    },
+    {
+        "id": "bd893034.6b25e8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5182.016372680664,
+        "y": 5764.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d0993207.1b217",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5179.016372680664,
+        "y": 5820.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "7824302d.31915",
+                "638f8d60.f2970c"
+            ]
+        ]
+    },
+    {
+        "id": "7824302d.31915",
+        "type": "save",
+        "name": "update SECONDARY-ROOT connectivity resource in AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5493.016372680664,
+        "y": 5879.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b539af9b.8e6488",
+        "type": "comment",
+        "name": "Update connectivity status to modified",
+        "info": "",
+        "comments": "",
+        "x": 5425.233413696289,
+        "y": 5831.699966430664,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "638f8d60.f2970c",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5623.683364868164,
+        "y": 5789.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9c7760f0.090d48",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 893.6833648681641,
+        "y": 4979.899673461914,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "89d9c849.63865"
+            ]
+        ]
+    },
+    {
+        "id": "89d9c849.63865",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1084.683364868164,
+        "y": 4983.899673461914,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "71eabcdb.edbe1c"
+            ]
+        ]
+    },
+    {
+        "id": "71eabcdb.edbe1c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1211.683364868164,
+        "y": 4982.899673461914,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "b655e9e.17d4118"
+            ]
+        ]
+    },
+    {
+        "id": "b655e9e.17d4118",
+        "type": "switchNode",
+        "name": "switch 2-ROOTS in same domain?",
+        "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1437.016372680664,
+        "y": 4984.899673461914,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "451cba7b.55b034",
+                "89345bed.8540d8"
+            ]
+        ]
+    },
+    {
+        "id": "451cba7b.55b034",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1647.016372680664,
+        "y": 4961.899673461914,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "6b3712d.199ce6c"
+            ]
+        ]
+    },
+    {
+        "id": "89345bed.8540d8",
+        "type": "outcomeTrue",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1652.016372680664,
+        "y": 5010.899673461914,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "84894ba9.2f6d9"
+            ]
+        ]
+    },
+    {
+        "id": "6b3712d.199ce6c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1773.016372680664,
+        "y": 4961.899673461914,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "84894ba9.2f6d9",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1770.016372680664,
+        "y": 5017.899673461914,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "d5552e7d.44cc8",
+                "e67d570d.d5f9f"
+            ]
+        ]
+    },
+    {
+        "id": "e67d570d.d5f9f",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2214.683364868164,
+        "y": 4986.899673461914,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "41723099.7f44e8",
+        "type": "comment",
+        "name": "Update connectivity status to modified",
+        "info": "",
+        "comments": "",
+        "x": 2016.233413696289,
+        "y": 5028.699478149414,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "d5552e7d.44cc8",
+        "type": "save",
+        "name": "update SECONDARY-ROOT connectivity resource in AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2084.016372680664,
+        "y": 5076.899673461914,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5d9c1c4d.83462c",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1496.0167388916016,
+        "y": 5820.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "4a1beb8f.c1dbac"
+            ]
+        ]
+    },
+    {
+        "id": "4a1beb8f.c1dbac",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1687.0167388916016,
+        "y": 5824.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "c43fef47.9c947"
+            ]
+        ]
+    },
+    {
+        "id": "c43fef47.9c947",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1814.0167388916016,
+        "y": 5823.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "40808ad0.742134"
+            ]
+        ]
+    },
+    {
+        "id": "40808ad0.742134",
+        "type": "switchNode",
+        "name": "switch 2-ROOTS in same domain?",
+        "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2039.3497467041016,
+        "y": 5825.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "5a051931.8c6a5",
+                "818560aa.91932"
+            ]
+        ]
+    },
+    {
+        "id": "5a051931.8c6a5",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2249.3497467041016,
+        "y": 5802.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "8edca568.ede98"
+            ]
+        ]
+    },
+    {
+        "id": "818560aa.91932",
+        "type": "outcomeTrue",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2254.3497467041016,
+        "y": 5851.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "9a80cebb.ff473"
+            ]
+        ]
+    },
+    {
+        "id": "8edca568.ede98",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2375.3497467041016,
+        "y": 5802.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9a80cebb.ff473",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2372.3497467041016,
+        "y": 5858.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            [
+                "cc186b3e.b594b",
+                "5f3c966d.1d57c"
+            ]
+        ]
+    },
+    {
+        "id": "5f3c966d.1d57c",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2817.0167388916016,
+        "y": 5827.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "224407cc.d62a7",
+        "type": "comment",
+        "name": "Update connectivity status to modified",
+        "info": "",
+        "comments": "",
+        "x": 2618.5667877197266,
+        "y": 5869.699966430664,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "cc186b3e.b594b",
+        "type": "save",
+        "name": "update SECONDARY-ROOT connectivity resource in AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2686.3497467041016,
+        "y": 5917.900161743164,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9067b91d.deea4",
+        "type": "execute",
+        "name": "execute Terminate SSE Connection",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='deleteSubscriptionAndSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1546.4500274658203,
+        "y": 6126.280899047852,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "61909f2b.d81a28",
+        "type": "set",
+        "name": "set parameters",
+        "xml": "<set>\n<parameter name='subscriptionId' value='`$rcvd-bandwidth-value`' />\n",
+        "comments": "",
+        "x": 1478.483413696289,
+        "y": 6067.680801391602,
+        "z": "1b4ba1fc.83240e",
+        "wires": []
+    },
+    {
+        "id": "3d1d7271.d95cbe",
+        "type": "execute",
+        "name": "execute Terminate SSE Connection",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='deleteSubscriptionAndSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2095.116714477539,
+        "y": 5574.514297485352,
+        "z": "1b4ba1fc.83240e",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file